etag_for 0.1.1 → 0.1.2

data/README.md

@@ -52,7 +52,9 @@ end
 
 ## etag_for(item_or_items, options = {})
 
-Returns an array of strings that can be used as an input to **fresh_when** and **stale?** to calculate an ETag value for the current request.
+Returns an array of objects and strings that can be used as the **etag** parameter to **fresh_when** and **stale?** to calculate 
+an ETag value for the current request.  The extra files involved give a more representative value for the **ETAG** header when rendering the
+response using Rails view templates 
 
 ### item_or_items parameter
 

data/lib/etag_for/etag_for.rb

@@ -10,7 +10,7 @@ module EtagFor
     files << options[:view] if options[:view]
     files += options[:files] if options[:files]
 
-    [ extract_keys(item_or_items) ].flatten + [ css_path(css_file), js_path(js_file) ] + digests_of(files)
+    [ item_or_items ].flatten + [ css_path(css_file), js_path(js_file) ] + digests_of(files)
   end
 
 protected
@@ -28,14 +28,4 @@ protected
     view_context.javascript_path(js_file) if js_file && js_file.length > 0
   end
 
-  def extract_keys(item_or_items)
-    if item_or_items.respond_to?(:map)
-      item_or_items.map do |item|
-        item.respond_to?(:cache_key) ? item.cache_key : item.to_param
-      end
-    else
-      item_or_items.respond_to?(:cache_key) ? item_or_items.cache_key : item_or_items.to_param
-    end
-  end
-
 end

data/lib/etag_for/version.rb

@@ -1,3 +1,3 @@
 module EtagFor
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/etag_for_test.rb

@@ -55,45 +55,21 @@ describe EtagFor do
     TestController.new.send(:js_path, "").must_be_nil
   end
 
-  it "must extract keys from item array with cache_key" do
-    item_1 = MiniTest::Mock.new
-    item_1.expect :cache_key, "foo"
-
-    item_2 = MiniTest::Mock.new
-    item_2.expect :cache_key, "bar"
-
-    TestController.new.send(:extract_keys, [ item_1, item_2 ]).must_equal [ "foo", "bar" ]
-  end
-
-  it "must extract key from a single item with cache_key" do
-    item_1 = MiniTest::Mock.new
-    item_1.expect :cache_key, "foo"
+  it "must return array from etag_for with single item" do
+    item = MiniTest::Mock.new
+    item.expect :to_param, "foo"
 
-    TestController.new.send(:extract_keys, item_1).must_equal "foo"
+    TestController.new.etag_for(item, :css => "", :js => "").must_equal [ item, nil, nil ]
   end
 
-  it "must extract keys from item array with out cache_key" do
+  it "must return array from etag_for with many items" do
     item_1 = MiniTest::Mock.new
     item_1.expect :to_param, "foo"
 
     item_2 = MiniTest::Mock.new
     item_2.expect :to_param, "bar"
 
-    TestController.new.send(:extract_keys, [ item_1, item_2 ]).must_equal [ "foo", "bar" ]
-  end
-
-  it "must extract key from a single item with out cache_key" do
-    item_1 = MiniTest::Mock.new
-    item_1.expect :to_param, "foo"
-
-    TestController.new.send(:extract_keys, item_1).must_equal "foo"
-  end
-
-  it "must return array from etag_for" do
-    item = MiniTest::Mock.new
-    item.expect :to_param, "foo"
-
-    TestController.new.etag_for(item, :css => "", :js => "").must_equal [ "foo", nil, nil ]
+    TestController.new.etag_for( [ item_1, item_2 ], :css => "", :js => "").must_equal [ item_1, item_2, nil, nil ]
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etag_for
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport