pakada-dispatch 0.3.3 → 0.3.4

data/lib/pakada/dispatch.rb

@@ -1,5 +1,6 @@
 require "hooked"
 require "http_router"
+require "multi_json"
 require "pakada"
 
 require "pakada/dispatch/controller"

data/lib/pakada/dispatch/controller.rb

@@ -55,7 +55,7 @@ class Pakada
         options[:render] = false
         options[:layout] = false
         response.headers["Content-Type"] = "application/json"
-        response.write data.to_json
+        response.write MultiJson.encode(data)
       end
       
       def json!(data)
@@ -74,25 +74,23 @@ class Pakada
           @actions ||= {}
         end
         
-        def action(name, options = {}, &block)
+        def action(name, opts = {}, &block)
           if block
             actions[name] = {
               :block => block,
-              :options => options
+              :options => opts
             }
           else
             unless action = actions[name]
               raise ArgumentError, "Unknown action: #{name}"
             end
             
-            options = self.options.dup.tap {|opts|
-              opts.merge! action[:options]
-              opts.merge! options
-              opts.merge! :action => name
-            }
+            options = self.options.merge(action[:options]).
+                                   merge(opts).
+                                   merge(:action => name)
             
             proc {|env|
-              self.new(env, options).process(&action[:block]).response.finish
+              self.new(env, options.dup).process(&action[:block]).response.finish
             }
           end
         end

data/lib/pakada/dispatch/version.rb

@@ -1,5 +1,5 @@
 class Pakada
   class Dispatch
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

data/pakada-dispatch.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "pakada"
   s.add_dependency "http_router"
+  s.add_dependency "multi_json"
   s.add_dependency "rack"
   
   s.add_development_dependency "rspec"

data/spec/controller_spec.rb

@@ -96,10 +96,13 @@ describe Pakada::Dispatch::Controller do
   end
   
   context "#json" do
-    let(:data) { stub "data", :to_json => stub("json_data") }
+    let(:data) { stub "data" }
+    let(:json) { stub "json" }
     
     it "sets a JSON response" do
-      response.should_receive(:write).with data.to_json
+      MultiJson.should_receive(:encode).with(data) { json }
+      response.should_receive(:write).with json
+      
       ctrlr_obj.json data
       response.headers["Content-Type"].should == "application/json"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakada-dispatch
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000Z
+date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakada
-  requirement: &81086540 !ruby/object:Gem::Requirement
+  requirement: &79714000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81086540
+  version_requirements: *79714000
 - !ruby/object:Gem::Dependency
   name: http_router
-  requirement: &81086230 !ruby/object:Gem::Requirement
+  requirement: &79713730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81086230
+  version_requirements: *79713730
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &79713460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *79713460
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &81085970 !ruby/object:Gem::Requirement
+  requirement: &79713190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81085970
+  version_requirements: *79713190
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81080830 !ruby/object:Gem::Requirement
+  requirement: &79712950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81080830
+  version_requirements: *79712950
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &81080460 !ruby/object:Gem::Requirement
+  requirement: &79712720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81080460
+  version_requirements: *79712720
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &81080100 !ruby/object:Gem::Requirement
+  requirement: &79712450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81080100
+  version_requirements: *79712450
 - !ruby/object:Gem::Dependency
   name: pakada-render
-  requirement: &81079600 !ruby/object:Gem::Requirement
+  requirement: &79712190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81079600
+  version_requirements: *79712190
 description: 
 email:
 - lars.gierth@gmail.com