cardname 0.13.0 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d63b8ade20fc2e7a823d15562459838cf4bc352bf822ecae4175852efecd50
-  data.tar.gz: c6f46acfcf2f84f4d3ecbd60486d264279e1896bffcea4760613f2e8086feca6
+  metadata.gz: fec4ca9f2762b2046c7897c254af22a4b91b594ebbfa9d33f79dba177e4b17f3
+  data.tar.gz: 75bf8e0d3cfa758a07a6f280b433815be3e9562454446775d97c926b0ca7e3d5
 SHA512:
-  metadata.gz: 90509ffb908a2f04faef293d95e715129e872945f0b5878a4bde788906913d735bba6be2ee7e48751edc2c8fa38df0d662b6a961b8e9ebd6a40d9b87125b26fe
-  data.tar.gz: d408d06a406dc6457003b90895f675ea4b14b58ba310590de7defc5c8bc08ed47aab55d63c25bedc017cee51cfcbec0820961690979a0cde581633538954b131
+  metadata.gz: f0e9a1ace8af5e1dbc94547bb6ff30523eb46451dcab4e7ec0f504e3ccdf0a64a89efc36279464e98f8f0f166c691ed61e881ee3b5a5c8b81f9289eb1e0c8b3b
+  data.tar.gz: 531c17b9e620f59a7f56dbb5bf8388b29ba21a987e49a5db0870b58d5d8ec509ad058aa5b9b723f9d4262b0138743e9cf41abd4d32740272f3a1095c50fff1fc

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.0
+  version: 0.13.4
 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