tins 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1bf4ee9dea65d5c11f563451d6642c5fe1884c
-  data.tar.gz: 1c7146c7571c21394db79a1d390507b3895e2e44
+  metadata.gz: a50aca615e8441d3218a594675339c5f9f959ac3
+  data.tar.gz: 7cd19f7ba00d883fa186d9fe579d9bcce1143de2
 SHA512:
-  metadata.gz: 19a5df0f5e8e5d13c1a868a369b1aa6e5ef85f75a91e37bf815c0954aefe71f4a602889ee12b37b1c12e8dce3669730ea39bd93620205391ec6012ba9eb16d53
-  data.tar.gz: f0d23c8f50f2638bd4d06ecd56abc6fce27036dfdc67573234f02cbe9db9fefe45c8b8ae6dfa8f3e281a35d85931b40b4d813efa31ff79b0c7077cb0d11b4283
+  metadata.gz: c6b1b385904afff0782b6cd98f48d75f898a34cc0535291427f1c5e6eedca01f8caf2e474eee39505162a4fb8c10ce901d67aaafa92725e600e92bbed626dd2e
+  data.tar.gz: 18420ef7cb78ed2aa3a2901a44702fd68472e3fa6c0db0cbb42c8a6a396c21b51f157dd7cd73aaeae158f6df0f7c7ce67617036f757fb6ea2fd9adbe0e7be4b6

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/tins/memoize.rb

@@ -13,6 +13,20 @@ module Tins
          __memoize_cache__.clear
         self
       end
+
+      def memoize_apply_visibility(id)
+        visibility = instance_eval do
+          case
+          when private_method_defined?(id)
+            :private
+          when protected_method_defined?(id)
+            :protected
+          end
+        end
+        yield
+      ensure
+        visibility and __send__(visibility, id)
+      end
     end
 
     class ::Module
@@ -25,17 +39,19 @@ module Tins
         include CacheMethods
         method_ids.each do |method_id|
           method_id = method_id.to_s.to_sym
-          orig_method = instance_method(method_id)
-          __send__(:define_method, method_id) do |*args|
-            mc = __memoize_cache__
-            if mc.key?(method_id) and result = mc[method_id][args]
+          memoize_apply_visibility method_id do
+            orig_method = instance_method(method_id)
+            __send__(:define_method, method_id) do |*args|
+              mc = __memoize_cache__
+              if mc.key?(method_id) and result = mc[method_id][args]
+                result
+              else
+                (mc[method_id] ||= {})[args] = result = orig_method.bind(self).call(*args)
+                $DEBUG and warn "#{self.class} cached method #{method_id}(#{args.inspect unless args.empty?}) = #{result.inspect} [#{__id__}]"
+                opts[:freeze] and result.freeze
+              end
               result
-            else
-              (mc[method_id] ||= {})[args] = result = orig_method.bind(self).call(*args)
-              $DEBUG and warn "#{self.class} cached method #{method_id}(#{args.inspect unless args.empty?}) = #{result.inspect} [#{__id__}]"
-              opts[:freeze] and result.freeze
             end
-            result
           end
         end
         method_ids.size == 1 ? method_ids.first : method_ids
@@ -52,16 +68,18 @@ module Tins
         mc = __memoize_cache__
         function_ids.each do |function_id|
           function_id = function_id.to_s.to_sym
-          orig_function = instance_method(function_id)
-          __send__(:define_method, function_id) do |*args|
-            if mc.key?(function_id) and result = mc[function_id][args]
+          memoize_apply_visibility function_id do
+            orig_function = instance_method(function_id)
+            __send__(:define_method, function_id) do |*args|
+              if mc.key?(function_id) and result = mc[function_id][args]
+                result
+              else
+                (mc[function_id] ||= {})[args] = result = orig_function.bind(self).call(*args)
+                opts[:freeze] and result.freeze
+                $DEBUG and warn "#{self.class} cached function #{function_id}(#{args.inspect unless args.empty?}) = #{result.inspect}"
+              end
               result
-            else
-              (mc[function_id] ||= {})[args] = result = orig_function.bind(self).call(*args)
-              opts[:freeze] and result.freeze
-              $DEBUG and warn "#{self.class} cached function #{function_id}(#{args.inspect unless args.empty?}) = #{result.inspect}"
             end
-            result
           end
         end
         function_ids.size == 1 ? function_ids.first : function_ids

data/lib/tins/version.rb

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

data/tests/memoize_test.rb

@@ -10,11 +10,26 @@ module Tins
       end
       memoize_method :foo
 
+      def footsie(*a)
+        @@footsie ||= 0
+        @@footsie += 1
+      end
+      protected :footsie
+      memoize_method :footsie
+
       def bar(*a)
         @@bar ||= 0
         @@bar += 1
       end
       memoize_function :bar
+
+      private
+
+      def baz(*a)
+        @@baz ||= 0
+        @@baz += 1
+      end
+      memoize_function :baz
     end
 
     def test_method_cache
@@ -40,6 +55,31 @@ module Tins
       assert_equal false, fb2.__memoize_cache__.empty?
     end
 
+    def test_method_cache_protected
+      fb1 = FooBar.new
+      fb2 = FooBar.new
+      assert_raises(NoMethodError) { fb1.footsie(1, 2) }
+      assert_raises(NoMethodError) { fb2.footsie(1, 2) }
+      assert_equal true, fb1.__memoize_cache__.empty?
+      assert_equal true, fb2.__memoize_cache__.empty?
+      assert_equal 1, fb1.__send__(:footsie, 1, 2)
+      assert_equal 2, fb2.__send__(:footsie, 1, 2)
+      assert_equal 3, fb1.__send__(:footsie, 1, 2, 3)
+      assert_equal 4, fb2.__send__(:footsie, 1, 2, 3)
+      assert_equal 1, fb1.__send__(:footsie, 1, 2)
+      assert_equal 2, fb2.__send__(:footsie, 1, 2)
+      fb1.memoize_cache_clear
+      fb2.memoize_cache_clear
+      assert_equal true, fb1.__memoize_cache__.empty?
+      assert_equal true, fb2.__memoize_cache__.empty?
+      assert_equal 5, fb1.__send__(:footsie, 1, 2)
+      assert_equal 6, fb2.__send__(:footsie, 1, 2)
+      assert_equal 5, fb1.__send__(:footsie, 1, 2)
+      assert_equal 6, fb2.__send__(:footsie, 1, 2)
+      assert_equal false, fb1.__memoize_cache__.empty?
+      assert_equal false, fb2.__memoize_cache__.empty?
+    end
+
     def test_function_cache
       fb1 = FooBar.new
       fb2 = FooBar.new
@@ -54,5 +94,22 @@ module Tins
       assert_equal 3, fb2.bar(1, 2)
       assert_equal false, FooBar.__memoize_cache__.empty?
     end
+
+    def test_function_cache_private
+      fb1 = FooBar.new
+      fb2 = FooBar.new
+      assert_raises(NoMethodError) { fb1.baz(1, 2) }
+      assert_raises(NoMethodError) { fb2.baz(1, 2) }
+      assert_equal 1, fb1.__send__(:baz, 1, 2)
+      assert_equal 1, fb2.__send__(:baz, 1, 2)
+      assert_equal 2, fb1.__send__(:baz, 1, 2, 3)
+      assert_equal 2, fb2.__send__(:baz, 1, 2, 3)
+      assert_equal 1, fb1.__send__(:baz, 1, 2)
+      assert_equal 1, fb2.__send__(:baz, 1, 2)
+      FooBar.memoize_cache_clear
+      assert_equal 3, fb1.__send__(:baz, 1, 2)
+      assert_equal 3, fb2.__send__(:baz, 1, 2)
+      assert_equal false, FooBar.__memoize_cache__.empty?
+    end
   end
 end

