memoist 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 630e2e80eea33c244c75ee3cab805415e627f357
-  data.tar.gz: 4e7760bdbe28b2e7aee579e722c80142cc775976
+  metadata.gz: 05bd6cfd3935ea3d449651b5a997497699b5ba47
+  data.tar.gz: 5e9fcd26cd38218270949a2757a9b1832ea63969
 SHA512:
-  metadata.gz: 99ea31ce66097c7350d6f1393bfdb322b9002d145674caa68e04545ec082a4db8da671553f21198463125685275194843e55a256ae9315c7cdccdcf344b4e548
-  data.tar.gz: 24b7a97927feb6a684e1c1dcc31b827510ccccb194b176de04ab852cdc1d5d8a88be845a79c6f1d3c0317341b154f4c44253d0133d8d65623cdc4281f152bafe
+  metadata.gz: 4369588f404fd7fa811c6b32af02998b656e13a95058018698ee9b2c67674b8da300c5ff6b736ce0d5f0a0ecbf5aee2f022756c26fce72edfea5fcad34123cd4
+  data.tar.gz: 9a07124cccbd25d30fbac70a2303b4b239a3871f50a261ba1d50e1a5c58402d04300fc1e930f780ceb1263f0e8097048846ea73ad4866f3c6112103ca84a596e

data/.travis.yml

@@ -6,5 +6,5 @@ rvm:
   - 1.8.7
   - jruby-18mode
   - jruby-19mode
-  - rbx
+  - rbx-2
 

data/lib/memoist.rb

@@ -78,7 +78,7 @@ module Memoist
 
       method_names.each do |method_name|
         ivar = Memoist.memoized_ivar_for(method_name)
-        instance_variable_get(ivar).clear if instance_variable_defined?(ivar)
+        remove_instance_variable(ivar) if instance_variable_defined?(ivar)
       end
     end
   end
@@ -105,17 +105,17 @@ module Memoist
           # define a method like this;
 
           # def mime_type(reload=true)
-          #   skip_cache = reload || !memoized?(:abc)
+          #   skip_cache = reload || !instance_variable_defined?("@_memoized_mime_type")
           #   set_cache = skip_cache && !frozen?
           #
           #   if skip_cache
           #     value = _unmemoized_mime_type
           #   else
-          #     value = @_memoized_mime_type[0]
+          #     value = @_memoized_mime_type
           #   end
           #
           #   if set_cache
-          #     @_memoized_mime_type = [value]
+          #     @_memoized_mime_type = value
           #   end
           #
           #   value
@@ -123,17 +123,17 @@ module Memoist
 
           module_eval <<-EOS, __FILE__, __LINE__ + 1
             def #{method_name}(reload = false)
-              skip_cache = reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty?
+              skip_cache = reload || !instance_variable_defined?("#{memoized_ivar}")
               set_cache = skip_cache && !frozen?
 
               if skip_cache
                 value = #{unmemoized_method}
               else
-                value = #{memoized_ivar}[0]
+                value = #{memoized_ivar}
               end
 
               if set_cache
-                #{memoized_ivar} = [value]
+                #{memoized_ivar} = value
               end
 
               value
@@ -167,7 +167,7 @@ module Memoist
             def #{method_name}(*args)
               reload = Memoist.extract_reload!(method(#{unmemoized_method.inspect}), args)
 
-              skip_cache = reload || !(defined?(#{memoized_ivar}) && #{memoized_ivar} && #{memoized_ivar}.has_key?(args))
+              skip_cache = reload || !(instance_variable_defined?(#{memoized_ivar.inspect}) && #{memoized_ivar} && #{memoized_ivar}.has_key?(args))
               set_cache = skip_cache && !frozen?
 
               if skip_cache

data/lib/memoist/version.rb

@@ -1,3 +1,3 @@
 module Memoist
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/test/memoist_test.rb

@@ -202,9 +202,10 @@ class MemoistTest < Test::Unit::TestCase
   def test_flush_cache
     assert_equal 1, @calculator.counter
 
-    assert @calculator.instance_variable_get(:@_memoized_counter).any?
+    assert @calculator.instance_variable_get(:@_memoized_counter)
     @calculator.flush_cache(:counter)
-    assert @calculator.instance_variable_get(:@_memoized_counter).empty?
+    assert_nil @calculator.instance_variable_get(:@_memoized_counter)
+    assert !@calculator.instance_variable_defined?(:@_memoized_counter)
 
     assert_equal 2, @calculator.counter
   end
@@ -212,9 +213,10 @@ class MemoistTest < Test::Unit::TestCase
   def test_unmemoize_all
     assert_equal 1, @calculator.counter
 
-    assert @calculator.instance_variable_get(:@_memoized_counter).any?
+    assert @calculator.instance_variable_get(:@_memoized_counter)
     @calculator.unmemoize_all
-    assert @calculator.instance_variable_get(:@_memoized_counter).empty?
+    assert_nil @calculator.instance_variable_get(:@_memoized_counter)
+    assert !@calculator.instance_variable_defined?(:@_memoized_counter)
 
     assert_equal 2, @calculator.counter
   end
@@ -329,4 +331,4 @@ class MemoistTest < Test::Unit::TestCase
     assert_equal 1, person.is_developer_calls
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memoist
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Joshua Peek
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler