memorandum 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c77ed8d5aeacd512262cfb151e072aec4d627b99
-  data.tar.gz: 2a8208f28a00b268bc3113425e6e963dc0e7c8c0
+  metadata.gz: 8d3980188220f33f7940fc8b959308b0bbd38f8e
+  data.tar.gz: 5296434b08e758ad82b5813cf389ed8029db3297
 SHA512:
-  metadata.gz: 8bb498553bc570cf01ab1b5f7827cb1c1164c26914ff231ad5b14100447df748094b9de931f2a2cc67fbdb2a90beb0c949e3fbb6fc4a7ab60b769bc747961997
-  data.tar.gz: 58d9478464993bdefde98fd5266de5e7aeb9d427fd215b361a2dd6182fd4c683ef76247d242ba2aa4ca6544776c6281657e50dcdf8d7333e1a4787348aa719ee
+  metadata.gz: fbad7ea1fe756c936a463c7bbb520e925db00f83877fe5146c95217872c245bbd26b733303437398038da7db850d47323559ec08b1eec19f928852f5bc80690f
+  data.tar.gz: 159b25d64d9d61e559ccbe51a506d6bb50d4273a470f9adde14a6667e5b01a80bcf6a23c0ee157d02debc55a5f48d94bdb371575045b239f7f771d755ae30dcb

data/lib/memorandum/version.rb

@@ -1,3 +1,3 @@
 module Memorandum
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/lib/memorandum.rb

@@ -1,22 +1,23 @@
 require 'ice_nine'
 
 module Memorandum
+  def self.extended base
+    base.send :include, InstanceMethods
+  end
+
   def memo *arguments
     name = arguments.pop
     flags = arguments
 
-    memoized_statuses = "@memoized_statuses_for_#{name}"
-    memoized_values   = "@memoized_values_for_#{name}"
-    unmemoized_name   = "unmemoized_#{name}"
+    memoized_statuses = memorandum_ivar_name MEMORANDUM_STATUSES, name
+    memoized_values   = memorandum_ivar_name MEMORANDUM_VALUES, name
+    unmemoized_name   = "#{MEMORANDUM_UNMEMOIZED}_#{name}"
 
     alias_method unmemoized_name, name
 
     define_method name do |*args|
-      statuses = instance_variable_get(memoized_statuses) \
-        || instance_variable_set(memoized_statuses, Hash[])
-
-      values = instance_variable_get(memoized_values) \
-        || instance_variable_set(memoized_values, Hash[])
+      statuses = memorandum_fetch memoized_statuses, Hash[]
+      values   = memorandum_fetch memoized_values,   Hash[]
 
       unless statuses[args]
         value = send unmemoized_name, *args
@@ -31,4 +32,25 @@ module Memorandum
       values[args]
     end
   end
+
+  private
+
+  MEMORANDUM_MEMOIZED   = 'memoized'.freeze
+  MEMORANDUM_STATUSES   = 'statuses'.freeze
+  MEMORANDUM_UNMEMOIZED = 'unmemoized'.freeze
+  MEMORANDUM_VALUES     = 'values'.freeze
+  MEMORANDUM_BANG       = '__BANG__'.freeze
+  MEMORANDUM_BOOL       = '__BOOL__'.freeze
+
+  def memorandum_ivar_name name, method_name
+    "@#{MEMORANDUM_MEMOIZED}_#{name}_for_#{method_name}"
+    .gsub('!', MEMORANDUM_BANG)
+    .gsub('?', MEMORANDUM_BOOL)
+  end
+
+  module InstanceMethods
+    def memorandum_fetch name, default
+      instance_variable_get(name) || instance_variable_set(name, default)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memorandum
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Robert Lude