data/tins.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: tins 1.3.1 ruby lib
+# stub: tins 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tins"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2014-08-13"
+  s.date = "2014-08-19"
   s.description = "All the stuff that isn't good/big enough for a real library."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/dslkit.rb", "lib/dslkit/polite.rb", "lib/dslkit/rude.rb", "lib/spruz.rb", "lib/tins.rb", "lib/tins/alias.rb", "lib/tins/annotate.rb", "lib/tins/ask_and_send.rb", "lib/tins/attempt.rb", "lib/tins/bijection.rb", "lib/tins/case_predicate.rb", "lib/tins/concern.rb", "lib/tins/count_by.rb", "lib/tins/date_dummy.rb", "lib/tins/date_time_dummy.rb", "lib/tins/deep_const_get.rb", "lib/tins/deep_dup.rb", "lib/tins/dslkit.rb", "lib/tins/extract_last_argument_options.rb", "lib/tins/file_binary.rb", "lib/tins/find.rb", "lib/tins/generator.rb", "lib/tins/go.rb", "lib/tins/hash_symbolize_keys_recursive.rb", "lib/tins/hash_union.rb", "lib/tins/if_predicate.rb", "lib/tins/limited.rb", "lib/tins/lines_file.rb", "lib/tins/memoize.rb", "lib/tins/method_description.rb", "lib/tins/minimize.rb", "lib/tins/module_group.rb", "lib/tins/named_set.rb", "lib/tins/null.rb", "lib/tins/once.rb", "lib/tins/p.rb", "lib/tins/partial_application.rb", "lib/tins/proc_compose.rb", "lib/tins/proc_prelude.rb", "lib/tins/range_plus.rb", "lib/tins/require_maybe.rb", "lib/tins/responding.rb", "lib/tins/rotate.rb", "lib/tins/secure_write.rb", "lib/tins/sexy_singleton.rb", "lib/tins/shuffle.rb", "lib/tins/string_byte_order_mark.rb", "lib/tins/string_camelize.rb", "lib/tins/string_underscore.rb", "lib/tins/string_version.rb", "lib/tins/subhash.rb", "lib/tins/terminal.rb", "lib/tins/thread_local.rb", "lib/tins/time_dummy.rb", "lib/tins/to.rb", "lib/tins/to_proc.rb", "lib/tins/token.rb", "lib/tins/uniq_by.rb", "lib/tins/version.rb", "lib/tins/write.rb", "lib/tins/xt.rb", "lib/tins/xt/annotate.rb", "lib/tins/xt/ask_and_send.rb", "lib/tins/xt/attempt.rb", "lib/tins/xt/blank.rb", "lib/tins/xt/case_predicate.rb", "lib/tins/xt/concern.rb", "lib/tins/xt/count_by.rb", "lib/tins/xt/date_dummy.rb", "lib/tins/xt/date_time_dummy.rb", "lib/tins/xt/deep_const_get.rb", "lib/tins/xt/deep_dup.rb", "lib/tins/xt/dslkit.rb", "lib/tins/xt/extract_last_argument_options.rb", "lib/tins/xt/file_binary.rb", "lib/tins/xt/full.rb", "lib/tins/xt/hash_symbolize_keys_recursive.rb", "lib/tins/xt/hash_union.rb", "lib/tins/xt/if_predicate.rb", "lib/tins/xt/irb.rb", "lib/tins/xt/method_description.rb", "lib/tins/xt/named.rb", "lib/tins/xt/null.rb", "lib/tins/xt/p.rb", "lib/tins/xt/partial_application.rb", "lib/tins/xt/proc_compose.rb", "lib/tins/xt/proc_prelude.rb", "lib/tins/xt/range_plus.rb", "lib/tins/xt/require_maybe.rb", "lib/tins/xt/responding.rb", "lib/tins/xt/rotate.rb", "lib/tins/xt/secure_write.rb", "lib/tins/xt/sexy_singleton.rb", "lib/tins/xt/shuffle.rb", "lib/tins/xt/string.rb", "lib/tins/xt/string_byte_order_mark.rb", "lib/tins/xt/string_camelize.rb", "lib/tins/xt/string_underscore.rb", "lib/tins/xt/string_version.rb", "lib/tins/xt/subhash.rb", "lib/tins/xt/symbol_to_proc.rb", "lib/tins/xt/time_dummy.rb", "lib/tins/xt/time_freezer.rb", "lib/tins/xt/to.rb", "lib/tins/xt/uniq_by.rb", "lib/tins/xt/write.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tins
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar