pancake 0.1.22 → 0.1.24

data/lib/pancake/mime_types.rb

@@ -116,6 +116,7 @@ module Pancake
     # @api private
     def self.reset_mime_types!
       # Setup the mime types based on the rack mime types
+      Type.new("any")
       Rack::Mime::MIME_TYPES.each do |ext, type|
         ext =~ /\.(.*)$/
         e = $1
@@ -166,9 +167,22 @@ module Pancake
       accepted_type = nil
 
       if accepted_types.include?("*/*")
-        name = provided.first
+        if provided.include?(:any)
+          name = :any
+          if at = accepted_types.detect{|t| t != "*/*"}
+            at
+          elsif t = provided.detect{|a| a != :any}
+            at = group(t).first.type_strings.first
+          else
+            at = "text/html"
+          end
+        else
+          name = provided.first
+          accepted_type = group(name).first
+          at = accepted_type.type_strings.first
+        end
         accepted_type = group(name).first
-        negotiated_accept_types[key] = [name, accepted_type.type_strings.first, accepted_type]
+        negotiated_accept_types[key] = [name, at, accepted_type]
         return negotiated_accept_types[key]
       end
 
@@ -177,14 +191,23 @@ module Pancake
         provided.flatten.each do |name|
           accepted_type = match_content_type(at, name)
           if accepted_type
+            if name == :any
+              if at = accepted_types.detect{|a| a != "*/*"}
+                return [name, at, accepted_type]
+              elsif at = provided.flatten.detect{|p| p != :any}
+                return [name, at.type_strings.first, accepted_type]
+              else
+                return [name, "text/html", accept_type]
+              end
+            end
             at = accepted_type.type_strings.first if at == "*/*"
             if accepted_types.join.size > 4096
-              # Don't save the key if it's larger than 4 k.
-              # This could hit a dos attack if it's repeatedly hit
-              # with anything large
-              negotiated_accept_types[key] = [name, at, accepted_type]
-            end
-            return [name, at, accepted_type]
+            # Don't save the key if it's larger than 4 k.
+            # This could hit a dos attack if it's repeatedly hit
+            # with anything large
+            negotiated_accept_types[key] = [name, at, accepted_type]
+          end
+          return [name, at, accepted_type]
           end
         end
       end
@@ -213,6 +236,13 @@ module Pancake
 
       result = nil
       provided.each do |name|
+        if name == :any
+          at = group(ext.to_sym).first
+          return nil if at.nil?
+          result = [name, at.type_strings.first, at]
+          negotiated_accept_types[key] = result
+          return result
+        end
         group(name).each do |type|
           if type.extension == ext
             result = [name, type.type_strings.first, type]
@@ -249,7 +279,11 @@ module Pancake
     # @api private
     def self.match_content_type(accept_type, key)
       group(key).detect do |t|
-        t.type_strings.include?(accept_type) || accept_type == "*/*"
+        if key == :any
+          true
+        else
+          t.type_strings.include?(accept_type) || accept_type == "*/*"
+        end
       end
     end
 

data/lib/pancake/stacks/short/stack.rb

@@ -115,6 +115,12 @@ module Pancake
         define_published_action(:delete, path, opts, block)
       end
 
+      # Matches any method to the route
+      # @api public
+      def self.any(path, opts={}, &block)
+        define_published_action(:any, path, opts, block)
+      end
+
       private
       # Defines an action on the inner Controller class of this stack.
       # Also sets it as published if it's not already published.
@@ -129,7 +135,6 @@ module Pancake
 
         action_name = controller_method_name(method,path)
         attach_action(action_name, block)
-
         attach_route(method, path, action_name, opts)
       end
 
@@ -156,7 +161,7 @@ module Pancake
       def self.attach_route(method, path, action_name, options)
         name = options.delete(:_name)
         options[:conditions] ||= {}
-        options[:conditions][:request_method] = method.to_s.upcase
+        options[:conditions][:request_method] = method.to_s.upcase unless method == :any
         options[:default_values] ||= {}
         options[:default_values][:action] = action_name
         r = router.add(path, options)

data/spec/pancake/mime_types_spec.rb

@@ -166,7 +166,6 @@ describe Pancake::MimeTypes do
     end
 
     it "should use */* if avaiable" do
-      # safari uses application/xml first
       accept_type = "application/xml,*/*"
       group, at, r = Pancake::MimeTypes.negotiate_accept_type(accept_type, :html, :xml)
       at.should == "text/html"
@@ -174,6 +173,39 @@ describe Pancake::MimeTypes do
       r.should_not be_nil
     end
 
+    describe "matching on :any" do
+      it "should use match :any for a request" do
+        accept_type = "text/xml,*/*"
+        group, at, r = Pancake::MimeTypes.negotiate_accept_type(accept_type, :any)
+        group.should == :any
+        at.should == "text/xml"
+        r.should_not be_nil
+      end
+
+      it "should match :any for a request with a defualt given" do
+        accept_types = "*/*"
+        group, at, r = Pancake::MimeTypes.negotiate_accept_type(accept_types, :any, :json)
+        group.should == :any
+        at.should == "application/json"
+        r.should_not be_nil
+      end
+
+      it "should allow a specified mime type when a default is set" do
+        accept_types = "text/plain"
+        group, at, r = Pancake::MimeTypes.negotiate_accept_type(accept_types, :any, :json)
+        group.should == :any
+        at.should == "text/plain"
+        r.should_not be_nil
+      end
+
+      it "should match text/html for a request with only */* with no default" do
+        accept_types = "*/*"
+        group, at, r = Pancake::MimeTypes.negotiate_accept_type(accept_types, :any)
+        at.should == "text/html"
+        group.should == :any
+      end
+    end
+
     it "should return nil if there is no matching class" do
       accept_type = "text/xml"
       group, r = Pancake::MimeTypes.negotiate_accept_type(accept_type, :text, :html)
@@ -229,6 +261,13 @@ describe Pancake::MimeTypes do
       r.should be_nil
     end
 
+    it "should negotiate when any by extension" do
+      group, at, r = Pancake::MimeTypes.negotiate_by_extension("xml", :any)
+      group.should == :any
+      at.should == "application/xml"
+      r.should_not be_nil
+    end
+
   end
 end
 

data/spec/pancake/stacks/short/router_spec.rb

@@ -41,6 +41,10 @@ describe Pancake::Stacks::Short, "routes" do
         "delete - bar"
       end
 
+      any "/any/foo" do
+        "any - foo"
+      end
+
       get "/baz/:var(/:date)" do
         "done: var == #{params[:var]} : date == #{params[:date]}"
       end.name(:baz)
@@ -83,6 +87,14 @@ describe Pancake::Stacks::Short, "routes" do
     result.body.should == "done: var == hassox : date == 2009-08-21"
   end
 
+  it "should handle the any request method" do
+    [:get, :post, :put, :delete].each do |meth|
+      result = self.send(meth, "/any/foo")
+      result.status.should == 200
+      result.body.should == "any - foo"
+    end
+  end
+
   describe "url generation" do
     it "should generate a simple named  url" do
       Pancake.url(RoutedShortStack, :foo).should == "/foo"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pancake
 version: !ruby/object:Gem::Version 
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: pancake
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 +11:00
+date: 2009-11-22 00:00:00 +11:00
 default_executable: pancake-gen
 dependencies: 
 - !ruby/object:Gem::Dependency