perma_cache 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmZmZTYxYWI3YWZjZDgzMjdmMDRhMGViMmM1MWJlYzQ1NTYzNTg0Nw==
-  data.tar.gz: !binary |-
-    ZWRiYTQzNTc3YjY1N2M3Y2YxMzA2YmMwZjMxZWFmMGQ4YmJkOTNlNA==
+SHA1:
+  metadata.gz: 921cb4e2804330effa28815fd21d2d7a8dc03b28
+  data.tar.gz: d9d136e1f7d48776b1dae411947cdff474863ac1
 SHA512:
-  metadata.gz: !binary |-
-    YzJlMWQ1NWFjY2RlNjkyZTIyODBkNDFjYTBkYzAyNGMzMmYxMTE3YTM4Y2I2
-    NTkyMjBhYjRhODdhMTFmNDQ3MmNkZjExNGFjY2UxMjEwZGNhMmI5YzYzZDMw
-    N2RiZTM2ZTkxZmVhYTZhNWMyMjk4MTdhNzhhZTE3ZGY4ODRlMDQ=
-  data.tar.gz: !binary |-
-    YjA3ZGJkYzM5N2I2ZThiNDhjNDZkZjlmODY1OGViNzcyNDMyN2VmMjgzNjYx
-    OWEzZTVjM2NjMDhkNGI3MGVjMjEzMTE3MGQzMmNjOWMyZjUyM2FjZmIwOGMw
-    YmVkNWY0ZmIxNjhkZjYwNjUwOTg3NGEwNDU3OGUyMTA5ZDkxYmY=
+  metadata.gz: 579934a7efa6f9850295bd935bfb1de69912c19531669c79e3d35cbb981b2fdfac36745b38c0fda46a032a30dc423b3899fd468d4be0ecf7498e36b2d6d29b01
+  data.tar.gz: 67a176a6d87eb548d9101ea02901792dc6766bb7fd0e544e1f94558e78dfa25cdd0c89e7d69b224ca140c58c627dfeee60e2cce812b2b769feb7a23a8a47dd84

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p484
+2.1.6

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in perma_cache.gemspec
 gemspec
+
+gem "bundler"
+gem "rake"
+gem "minitest"
+gem "shoulda"
+gem "mocha"
+gem "byebug"
+

data/Gemfile.lock

@@ -0,0 +1,122 @@
+PATH
+  remote: .
+  specs:
+    perma_cache (0.0.7)
+      rails
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
+    columnize (0.9.0)
+    erubis (2.7.0)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.2)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    metaclass (0.0.4)
+    mime-types (2.5)
+    mini_portile (0.6.2)
+    minitest (5.6.1)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    sprockets (3.0.3)
+      rack (~> 1.0)
+    sprockets-rails (2.2.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  byebug
+  minitest
+  mocha
+  perma_cache!
+  rake
+  shoulda

data/lib/perma_cache.rb

@@ -41,8 +41,12 @@ module PermaCache
   end
 
   module ClassMethods
-    def perma_cache(method_name, options = {})
+    def perma_cache(original_name, options = {})
       class_eval do
+        regex = /[\?\!]\Z/
+        method_name   = original_name.to_s.gsub("!", "_exclamation").gsub("?", "_question")
+        method_base   = original_name.to_s.gsub(regex,'')
+        method_suffix = original_name.to_s.match(regex)
 
         was_rebuilt_inst_var = "@#{method_name}_was_rebuilt"
 
@@ -74,7 +78,7 @@ module PermaCache
 
         define_method "#{method_name}!" do
           instance_variable_set(was_rebuilt_inst_var , true)
-          send("#{method_name}_without_perma_cache").tap do |result|
+          send("#{method_base}_without_perma_cache#{method_suffix}").tap do |result|
             PermaCache.cache.write(send("#{method_name}_perma_cache_key"), result, :expires_in => options[:expires_in])
           end
         end
@@ -83,7 +87,7 @@ module PermaCache
           PermaCache.cache.read(send("#{method_name}_perma_cache_key"))
         end
 
-        define_method "#{method_name}_with_perma_cache" do
+        define_method "#{method_base}_with_perma_cache#{method_suffix}" do
           instance_variable_set(was_rebuilt_inst_var , false)
 
           send("#{method_name}_get_perma_cache") ||
@@ -97,7 +101,7 @@ module PermaCache
           instance_variable_get(was_rebuilt_inst_var ) == true
         end
 
-        alias_method_chain method_name, :perma_cache
+        alias_method_chain [method_base, method_suffix].join, :perma_cache
       end
     end
   end

data/lib/perma_cache/version.rb

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

data/perma_cache.gemspec

@@ -19,11 +19,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "shoulda"
-  spec.add_development_dependency "mocha"
-  spec.add_development_dependency "debugger"
 end
 

data/test/perma_cache_test.rb

@@ -24,6 +24,18 @@ class KlassOne
   end
   perma_cache :method3, :version => 2, :expires_in => 5
 
+  def question?
+    sleep 1
+    4
+  end
+  perma_cache :question?
+
+  def exclamation!
+    sleep 1
+    4
+  end
+  perma_cache :exclamation!
+
   def other_klass
     KlassTwo.new
   end
@@ -55,7 +67,7 @@ module ModuleOne
   end
 end
 
-class PermaCacheTest < Test::Unit::TestCase
+class PermaCacheTest < Minitest::Test
 
   context "build_key_from_object" do
     context  "for a class" do
@@ -87,7 +99,7 @@ class PermaCacheTest < Test::Unit::TestCase
   context "calling cache" do
     context "without setting a cache source" do
       setup do
-        PermaCache.send :remove_instance_variable, :@cache
+        PermaCache.send :remove_instance_variable, :@cache rescue nil
       end
       should "raise" do
         assert_raises PermaCache::UndefinedCache do
@@ -106,11 +118,37 @@ class PermaCacheTest < Test::Unit::TestCase
   end
 
   context "KlassOne" do
-    should "have some additional methods defined" do
+    should "have some methods defined for :method1" do
       obj = KlassOne.new
+      assert obj.respond_to?(:method1_base_key)
       assert obj.respond_to?(:method1_perma_cache_key)
       assert obj.respond_to?(:method1!)
+      assert obj.respond_to?(:method1_get_perma_cache)
       assert obj.respond_to?(:method1_with_perma_cache)
+      assert obj.respond_to?(:method1_without_perma_cache)
+      assert obj.respond_to?(:method1_was_rebuilt?)
+    end
+
+    should "have some methods defined for :question?" do
+      obj = KlassOne.new
+      assert obj.respond_to?(:question_question_base_key)
+      assert obj.respond_to?(:question_question_perma_cache_key)
+      assert obj.respond_to?(:question_question!)
+      assert obj.respond_to?(:question_question_get_perma_cache)
+      assert obj.respond_to?(:question_with_perma_cache?)
+      assert obj.respond_to?(:question_without_perma_cache?)
+      assert obj.respond_to?(:question_question_was_rebuilt?)
+    end
+
+    should "have some methods defined for :exclamation!" do
+      obj = KlassOne.new
+      assert obj.respond_to?(:exclamation_exclamation_base_key)
+      assert obj.respond_to?(:exclamation_exclamation_perma_cache_key)
+      assert obj.respond_to?(:exclamation_exclamation!)
+      assert obj.respond_to?(:exclamation_exclamation_get_perma_cache)
+      assert obj.respond_to?(:exclamation_with_perma_cache!)
+      assert obj.respond_to?(:exclamation_without_perma_cache!)
+      assert obj.respond_to?(:exclamation_exclamation_was_rebuilt?)
     end
 
     should "calling #method1 should write and return the result if the cache is empty" do

data/test/test_helper.rb

@@ -1,9 +1,10 @@
 require "rubygems"
-require 'test/unit'
+require 'bundler/setup'
+
+require 'byebug'
+require 'minitest/autorun'
+require 'mocha/mini_test'
 require 'shoulda'
-require 'mocha/test_unit'
-require 'debugger'
 
-require 'bundler/setup'
 require 'perma_cache'
 

metadata

@@ -1,97 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: perma_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Josh Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   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: 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: shoulda
-  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: mocha
-  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: debugger
-  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: It's a perma cache, duh
@@ -101,10 +31,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -123,17 +54,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.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: It's a perma cache, duh