cardname 0.3.13 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62968f99bcd0657cbd165f76d56823db7d6c862
-  data.tar.gz: 4404675f606f45a36cc848bbab7c90d811eb97e5
+  metadata.gz: d8a43b73f7cdbeeb1711642bec6713472a29444e
+  data.tar.gz: c99ad7d12caa1d33f1c1c98b97230085a418946d
 SHA512:
-  metadata.gz: 702b68602eea4b4e406aeae8704522021a74ef107634f3ec3975a9a622c39d3cf83149dbbbf6ed1fb74c1c43be7e096b24326b320ed030b04597b45636941f06
-  data.tar.gz: 66fe9ed8593211ba788d459feeda9f5e07dca5db75e33bb89d6d44cc51a50789aedc31550dc02e6d4528649f86e0bf2ca26b1710efb746796988e4b871ca9c36
+  metadata.gz: 59ed2b78bf8d651941c8bc60fe4a6f229be00bc9bce6739d3fa4eaea7fe5d4160f4f1ffdf3f7f7220405288d146ba5aec15f475850ab8defa60b00ad2a1d5d48
+  data.tar.gz: 151d18229b037833ed54f22fe1f5e8715d0680b2a3b88a21d837aa5248e52c4344f86e07d65d8f4ac9f41ceb003fcaf98660bb293f5aaef87ca84673d0159c3f

data/lib/cardname/contextual.rb

@@ -120,7 +120,7 @@ class Cardname
         next if new_parts[i].present?
         # following avoids recontextualizing with relative contexts.
         # Eg, `+A+B+.absolute('+A')` should be +A+B, not +A+A+B.
-        next if new_parts.to_name.send "#{[ :start, :end ][i]}s_with?", context
+        next if new_parts.to_name.send "#{[ :start, :end ][i]}s_with_parts?", context
         new_parts[i] = context
       end
     end

data/lib/cardname/manipulate.rb

@@ -27,7 +27,7 @@ class Cardname
       newpiece = newpiece.to_name
 
       return swap_part oldpiece, newpiece if oldpiece.simple?
-      return self unless self.starts_with?(oldpiece)
+      return self unless starts_with_parts?(oldpiece)
       return newpiece if oldpiece.num_parts == num_parts
       self.class.new [newpiece, self[oldpiece.num_parts..-1]].flatten
     end

data/lib/cardname/parts.rb

@@ -8,7 +8,7 @@ class Cardname
     alias_method :to_a, :parts
 
     def parts
-      @parts = s.split(/\s*#{JOINT_RE}\s*/, -1)
+      @parts = Cardname.split_parts s
     end
 
     def simple

data/lib/cardname/predicates.rb

@@ -12,18 +12,18 @@ class Cardname
     end
 
     # @return true if name starts with the same parts as `prefix`
-    def starts_with? prefix
+    def starts_with_parts? *prefix
       start_name = prefix.to_name
       start_name == self[0, start_name.num_parts]
     end
-    alias_method :start_with?, :starts_with?
+    alias_method :start_with_parts?, :starts_with_parts?
 
     # @return true if name ends with the same parts as `prefix`
-    def ends_with? postfix
-      end_name = postfix.to_name
+    def ends_with_parts? *suffix
+      end_name = suffix.to_name
       end_name == self[-end_name.num_parts..-1]
     end
-    alias_method :end_with?, :ends_with?
+    alias_method :end_with_parts?, :ends_with_parts?
 
     # @return true if name has a chain of parts that equals `subname`
     def include? subname

data/lib/cardname.rb

@@ -5,7 +5,6 @@ require 'active_support/inflector'
 require 'htmlentities'
 
 class Cardname < String
-
   require_relative 'cardname/parts'
   require_relative 'cardname/variants'
   require_relative 'cardname/contextual'
@@ -26,7 +25,7 @@ class Cardname < String
                   :session, :stabilize
 
   Cardname.joint          = '+'
-  Cardname.banned_array   = %w{ / }
+  Cardname.banned_array   = []
   Cardname.var_re         = /\{([^\}]*\})\}/
   Cardname.uninflect      = :singularize
   Cardname.stabilize      = false
@@ -38,7 +37,7 @@ class Cardname < String
   class << self
     def new obj
       return obj if obj.is_a? self.class
-      str = stringify obj
+      str = stringify(obj)
       cached_name(str) || super(str)
     end
 
@@ -59,7 +58,8 @@ class Cardname < String
     end
 
     def banned_re
-      %r{#{ (['['] + banned_array << joint) * '\\' + ']' }}
+      banned_chars = (banned_array << joint).join
+      /[#{Regexp.escape banned_chars}]/
     end
 
     # Sometimes the core rule "the key's key must be itself" (called "stable" below) is violated
@@ -74,6 +74,15 @@ class Cardname < String
       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.ends_with?("!") }
+      [:replace].concat bang_methods
+    end
+
+    def split_parts str
+      str.split(/\s*#{JOINT_RE}\s*/, -1)
+    end
   end
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -94,6 +103,13 @@ class Cardname < String
     self
   end
 
+  dangerous_methods.each do |m|
+    define_method m do |*args, &block|
+      reset
+      super(*args, &block)
+    end
+  end
+
   def key
     @key ||= part_keys.join(self.class.joint)
   end
@@ -107,4 +123,12 @@ class Cardname < String
       end
     other_key == key
   end
+
+  private
+
+  def reset
+    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.3.13
+  version: 0.4.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport