cardname 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75a63ea4a3dbd7ec7920e2eb1573e321fc0877cbd5db44c7d90fa3526155cf94
-  data.tar.gz: 905c3ddfbb7f20512c936b2a544d406c5b24e10b3f7d49491af543ce47db8448
+  metadata.gz: e8f8b91a34b888b1e298d4ec50d7a6d2c12207e1449ece845751bf8ad7f325b1
+  data.tar.gz: 6deab4dff00266b7e180557e3bf0b7577ad393f76bd560ee2adfa766d56a5f23
 SHA512:
-  metadata.gz: c63370449892d9571c79ae9ffd0a42c0bb0996ebbc6121f0a35e80a839eecd8365d9b161749991dfe488a104f00e6f12d4e769e7dbe43fb9471496dcf5289523
-  data.tar.gz: 1ec95b1369d49aa4fe9ebab5f695253b7bc40084dcc1f4cc0df0c52dd0f84fe9b516e7783ab73490470d02feb4595d278bd32a68b86b88c53e53ed9deb2f7c01
+  metadata.gz: 204bad77b0157b0e472c92a6a2d861ea336da50744c4fc572e72c82b6fa9a0be6eb04591205c1441d8e51b050ca3f9242f26c18691b38d10a935dad267570ead
+  data.tar.gz: e1a36c3294f34dd18e56588eec50262177ae94a6d35eb18ba8e8702b553c3dde82608d75147fa493cfa464a7f200291d6e60bc85160a57d124bd0a512385a72a

data/lib/cardname.rb

@@ -5,12 +5,14 @@ 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"
 
   include Parts
+  include Pieces
   include Variants
   include Contextual
   include Predicates
@@ -18,8 +20,7 @@ class Cardname < String
 
   OK4KEY_RE = '\p{Word}\*'
 
-  cattr_accessor :joint, :banned_array, :var_re, :uninflect, :params,
-                 :session, :stabilize
+  cattr_accessor :joint, :banned_array, :var_re, :uninflect, :params, :session, :stabilize
 
   self.joint          = "+"
   self.banned_array   = []
@@ -116,7 +117,6 @@ class Cardname < String
     end
   end
 
-  # dangerous, too
   def []= index, val
     p = parts
     p[index] = val

data/lib/cardname/parts.rb

@@ -4,24 +4,12 @@ class Cardname
   # the same methods without _name return strings
   module Parts
     attr_reader :parts, :part_keys, :simple
-
     alias_method :to_a, :parts
 
     def parts
       @parts = Cardname.split_parts s
     end
 
-    def simple
-      @simple = parts.size <= 1
-    end
-    alias simple? simple
-
-    # @return true if name has more than one part
-    def compound?
-      !simple?
-    end
-    alias junction? compound?
-
     def part_keys
       @part_keys ||= simple ? [simple_key] : parts.map { |p| p.to_name.simple_key }
     end
@@ -89,25 +77,6 @@ class Cardname
       @piece_names ||= pieces.map(&:to_name)
     end
 
-    # self and all ancestors (= parts and recursive lefts)
-    # @example
-    #   "A+B+C+D".to_name.pieces
-    #   # => ["A", "B", "C", "D", "A+B", "A+B+C", "A+B+C+D"]
-    def pieces
-      @pieces ||=
-        if simple?
-          [self]
-        else
-          junction_pieces = []
-          parts[1..-1].inject parts[0] do |left, right|
-            piece = [left, right] * self.class.joint
-            junction_pieces << piece
-            piece
-          end
-          parts + junction_pieces
-        end
-    end
-
     def ancestors
       @ancestors ||= pieces.reject { |p| p == self}
     end

data/lib/cardname/predicates.rb

@@ -1,5 +1,16 @@
 class Cardname
   module Predicates
+    def simple
+      @simple.nil? ? (@simple = parts.size <= 1) : @simple
+    end
+    alias_method :simple?, :simple
+
+    # @return true if name has more than one part
+    def compound?
+      !simple?
+    end
+    alias_method :junction?, :compound?
+
     def valid?
       return true if self.class.nothing_banned?
       !parts.find do |pt|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport