brianmario · August 12, 2009 00:06 · Nov 24, 2009 · Nov 24, 2009 · Aug 17, 2009 · Aug 12, 2009
diff --git a/gistfile1.rb b/gistfile1.rb
@@ -5,7 +5,6 @@ def post_init
         @parser = Yajl::Parser.new
         @parser.on_parse_complete = method(:receive_object)
         @encoder = Yajl::Encoder.new
-        @encoder.on_progress = method(:send_data)
       end
 
       def receive_data(data)
@@ -21,7 +20,9 @@ def receive_object(obj)
       def send_object(obj)
         # attempts to hand the caller 8kb chunks of the buffer as
         # it's being generated
-        @encoder.encode(obj)
+        @encoder.encode(obj) do |chunk|
+          send_data(chunk)
+        end
       end
     end
   end

diff --git a/gistfile1.rb b/gistfile1.rb
@@ -5,6 +5,7 @@ def post_init
         @parser = Yajl::Parser.new
         @parser.on_parse_complete = method(:receive_object)
         @encoder = Yajl::Encoder.new
+        @encoder.on_progress = method(:send_data)
       end
 
       def receive_data(data)
@@ -20,9 +21,7 @@ def receive_object(obj)
       def send_object(obj)
         # attempts to hand the caller 8kb chunks of the buffer as
         # it's being generated
-        @encoder.encode(obj) do |chunk|
-          send_data(chunk)
-        end
+        @encoder.encode(obj)
       end
     end
   end

diff --git a/gistfile1.rb b/gistfile1.rb
@@ -4,24 +4,24 @@ module JsonProtocol
       def post_init
         @parser = Yajl::Parser.new
         @parser.on_parse_complete = method(:receive_object)
-        @encoder = Yajl::Encoder.new(:terminator => "\0")
+        @encoder = Yajl::Encoder.new
       end
 
-      def receive_data data
+      def receive_data(data)
         @parser << data
       end
 
       # Invoked with ruby objects received over the network
-      def receive_object obj
+      def receive_object(obj)
         # stub
       end
 
       # Sends a ruby object over the network
-      def send_object obj
+      def send_object(obj)
         # attempts to hand the caller 8kb chunks of the buffer as
         # it's being generated
         @encoder.encode(obj) do |chunk|
-          send_data chunk
+          send_data(chunk)
         end
       end
     end

diff --git a/gistfile1.rb b/gistfile1.rb
@@ -18,6 +18,8 @@ def receive_object obj
 
       # Sends a ruby object over the network
       def send_object obj
+        # attempts to hand the caller 8kb chunks of the buffer as
+        # it's being generated
         @encoder.encode(obj) do |chunk|
           send_data chunk
         end

diff --git a/gistfile1.rb b/gistfile1.rb
@@ -7,7 +7,7 @@ def post_init
         @encoder = Yajl::Encoder.new(:terminator => "\0")
       end
 
-      def receive_data data # :nodoc:
+      def receive_data data
         @parser << data
       end
 

diff --git a/gistfile1.rb b/gistfile1.rb
@@ -0,0 +1,27 @@
+module EventMachine
+  module Protocols
+    module JsonProtocol
+      def post_init
+        @parser = Yajl::Parser.new
+        @parser.on_parse_complete = method(:receive_object)
+        @encoder = Yajl::Encoder.new(:terminator => "\0")
+      end
+
+      def receive_data data # :nodoc:
+        @parser << data
+      end
+
+      # Invoked with ruby objects received over the network
+      def receive_object obj
+        # stub
+      end
+
+      # Sends a ruby object over the network
+      def send_object obj
+        @encoder.encode(obj) do |chunk|
+          send_data chunk
+        end
+      end
+    end
+  end
+end