def_cache 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTEyMGI3NjEzNjA5ZWEzOTZhYmI2OGY1MTY0ZjhhZDRlMGYwZGM3MQ==
-  data.tar.gz: !binary |-
-    ZDU2YjJiODFiOTI0MmMzNTVmZTQ5ZjVlYjI3ZGRhNmU0ZjRlZmFiYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjIxYTlmMDc1ZTk5ZDA2NTEwZjMzZDU4NmJhNDExNjk3MzYxMDk2ODYwZjU4
-    MWI1YTZkYjNhZWViMjA4YzA4OWNiM2RmYzYxOTJlYzE1ZGVkZjA3YWViMzg3
-    YTE4ZjZiYTVhNTNlNDY3Y2U2MjkzMDExZGI1YTdmZWRkYjUxN2M=
-  data.tar.gz: !binary |-
-    YjQ2YmU1ZDNlYzY4NGFkZmE2NjMyYWVhMjE1MDhlYTA5MTE0YTViNjZkNDJl
-    NTlhY2U5ZDU1Zjk5ZmEwM2UyYWEzMzNiNDU2NzZhYTUzNWEzYWM4ZTY0MDgz
-    Y2VhOTgwOWJmMDNmYWJjMDM4NmRhNjRjMzFmMGUzZDMzNmJhNzg=
+SHA1:
+  metadata.gz: 8f562213e73efa88b61a7eb92cb144c6198f3975
+  data.tar.gz: ec7c67194b038d4f698bdcd287a236c2488187bc
+SHA512:
+  metadata.gz: c153c3926c0c32bc423afb07a80c4054e95ba5f1d678b0ef61f114145b9f91d65b7564b01794b307c271fd644439db21d963df22225bae23250bcc7bc5897f24
+  data.tar.gz: 5ce5dd50a90990a38a44011b1175c403988e1900455e3a73ceb609da96357eb0b148548c7ae2b842a1cf7dbd64221dd8a7828d137b17dcf2104e3c88687aeea4

data/def_cache.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "yard"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/def_cache/class_methods.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module DefCache::ClassMethods
 
   protected
@@ -14,22 +16,23 @@ module DefCache::ClassMethods
 
   # Define the cache_method
   def define_cache_method(method, options={})
+    __cached_methods__ << method.to_sym
     stub_cache_method_original(method)
     define_cache_handler_method(method, options)
     define_cache_with_method(method)
-    cached_methods_just_added << method
     alias_method_chain method, :cache
   end
 
   # Define cache with method
   def define_cache_with_method(method)
     target, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
+    raise PunctuationError, 'methods ending in `=` cannot be cached.' if punctuation == '='
     class_eval <<-RUBY
       def #{target}_with_cache#{punctuation}(*args, &block)
         handler = cache_handler_for_#{method}
         handler.cache_store.fetch(handler.cache_key, handler.cache_options) do
           handler.add_reference(handler.cache_key)
-          #{target}_without_cache#{punctuation} *args, &block
+          #{target}_without_cache#{punctuation}(*args, &block)
         end
       rescue MethodSource::SourceNotFoundError => e
         warn e
@@ -58,13 +61,14 @@ module DefCache::ClassMethods
 
   # Relink the original method if it is redefined
   def method_added(method)
-    define_cache_method(method) if !cached_methods_just_added.delete(method) && method_defined?("#{method}_with_cache")
+    if __cached_methods__.include? method.to_sym
+      define_cache_method(method) unless caller.any? { |files| files.include? __FILE__ }
+    end
     super
   end
 
-  # A collection for just added methods
-  def cached_methods_just_added
-    @cached_methods_added ||= []
+  def __cached_methods__
+    @__cached_methods__ ||= Set.new
   end
 
-end
+end

data/lib/def_cache/version.rb

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

data/spec/lib/def_cache/class_methods_spec.rb

@@ -119,22 +119,4 @@ describe DefCache::ClassMethods do
     end
   end
 
-  describe '.method_added' do
-    context 'if the with cache method is defined' do
-      before(:each) { klass.send(:define_method, :foo_with_cache) { 'value' } }
-      it 'should call define_cache_method' do
-        expect(klass).to receive(:define_cache_method).with(:foo)
-        klass.send(:method_added, :foo)
-      end
-
-      context 'if the method has just been added' do
-        it 'should call define_cache_method' do
-          klass.send(:cached_methods_just_added) << :foo
-          expect(klass).to_not receive(:define_cache_method).with(:foo)
-          klass.send(:method_added, :foo)
-        end
-      end
-    end
-  end
-
-end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'simplecov'
 require 'coveralls'
+require 'rspec'
+require 'rspec/its'
+require 'pry'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,

metadata

@@ -1,181 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: def_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An agnostic ActiveSupport::Cache helper to enable easy caching of methods
@@ -186,9 +200,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -213,17 +227,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An agnostic ActiveSupport::Cache helper to enable easy caching of methods