cardname 0.6.8 → 0.7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7940bcd665e6edc0328726a742900a66cf0e8fdf
-  data.tar.gz: c3139053cb9479378d506face1cf0a4ad4f2c142
+  metadata.gz: a715e26a23140fa8aee5faf2591ec817f563a65a
+  data.tar.gz: 28651f25f3126f6c1ad79575abf59bc3a9a06a03
 SHA512:
-  metadata.gz: c55cf5394a49c33a8cbaf57aee90684cb37c54bce8cbc1c264ec6ce4a59b3e2ab8f29f0763e34e6394690c71322390e60aac19dcf7a82ba8149b3cb9380e6d01
-  data.tar.gz: d1da73ca34afa1d52e766862931e2e2cdad1572e594d8abdb00689feb50f6509b4e3ac55867df052edfd8c5fbada9e1080372cc08e5e4a4f5fba651ec9c71da4
+  metadata.gz: f2fd295ad5b0d63d9b213b5c6ed62bd69887572aae18b6cd84ac408885b84365341423cc545faf8d877de617a0591f620a2e8686ac62edeb1dfb9d07a9ea2595
+  data.tar.gz: 2c3aa14bdbf5072cad765a1058f36cad2f847dd4f4bbcb7d1cd5d30338bb692bc38959c7271e89fa0a14b3f26ba5876139de822abfe456644afaf2cb36f4d941

data/lib/cardname.rb

@@ -1,15 +1,15 @@
 # -*- encoding : utf-8 -*-
 
-require 'active_support/configurable'
-require 'active_support/inflector'
-require 'htmlentities'
+require "active_support/configurable"
+require "active_support/inflector"
+require "htmlentities"
 
 class Cardname < String
-  require_relative 'cardname/parts'
-  require_relative 'cardname/variants'
-  require_relative 'cardname/contextual'
-  require_relative 'cardname/predicates'
-  require_relative 'cardname/manipulate'
+  require_relative "cardname/parts"
+  require_relative "cardname/variants"
+  require_relative "cardname/contextual"
+  require_relative "cardname/predicates"
+  require_relative "cardname/manipulate"
 
   include Parts
   include Variants
@@ -24,7 +24,7 @@ class Cardname < String
   config_accessor :joint, :banned_array, :var_re, :uninflect, :params,
                   :session, :stabilize
 
-  Cardname.joint          = '+'
+  Cardname.joint          = "+"
   Cardname.banned_array   = []
   Cardname.var_re         = /\{([^\}]*\})\}/
   Cardname.uninflect      = :singularize
@@ -37,6 +37,7 @@ class Cardname < String
   class << self
     def new obj
       return obj if obj.is_a? self.class
+
       str = stringify(obj)
       cached_name(str) || super(str)
     end
@@ -57,9 +58,14 @@ class Cardname < String
       end
     end
 
+    def nothing_banned?
+      return @nothing_banned unless @nothing_banned.nil?
+
+      @nothing_banned = banned_array.empty?
+    end
+
     def banned_re
-      banned_chars = (banned_array << joint).join
-      /[#{Regexp.escape banned_chars}]/
+      @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
@@ -72,12 +78,13 @@ class Cardname < String
       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.ends_with?("!") }
-      [:replace].concat bang_methods
+      %i[replace concat clear].concat bang_methods
     end
 
     def split_parts str
@@ -90,14 +97,14 @@ class Cardname < String
   attr_reader :key
 
   def initialize str
-    @@cache[str] = super str.strip.encode('UTF-8')
+    @@cache[str] = super str.strip.encode("UTF-8")
   end
 
   def s
     @s ||= String.new self
   end
-  alias to_s s
-  alias to_str s
+  alias_method :to_s, :s
+  alias_method :to_str, :s
 
   def to_name
     self
@@ -110,6 +117,17 @@ class Cardname < String
     end
   end
 
+  # dangerous, too
+  def []= index, val
+    p = parts
+    p[index] = val
+    replace self.class.new(p)
+  end
+
+  def << val
+    replace self.class.new(parts << val)
+  end
+
   def key
     @key ||= part_keys.join(self.class.joint)
   end
@@ -127,6 +145,7 @@ class Cardname < String
   private
 
   def reset
+    self.class.reset_cache s
     instance_variables.each do |var|
       instance_variable_set var, nil
     end

data/lib/cardname/predicates.rb

@@ -6,6 +6,7 @@ class Cardname
     end
 
     def valid?
+      return true if self.class.nothing_banned?
       !parts.find do |pt|
         pt.match self.class.banned_re
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0.pre
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,9 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13