mockingbird 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+0.2.0
+=====
+* Fix chunked encoding bug. Scripts that used to rely on "\r\n" being 
+  automatically appended to each send call need to be updated to manually add 
+  "\r\n" (or whatever line ending) as appropriate.
+
+0.1.1
+=====
+* Add :quiet flag to silence puts during tests (thanks @rud)
+
+0.1.0
+=====
+* Initial release

data/examples/gzip.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'mockingbird'
+require 'gzip'
+require 'stringio'
+
+Mockingbird.setup(:port=>8080) do
+
+  headers(
+    "Transfer-Encoding"=>"chunked",
+    "Content-Encoding"=>"gzip"
+  )
+
+  send %Q({"foo":"bar"}\r\n)
+  wait 0.5
+  5.times do |n|
+    send %Q({"foo":"bar#{n}"}\r\n)
+  end
+  pipe "#{File.dirname(__FILE__)}/overview_output.txt", :wait=>1
+  close
+end

data/examples/overview.rb

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'mockingbird'
 
 Mockingbird.setup(:port=>8080) do
-  send '{"foo":"bar"}'
+  send %Q({"foo":"bar"}\r\n)
   wait 0.5
   5.times do |n|
-    send %Q({"foo":"bar#{n}"})
+    send %Q({"foo":"bar#{n}"}\r\n)
   end
   pipe "#{File.dirname(__FILE__)}/overview_output.txt", :wait=>1
   close

data/examples/reconnects.rb

@@ -9,15 +9,15 @@ Mockingbird.setup(:port=>8080) do
   on_connection(1) do
     disconnect!
   end
-  
+
   on_connection(2..5) do
     wait(0.5)
     close
   end
-  
+
   on_connection('*') do
-    100.times do
-      send '{"foo":"bar"}'
+    10.times do |i|
+      send %Q({"foo":"bar#{i}"}\r\n)
     end
     close
   end

data/lib/mockingbird/commands.rb

@@ -107,7 +107,7 @@ module Mockingbird
       
       def run(conn)
         unless io.eof?
-          chunk = io.readline.chomp
+          chunk = io.readline
           conn.send_chunk(chunk)
           if delay
             EM.add_timer(delay) { run(conn) }

data/lib/mockingbird/encoders.rb

@@ -0,0 +1,24 @@
+module Mockingbird
+  module Encoders
+
+    def IdentityEncoder
+      def start
+        nil
+      end
+
+      def encode(content)
+        content
+      end
+    end
+
+    def GzipEncoder
+
+      def start
+        @gzw = Zlib::GzipWriter.new
+        
+      end
+
+    end
+
+  end
+end

data/lib/mockingbird/server.rb

@@ -15,9 +15,9 @@ module Mockingbird
   # recommended that you use the simpler convenience interface defined on 
   # the Mockingbird module.
   module Server
-  
+
     class << self
-     
+
       def start!(opts={})
         opts = {:host=>'0.0.0.0',:port=>8080}.merge(opts)
         host = opts[:host]
@@ -27,57 +27,67 @@ module Mockingbird
           EventMachine::start_server host, port, self
         end
       end
-      
+
       def configure(&block)
         @script = Script.new(&block)
       end
-      
+
       def script
         @script
       end
-      
+
       def new_connection_id
         @connection_id ||= 0
         @connection_id += 1
       end
-      
+
     end
-    
+
     def receive_data(data)
       conn_id = new_connection_id
       runner = ScriptRunner.new(self,script.for_connection(conn_id))
       runner.run
     end
-    
+
     def new_connection_id
       Mockingbird::Server.new_connection_id
     end
-    
+
     def script
       Mockingbird::Server.script
     end
-    
+
     def send_status(code=200,text="OK")
       send_data "HTTP/1.1 #{code} #{text}\r\n"
     end
-    
+
     def send_header(name,value)
       send_data "#{name}: #{value}\r\n"
     end
-    
+
     def start_body
       send_data "\r\n"
     end
-    
+
     def send_chunk(chunk)
-      res = %Q(#{chunk}\r\n)
-      send_data "#{res.length.to_s(16)}\r\n"
-      send_data "#{res}\r\n"
+      len = chunk_length(chunk)
+      send_data "#{len.to_s(16)}\r\n"
+      send_data "#{chunk}\r\n"
     end
-    
+
     def send_terminal_chunk
       send_data "0\r\n\r\n"
     end
-    
+
+    private
+      def chunk_length(chunk)
+        # Be friendly to 1.8 and 1.9. In 1.9, length is the char length, not
+        # the byte length
+        if chunk.respond_to?(:bytesize)
+          chunk.bytesize
+        else
+          chunk.length
+        end
+      end
   end
 end

data/lib/mockingbird/version.rb

@@ -1,5 +1,5 @@
 module Mockingbird
   
-  VERSION = Version = "0.1.1"
+  VERSION = Version = "0.2.0"
   
 end

metadata

@@ -2,7 +2,7 @@
 name: mockingbird
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Hayes Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-18 00:00:00 -08:00
+date: 2012-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,21 +33,25 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.md
+- CHANGELOG.md
 files: 
 - README.md
 - lib/mockingbird/commands.rb
 - lib/mockingbird/connection_script.rb
+- lib/mockingbird/encoders.rb
 - lib/mockingbird/script.rb
 - lib/mockingbird/script_runner.rb
 - lib/mockingbird/server.rb
 - lib/mockingbird/version.rb
 - lib/mockingbird.rb
 - examples/examples.md
+- examples/gzip.rb
 - examples/overview.rb
 - examples/overview_output.txt
 - examples/reconnects.rb
 - examples/status_and_headers.rb
 - LICENSE
+- CHANGELOG.md
 has_rdoc: true
 homepage: http://github.com/hayesdavis/mockingbird
 licenses: []