memery 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b422cc5336406f390272a02aea253b991470519a786844cb72b4cc0c05ef3b56
-  data.tar.gz: 12c2329a8539305d85dcb99b30604e55aa04b0f75153fc6a173ae73875f423c8
+  metadata.gz: 826d0bdf9b559052298b1d6fcd11b22c302533e35037f21213680f80d019528b
+  data.tar.gz: b953dc19e1d6743f4d12e088b2efad526dac3a92b4eaa9d2ee0aeb5e641b358b
 SHA512:
-  metadata.gz: 94b69a032837511e10b368ab6db8212bf6b48c8b835c5f76732484b05dea8910af17712797a42fa334ee0529973f8c61d69ea052c1949619411bc1ae7c0897fa
-  data.tar.gz: fd17f734226f87487223034bf07afae259ed54ca5b216bfc11322b38adcdf1dd3898bf0f238ab8dcb846492c7f93baa8e51d909584bd1ec1e8b07774d4cc3693
+  metadata.gz: 741369cf1d8fb3cf743d19d7415cb96ede62ddb71419882089dd41cf19b461d06cb1dbd08b8c2358fd29e70f6637d34dba8fcc999ae6ea94b8a2adc623c2bac3
+  data.tar.gz: f7a8f6829fdf1b4b4a3f674ea5d9394c27230589ad7ccd4d4e61471261915fa81db4cc75ae6048daa068dba50864dc59109e25c8b2e00d48d54c24eddcc640ae

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /coverage/
 /doc/
 /pkg/

data/.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.5
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   AllowedNames: ["x", "y", "z"]
 
 RSpec/EmptyLineAfterHook:

data/.travis.yml

@@ -3,10 +3,10 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 
 before_install: gem install bundler

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [1.3.0] - 2020-02-10
+### Added
+- Allow memoization after including module with Memery. ([@AlexWayfer]) [#23]
+
+### Changed
+- Make `memoize` return the method name to allow chaining. ([@JelF]) [#22]
+
+### Fixed
+- Fix warnings in Ruby 2.7. ([@AlexWayfer]) [#19], [#25]
+
 ## [1.2.0] - 2019-10-19
 ### Added
 - Add `:ttl` option for `memoize` method ([@AlexWayfer]) [#11]
@@ -19,7 +29,7 @@
 - Readme example for memoizing class methods. ([@AlexWayfer]) [#3]
 - Memery raises `ArgumentError` if method is not defined when you call `memoize`.
 
-## [0.5.0] - 2017-16-12
+## [0.5.0] - 2017-06-12
 - Initial public version.
 
 [0.5.0]: https://github.com/tycooon/memery/tree/v0.5.0
@@ -27,10 +37,12 @@
 [1.0.0]: https://github.com/tycooon/memery/compare/v0.6.0...v1.0.0
 [1.1.0]: https://github.com/tycooon/memery/compare/v1.0.0...v1.1.0
 [1.2.0]: https://github.com/tycooon/memery/compare/v1.1.0...v1.2.0
-[Unreleased]: https://github.com/tycooon/memery/compare/v1.2.0...HEAD
+[1.3.0]: https://github.com/tycooon/memery/compare/v1.2.0...v1.3.0
+[Unreleased]: https://github.com/tycooon/memery/compare/v1.3.0...HEAD
 
 [@tycooon]: https://github.com/tycooon
 [@AlexWayfer]: https://github.com/AlexWayfer
+[@JelF]: https://github.com/JelF
 
 [#3]: https://github.com/tycooon/memery/pull/3
 [#7]: https://github.com/tycooon/memery/pull/7
@@ -38,3 +50,7 @@
 [#11]: https://github.com/tycooon/memery/pull/11
 [#14]: https://github.com/tycooon/memery/pull/14
 [#17]: https://github.com/tycooon/memery/pull/17
+[#19]: https://github.com/tycooon/memery/pull/19
+[#22]: https://github.com/tycooon/memery/pull/22
+[#23]: https://github.com/tycooon/memery/pull/23
+[#25]: https://github.com/tycooon/memery/pull/25

data/Gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: .
+  specs:
+    memery (1.3.0)
+      ruby2_keywords (~> 0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    benchmark-ips (2.7.2)
+    benchmark-memory (0.1.2)
+      memory_profiler (~> 0.9)
+    coderay (1.1.2)
+    coveralls (0.8.23)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    diff-lcs (1.3)
+    docile (1.3.2)
+    jaro_winkler (1.5.4)
+    json (2.3.0)
+    memory_profiler (0.9.14)
+    method_source (0.9.2)
+    parallel (1.19.1)
+    parser (2.7.0.2)
+      ast (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rack (2.1.1)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-config-umbrellio (0.79.0.68)
+      rubocop (= 0.79.0)
+      rubocop-performance (= 1.5.2)
+      rubocop-rails (= 2.4.1)
+      rubocop-rspec (= 1.37.1)
+    rubocop-performance (1.5.2)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.4.1)
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)
+    rubocop-rspec (1.37.1)
+      rubocop (>= 0.68.1)
+    ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (1.0.1)
+    tins (1.24.0)
+      sync
+    unicode-display_width (1.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  benchmark-ips
+  benchmark-memory
+  bundler
+  coveralls
+  memery!
+  pry
+  rake
+  rspec
+  rubocop-config-umbrellio
+  simplecov
+
+BUNDLED WITH
+   2.1.2

data/lib/memery.rb

@@ -1,34 +1,31 @@
 # frozen_string_literal: true
 
+require "ruby2_keywords"
+
 require "memery/version"
 
 module Memery
   class << self
+    def monotonic_clock
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+  end
+
+  module ModuleMethods
     def included(base)
       base.extend(ClassMethods)
       base.include(InstanceMethods)
-    end
-
-    def method_visibility(klass, method_name)
-      case
-      when klass.private_method_defined?(method_name)
-        :private
-      when klass.protected_method_defined?(method_name)
-        :protected
-      when klass.public_method_defined?(method_name)
-        :public
-      end
-    end
-
-    def monotonic_clock
-      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      base.extend ModuleMethods if base.instance_of?(Module)
     end
   end
 
+  extend ModuleMethods
+
   module ClassMethods
     def memoize(method_name, condition: nil, ttl: nil)
       prepend_memery_module!
       define_memoized_method!(method_name, condition: condition, ttl: ttl)
+      method_name
     end
 
     def memoized?(method_name)
@@ -42,37 +39,61 @@ module Memery
 
     def prepend_memery_module!
       return if defined?(@_memery_module)
-      @_memery_module = Module.new
+      @_memery_module = Module.new do
+        extend MemoizationModule
+      end
       prepend @_memery_module
     end
 
-    def define_memoized_method!(method_name, condition: nil, ttl: nil)
-      mod_id = @_memery_module.object_id
-      visibility = Memery.method_visibility(self, method_name)
-      raise ArgumentError, "Method #{method_name} is not defined on #{self}" unless visibility
+    def define_memoized_method!(*args, **kwargs)
+      @_memery_module.public_send __method__, self, *args, **kwargs
+    end
+
+    module MemoizationModule
+      def define_memoized_method!(klass, method_name, condition: nil, ttl: nil)
+        method_key = "#{method_name}_#{object_id}"
+
+        original_visibility = method_visibility(klass, method_name)
 
-      @_memery_module.module_eval do
-        define_method(method_name) do |*args, &block|
+        define_method method_name do |*args, &block|
           if block || (condition && !instance_exec(&condition))
             return super(*args, &block)
           end
 
-          key = "#{method_name}_#{mod_id}"
+          store = (@_memery_memoized_values ||= {})[method_key] ||= {}
 
-          store = (@_memery_memoized_values ||= {})[key] ||= {}
-
-          if store.key?(args) && (ttl.nil? || Memery.monotonic_clock <= store[args][:time] + ttl)
+          if store.key?(args) &&
+            (ttl.nil? || Memery.monotonic_clock <= store[args][:time] + ttl)
             return store[args][:result]
           end
 
           result = super(*args)
-          @_memery_memoized_values[key][args] = { result: result, time: Memery.monotonic_clock }
+          @_memery_memoized_values[method_key][args] =
+            { result: result, time: Memery.monotonic_clock }
           result
         end
 
-        send(visibility, method_name)
+        ruby2_keywords method_name
+
+        send original_visibility, method_name
+      end
+
+      private
+
+      def method_visibility(klass, method_name)
+        if klass.private_method_defined?(method_name)
+          :private
+        elsif klass.protected_method_defined?(method_name)
+          :protected
+        elsif klass.public_method_defined?(method_name)
+          :public
+        else
+          raise ArgumentError, "Method #{method_name} is not defined on #{klass}"
+        end
       end
     end
+
+    private_constant :MemoizationModule
   end
 
   module InstanceMethods

data/lib/memery/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Memery
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/memery.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "ruby2_keywords", "~> 0.0.2"
+
   spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "benchmark-memory"
   spec.add_development_dependency "bundler"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: memery
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-19 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -176,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A gem for memoization.