memoist2 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e42697bf2e5d3807d6075bf5498bf849b86353c
-  data.tar.gz: 80b78cee05bd57d58ccfd7afd5e46b4a6e4b79c3
+  metadata.gz: ef4b828c8b6a81a9fd4a8aac1c184a43bb7f780f
+  data.tar.gz: b8d944584b7b9a3c714ae90fe1604d4cd1673bf2
 SHA512:
-  metadata.gz: 66d8dd9039e1f2ac5c724bbc01946cafda39c3d1d5201564f42a2cbe33f37e2ce087f1836b8ee130d408403862245f25bf68e614f1e50b25ce8fc424aa4c2786
-  data.tar.gz: 2ad308d69a84799e565257ec2e4dedcfac853fc2039346b22abcaa38045859c2aea3d8347435f0d2444d2dace75124e2db7f3112fad440664f6afb734d1f9eec
+  metadata.gz: 0a175366c60c368b9cbc45a0b20c1a0da48a192b1704e63db7d78753aaf7b6b4c280e979f623e0f0f3adf7163650a977c8c21511cfeb90161967e506ae58923c
+  data.tar.gz: 648a750081622643148de2f103856c8858f149484937a18d2c41db0e479de72cfa19fecd7f98efa65049504b73f9681ae92789c9a571fed1a4a3f35946ad086e

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.2.0

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
   - 2.0.0
-#  - jruby-20mode # Module prepend not supported yet
+  - 2.1.0
+  - 2.2.0
+  - ruby-head

data/README.md

@@ -5,34 +5,47 @@ memoist2
 
 Simple Memoization for Ruby 2.0
 
+### Differences between Memoist & Memoist2
+
+Unlike [Memoist], this is **not** a drop-in replacement for old ActiveSupport::Memoizable. Memoist will still work just fine for that if you're using Ruby 2.0. This project, on the other hand, is just me playing using Module#prepend which makes this stuff very simple.
+
+* Memoist works on all Rubies
+* Memoist is quite complicated
+* Memoist has the exact same api as ActiveSupport::Memoizable
+* Memoist2 only works on Ruby >= 2.0.0
+* Memoist2 is deliberately much simpler
+* Memoist2 has a slightly different API that could totally change
+
+  [Memoist]: https://github.com/matthewrudy/memoist
+
 Example
-=======
+-------
 
 Memoize an instance method
 
-  class Foo
-    include Memoist2
-
-    def bar
-      sleep 1 && 2**10
+    class Foo
+      include Memoist2
+  
+      def bar
+        sleep 1 && 2**10
+      end
+      memoize :bar
     end
-    memoize :bar
-  end
 
 Memoize a class method
 
-  class Foo
-    include Memoist2
-
-    def self.bar
-      # something expensive
+    class Foo
+      include Memoist2
+  
+      def self.bar
+        # something expensive
+      end
+      memoize_class_method :bar
     end
-    memoize_class_method :bar
-  end
 
 Licence
-=======
+-------
 
 Licensed under the MIT licence.
 
-See the file LICENCE.
+See the file LICENCE.

data/Rakefile

@@ -2,74 +2,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
-require "rubygems"
-require "rubygems/package_task"
-require "rdoc/task"
-
-# This builds the actual gem. For details of what all these options
-# mean, and other ones you can add, check the documentation here:
-#
-#   http://rubygems.org/read/chapter/20
-#
-spec = Gem::Specification.new do |s|
-
-  # Basic details
-  s.name              = "memoist2"
-  s.version           = "0.2.0"
-  s.summary           = "Really simple memoization for ruby 2.0"
-  s.author            = "Matthew Rudy Jacobs"
-  s.email             = "MatthewRudyJacobs@gmail.com"
-  s.homepage          = "https://github.com/matthewrudy/memoist2"
-  s.license           = "MIT"
-
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = %w(README.md)
-  s.rdoc_options      = %w(--main README.md)
-
-  # Only works with Ruby 2
-  s.required_ruby_version = '>= 2.0.0'
-
-  # Add any extra files to include in the gem
-  s.files             = `git ls-files`.split
-  s.require_paths     = ["lib"]
-
-  # Dependencies to run tests
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("rake")
-end
-
-# This task actually builds the gem. We also regenerate a static
-# .gemspec file, which is useful if something (i.e. GitHub) will
-# be automatically building a gem for this project. If you're not
-# using GitHub, edit as appropriate.
-#
-# To publish your gem online, install the 'gemcutter' gem; Read more
-# about that here: http://gemcutter.org/pages/gem_docs
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Build the gemspec file #{spec.name}.gemspec"
-task :gemspec do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
-
-# If you don't want to generate the .gemspec file, just remove this line. Reasons
-# why you might want to generate a gemspec:
-#  - using bundler with a git source
-#  - building the gem without rake (i.e. gem build blah.gemspec)
-#  - maybe others?
-task :package => :gemspec
-
-# Generate documentation
-RDoc::Task.new do |rd|
-  rd.main = "README.md"
-  rd.rdoc_files.include("README.md", "lib/**/*.rb")
-  rd.rdoc_dir = "rdoc"
-end
-
-desc 'Clear out RDoc and generated packages'
-task :clean => [:clobber_rdoc, :clobber_package] do
-  rm "#{spec.name}.gemspec"
-end
+require "bundler/gem_tasks"

data/lib/memoist2.rb

@@ -1,3 +1,5 @@
+require "memoist2/version"
+
 module Memoist2
 
   def self.memoized_ivar_for(symbol)
@@ -6,28 +8,34 @@ module Memoist2
 
   module ClassMethods
 
-    def memoize(method_name)
-      memoized_ivar = Memoist2.memoized_ivar_for(method_name)
-      memoized_module = Module.new do
-        module_eval <<-EVAL
-          def #{method_name}
-            unless #{memoized_ivar}
-              #{memoized_ivar} = [super]
+    def memoize(*method_names)
+      method_names.each do |method_name|
+        memoized_ivar = Memoist2.memoized_ivar_for(method_name)
+        memoized_module = Module.new do
+          module_eval <<-EVAL
+            def #{method_name}
+              unless #{memoized_ivar}
+                #{memoized_ivar} = [super]
+              end
+              #{memoized_ivar}[0]
+            end
+
+            def self.to_s
+              "Memoist2::MemoizedMethod(#{method_name})"
             end
-            #{memoized_ivar}[0]
-          end
-        EVAL
+            def self.inspect; to_s; end
+          EVAL
+        end
+        prepend memoized_module
       end
-      prepend memoized_module
     end
 
-    def memoize_class_method(method_name)
+    def memoize_class_method(*method_names)
       singleton_class.class_eval do
         include Memoist2 unless ancestors.include?(Memoist2)
-        memoize method_name
+        memoize *method_names
       end
     end
-
   end
 
   def self.included(klass)

data/lib/memoist2/version.rb

@@ -0,0 +1,3 @@
+module Memoist2
+  VERSION = "0.3.0"
+end

data/memoist2.gemspec

@@ -1,35 +1,29 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'memoist2/version'
+
 
 Gem::Specification.new do |s|
-  s.name = "memoist2"
-  s.version = "0.1.2"
+  # Basic details
+  s.name              = "memoist2"
+  s.version           = Memoist2::VERSION
+  s.authors           = ["Matthew Rudy Jacobs"]
+  s.email             = ["matthewrudyjacobs@gmail.com"]
+
+  s.summary           = "Really simple memoization for ruby 2.0"
+  s.homepage          = "https://github.com/matthewrudy/memoist2"
+  s.license           = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Matthew Rudy Jacobs"]
-  s.date = "2013-07-19"
-  s.email = "MatthewRudyJacobs@gmail.com"
-  s.extra_rdoc_files = ["README.md"]
-  s.files = [".gitignore", ".rspec", ".ruby-version", ".travis.yml", "Gemfile", "LICENCE", "README.md", "Rakefile", "benchmark.rb", "example/foo.rb", "lib/memoist2.rb", "memoist2.gemspec", "spec/memoist2_spec.rb", "spec/spec_helper.rb"]
-  s.homepage = "https://github.com/matthewrudy/memoist2"
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--main", "README.md"]
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0.0")
-  s.rubygems_version = "2.0.3"
-  s.summary = "Really simple memoization for ruby 2.0"
+  # Only works with Ruby 2
+  s.required_ruby_version = '>= 2.0.0'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  # Add any extra files to include in the gem
+  s.files             = `git ls-files`.split
+  s.require_paths     = ["lib"]
+  s.test_files        = s.files.grep(%r{^(test|spec|features)/})
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-  end
+  # Dependencies to run tests
+  s.add_development_dependency("rspec")
+  s.add_development_dependency("rake")
 end

data/spec/memoist2_spec.rb

@@ -29,7 +29,7 @@ describe Memoist2 do
 
     it "returns the expected value" do
       5.times do
-        subject.nilly.should == nil
+        expect(subject.nilly).to be nil
       end
     end
 
@@ -55,7 +55,7 @@ describe Memoist2 do
 
     it "returns the expected value" do
       5.times do
-        subject.foo.should == :bar
+        expect(subject.foo).to be :bar
       end
     end
 
@@ -64,6 +64,27 @@ describe Memoist2 do
         5.times{ subject.foo }
       end.to change{ subject.counter }.by(1)
     end
+
+    it "can memoize multiple methods simultaneously" do
+      subject = Class.new(Counter) do
+        include Memoist2
+
+        def a
+          count! && :a
+        end
+
+        def b
+          count! && :b
+        end
+
+        memoize :a, :b
+      end.new
+
+      5.times{ subject.a }
+      5.times{ subject.b }
+
+      expect(subject.counter).to be 2
+    end
   end
 
   describe "class methods" do
@@ -84,7 +105,7 @@ describe Memoist2 do
 
       it "works" do
         5.times do
-          subject.foo.should == 1
+          expect(subject.foo).to be 1
         end
       end
     end
@@ -104,7 +125,7 @@ describe Memoist2 do
 
       it "works" do
         5.times do
-          subject.foo.should == 1
+          expect(subject.foo).to be 1
         end
       end
     end
@@ -132,14 +153,14 @@ describe Memoist2 do
 
     it "can memoize question methods" do
       5.times do
-        subject.question?.should == 1
+        expect(subject.question?).to be 1
       end
     end
 
     it "can memoize bang methods" do
       5.times do
-        subject.bang!.should == 1
+        expect(subject.bang!).to be 1
       end
     end
   end
-end
+end

metadata

@@ -1,54 +1,54 @@
 --- !ruby/object:Gem::Specification
 name: memoist2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthew Rudy Jacobs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: MatthewRudyJacobs@gmail.com
+email:
+- matthewrudyjacobs@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENCE
 - README.md
@@ -56,6 +56,7 @@ files:
 - benchmark.rb
 - example/foo.rb
 - lib/memoist2.rb
+- lib/memoist2/version.rb
 - memoist2.gemspec
 - spec/memoist2_spec.rb
 - spec/spec_helper.rb
@@ -64,25 +65,25 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- --main
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Really simple memoization for ruby 2.0
-test_files: []
+test_files:
+- spec/memoist2_spec.rb
+- spec/spec_helper.rb