cardname 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b1d575c9f030ba1f469a778250f42972e67932b439175bdb491d2b6fac9a55b
-  data.tar.gz: 7b0f58c98b1ad9d9c989d0b686dccb8584aaacd0d45c54ca46b09f216d5e7fe3
+  metadata.gz: a270d529d612496f36241b52e11910e744e4507976f5614c8c3b0afe904d3b8a
+  data.tar.gz: 828aa53f1b7fd74c7ddadd528136773077008a89993f8b25f1d260c561b15c22
 SHA512:
-  metadata.gz: 3745d840bc9b35e2d5a39ff3efc1eaab31997e9d149585ded9a76d973aa5a078a78dee1df4e105156f7c9ff446c21e250449548f3a164a7b1ebabf43c4d6075f
-  data.tar.gz: c83807b79b37e3eb08612c817397b97a7b6ce4fec562101b7cd09ea975cab1e1db64d124b7a3fc3aa90aeabf8ff48c2bbca1224bc9fa14d34e7c78a8aeca10aa
+  metadata.gz: d8e5baf88014f7e32331976710bc7d727d235131570c4e251e6b73846997b4b7000a9b867268f320195fe86c9d677e51c668def42c5623678a6a7c9e0d679a1b
+  data.tar.gz: 36fe3fa8512f8e23e27a71e76be3c037234144cb15a6d8f764c033f6b9463023b44c65e255a75960fb60cc8878fcc92f2dfc93be74d26fe4de1011f83551ccdd

data/lib/cardname/danger.rb

@@ -0,0 +1,23 @@
+class Cardname
+  # methods that have the potential to confuse cardname cache prompt cache resets
+  module Danger
+    def self.dangerous_methods
+      bang_methods = String.instance_methods.select { |m| m.to_s.end_with?("!") }
+      %i[replace concat clear].concat bang_methods
+    end
+
+    dangerous_methods.each do |m|
+      define_method m do |*args, &block|
+        reset
+        super(*args, &block)
+      end
+    end
+
+    private
+
+    def reset
+      self.class.reset_cache s
+      instance_variables.each { |var| instance_variable_set var, nil }
+    end
+  end
+end

data/lib/cardname/variants.rb

@@ -10,7 +10,7 @@ class Cardname
         .gsub(/[^#{OK4KEY_RE}]+/, "_")
         .split(/_+/)
         .reject(&:empty?)
-        .map { |key| self.class.stable_key(key) }
+        .map { |key| stable_key(key) }
         .join("_")
     end
 
@@ -35,5 +35,30 @@ class Cardname
     def to_sym
       s.to_sym
     end
+
+    private
+
+    def uninflect_method
+      self.class.uninflect
+    end
+
+    def stabilize?
+      self.class.stabilize
+    end
+
+    # Sometimes the core rule "the key's key must be itself" (called "stable" below)
+    # is violated. For example,  it fails with singularize as uninflect method
+    # for Matthias -> Matthia -> Matthium
+    # Usually that means the name is a proper noun and not a plural.
+    # You can choose between two solutions:
+    # 1. don't uninflect if the uninflected key is not stable (stabilize = false)
+    # 2. uninflect until the key is stable (stabilize = true)
+    def stable_key name
+      key_one = name.send uninflect_method
+      key_two = key_one.send uninflect_method
+      return key_one unless key_one != key_two
+
+      stabilize? ? stable_key(key_two) : name
+    end
   end
 end

data/lib/cardname.rb

@@ -4,12 +4,13 @@ require "active_support/inflector"
 require "htmlentities"
 
 class Cardname < String
-  require_relative "cardname/parts"
-  require_relative "cardname/pieces"
-  require_relative "cardname/variants"
-  require_relative "cardname/contextual"
-  require_relative "cardname/predicates"
-  require_relative "cardname/manipulate"
+  require "cardname/parts"
+  require "cardname/pieces"
+  require "cardname/variants"
+  require "cardname/contextual"
+  require "cardname/predicates"
+  require "cardname/manipulate"
+  require "cardname/danger"
 
   include Parts
   include Pieces
@@ -17,6 +18,7 @@ class Cardname < String
   include Contextual
   include Predicates
   include Manipulate
+  include Danger
 
   OK4KEY_RE = '\p{Word}\*'
 
@@ -68,25 +70,6 @@ class Cardname < String
       @banned_re ||= /[#{Regexp.escape((banned_array + [joint])).join}]/
     end
 
-    # Sometimes the core rule "the key's key must be itself" (called "stable" below) is violated
-    # eg. it fails with singularize as uninflect method for Matthias -> Matthia -> Matthium
-    # Usually that means the name is a proper noun and not a plural.
-    # You can choose between two solutions:
-    # 1. don't uninflect if the uninflected key is not stable (stabilize = false)
-    # 2. uninflect until the key is stable (stabilize = true)
-    def stable_key name
-      key_one = name.send(uninflect)
-      key_two = key_one.send(uninflect)
-      return key_one unless key_one != key_two
-
-      stabilize ? stable_key(key_two) : name
-    end
-
-    def dangerous_methods
-      bang_methods = String.instance_methods.select { |m| m.to_s.end_with?("!") }
-      %i[replace concat clear].concat bang_methods
-    end
-
     def split_parts str
       str.split(/\s*#{JOINT_RE}\s*/, -1)
     end
@@ -110,13 +93,6 @@ class Cardname < String
     self
   end
 
-  dangerous_methods.each do |m|
-    define_method m do |*args, &block|
-      reset
-      super(*args, &block)
-    end
-  end
-
   def []= index, val
     p = parts
     p[index] = val
@@ -132,21 +108,11 @@ class Cardname < String
   end
 
   def == other
-    other_key =
+    key ==
       case
       when other.respond_to?(:key)     then other.key
       when other.respond_to?(:to_name) then other.to_name.key
       else                                  other.to_s
       end
-    other_key == key
-  end
-
-  private
-
-  def reset
-    self.class.reset_cache s
-    instance_variables.each do |var|
-      instance_variable_set var, nil
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -51,6 +51,7 @@ files:
 - Rakefile
 - lib/cardname.rb
 - lib/cardname/contextual.rb
+- lib/cardname/danger.rb
 - lib/cardname/manipulate.rb
 - lib/cardname/parts.rb
 - lib/cardname/pieces.rb