erector_cache 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/erector_cache.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{erector_cache}
+  s.version = "0.0.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Grockit"]
+  s.date = %q{2011-01-27}
+  s.description = %q{Caching for your Erector}
+  s.email = %q{mmol@grockit.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "erector_cache.gemspec",
+    "lib/erector_cache.rb",
+    "lib/erector_cache/fragment.rb",
+    "lib/erector_cache/widget.rb",
+    "spec/erector_cache/fragment_spec.rb",
+    "spec/erector_cache/widget_spec.rb",
+    "spec/erector_cache_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/grockit/erector_cache}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Caching for your Erector}
+  s.test_files = [
+    "spec/erector_cache/fragment_spec.rb",
+    "spec/erector_cache/widget_spec.rb",
+    "spec/erector_cache_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.6"])
+      s.add_runtime_dependency(%q<lawnchair>, [">= 0.6.8"])
+      s.add_runtime_dependency(%q<erector>, ["= 0.8.1"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.6"])
+      s.add_dependency(%q<lawnchair>, [">= 0.6.8"])
+      s.add_dependency(%q<erector>, ["= 0.8.1"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.6"])
+    s.add_dependency(%q<lawnchair>, [">= 0.6.8"])
+    s.add_dependency(%q<erector>, ["= 0.8.1"])
+  end
+end
+

data/lib/erector_cache/widget.rb

@@ -26,25 +26,18 @@ module ErectorCache
       
       def expire!(hash={})
         hash = Hash.new("*").merge(hash)
-        search_key = self.key_components.inject(["Lawnchair", self.to_s]) do |collection, part|
-          p_prime = (part.is_a?(Hash) ? part.keys.first : part)
-          collection << p_prime
-          collection << if part.is_a?(Hash) && hash.keys.include?(p_prime)
-            part[p_prime].call(hash[p_prime])
-          else
-            hash[p_prime].to_param
-          end
-        end.join(":")
-        
+        search_key = "Lawnchair:"+cache_key(hash, true)
         LAWNCHAIR.redis.keys(search_key).each{|key| LAWNCHAIR.redis.del(key) }
       end
       
-      def cache_key(hash)
+      def cache_key(hash, wildcard=false)
         self.key_components.inject([self.to_s]) do |collection, part|
-          object = part.is_a?(Hash) ? hash[part.keys.first] : hash[part]
+          key = (part.is_a?(Hash) ? part.keys.first : part)
+          object = hash[key]
 
-          if part.is_a?(Hash)
-            key = part.keys.first
+          if wildcard && object == "*"
+            value = "*"
+          elsif part.is_a?(Hash)
             value = Array(part[key]).map do |p| 
               if p.is_a?(Proc)
                 p.call(object)
@@ -53,7 +46,6 @@ module ErectorCache
               end
             end.join("-")
           else
-            key = part
             value = object.to_param
           end
           collection << [key, value]

data/spec/erector_cache/widget_spec.rb

@@ -38,7 +38,7 @@ class Weapon
 end
 
 class NinjaTurtle < Turtle
-  cache_with :weapon, :master => lambda {|m| m.name }
+  cache_with :weapon, :master => [:to_param, lambda {|m| m.name }]
   cache_for 25.years
   
   def content
@@ -164,7 +164,7 @@ describe ErectorCache::Widget do
       
       it "builds a complex cache key" do
         widget = NinjaTurtle.new(:name => "Leonardo", :master => @splinter, :weapon => "Dual Katanas")
-        widget.cache_key.should == "NinjaTurtle:name:Leonardo:weapon:Dual Katanas:master:Splinter"
+        widget.cache_key.should == "NinjaTurtle:name:Leonardo:weapon:Dual Katanas:master:Splinter-Splinter"
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: erector_cache
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Grockit
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -08:00
+date: 2011-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,12 +78,12 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README
 - README.rdoc
 - Rakefile
 - VERSION
+- erector_cache.gemspec
 - lib/erector_cache.rb
 - lib/erector_cache/fragment.rb
 - lib/erector_cache/widget.rb
@@ -97,8 +97,8 @@ homepage: http://github.com/grockit/erector_cache
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC