pakada-dispatch 0.0.4 → 0.0.5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Lars Gierth
+Copyright (c) 2011 Lars Gierth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/pakada/dispatch/controller.rb

@@ -47,6 +47,12 @@ class Pakada
         throw :finish
       end
       
+      def json(obj)
+        response.headers["Content-Type"] = "application/json"
+        response.write obj.respond_to?(:json) ? obj.to_json : Yajl::Encoder.encode(obj)
+        finish!
+      end
+      
       def redirect(*args)
         response.status = (Fixnum === args[0]) ? args.shift : 303
 
@@ -56,6 +62,8 @@ class Pakada
           url = args[0].to_url
         elsif args[0]
           url = args[0]
+        else
+          raise ArgumentError, "Controller#redirect needs a URL"
         end
           
         response.headers["Location"] = url

data/lib/pakada/dispatch/version.rb

@@ -1,5 +1,5 @@
 class Pakada
   class Dispatch
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/controller_spec.rb

@@ -223,6 +223,13 @@ describe "SomeController" do
       
       controller.response.status.should == 303
     end
+    
+    it "raises an ArgumentError if the arguments don't include a URL" do
+      controller = subject.new({})
+      
+      proc { controller.redirect }.should raise_error(ArgumentError)
+      proc { controller.redirect 303 }.should raise_error(ArgumentError)
+    end
   end
   
   describe "#not_found" do
@@ -282,6 +289,30 @@ describe "SomeController" do
       end
     end
   end
+  
+  describe "#json" do
+    it "sets the JSON Content-Type header, writes JSON output and finishes" do
+      subject.action(:foo) { json :key => "value" }
+      controller = subject.new({})
+      
+      controller.should_receive :finish!
+      controller.call_action :foo
+      
+      controller.response.headers["Content-Type"].should == "application/json"
+      Yajl::Parser.parse(controller.response.body.join).should == {"key" => "value"}
+    end
+    
+    it "tries to call #to_json and use its result as output" do
+      obj = double "output", :to_json => '{"key":"value"}'
+      obj.should_receive :to_json
+      
+      subject.action(:foo) { json obj }
+      controller = subject.new({})
+      controller.call_action :foo
+      
+      Yajl::Parser.parse(controller.response.body.join).should == {"key" => "value"}
+    end
+  end
 end
 
 describe Pakada::Dispatch::NOT_FOUND_ENDPOINT do

metadata

@@ -2,7 +2,7 @@
 name: pakada-dispatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Lars Gierth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 972238593
+      hash: 530646867
       segments: 
       - 0
       version: "0"
@@ -118,14 +118,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 972238593
+      hash: 530646867
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Routing And Action Controllers For Pakada