memoized 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ab7a8649195530ae1e3ace893313e3731c1dcf3af93f6ebeaebad4a715efa65
-  data.tar.gz: 543fd2584dbf7a34fd45c23394888cf8935a8f93f93be9a293b684e1054c3eed
+  metadata.gz: 794d162ed40844f311ed29ff37885d44930b416467b9fa9c49adb77646f6f44b
+  data.tar.gz: 59dcbf3a4cd03d2f0ed4bcab509758dd59a9fccdf0fe85999b325e18cb0d2948
 SHA512:
-  metadata.gz: 13673e0131ff6560848e8dcac44ea746db4c18602b3fa68d3072dbefeaca95bf93ea1bbd4159ce49c8be30cd7361e616237c1ef61d19bc6e2d72efaba6a5d9fe
-  data.tar.gz: 99f27fd8d150aaf3283d29cd159f16ed31beb13c6a293338709f15397c562294caf55a971b7764847895919aaf46c1a87ea77c123f2680691b1765b361b129b8
+  metadata.gz: bd346b36f77cca85aa9cf29bb20d4d1f0f5358d409138a087be59675ba07dc65003d69d654c3901b3aaf97de14812a65356e1cb44e8cec5ffbebd45039266537
+  data.tar.gz: cc3d756d28efbeb07ca0ae2510fc46b077b59c1b8945f4752dd9f410105c6e4cbbe566d6a0b67c62772ae8ad5b3cddfa2ca821ba1bea8ae5be023ee165da4393

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    memoized (1.0.0)
+    memoized (1.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/memoized.rb

@@ -22,8 +22,7 @@ module Memoized
 
         arity = instance_method(unmemoized_method).arity
 
-        case arity
-        when 0
+        if arity == 0
           module_eval(<<-RUBY)
             def #{method_name}()
               #{memoized_ivar_name} ||= [#{unmemoized_method}()]
@@ -31,7 +30,7 @@ module Memoized
             end
           RUBY
 
-        when -1
+        elsif arity == -1
           module_eval(<<-RUBY)
             def #{method_name}(*args)
               #{memoized_ivar_name} ||= {}
@@ -43,18 +42,36 @@ module Memoized
             end
           RUBY
 
-        else
-          arg_names = (0..(arity - 1)).map { |i| "arg#{i}" }
+        elsif arity < -1
+          # For Ruby methods that take a variable number of arguments,
+          # Method#arity returns -n-1, where n is the number of required arguments
+          required_arg_names = (1..(-arity - 1)).map { |i| "arg#{i}" }
+          required_args_ruby = required_arg_names.join(', ')
+
+          module_eval(<<-RUBY)
+            def #{method_name}(#{required_args_ruby}, *optional_args)
+              all_args = [#{required_args_ruby}, *optional_args]
+              #{memoized_ivar_name} ||= {}
+              if #{memoized_ivar_name}.has_key?(all_args)
+                #{memoized_ivar_name}[all_args]
+              else
+                #{memoized_ivar_name}[all_args] = #{unmemoized_method}(*all_args)
+              end
+            end
+          RUBY
+
+        else # positive arity
+          arg_names = (1..arity).map { |i| "arg#{i}" }
           args_ruby = arg_names.join(', ')
 
           module_eval(<<-RUBY)
             def #{method_name}(#{args_ruby})
-              args = [#{args_ruby}]
+              all_args = [#{args_ruby}]
               #{memoized_ivar_name} ||= {}
-              if #{memoized_ivar_name}.has_key?(args)
-                #{memoized_ivar_name}[args]
+              if #{memoized_ivar_name}.has_key?(all_args)
+                #{memoized_ivar_name}[all_args]
               else
-                #{memoized_ivar_name}[args] = #{unmemoized_method}(#{args_ruby})
+                #{memoized_ivar_name}[all_args] = #{unmemoized_method}(#{args_ruby})
               end
             end
           RUBY

data/lib/memoized/version.rb

@@ -1,3 +1,3 @@
 module Memoized
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/memoized_spec.rb

@@ -145,6 +145,48 @@ describe Memoized do
 
     end
 
+    context 'for methods with a required and an optional arg' do
+
+      class ArityRequiredAndOptional < MemoizedSpecClass
+        def foo(a, b = 'default')
+          return [a, b]
+        end
+
+        memoize :foo
+      end
+
+      it 'creates a memoized method with a arity of -2' do
+        expect(ArityRequiredAndOptional.instance_method(:foo).arity).to eq(-2)
+      end
+
+      it "preserves the optional arg's default value" do
+        instance = ArityRequiredAndOptional.new
+        expect(instance.foo('foo')).to eq ['foo', 'default']
+      end
+
+    end
+
+    context 'for methods with a required arg and splat args' do
+
+      class ArityArgAndOptional < MemoizedSpecClass
+        def foo(a, *args)
+          return [a, args]
+        end
+
+        memoize :foo
+      end
+
+      it 'creates a memoized method with a arity of -2' do
+        expect(ArityArgAndOptional.instance_method(:foo).arity).to eq(-2)
+      end
+
+      it "passes the splat args to the memoized method" do
+        instance = ArityArgAndOptional.new
+        expect(instance.foo('foo', 'bar', 'baz')).to eq ['foo', ['bar', 'baz']]
+      end
+
+    end
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memoized
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Barun Singh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake