memor 0.2.1 → 0.3.0

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 script: 'bundle exec rspec'
 rvm:
   - 1.9.2
+  - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in memor.gemspec
 gemspec

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { 'spec' }

data/README.md

@@ -10,6 +10,8 @@ This lib has one utility method called **memor** which takes *binding* as an
   class Foo
     include Memor
 
+    attr_accessor :age
+
     def slow_method1
       memor binding do
         # slow stuff
@@ -27,7 +29,22 @@ This lib has one utility method called **memor** which takes *binding* as an
         # slow stuff
       end
     end
+
+    def double_age
+      memor binding, :age do
+        age * 2
+      end
+    end
+
   end
+
+  foo = Foo.new
+
+  foo.age = 2
+  foo.double_age # 4
+
+  foo.age = 3
+  foo.double_age # 6
 ```
 
 Tested in ruby 1.9.2

data/lib/memor.rb

@@ -1,6 +1,79 @@
 require 'memor/version'
 
 module Memor
+  class PrivateMemoizeInstance
+    def initialize(the_caller, the_context_binding, explicit_dependents)
+      @the_caller          = the_caller
+      @the_context_binding = the_context_binding
+      @explicit_dependents = explicit_dependents
+    end
+
+    def callee
+      @the_context_binding.eval '__callee__'
+    end
+
+    def memor_name
+     "@____memor_#{callee}".gsub('?', '_question_mark')
+                           .gsub('!', '_bang')
+    end
+
+    def memor_method
+      @the_caller.method callee
+    end
+
+    def memoize_wrap
+      if memoize_lookup_key.empty?
+        memoize_without_dependent { yield }
+
+      else
+        memoize_with_dependents { yield }
+      end
+    end
+
+    def memoize_lookup_key
+      args_values + explicit_dependents_values
+    end
+
+    def explicit_dependents_values
+      @explicit_dependents.map do |ed_name|
+        @the_context_binding.eval ed_name.to_s
+      end
+    end
+
+    def args_values
+      # parameters is like [[:req, :a], [:opt, :b], [:rest, :c], [:block, :d]]
+      value_parameters = memor_method.parameters.map do |pp|
+        if [:req, :rest, :opt].include? pp[0]
+          pp[1]
+        end
+      end.compact.map do |arg_name|
+        @the_context_binding.eval arg_name.to_s
+      end
+    end
+
+    def memoize_without_dependent
+      unless @the_caller.instance_variable_defined? memor_name
+        @the_caller.instance_variable_set memor_name, yield
+      end
+
+      @the_caller.instance_variable_get memor_name
+    end
+
+    def memoize_with_dependents
+      unless @the_caller.instance_variable_defined? memor_name
+        @the_caller.instance_variable_set memor_name, {}
+      end
+
+      buckets = @the_caller.instance_variable_get memor_name
+
+      unless buckets.has_key?(memoize_lookup_key)
+        buckets[memoize_lookup_key] = yield
+      end
+
+      buckets[memoize_lookup_key]
+    end
+
+  end
 
 private
 
@@ -22,64 +95,9 @@ private
   #   end
   # end
   #
-  def memor(context_binding)
-    callee = context_binding.eval '__callee__'
-
-    memor_name = "@_memor_#{callee}".gsub('?', '_question_mark')
-                                    .gsub('!', '_bang')
-
-    memor_method = method(callee)
-
-    if memor_method.arity == 0 # no argument
-      _memor_with_no_arg(memor_name) { yield }
-
-    else
-      # FIXME args may be insufficient
-      args = _memor_args(memor_method, context_binding)
-
-      _memor_with_args(memor_name, args) { yield }
-    end
-  end
-
-  def _memor_args(memor_method, context_binding)
-    arg_names = _memor_arg_names(memor_method)
-
-    arg_names.map do |arg_name|
-      context_binding.eval arg_name.to_s
-    end
-  end
-
-  def _memor_arg_names(memor_method)
-    # parameters is like [[:req, :a], [:opt, :b], [:rest, :c], [:block, :d]]
-
-    value_parameters = memor_method.parameters.map do |pp|
-      if [:req, :rest, :opt].include? pp[0]
-        pp[1]
-      end
-    end.compact
-  end
-
-  def _memor_with_no_arg(memor_name)
-    unless instance_variable_defined? memor_name
-      instance_variable_set memor_name, yield
-    end
-
-    instance_variable_get memor_name
-  end
-
-  def _memor_with_args(memor_name, args)
-    unless instance_variable_defined? memor_name
-      instance_variable_set memor_name, {}
-    end
-
-    memor = instance_variable_get memor_name
-    key = [* args] # use the args array as the cache key
-
-    unless memor.has_key?(key)
-      memor[key] = yield
-    end
-
-    memor[key]
+  def memor(context_binding, *explicit_dependents)
+    PrivateMemoizeInstance.new(self, context_binding, explicit_dependents)
+                          .memoize_wrap { yield }
   end
 
 end

data/lib/memor/version.rb

@@ -1,3 +1,3 @@
 module Memor
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/memor.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   # s.add_runtime_dependency 'rest-client'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'ruby-debug19'
+  s.add_development_dependency 'debugger'
 end

data/spec/lib/memor_spec.rb

@@ -23,11 +23,20 @@ describe Memor do
     include Memor
 
     attr_reader :slows
+    attr_accessor :the_explicit_depend_value
 
     def initialize
       @slows = 0
     end
 
+    def explicit_depend_value
+      memor binding, :the_explicit_depend_value do
+        slow_method
+
+        the_explicit_depend_value
+      end
+    end
+
     def no_arg
       memor binding do
         slow_method
@@ -144,17 +153,24 @@ describe Memor do
     foo.slows.should == 1
   end
 
-  it '#_memor_parameters' do
-    foo.send(:_memor_arg_names, foo.method(:no_arg)).should == []
-    foo.send(:_memor_arg_names, foo.method(:with_args1)).should == [:a, :b]
-    foo.send(:_memor_arg_names, foo.method(:with_args2)).should == [:args]
-    foo.send(:_memor_arg_names, foo.method(:with_args3)).should == [:a, :args]
-  end
-
   it 'class methods' do
     Bar.bar
     Bar.bar.should == 'bar'
 
     Bar.slows.should == 1
   end
+
+  it 'explicit depend value' do
+    foo.explicit_depend_value.should == nil
+    foo.explicit_depend_value.should == nil
+
+    foo.slows.should == 1
+
+    foo.the_explicit_depend_value = 3
+
+    foo.explicit_depend_value.should == 3
+    foo.explicit_depend_value.should == 3
+
+    foo.slows.should == 2
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memor
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &4607510 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4607510
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &4607140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4607140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &4606790 !ruby/object:Gem::Requirement
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4606790
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: memoize function without alias method chain
 email:
 - Aaron2Ti@gmail.com
@@ -83,11 +98,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: memor
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: simple memoize function without alias method chain
 test_files:
 - spec/lib/memor_spec.rb
 - spec/spec_helper.rb
-has_rdoc: