cardname 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fec4ca9f2762b2046c7897c254af22a4b91b594ebbfa9d33f79dba177e4b17f3
-  data.tar.gz: 75bf8e0d3cfa758a07a6f280b433815be3e9562454446775d97c926b0ca7e3d5
+  metadata.gz: d42f369012c637f78375a460e4814d841ed45fee9f4f3d7eb5f9dee84f725dd0
+  data.tar.gz: 5bbfbdfcaaf320fa1e0853e5ec781c54b38cd9a38e41bffdb12a52820fc768ed
 SHA512:
-  metadata.gz: f0e9a1ace8af5e1dbc94547bb6ff30523eb46451dcab4e7ec0f504e3ccdf0a64a89efc36279464e98f8f0f166c691ed61e881ee3b5a5c8b81f9289eb1e0c8b3b
-  data.tar.gz: 531c17b9e620f59a7f56dbb5bf8388b29ba21a987e49a5db0870b58d5d8ec509ad058aa5b9b723f9d4262b0138743e9cf41abd4d32740272f3a1095c50fff1fc
+  metadata.gz: a3376035abe1d69ed768e6f3eb040106a87985c6a20fb9dfb939d416589f804e6c820ff325e9e819ac43d3529513cdc6fd6a03e01fd50301c7b1d958a8ad4d2d
+  data.tar.gz: 0ec2da901b07b528bfe7ddaaecc50a4ff8e65533d4282e51f74e9595214ebfe012cccbdff2729d4b3fd0613f7fa24eac091b25444375745a038a93d6c8583c5a

data/lib/cardname/contextual.rb

@@ -34,7 +34,8 @@ class Cardname
       name_from(*from).s
     end
 
-    # if possible, relativize name into one beginning with a "+".  The new name must absolutize back to the correct
+    # if possible, relativize name into one beginning with a "+".
+    # The new name must absolutize back to the correct
     # original name in the context of "from"
     def name_from *from
       return self unless (remaining = remove_context(*from))

data/lib/cardname/manipulate.rb

@@ -38,6 +38,10 @@ class Cardname
       parts.length
     end
 
+    def [] *args
+      self.class.new part_names[*args]
+    end
+
     def prepend_joint
       joint = self.class.joint
       self =~ /^#{Regexp.escape joint}/ ? self : (joint + self)

data/lib/cardname/parts.rb

@@ -3,106 +3,92 @@ class Cardname
   # methods that end with _name return name objects
   # the same methods without _name return strings
   module Parts
-    attr_reader :parts, :part_keys, :simple
-    alias_method :to_a, :parts
+    # PARTS
+    def part_names
+      @part_names ||= generate_part_names
+    end
 
     def parts
-      @parts = Cardname.split_parts s
+      part_names.map(&:s)
     end
+    alias_method :to_a, :parts
 
     def part_keys
-      @part_keys ||= simple ? [simple_key] : parts.map { |p| p.to_name.simple_key }
+      part_names.map(&:key)
     end
 
-    def left
-      @left ||= simple? ? nil : parts[0..-2] * self.class.joint
-    end
-
-    def right
-      @right ||= simple? ? nil : parts[-1]
+    def trunk_name
+      simple? ? self : left_name
     end
 
-    def left_name
-      @left_name ||= left && self.class.new(left)
+    def trunk
+      trunk_name.s
     end
 
-    def right_name
-      @right_name ||= right && self.class.new(right)
+    def trunk_key
+      trunk_name.key
     end
 
-    def left_key
-      @left_key ||=  simple? ? nil : part_keys[0..-2] * self.class.joint
+    def tag_name
+      simple? ? self : right_name
     end
 
-    def right_key
-      @right_key ||= simple? ? nil : part_keys.last
+    def tag
+      tag_name.s
     end
 
-    def parents
-      @parents ||= compound? ? [left, right] : []
+    def tag_key
+      tag_name.key
     end
 
     def parent_names
-      @parent_names ||= compound? ? [left_name, right_name] : []
+      simple? ? [] : [left_name, right_name]
     end
 
-    def parent_keys
-      @parent_keys ||= compound? ? [left_key, right_key] : []
+    def parents
+      parent_names.map(&:s)
     end
 
-    # Note that all names have a trunk and tag,
-    # but only junctions have left and right
-
-    def trunk
-      @trunk ||= simple? ? s : left
+    def parent_keys
+      parent_names.map(&:key)
     end
 
-    def tag
-      @tag ||= simple? ? s : right
+    def left_name
+      simple? ? nil : self.class.new(part_names[0..-2])
     end
 
-    def trunk_name
-      @trunk_name ||= simple? ? self : left_name
+    def left
+      left_name&.s
     end
 
-    def tag_name
-      @tag_name ||= simple? ? self : right_name
+    def left_key
+      left_name&.key
     end
 
-    def part_names
-      @part_names ||= parts.map(&:to_name)
+    def right_name
+      simple? ? nil : part_names[-1]
     end
 
-    def piece_names
-      @piece_names ||= pieces.map(&:to_name)
+    def right
+      right_name&.s
     end
 
-    def ancestors
-      @ancestors ||= pieces.reject { |p| p == self }
+    def right_key
+      right_name&.key
     end
 
-    # def + other
-    #   self.class.new(parts + other.to_name.parts)
-    # end
+    private
 
-    def [] *args
-      self.class.new parts[*args]
+    def generate_part_names
+      return blank_part_names if blank?
+      parts = Cardname.split_parts s
+      @simple = parts.size <= 1
+      @simple ? [self] : parts.map(&:to_name)
     end
 
-    # full support of array methods caused trouble with `flatten` calls
-    # It splits the parts of names in arrays
-    # # name parts can be accessed and manipulated like an array
-    # def method_missing method, *args, &block
-    #   if ARRAY_METHODS.include? method # parts.respond_to?(method)
-    #     self.class.new parts.send(method, *args, &block)
-    #   else
-    #     super
-    #   end
-    # end
-    #
-    # def respond_to? method, include_private=false
-    #   return true if ARRAY_METHODS.include? method
-    #   super || parts.respond_to?(method, include_private)
-    # end
+    def blank_part_names
+      @simple = true
+      []
+    end
   end
 end

data/lib/cardname/pieces.rb

@@ -8,7 +8,15 @@ class Cardname
     #   "A+B+C+D".to_name.pieces
     #   # => ["A", "B", "C", "D", "A+B", "A+B+C", "A+B+C+D"]
     def pieces
-      @pieces ||= simple? ? [self] : (parts + junction_pieces)
+      simple? ? [self] : (parts + junction_pieces)
+    end
+
+    def piece_names
+      pieces.map(&:to_name)
+    end
+
+    def ancestors
+      pieces.reject { |p| p == self }
     end
 
     private

data/lib/cardname/predicates.rb

@@ -1,15 +1,15 @@
 class Cardname
   module Predicates
+    # @return true if name has only one part
     def simple?
-      @simple.nil? ? (@simple = parts.size <= 1) : @simple
+      part_names if @simple.nil?
+      @simple
     end
-    alias_method :simple, :simple? # @deprecated
 
     # @return true if name has more than one part
     def compound?
       !simple?
     end
-    alias_method :junction?, :compound? # @deprecated
 
     def valid?
       return true if self.class.nothing_banned?

data/lib/cardname/variants.rb

@@ -15,7 +15,7 @@ class Cardname
     end
 
     def url_key
-      @url_key ||= part_names.map do |part_name|
+      part_names.map do |part_name|
         stripped = part_name.decoded.gsub(/[^#{OK4KEY_RE}]+/, " ").strip
         stripped.gsub(/[\s_]+/, "_")
       end * self.class.joint
@@ -25,7 +25,7 @@ class Cardname
     # but the key is no longer unique.
     # For example "A-XB" and "A+*B" have the same safe_key
     def safe_key
-      @safe_key ||= key.tr("*", "X").tr self.class.joint, "-"
+      key.tr("*", "X").tr self.class.joint, "-"
     end
 
     def decoded

data/lib/cardname.rb

@@ -10,7 +10,6 @@ class Cardname < String
   require "cardname/contextual"
   require "cardname/predicates"
   require "cardname/manipulate"
-  require "cardname/danger"
 
   include Parts
   include Pieces
@@ -18,7 +17,6 @@ class Cardname < String
   include Contextual
   include Predicates
   include Manipulate
-  include Danger
 
   OK4KEY_RE = '\p{Word}\*'
 
@@ -33,31 +31,15 @@ class Cardname < String
   JOINT_RE = Regexp.escape joint
 
   class << self
-    def cache
-      @cache ||= {}
-    end
-
     def new obj
       return obj if obj.is_a? self.class
 
       str = stringify(obj)
-      cached_name(str) || super(str)
+      cache[str] ||= super(str)
     end
 
-    def cached_name str
-      cache[str]
-    end
-
-    def reset_cache str=nil
-      str ? cache.delete(str) : @cache = {}
-    end
-
-    def stringify obj
-      if obj.is_a?(Array)
-        obj.map(&:to_s) * joint
-      else
-        obj.to_s
-      end
+    def reset
+      @cache = {}
     end
 
     def nothing_banned?
@@ -73,6 +55,20 @@ class Cardname < String
     def split_parts str
       str.split(/\s*#{JOINT_RE}\s*/, -1)
     end
+
+    def cache
+      @cache ||= {}
+    end
+
+    private
+
+    def stringify obj
+      if obj.is_a?(Array)
+        obj.map(&:to_s) * joint
+      else
+        obj.to_s
+      end
+    end
   end
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -80,14 +76,21 @@ class Cardname < String
   attr_reader :key
 
   def initialize str
-    self.class.cache[str] = super str.strip.encode("UTF-8")
+    super str
+    strip!
+    encode! "UTF-8"
+    part_names # populates @part_names and @simple
+    decoded # populates @decoded
+    key # populates and freezes @key
+    freeze
   end
 
   def s
-    @s ||= String.new self
+    String.new self
   end
   alias_method :to_s, :s
   alias_method :to_str, :s
+  # alias_method :dup, :clone
 
   def to_name
     self
@@ -104,7 +107,7 @@ class Cardname < String
   end
 
   def key
-    @key ||= part_keys.join(self.class.joint)
+    @key ||= generate_key.freeze
   end
 
   def == other
@@ -112,7 +115,13 @@ class Cardname < String
       case
       when other.respond_to?(:key)     then other.key
       when other.respond_to?(:to_name) then other.to_name.key
-      else                                  other.to_s
+      else                                  other.to_s.to_name.key
       end
   end
+
+  private
+
+  def generate_key
+    @simple ? simple_key : part_keys.join(self.class.joint)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -51,7 +51,6 @@ 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
@@ -82,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Card names without all the cards

data/lib/cardname/danger.rb

@@ -1,23 +0,0 @@
-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