memoist 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f737a677ee84ae6e38db47c459ce5151d87d57b
-  data.tar.gz: 454244a7dc119201a0339227a5e6c54a8ec64e06
+  metadata.gz: aca25d96c69122d50102f2d9615409389004002e
+  data.tar.gz: db741378eab95d22ee2b6e6b9cde18fb4ec2abdb
 SHA512:
-  metadata.gz: 67f7764129d2f645a6d9e4d586bf8fed469460b10af0eb56bf7906191ce271a1d1ca7413e2f67cab12519862342b516c305994f2e1f73d263443f48e79dfffc9
-  data.tar.gz: 2b7d05ccffe29ce0cd42b93aa430ed682fbe90dae8badfe632f6e2573f9daa1705aabb2fb16bf360ba7b649128caecddd9a7ce8cfebcedf055beefd5d690db07
+  metadata.gz: 1307707c8feba8c316cb1628503b76fde33e5c04b62de897c6350edc67333f325d652b45b614ecb4365229e909c7869e71c2713272b971826f8e33c7ddcbb566
+  data.tar.gz: 8b8141373347a9b87b7923fca58c3d3fb1daaa660af63ca765d1f9654343a77dbd915b3a8e0b89188870222a3d85cf8c9e9dba4d2af638cda4a63c50530c2acd

data/lib/memoist.rb

@@ -3,7 +3,7 @@ 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)}"
+    "@#{memoized_prefix(identifier)}_#{escape_punctuation(method_name)}"
   end
 
   def self.unmemoized_method_for(method_name, identifier=nil)
@@ -27,9 +27,9 @@ module Memoist
   end
 
   def self.escape_punctuation(string)
-    return string unless string.end_with?('?'.freeze, '!'.freeze)
+    string = string.is_a?(String) ? string.dup : string.to_s
 
-    string = string.dup
+    return string unless string.end_with?('?'.freeze, '!'.freeze)
 
     # A String can't end in both ? and !
     if string.sub!(/\?\Z/, '_query'.freeze)
@@ -63,28 +63,52 @@ module Memoist
       flush_cache
     end
 
+    def memoized_structs(names)
+      structs = self.class.all_memoized_structs
+      return structs if names.empty?
+
+      structs.select { |s| names.include?(s.memoized_method) }
+    end
+
     def prime_cache(*method_names)
-      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)
+      memoized_structs(method_names).each do |struct|
+        if struct.arity == 0
+          __send__(struct.memoized_method)
         else
-          ivar = Memoist.memoized_ivar_for(method_name)
-          instance_variable_set(ivar, {})
+          instance_variable_set(struct.ivar, {})
         end
       end
     end
 
     def flush_cache(*method_names)
-      method_names = self.class.memoized_methods if method_names.empty?
+      memoized_structs(method_names).each do |struct|
+        remove_instance_variable(struct.ivar) if instance_variable_defined?(struct.ivar)
+      end
+    end
+  end
+
+  MemoizedMethod = Struct.new(:memoized_method, :ivar, :arity)
+
+  def all_memoized_structs
+    @all_memoized_structs ||= begin
+      structs = memoized_methods.dup
 
-      method_names.each do |method_name|
-        ivar = Memoist.memoized_ivar_for(method_name)
-        remove_instance_variable(ivar) if instance_variable_defined?(ivar)
+      # Collect the memoized_methods of ancestors in ancestor order
+      # unless we already have it since self or parents could be overriding
+      # an ancestor method.
+      ancestors.grep(Memoist).each do |ancestor|
+        ancestor.memoized_methods.each do |m|
+          structs << m unless structs.any? {|am| am.memoized_method == m.memoized_method }
+        end
       end
+      structs
     end
   end
 
+  def clear_structs
+    @all_memoized_structs = nil
+  end
+
   def memoize(*method_names)
     if method_names.last.is_a?(Hash)
       identifier = method_names.pop[:identifier]
@@ -92,8 +116,7 @@ module Memoist
 
     Memoist.memoist_eval(self) do
       def self.memoized_methods
-        require 'set'
-        @_memoized_methods ||= Set.new
+        @_memoized_methods ||= []
       end
     end
 
@@ -110,8 +133,9 @@ module Memoist
         end
         alias_method unmemoized_method, method_name
 
-        self.memoized_methods << method_name
-        if instance_method(method_name).arity == 0
+        mm = MemoizedMethod.new(method_name, memoized_ivar, instance_method(method_name).arity)
+        self.memoized_methods << mm
+        if mm.arity == 0
 
           # define a method like this;
 

data/lib/memoist/version.rb

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

data/test/memoist_test.rb

@@ -114,6 +114,13 @@ class MemoistTest < Minitest::Test
     memoize :name, :identifier => :student
   end
 
+  class Teacher < Person
+    def seniority
+      "very_senior"
+    end
+    memoize :seniority
+  end
+
   class Company
     attr_reader :name_calls
     def initialize
@@ -261,11 +268,75 @@ class MemoistTest < Minitest::Test
     assert_equal 2, @calculator.counter
   end
 
+  def test_all_memoized_structs
+    # Person             memoize :age, :is_developer?, :memoize_protected_test, :name, :name?, :sleep, :update, :update_attributes
+    # Student < Person   memoize :name, :identifier => :student
+    # Teacher < Person   memoize :seniority
+
+    expected = %w(age is_developer? memoize_protected_test name name? sleep update update_attributes)
+    structs = Person.all_memoized_structs
+    assert_equal expected, structs.collect(&:memoized_method).collect(&:to_s).sort
+    assert_equal "@_memoized_name", structs.detect {|s| s.memoized_method == :name }.ivar
+
+    # Same expected methods
+    structs = Student.all_memoized_structs
+    assert_equal expected, structs.collect(&:memoized_method).collect(&:to_s).sort
+    assert_equal "@_memoized_student_name", structs.detect {|s| s.memoized_method == :name }.ivar
+
+    expected = (expected << "seniority").sort
+    structs = Teacher.all_memoized_structs
+    assert_equal expected, structs.collect(&:memoized_method).collect(&:to_s).sort
+    assert_equal "@_memoized_name", structs.detect {|s| s.memoized_method == :name }.ivar
+  end
+
+  def test_unmemoize_all_subclasses
+    # Person             memoize :age, :is_developer?, :memoize_protected_test, :name, :name?, :sleep, :update, :update_attributes
+    # Student < Person   memoize :name, :identifier => :student
+    # Teacher < Person   memoize :seniority
+
+    teacher = Teacher.new
+    assert_equal "Josh", teacher.name
+    assert_equal "Josh", teacher.instance_variable_get(:@_memoized_name)
+    assert_equal "very_senior", teacher.seniority
+    assert_equal "very_senior", teacher.instance_variable_get(:@_memoized_seniority)
+
+    teacher.unmemoize_all
+    assert_nil teacher.instance_variable_get(:@_memoized_name)
+    assert_nil teacher.instance_variable_get(:@_memoized_seniority)
+
+    student = Student.new
+    assert_equal "Student Josh", student.name
+    assert_equal "Student Josh", student.instance_variable_get(:@_memoized_student_name)
+    assert_nil student.instance_variable_get(:@_memoized_seniority)
+
+    student.unmemoize_all
+    assert_nil student.instance_variable_get(:@_memoized_student_name)
+  end
+
   def test_memoize_all
     @calculator.memoize_all
     assert @calculator.instance_variable_defined?(:@_memoized_counter)
   end
 
+  def test_memoize_all_subclasses
+    # Person             memoize :age, :is_developer?, :memoize_protected_test, :name, :name?, :sleep, :update, :update_attributes
+    # Student < Person   memoize :name, :identifier => :student
+    # Teacher < Person   memoize :seniority
+
+    teacher = Teacher.new
+    teacher.memoize_all
+
+    assert_equal "very_senior", teacher.instance_variable_get(:@_memoized_seniority)
+    assert_equal "Josh", teacher.instance_variable_get(:@_memoized_name)
+
+    student = Student.new
+    student.memoize_all
+
+    assert_equal "Student Josh", student.instance_variable_get(:@_memoized_student_name)
+    assert_equal "Student Josh", student.name
+    assert_nil student.instance_variable_get(:@_memoized_seniority)
+  end
+
   def test_memoization_cache_is_different_for_each_instance
     assert_equal 1, @calculator.counter
     assert_equal 2, @calculator.counter(:reload)
@@ -331,7 +402,29 @@ class MemoistTest < Minitest::Test
   end
 
   def test_double_memoization_with_identifier
+    # Person             memoize :age, :is_developer?, :memoize_protected_test, :name, :name?, :sleep, :update, :update_attributes
+    # Student < Person   memoize :name, :identifier => :student
+    # Teacher < Person   memoize :seniority
+
     Person.memoize :name, :identifier => :again
+    p = Person.new
+    assert_equal "Josh", p.name
+    assert p.instance_variable_get(:@_memoized_again_name)
+
+    # HACK: tl;dr: Don't memoize classes in test that are used elsewhere.
+    # Calling Person.memoize :name, :identifier => :again pollutes Person
+    # and descendents since we cache the memoized method structures.
+    # This populates those structs, verifies Person is polluted, resets the
+    # structs, cleans up cached memoized_methods
+    Student.all_memoized_structs
+    Person.all_memoized_structs
+    Teacher.all_memoized_structs
+    assert Person.memoized_methods.any? { |m| m.ivar == "@_memoized_again_name" }
+
+    [Student, Teacher, Person].each { |obj| obj.clear_structs }
+    assert Person.memoized_methods.reject!      { |m| m.ivar == "@_memoized_again_name" }
+    assert_nil Student.memoized_methods.reject! { |m| m.ivar == "@_memoized_again_name" }
+    assert_nil Teacher.memoized_methods.reject! { |m| m.ivar == "@_memoized_again_name" }
   end
 
   def test_memoization_with_a_subclass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memoist
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Joshua Peek
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,3 +120,4 @@ summary: memoize methods invocation
 test_files:
 - test/memoist_test.rb
 - test/test_helper.rb
+has_rdoc: