memoist 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2940374d92fdc408f67414dc6aefaee449b0722
-  data.tar.gz: 1e695236b23a8a12790732c8f00fbe0bf7251fda
+  metadata.gz: 5f737a677ee84ae6e38db47c459ce5151d87d57b
+  data.tar.gz: 454244a7dc119201a0339227a5e6c54a8ec64e06
 SHA512:
-  metadata.gz: 714ba49dd47d39cfaef3d19ff8e0d56e115d059760016fd43a6d6379701422e58fb10a8b6481972d4108fc7e6db35cf82339a494dcff810f743363db6de757e8
-  data.tar.gz: 9a645417282d73779cdfabaad7222b6b5bc769e9d1a0968ffa51f901eb66ce3bdbadb715398a7c7853ad4607da3c63fffad3b97b684b22b69740612d47712c08
+  metadata.gz: 67f7764129d2f645a6d9e4d586bf8fed469460b10af0eb56bf7906191ce271a1d1ca7413e2f67cab12519862342b516c305994f2e1f73d263443f48e79dfffc9
+  data.tar.gz: 2b7d05ccffe29ce0cd42b93aa430ed682fbe90dae8badfe632f6e2573f9daa1705aabb2fb16bf360ba7b649128caecddd9a7ce8cfebcedf055beefd5d690db07

data/README.md

@@ -14,72 +14,81 @@ Usage
 
 Just extend with the Memoist module
 
-    require 'memoist'
-    class Person
-      extend Memoist
-
-      def social_security
-        decrypt_social_security
-      end
-      memoize :social_security
-    end
+```ruby
+require 'memoist'
+class Person
+  extend Memoist
+
+  def social_security
+    decrypt_social_security
+  end
+  memoize :social_security
+end
+```
 
 And person.social_security will only be calculated once.
 
 Every memoized function (which initially was not accepting any arguments) has a ```(reload)```
 argument you can pass in to bypass and reset the memoization:
 
-    def some_method
-      Time.now
-    end
-    memoize :some_method
+```ruby
+def some_method
+  Time.now
+end
+memoize :some_method
+```
 
 Calling ```some_method``` will be memoized, but calling ```some_method(true)``` will rememoize each time.
 
 You can even memoize method that takes arguments.
 
-
-    class Person
-      def taxes_due(income)
-        income * 0.40
-      end
-      memoize :taxes_due
-    end
+```ruby
+class Person
+  def taxes_due(income)
+    income * 0.40
+  end
+  memoize :taxes_due
+end
+```
 
 This will only be calculated once per value of income.
 
 You can also memoize class methods.
 
-    class Person
-
-      class << self
-        extend Memoist
-        def with_overdue_taxes
-          # ...
-        end
-        memoize :with_overdue_taxes
-      end
+```ruby
+class Person
 
+  class << self
+    extend Memoist
+    def with_overdue_taxes
+      # ...
     end
+    memoize :with_overdue_taxes
+  end
+
+end
+```
 
 When a sub-class overrides one of its parent's methods and you need to memoize both. 
 Then you can use the `:identifier` parameter in order to help _Memoist_ distinguish between the two.
 
-    class Clock
-      extend Memoist
-      def now
-         "The time now is #{Time.now.hour} o'clock and #{Time.now.min} minutes"
-      end
-      memoize :now
-    end
-
-    class AccurateClock < Clock
-      extend Memoist
-      def now
-        "#{super} and #{Time.now.sec} seconds"
-      end
-      memoize :now, :identifier => :accurate_clock
-    end
+```ruby
+class Clock
+  extend Memoist
+  def now
+     "The time now is #{Time.now.hour} o'clock and #{Time.now.min} minutes"
+  end
+  memoize :now
+end
+
+class AccurateClock < Clock
+  extend Memoist
+  def now
+    "#{super} and #{Time.now.sec} seconds"
+  end
+  memoize :now, :identifier => :accurate_clock
+end
+```
 
 
 Reload
@@ -87,17 +96,23 @@ Reload
 
 Each memoized function comes with a way to flush the existing value.
 
-    person.social_security       # returns the memoized value
-    person.social_security(true) # bypasses the memoized value and rememoizes it
+```ruby
+person.social_security       # returns the memoized value
+person.social_security(true) # bypasses the memoized value and rememoizes it
+```
 
 This also works with a memoized method with arguments
 
-    person.taxes_due(100_000)       # returns the memoized value
-    person.taxes_due(100_000, true) # bypasses the memoized value and rememoizes it
+```ruby
+person.taxes_due(100_000)       # returns the memoized value
+person.taxes_due(100_000, true) # bypasses the memoized value and rememoizes it
+```
 
 If you want to flush the entire memoization cache for an object
 
-    person.flush_cache
+```ruby
+person.flush_cache
+```
 
 Authors
 ===========

data/lib/memoist.rb

@@ -3,23 +3,40 @@ require 'memoist/core_ext/singleton_class'
 module Memoist
 
   def self.memoized_ivar_for(method_name, identifier=nil)
-    ["@#{memoized_prefix(identifier)}", escape_punctuation(method_name.to_s)].join("_")
+    "@#{memoized_prefix(identifier)}_#{escape_punctuation(method_name.to_s)}"
   end
 
   def self.unmemoized_method_for(method_name, identifier=nil)
-    [unmemoized_prefix(identifier), method_name].join("_").to_sym
+    "#{unmemoized_prefix(identifier)}_#{method_name}".to_sym
   end
 
   def self.memoized_prefix(identifier=nil)
-    ["_memoized", identifier].compact.join("_")
+    if identifier
+      "_memoized_#{identifier}"
+    else
+      "_memoized".freeze
+    end
   end
 
   def self.unmemoized_prefix(identifier=nil)
-    ["_unmemoized", identifier].compact.join("_")
+    if identifier
+      "_unmemoized_#{identifier}"
+    else
+      "_unmemoized".freeze
+    end
   end
 
   def self.escape_punctuation(string)
-    string.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')
+    return string unless string.end_with?('?'.freeze, '!'.freeze)
+
+    string = string.dup
+
+    # A String can't end in both ? and !
+    if string.sub!(/\?\Z/, '_query'.freeze)
+    else
+      string.sub!(/!\Z/, '_bang'.freeze)
+    end
+    string
   end
 
   def self.memoist_eval(klass, *args, &block)
@@ -47,15 +64,7 @@ module Memoist
     end
 
     def prime_cache(*method_names)
-      if method_names.empty?
-        prefix = Memoist.unmemoized_prefix+"_"
-        method_names = methods.collect do |method_name|
-          if method_name.to_s.start_with?(prefix)
-            method_name[prefix.length..-1]
-          end
-        end.compact
-      end
-
+      method_names = self.class.memoized_methods if method_names.empty?
       method_names.each do |method_name|
         if method(Memoist.unmemoized_method_for(method_name)).arity == 0
           __send__(method_name)
@@ -67,14 +76,7 @@ module Memoist
     end
 
     def flush_cache(*method_names)
-      if method_names.empty?
-        prefix = Memoist.unmemoized_prefix+"_"
-        method_names = (methods + private_methods + protected_methods).collect do |method_name|
-          if method_name.to_s.start_with?(prefix)
-            method_name[prefix.length..-1]
-          end
-        end.compact
-      end
+      method_names = self.class.memoized_methods if method_names.empty?
 
       method_names.each do |method_name|
         ivar = Memoist.memoized_ivar_for(method_name)
@@ -88,6 +90,13 @@ module Memoist
       identifier = method_names.pop[:identifier]
     end
 
+    Memoist.memoist_eval(self) do
+      def self.memoized_methods
+        require 'set'
+        @_memoized_methods ||= Set.new
+      end
+    end
+
     method_names.each do |method_name|
       unmemoized_method = Memoist.unmemoized_method_for(method_name, identifier)
       memoized_ivar = Memoist.memoized_ivar_for(method_name, identifier)
@@ -101,6 +110,7 @@ module Memoist
         end
         alias_method unmemoized_method, method_name
 
+        self.memoized_methods << method_name
         if instance_method(method_name).arity == 0
 
           # define a method like this;

data/lib/memoist/version.rb

@@ -1,3 +1,3 @@
 module Memoist
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/memoist.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 3.0"
+  spec.add_development_dependency "minitest", "~> 5.5.1"
 end

data/test/memoist_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'memoist'
 
-class MemoistTest < Minitest::Unit::TestCase
+class MemoistTest < Minitest::Test
 
   class CallCounter
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memoist
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Joshua Peek
@@ -19,22 +19,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,14 +55,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.5.1
 description: 
 email:
 - josh@joshpeek.com
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: memoize methods invocation