perma_cache 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmZmZTYxYWI3YWZjZDgzMjdmMDRhMGViMmM1MWJlYzQ1NTYzNTg0Nw==
+  data.tar.gz: !binary |-
+    ZWRiYTQzNTc3YjY1N2M3Y2YxMzA2YmMwZjMxZWFmMGQ4YmJkOTNlNA==
+SHA512:
+  metadata.gz: !binary |-
+    YzJlMWQ1NWFjY2RlNjkyZTIyODBkNDFjYTBkYzAyNGMzMmYxMTE3YTM4Y2I2
+    NTkyMjBhYjRhODdhMTFmNDQ3MmNkZjExNGFjY2UxMjEwZGNhMmI5YzYzZDMw
+    N2RiZTM2ZTkxZmVhYTZhNWMyMjk4MTdhNzhhZTE3ZGY4ODRlMDQ=
+  data.tar.gz: !binary |-
+    YjA3ZGJkYzM5N2I2ZThiNDhjNDZkZjlmODY1OGViNzcyNDMyN2VmMjgzNjYx
+    OWEzZTVjM2NjMDhkNGI3MGVjMjEzMTE3MGQzMmNjOWMyZjUyM2FjZmIwOGMw
+    YmVkNWY0ZmIxNjhkZjYwNjUwOTg3NGEwNDU3OGUyMTA5ZDkxYmY=

data/lib/perma_cache.rb

@@ -24,11 +24,11 @@ module PermaCache
   def self.build_key_from_object(obj)
     # Don't want to add this to Object
     Array.new.tap do |arr|
+
       if obj.respond_to?(:cache_key)
         arr << obj.cache_key
       else
-        arr << obj.class.name
-
+        arr << (obj.is_a?(Module) ? obj.name : obj.class.name)
         if obj.respond_to?(:id)
           arr << obj.id
         end
@@ -57,25 +57,19 @@ module PermaCache
             key << PermaCache.build_key_from_object(send(options[:obj]))
           end
 
-          key << method_name
-
           if options[:version]
             key << "v#{options[:version]}"
           end
 
-          key = key.flatten.reject do |k|
-            (k.empty? rescue nil) ||
-            (k.nil? rescue nil)
-          end.join('/')
-
           key
         end
 
         define_method "#{method_name}_perma_cache_key" do
           [
             send("#{method_name}_base_key"),
-            (send("#{method_name}_key") rescue nil)
-          ].compact.join('/').gsub(' ','_')
+            (send("#{method_name}_key") rescue nil),
+            method_name
+          ].flatten.compact.map(&:to_s).reject{|k| k.empty?}.join('/').gsub(' ','_')
         end
 
         define_method "#{method_name}!" do

data/lib/perma_cache/version.rb

@@ -1,3 +1,3 @@
 module PermaCache
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/perma_cache.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "shoulda"
-  spec.add_development_dependency "mocha", "< 1.0"
+  spec.add_development_dependency "mocha"
   spec.add_development_dependency "debugger"
 end
 

data/test/perma_cache_test.rb

@@ -30,17 +30,31 @@ class KlassOne
 end
 
 class KlassTwo
+  include PermaCache
+
   def cache_key
     "some_other_class/123"
   end
 end
 
 class KlassThree
+  include PermaCache
+
   def id
     234
   end
 end
 
+module ModuleOne
+  class << self
+    include PermaCache
+    def module_one_method
+      345
+    end
+    perma_cache :module_one_method
+  end
+end
+
 class PermaCacheTest < Test::Unit::TestCase
 
   context "build_key_from_object" do
@@ -101,7 +115,7 @@ class PermaCacheTest < Test::Unit::TestCase
 
     should "calling #method1 should write and return the result if the cache is empty" do
       obj = KlassOne.new
-      cache_obj = mock
+      cache_obj = Object.new
       cache_obj.expects(:read).with(obj.method1_perma_cache_key).once.returns(nil)
       cache_obj.expects(:write).with(obj.method1_perma_cache_key, 1, :expires_in => nil).once
       PermaCache.cache = cache_obj
@@ -112,7 +126,7 @@ class PermaCacheTest < Test::Unit::TestCase
 
     should "calling #method1 should read the cache, but not write it, if the cache is present" do
       obj = KlassOne.new
-      cache_obj = mock
+      cache_obj = Object.new
       cache_obj.expects(:read).with(obj.method1_perma_cache_key).once.returns(123)
       cache_obj.expects(:write).never
       PermaCache.cache = cache_obj
@@ -123,7 +137,7 @@ class PermaCacheTest < Test::Unit::TestCase
 
     should "calling #method1! should write the cache, but not read from it" do
       obj = KlassOne.new
-      cache_obj = mock
+      cache_obj = Object.new
       cache_obj.expects(:read).never
       cache_obj.expects(:write).with(obj.method1_perma_cache_key, 1, :expires_in => nil).once
       PermaCache.cache = cache_obj
@@ -134,18 +148,18 @@ class PermaCacheTest < Test::Unit::TestCase
   end
   context "version option" do
     should "add that key/value to the cache key" do
-      assert_equal "perma_cache/v1/KlassOne/method3/v2", KlassOne.new.method3_perma_cache_key
+      assert_equal "perma_cache/v1/KlassOne/v2/method3", KlassOne.new.method3_perma_cache_key
     end
   end
   context "user defined keys" do
     should "should append themselves to the cache key" do
-      assert_equal "perma_cache/v1/KlassOne/some_other_class/123/method2/more_things", KlassOne.new.method2_perma_cache_key
+      assert_equal "perma_cache/v1/KlassOne/some_other_class/123/more_things/method2", KlassOne.new.method2_perma_cache_key
     end
   end
   context "setting expires_in" do
     should "pass the value through to #write" do
       obj = KlassOne.new
-      cache_obj = mock
+      cache_obj = Object.new
       cache_obj.expects(:read).with(obj.method3_perma_cache_key).returns(nil).once
       cache_obj.expects(:write).with(obj.method3_perma_cache_key, 3, :expires_in => 5).once
       obj.expects(:sleep).with(1).once
@@ -153,5 +167,11 @@ class PermaCacheTest < Test::Unit::TestCase
       obj.method3
     end
   end
+
+  context "a module" do
+    should "set the perma cache key" do
+      assert_equal "perma_cache/v1/ModuleOne/module_one_method", ModuleOne.module_one_method_perma_cache_key
+    end
+  end
 end
 

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/test_unit'
 require 'debugger'
 
 require 'bundler/setup'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: perma_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Josh Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,23 +69,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -129,27 +116,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: It's a perma cache, duh
 test_files:
 - test/perma_cache_test.rb