tricycle-rack-contrib 0.9.6 → 0.9.7

data/lib/rack/contrib/response_cache.rb

@@ -16,8 +16,9 @@ class Rack::ResponseCache
     "text/javascript" => %w[js], "application/javascript" => %w[js],
     "text/plain" => %w[txt],
     "text/xml" => %w[xml],
+    "text/x-component" => %w[htc],
   }
-  ALLOWED_EXTENSIONS = CONTENT_TYPES.collect {|k, v| v }.flatten.uniq
+  ALLOWED_EXTENSIONS = CONTENT_TYPES.values.flatten.uniq
 
   # The default proc used if a block is not provided to .new
   # Doesn't cache unless path does not contain '..', Content-Type is

data/test/spec_rack_response_cache.rb

@@ -129,16 +129,19 @@ context Rack::ResponseCache do
     @cache.should.equal('/a.html' => @def_value)
   end
 
-  {
-    :css => %w[text/css],
-    :csv => %w[text/csv],
-    :html => %w[text/html],
-    :js => %w[text/javascript application/javascript],
-    :pdf => %w[application/pdf],
-    :txt => %w[text/plain],
-    :xhtml => %w[application/xhtml+xml],
-    :xml => %w[text/xml],
-  }.each do |extension, mime_types|
+  extensions_fixture = {}  # reversed CONTENT_TYPES
+  Rack::ResponseCache::CONTENT_TYPES.each do |mime_type, extensions|
+    extensions.each do |extension|
+      next if extension == "htm"  # special behaviour for .htm
+      if extensions_fixture[extension]
+        extensions_fixture[extension] << mime_type
+      else
+        extensions_fixture[extension] = [mime_type]
+      end
+    end
+  end
+
+  extensions_fixture.each do |extension, mime_types|
     mime_types.each do |mime_type|
       specify "should cache #{mime_type} responses with the extension ('#{extension}') unchanged" do
         request(:path => "/a.#{extension}", :headers => {'CT' => mime_type})
@@ -157,7 +160,7 @@ context Rack::ResponseCache do
     @cache.should.equal("/a.htm" => @def_value)
   end
   
-  [:css, :xml, :xhtml, :js, :txt, :pdf, :csv].each do |extension|
+  (extensions_fixture.keys - %w[htm html]).each do |extension|
     specify "should not cache if extension and content-type don't agree" do
       request(:path => "/d.#{extension}", :headers => {'CT' => 'text/html'})
       @cache.should.equal({})

data/tricycle-rack-contrib.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'tricycle-rack-contrib'
-  s.version = '0.9.6'
-  s.date = '2010-01-07'
+  s.version = '0.9.7'
+  s.date = '2010-01-28'
 
   s.description = "Contributed Rack Middleware and Utilities, including Tricycle's modifications"
   s.summary     = "Contributed Rack Middleware and Utilities, including Tricycle's modifications"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tricycle-rack-contrib
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - tricycle
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +11:00
+date: 2010-01-28 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency