memoit 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8ece57c9bea6440805f8ccd28b6bae60c977d40
-  data.tar.gz: cd5fd4c30fd3c6a9fa040c6a85510a88b8fbd00d
+SHA256:
+  metadata.gz: '068ad78c5ca6426134080648451b94d4243130e39e985b3cc98edae3044a5f20'
+  data.tar.gz: e498ebe3a522f57a0fcfdd4e0ea7e1ccb096ec26adb6f73dce0badc1ee7cf935
 SHA512:
-  metadata.gz: 4091ce16342522f9321735939e83d78f17f401c77480fb572c2d5b20de87f94ee58db4f6b0d1ca87a9c207b0df4a1eed1f32a738596a9e43c895dada06b05b99
-  data.tar.gz: cbe78faf3d28a6d100f14df8c90994170ded87f95991e7c8a607f4593d36ff13cd9ac8e5ce9063589d8d654847e015be3540bc5a20dad0d7caac996351517b77
+  metadata.gz: be5728d2629e1a192a3e6f89f089159f0fad2eadc778213836474fa52688e509414b2b0b048e38665e2c267dc30ac3e8669d4edf27cfdae64a4f81dc6b465156
+  data.tar.gz: 2fd4ae72e455d1e29f43451c9bbde94aa9381fcc02c9c5843628db3a6eb9fcf00a0623a55a683f90d8bad75edb30d52064ea9d7c929fff53b0a6ae65eba28636

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Ruby CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - 3.1
+          - "3.0"
+          - 2.7
+          - jruby-9.3
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

data/README.md

@@ -1,5 +1,8 @@
 # Memoit
 
+[![Gem Version](https://badge.fury.io/rb/memoit.svg)](http://badge.fury.io/rb/memoit)
+[![Build Status](https://github.com/jnicklas/memoit/actions/workflows/ci.yml/badge.svg)](https://github.com/jnicklas/memoit/actions/workflows/ci.yml)
+
 Memoizes methods.
 
 ## Installation
@@ -28,6 +31,14 @@ end
 
 [Yes](https://news.ycombinator.com/item?id=3067434).
 
+## Development
+
+```sh
+gem install bundler
+bundle install
+rspec
+```
+
 ## License
 
-[MIT](License.txt)
+[MIT](LICENSE.txt)

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/memoit/version.rb

@@ -1,3 +1,3 @@
 module Memoit
-  VERSION = "0.2.0"
+  VERSION = "0.4.1"
 end

data/lib/memoit.rb

@@ -11,12 +11,13 @@ module Memoit
   #     end
   #   end
   def memoize(name)
-    ivar_name = "@_memo_#{name}".to_sym
+    ivar_method_name = name.to_s.sub("?", "__questionmark").sub("!", "__bang")
+    ivar_name = "@_memo_#{ivar_method_name}".to_sym
     mod = Module.new do
-      define_method(name) do |*args, &block|
-        return super(*args, &block) if block
+      define_method(name) do |*args, **kwargs, &block|
+        return super(*args, **kwargs, &block) if block
         cache = instance_variable_get(ivar_name) || instance_variable_set(ivar_name, {})
-        cache.fetch(args.hash) { |hash| cache[hash] = super(*args) }
+        cache.fetch([args, kwargs].hash) { |hash| cache[hash] = super(*args, **kwargs) }
       end
     end
     prepend mod

data/memoit.gemspec

@@ -13,13 +13,12 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", "~> 2.3"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.10"
 end

data/spec/memoit_spec.rb

@@ -15,10 +15,38 @@ describe Memoit do
         rand
       end
 
+      memoize def baz(pos = nil, hash = {}, kwak: nil)
+        rand
+      end
+
+      memoize def qux(pos = nil, kwak: nil)
+        rand
+      end
+
+      memoize def quux(kwak: nil)
+        rand
+      end
+
+      memoize def corge(hash = {}, kwak: nil)
+        rand
+      end
+
       memoize def falsy
         foo
         false
       end
+
+      memoize def query?
+        rand
+      end
+
+      memoize def bang!
+        rand
+      end
+
+      memoize def ☃
+        rand
+      end
     end
   end
   let(:instance) { klass.new }
@@ -37,6 +65,28 @@ describe Memoit do
       expect(instance.bar(a, 1, :foo, "bar")).not_to eq(instance.bar(Object.new, 1, :foo, "bar"))
     end
 
+    it "caches results when positional, hash and keyword arguments are used" do
+      a = Object.new
+      expect(instance.baz(a, { hash_key: "hash_value" }, kwak: "kwav")).to eq(instance.baz(a, { hash_key: "hash_value" }, kwak: "kwav"))
+    end
+
+    it "caches results when positional and keyword arguments are used" do
+      a = Object.new
+      expect(instance.qux(a, kwak: "kwav")).to eq(instance.qux(a, kwak: "kwav"))
+    end
+
+    it "caches results when keyword arguments are used" do
+      expect(instance.quux(kwak: "kwav")).to eq(instance.quux(kwak: "kwav"))
+    end
+
+    it "ignores cache if keyword arguments differ" do
+      expect(instance.quux(kwak: "1")).not_to eq(instance.quux(kwak: "2"))
+    end
+
+    it "caches results when hash and keyword arguments are used" do
+      expect(instance.corge({ hash_key: "hash_value" }, kwak: "kwav")).to eq(instance.corge({ hash_key: "hash_value" }, kwak: "kwav"))
+    end
+
     it "ignores cache when block given" do
       expect(instance.foo { }).not_to eq(instance.foo { })
     end
@@ -46,6 +96,18 @@ describe Memoit do
       expect(instance.falsy).to eq(instance.falsy)
     end
 
+    it "handles question-mark methods" do
+      expect(instance.query?).to eq(instance.query?)
+    end
+
+    it "handles bang methods" do
+      expect(instance.bang!).to eq(instance.bang!)
+    end
+
+    it "handles non-ASCII-name methods" do
+      expect(instance.☃).to eq(instance.☃)
+    end
+
     it "returns the name of the method" do
       name = nil
       Class.new do
@@ -54,6 +116,25 @@ describe Memoit do
       end
       expect(name).to eq(:blah)
     end
+
+    it "works in a mixin" do
+      mod = Module.new do
+        memoize def cname
+          self.class.name
+        end
+      end
+
+      Foo = Class.new do
+        include mod
+      end
+
+      Bar = Class.new do
+        include mod
+      end
+
+      expect(Foo.new.cname).to eq("Foo")
+      expect(Bar.new.cname).to eq("Bar")
+    end
   end
 
   describe ".memoize_class_method" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memoit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jonas Nicklas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,49 +16,50 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: 
+        version: '3.10'
+description:
 email:
 - jonas.nicklas@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -72,7 +73,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,11 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Memoize is back!
 test_files:
 - spec/memoit_spec.rb
-has_rdoc: