cardname 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ec2a308a3378e69b7dcf8a88cd249c70b2e37b
-  data.tar.gz: 51ab12c658f6639b0479731323bd43734f787060
+  metadata.gz: bf908ff88412470eef1eb037b0a90b398e419ad4
+  data.tar.gz: 791c5cf2d06a2b7d572262fb9f16d56cb647c0b3
 SHA512:
-  metadata.gz: 3c49c639c5ce9f90a08a03bdba4ea4a4ff53681c931a1dda58409eadf81d71b5821ca64e511d2bebecda21c509ffca082dcaf913f13daffc64854bc1b7b9f4b1
-  data.tar.gz: ed8a1afaa7932b2444742d42de55700298e9ade05eed4be6a6dabcf6a5bd53f4555a585228cd6b3cac36c6ffb775c6e242ba5a36e13043f1609b9ba05d8f3e5b
+  metadata.gz: 4298e82e31e1b987bd42a589f52bb13f3ee0e9e611277f64307de182db345ad34436ec4f53310b2901d447f0063338d2e53081132c288b9fa1d0e4b65c9ab985
+  data.tar.gz: ed7fe969ab7f71ff59ff998640b0d5489d02147501e92aedf1f6e9f30028ed178ef72f38765a5c144ffbeda2fb2f827808d4b47d2d7296e7a8296cd08e30600c

data/lib/cardname/manipulate.rb

@@ -1,18 +1,18 @@
 class Cardname
   module Manipulate
-    # replace a subname
+    # swap a subname
     # keys are used for comparison
-    def replace old, new
+    def swap old, new
       old_name = old.to_name
       new_name = new.to_name
-      return self if old_name.length > length
-      return replace_part(old_name, new_name) if old_name.simple?
+      return self if old_name.num_parts > num_parts
+      return swap_part(old_name, new_name) if old_name.simple?
       return self unless include? old_name
-      replace_all_subsequences(old_name, new_name).to_name
+      swap_all_subsequences(old_name, new_name).to_name
     end
 
-    def replace_part oldpart, newpart
-      ensure_simpliness oldpart, "Use 'replace' to replace junctions"
+    def swap_part oldpart, newpart
+      ensure_simpleness oldpart, "Use 'swap' to swap junctions"
 
       oldpart = oldpart.to_name
       newpart = newpart.to_name
@@ -22,37 +22,46 @@ class Cardname
       end.to_name
     end
 
-    def replace_piece oldpiece, newpiece
+    def swap_piece oldpiece, newpiece
       oldpiece = oldpiece.to_name
       newpiece = newpiece.to_name
 
-      return replace_part oldpiece, newpiece if oldpiece.simple?
+      return swap_part oldpiece, newpiece if oldpiece.simple?
       return self unless self.starts_with?(oldpiece)
-      return newpiece if oldpiece.length == length
-      newpiece + self[oldpiece.length..-1]
+      return newpiece if oldpiece.num_parts == num_parts
+      self.class.new [newpiece, self[oldpiece.num_parts..-1]].flatten
+    end
+
+    def num_parts
+      parts.length
+    end
+
+    def prepend_joint
+      joint = self.class.joint
+      self =~ /^#{Regexp.escape joint}/ ? self : (joint + self)
     end
 
     private
 
-    def replace_all_subsequences oldseq, newseq
+    def swap_all_subsequences oldseq, newseq
       res = []
       i = 0
-      while i <= length - oldseq.length
+      while i <= num_parts - oldseq.num_parts
         # for performance reasons: check first character first then the rest
         if oldseq.part_keys.first == part_keys[i] &&
-           oldseq.part_keys == part_keys[i, oldseq.length]
+           oldseq.part_keys == part_keys[i, oldseq.num_parts]
           res += newseq.parts
-          i += oldseq.length
+          i += oldseq.num_parts
         else
           res << parts[i]
           i += 1
         end
       end
-      res += parts[i..-1] if i < length
+      res += parts[i..-1] if i < num_parts
       res
     end
 
-    def ensure_simpliness part, msg=nil
+    def ensure_simpleness part, msg=nil
       return if part.to_name.simple?
       raise StandardError, "'#{part}' has to be simple. #{msg}"
     end

data/lib/cardname/parts.rb

@@ -5,16 +5,19 @@ class Cardname
   module Parts
     attr_reader :parts, :part_keys, :simple
 
-    alias simple? simple
     alias_method :to_a, :parts
 
-    def initialize_parts
-      # -1 = don't suppress trailing null fields
-      @parts = @s.split(/\s*#{JOINT_RE}\s*/, -1)
-      @simple = @parts.size <= 1
-      # simple check needed to avoid inifinite recursion
-      @part_keys =
-        @simple ? [simple_key] : @parts.map { |p| p.to_name.simple_key }
+    def parts
+      @parts = s.split(/\s*#{JOINT_RE}\s*/, -1)
+    end
+
+    def simple
+      @simple = parts.size <= 1
+    end
+    alias simple? simple
+
+    def part_keys
+      @part_keys ||= simple ? [simple_key] : parts.map { |p| p.to_name.simple_key }
     end
 
     def left
@@ -99,16 +102,16 @@ class Cardname
         end
     end
 
-    def + other
-      self.class.new(parts + other.to_name.parts)
-    end
+    # def + other
+    #   self.class.new(parts + other.to_name.parts)
+    # end
 
     def [] *args
       self.class.new parts[*args]
     end
 
     # full support of array methods caused trouble with `flatten` calls
-    # It splits the parts of cardnames in arrays
+    # 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)

data/lib/cardname/predicates.rb

@@ -5,11 +5,6 @@ class Cardname
       !simple?
     end
 
-    def blank?
-      s.blank?
-    end
-    alias empty? blank?
-
     def valid?
       !parts.find do |pt|
         pt.match self.class.banned_re
@@ -19,14 +14,14 @@ class Cardname
     # @return true if name starts with the same parts as `prefix`
     def starts_with? prefix
       start_name = prefix.to_name
-      start_name == self[0, start_name.length]
+      start_name == self[0, start_name.num_parts]
     end
     alias_method :start_with?, :starts_with?
 
     # @return true if name ends with the same parts as `prefix`
     def ends_with? postfix
       end_name = postfix.to_name
-      end_name == self[-end_name.length..-1]
+      end_name == self[-end_name.num_parts..-1]
     end
     alias_method :end_with?, :ends_with?
 

data/lib/cardname/variants.rb

@@ -1,7 +1,7 @@
 class Cardname
   module Variants
     def simple_key
-      return "" if @s.empty?
+      return "" if empty?
       decoded
         .underscore
         .gsub(/[^#{OK4KEY_RE}]+/, '_')

data/lib/cardname.rb

@@ -3,13 +3,14 @@
 require 'active_support/configurable'
 require 'active_support/inflector'
 require 'htmlentities'
-require_relative 'cardname/parts'
-require_relative 'cardname/variants'
-require_relative 'cardname/contextual'
-require_relative 'cardname/predicates'
-require_relative 'cardname/manipulate'
 
-class Cardname < Object
+class Cardname < String
+
+  require_relative 'cardname/parts'
+  require_relative 'cardname/variants'
+  require_relative 'cardname/contextual'
+  require_relative 'cardname/predicates'
+  require_relative 'cardname/manipulate'
 
   include Parts
   include Variants
@@ -17,8 +18,7 @@ class Cardname < Object
   include Predicates
   include Manipulate
 
-  RUBYENCODING = RUBY_VERSION !~ /^1\.8/
-  OK4KEY_RE    = RUBYENCODING ? '\p{Word}\*' : '\w\*'
+  OK4KEY_RE = '\p{Word}\*'
 
   include ActiveSupport::Configurable
 
@@ -78,32 +78,24 @@ class Cardname < Object
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # ~~~~~~~~~~~~~~~~~~~~~~ INSTANCE ~~~~~~~~~~~~~~~~~~~~~~~~~
-  attr_reader :key, :s
-  alias to_s s
-  alias to_str s
+  attr_reader :key
 
   def initialize str
-    @s = str.to_s.strip
-    @s = @s.encode('UTF-8') if RUBYENCODING
-    initialize_parts
-    @key = @part_keys.join(self.class.joint)
-    @@cache[str] = self
+    @@cache[str] = super str.strip.encode('UTF-8')
   end
 
-  def to_name
-    self
-  end
-
-  def length
-    parts.length
+  def s
+    @s ||= String.new self
   end
+  alias to_s s
+  alias to_str s
 
-  def size
-    to_s.size
+  def to_name
+    self
   end
 
-  def inspect
-    "<#{self.class.name} key=#{key}[#{self}]>"
+  def key
+    @key ||= part_keys.join(self.class.joint)
   end
 
   def == other

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="