memor 0.0.3 → 0.1.0

data/Guardfile

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

data/README.md

@@ -1,8 +1,8 @@
 # Memor
 
 ## USAGE
-This lib has one utility method called **memor** which takes *__callee__* as
-first argument and all the host methods other arguments, see the following example:
+This lib has one utility method called **memor** which takes *binding* as an
+ argument, see the following example:
 
 ``` ruby
   require 'memor'
@@ -11,19 +11,19 @@ first argument and all the host methods other arguments, see the following examp
     include Memor
 
     def slow_method1
-      memor(__callee__) do
+      memor binding do
         # slow stuff
       end
     end
 
     def slow_method2(a, b)
-      memor(__callee__, a, b) do
+      memor binding do
         # slow stuff
       end
     end
 
     def slow_method3(a, *args)
-      memor(__callee__, a, args) do
+      memor binding do
         # slow stuff
       end
     end

data/lib/memor.rb

@@ -1,4 +1,4 @@
-require "memor/version"
+require 'memor/version'
 
 module Memor
 
@@ -7,38 +7,81 @@ module Memor
   # class Foo
   #   include Memor
   #
-  #   def slow(a, b)
-  #     memor(__callee__, a, b) do
+  #   def foo(a, b)
+  #     memor binding do
+  #       # slow stuff
+  #     end
+  #   end
+  #
+  #   def bar(a, b)
+  #     memor binding do
   #       # slow stuff
   #     end
   #   end
   # end
   #
-  def memor(callee, *args)
+  def memor(context_binding)
+    callee = context_binding.eval '__callee__'
+
     memor_name = "@_memor_#{callee}".gsub('?', '_question_mark')
                                     .gsub('!', '_bang')
 
-    if args.nil? # methods without arguments
-      unless instance_variable_defined? memor_name
-        instance_variable_set memor_name, yield
-      end
+    memor_method = method(callee)
 
-      return instance_variable_get memor_name
+    if memor_method.arity == 0 # no argument
+      _memor_with_no_arg(memor_name) { yield }
 
     else
-      unless instance_variable_defined? memor_name
-        instance_variable_set memor_name, {}
-      end
+      # FIXME args may be insufficient
+      args = _memor_args(memor_method, context_binding)
+
+      _memor_with_args(memor_name, args) { yield }
+    end
+  end
+
 
-      memor = instance_variable_get memor_name
-      key = [* args] # use the args array as the cache key
+  def _memor_args(memor_method, context_binding)
+    arg_names = _memor_arg_names(memor_method)
 
-      unless memor.has_key?(key)
-        memor[key] = yield
+    arg_names.map do |arg_name|
+      context_binding.eval arg_name.to_s
+    end
+  end
+  private :_memor_args
+
+  def _memor_arg_names(memor_method)
+    # parameters is like [[:req, :a], [:req, :b], [:rest, :c], [:block, :d]]
+    value_parameters = memor_method.parameters.map do |pp|
+      if pp[0] == :req or pp[0] == :rest
+        pp[1]
       end
+    end.compact
+  end
+  private :_memor_arg_names
 
-      memor[key]
+  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
+  private :_memor_with_no_arg
+
+  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]
   end
+  private :_memor_with_args
 
 end

data/lib/memor/version.rb

@@ -1,3 +1,3 @@
 module Memor
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/memor.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_runtime_dependency 'rest-client'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'ruby-debug19'
 end

data/spec/{memor_spec.rb → lib/memor_spec.rb}

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'memor'
 
 describe Memor do
@@ -11,31 +12,37 @@ describe Memor do
     end
 
     def no_arg
-      memor __callee__ do
+      memor binding do
         slow_method
       end
     end
 
     def with_args1(a, b)
-      memor __callee__, a, b do
+      memor binding do
         slow_method
       end
     end
 
     def with_args2(*args)
-      memor __callee__, args do
+      memor binding do
+        slow_method
+      end
+    end
+
+    def with_args3(a, *args)
+      memor binding do
         slow_method
       end
     end
 
     def query?
-      memor __callee__ do
+      memor binding do
         slow_method
       end
     end
 
     def bang!
-      memor __callee__ do
+      memor binding do
         slow_method
       end
     end
@@ -59,15 +66,28 @@ describe Memor do
   it 'fix arguments' do
     foo.with_args1(1, 2).should == 'slow'
     foo.with_args1(1, 2).should == 'slow'
+    foo.with_args1(2, 2).should == 'slow'
+    foo.with_args1(2, 2).should == 'slow'
 
-    foo.slows.should == 1
+    foo.slows.should == 2
   end
 
   it 'splat arguments' do
     foo.with_args2('bar').should == 'slow'
     foo.with_args2('bar').should == 'slow'
+    foo.with_args2('foo').should == 'slow'
+    foo.with_args2('foo').should == 'slow'
 
-    foo.slows.should == 1
+    foo.slows.should == 2
+  end
+
+  it 'normal arguments and splat arguments' do
+    foo.with_args3('bar', 4).should == 'slow'
+    foo.with_args3('bar', 4).should == 'slow'
+    foo.with_args3('bar', 5).should == 'slow'
+    foo.with_args3('bar', 5).should == 'slow'
+
+    foo.slows.should == 2
   end
 
   it '! in method name' do
@@ -83,4 +103,11 @@ 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
 end

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &4814260 !ruby/object:Gem::Requirement
+  requirement: &10183170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4814260
+  version_requirements: *10183170
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &10182960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10182960
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &10182750 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10182750
 description: memoize function without alias method chain
 email:
 - Aaron2Ti@gmail.com
@@ -32,13 +54,15 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - lib/memor.rb
 - lib/memor/version.rb
 - memor.gemspec
-- spec/memor_spec.rb
+- spec/lib/memor_spec.rb
+- spec/spec_helper.rb
 homepage: https://rubygems.org/gems/memor
 licenses: []
 post_install_message: 
@@ -64,5 +88,6 @@ signing_key:
 specification_version: 3
 summary: simple memoize function without alias method chain
 test_files:
-- spec/memor_spec.rb
+- spec/lib/memor_spec.rb
+- spec/spec_helper.rb
 has_rdoc: