mize 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9034cdc4e48b4728a4fc0e15332af968e79a79
-  data.tar.gz: 483494fa7a728960a031bcd3dc1febea921d28f4
+  metadata.gz: 6e4fc73a14f849a06c78dd20166fc33e3b10aee1
+  data.tar.gz: e1ba0c8d1b76b06fedec1f82d0ab249b192b4df5
 SHA512:
-  metadata.gz: 25ee593f7690ee48fe44def237a2c006797b23f0236779d65fab254656666a65c4b6ccf8c2c116c6e9a2c8c131a0e08bd0933f6b73938ee89748ccf26d25548b
-  data.tar.gz: 25fe53fcbf4802c07beafc0cd8f1b2fdf76e72c3c9b1404fea676172fca927c90a176e1a3577914c26ae9f6e6e29a60c5bc1d900e2ecb3d84659eaede43bc8ad
+  metadata.gz: 83244d36a55fc6d5a3610dd16a9d048303311fbf67f777017cb18dea9eac9d3fe942e8ec2cad6ab1ee8882b3fb4ff52fd76b65e4c9d1c25b41aedbe538e2fbcf
+  data.tar.gz: f5ff84dca60446440666246d333adb8edf2da1e8197c0d33f4b6a8d71b45f8ef734e9a9ecc636890eadd33bc68a8ed692b63e88b2f6a5cf8c2112470078f77a8

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.3
-  - 2.4.0
+  - 2.4.1
   - ruby-head
 matrix:
   allow_failures:

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/mize.rb

@@ -1,4 +1,12 @@
+require 'thread'
+
 module Mize
+  MUTEX = Mutex.new
+
+  class << self
+    attr_accessor :wrapped
+  end
+  self.wrapped = {}
 end
 
 require 'mize/version'

data/lib/mize/global_clear.rb

@@ -1,8 +1,4 @@
-require 'thread'
-
 module Mize
-  MUTEX = Mutex.new
-
   class << self
 
     # Clear all memoization caches at once.
@@ -13,7 +9,7 @@ module Mize
     private
 
     def each_cache
-      MUTEX.synchronize do
+      Mize::MUTEX.synchronize do
         for cache in ObjectSpace.each_object(Mize::CacheProtocol)
           yield cache
         end

data/lib/mize/memoize.rb

@@ -13,14 +13,16 @@ module Mize
     # store_nil argument is false do not store nil results and always recompute
     # otherwise don't which is the default.
     def memoize(method: nil, function: nil, freeze: false, store_nil: true)
-      if method && function
-        raise ArgumentError, 'memoize a method xor a function'
-      elsif method
-        wrap_method method, freeze: freeze, store_nil: store_nil
-      elsif function
-        wrap_method function, function: true, freeze: freeze, store_nil: store_nil
-      else
-        raise ArgumentError, 'missing keyword: method/function'
+      Mize::MUTEX.synchronize do
+        if method && function
+          raise ArgumentError, 'memoize a method xor a function'
+        elsif method
+          wrap_method method, freeze: freeze, store_nil: store_nil
+        elsif function
+          wrap_method function, function: true, freeze: freeze, store_nil: store_nil
+        else
+          raise ArgumentError, 'missing keyword: method/function'
+        end
       end
     end
 
@@ -43,6 +45,15 @@ module Mize
 
     def wrap_method(method_id, freeze: false, function: false, store_nil: true)
       verbose, $VERBOSE = $VERBOSE, nil
+      if already_wrapped = Mize.wrapped[ [ self, method_id, function ] ]
+        if already_wrapped == [ freeze, store_nil ]
+          return method_id
+        else
+          raise ArgumentError,
+            "encountered mismatching memoize declaration within #{self} for freeze, store_nil:"\
+            " #{already_wrapped} != #{ [ freeze, store_nil ] }"
+        end
+      end
       include CacheMethods
 
       function and mc = __mize_cache__
@@ -70,6 +81,7 @@ module Mize
           end
         end
       end
+      Mize.wrapped[ [ self, method_id, function ] ] = [ freeze, store_nil ]
       method_id
     ensure
       $VERBOSE = verbose

data/lib/mize/version.rb

@@ -1,6 +1,6 @@
 module Mize
   # Mize version
-  VERSION         = '0.3.0'
+  VERSION         = '0.3.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/mize.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: mize 0.3.0 ruby lib
+# stub: mize 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mize".freeze
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2017-02-27"
+  s.date = "2017-06-20"
   s.description = "Library that provides memoziation for methods and functions for Ruby.".freeze
   s.email = "flori@ping.de".freeze
   s.extra_rdoc_files = ["README.md".freeze, "lib/mize.rb".freeze, "lib/mize/cache_methods.rb".freeze, "lib/mize/cache_protocol.rb".freeze, "lib/mize/configure.rb".freeze, "lib/mize/default_cache.rb".freeze, "lib/mize/global_clear.rb".freeze, "lib/mize/memoize.rb".freeze, "lib/mize/railtie.rb".freeze, "lib/mize/reload.rb".freeze, "lib/mize/version.rb".freeze]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "Mize - Library that provides memoziation for methods and functions".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2".freeze)
-  s.rubygems_version = "2.6.10".freeze
+  s.rubygems_version = "2.6.11".freeze
   s.summary = "Library that provides memoziation for methods and functions".freeze
   s.test_files = ["spec/mize/global_clear_spec.rb".freeze, "spec/mize/memoize_method_spec.rb".freeze, "spec/mize/memoize_reload_spec.rb".freeze, "spec/mize/version_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 

data/spec/mize/global_clear_spec.rb

@@ -14,10 +14,17 @@ class Foo
     @@foo ||= 0
     @@foo += 1
   end
-  memoize method: :foo
 end
 
 describe Mize, 'cache_clear' do
+  before do
+    Mize.wrapped.clear
+
+    class Foo
+      memoize method: :foo
+    end
+  end
+
   let(:foo) { Foo.new }
 
   describe '#cache_clear' do

data/spec/mize/memoize_method_spec.rb

@@ -148,6 +148,26 @@ describe Mize do
       expect(fb1.__send__(:__mize_cache__)).to be_empty
       expect(FooBar.foo_nil_not_stored).to eq 2
     end
+
+    it 'only wraps once' do
+      class FooBar2
+        def foo
+        end
+      end
+      expect(FooBar2).to receive(:memoize_apply_visibility).and_call_original
+      class FooBar2
+        memoize method: :foo
+      end
+      expect(FooBar2).not_to receive(:memoize_apply_visibility)
+      class FooBar2
+        memoize method: :foo
+      end
+      expect do
+        class FooBar2
+          memoize method: :foo, store_nil: false
+        end
+      end.to raise_error(ArgumentError)
+    end
   end
 
   context 'memoize function' do

data/spec/mize/memoize_reload_spec.rb

@@ -14,11 +14,15 @@ class Foo
     @@foo ||= 0
     @@foo += 1
   end
-  memoize method: :foo
 end
 
 describe Mize::Reload do
   before do
+    Mize.wrapped.clear
+
+    class Foo
+      memoize method: :foo
+    end
     Foo.reset
   end
 

data/spec/mize/version_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Mize::VERSION do
+describe 'Mize::VERSION' do
   it 'has a version' do
     expect(Mize::VERSION).to be_a String
-    expect(Mize::VERSION).to match /\d+./
+    expect(Mize::VERSION).to match(/\d+./)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mize
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Library that provides memoziation for methods and functions