cardname 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf5fcc7baaf382877caaa33709af3466edcac8f76522cd4c961872e07413f19
-  data.tar.gz: 0dc65eca8caecefab6fd9ac00172d0fc67094d878c1a983e8b9bfec959b7a94d
+  metadata.gz: da9b4a6b3d8ecfa150c732ef2bdba888f626b7e51c7230755ee2e93a2e61cde9
+  data.tar.gz: cdb0675cb1f3ab97d7df2d1ed8f5cf54f73e00fe16c1302da5cea5881b45938f
 SHA512:
-  metadata.gz: f6299b18bded8bf01ee0cfff088ea5ff8bdc188bbe8b99a2cd660c61ad592bd3698bbae95676311839dcbc6754ac34afd8a03f66628d2ba082748963e9c79e2d
-  data.tar.gz: 8787e26c28145689a3a4d0b378163d34140b514c71a19f1685ca323d12690cc108b1d3fb04884a8eaeca0a6d66a62a93fe412fc82ccde399dd96f0bd2ac38e67
+  metadata.gz: 045012fd80276a3ae92bdc2597664cdc7e0116500fd486443375fff0b7cb27c7ec5b4fd9938671ea36479b4df07539cb0597210f771613efcbedfed98c87f610
+  data.tar.gz: 1ea808887da019f345fe558c3e611cd21b4018ee19aa6e7bacb893565ae81a141aab70078c66392c34533da6b606a5ed55015f72ac9903732228c78bfbc1c21c

data/lib/cardname.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-require "active_support/configurable"
 require "active_support/inflector"
 require "htmlentities"
 
@@ -19,22 +18,22 @@ class Cardname < String
 
   OK4KEY_RE = '\p{Word}\*'
 
-  include ActiveSupport::Configurable
+  cattr_accessor :joint, :banned_array, :var_re, :uninflect, :params,
+                 :session, :stabilize
 
-  config_accessor :joint, :banned_array, :var_re, :uninflect, :params,
-                  :session, :stabilize
-
-  Cardname.joint          = "+"
-  Cardname.banned_array   = []
-  Cardname.var_re         = /\{([^\}]*\})\}/
-  Cardname.uninflect      = :singularize
-  Cardname.stabilize      = false
+  self.joint          = "+"
+  self.banned_array   = []
+  self.var_re         = /\{([^\}]*\})\}/
+  self.uninflect      = :singularize
+  self.stabilize      = false
 
   JOINT_RE = Regexp.escape joint
 
-  @@cache = {}
-
   class << self
+    def cache
+      @cache ||= {}
+    end
+
     def new obj
       return obj if obj.is_a? self.class
 
@@ -43,11 +42,11 @@ class Cardname < String
     end
 
     def cached_name str
-      @@cache[str]
+      cache[str]
     end
 
     def reset_cache str=nil
-      str ? @@cache.delete(str) : @@cache = {}
+      str ? cache.delete(str) : @cache = {}
     end
 
     def stringify obj
@@ -97,7 +96,7 @@ class Cardname < String
   attr_reader :key
 
   def initialize str
-    @@cache[str] = super str.strip.encode("UTF-8")
+    self.class.cache[str] = super str.strip.encode("UTF-8")
   end
 
   def s

data/lib/cardname/contextual.rb

@@ -64,7 +64,7 @@ class Cardname
       end
     end
 
-    def absolute context, args={}
+    def absolute context
       context = (context || "").to_name
       new_parts = absolutize_contextual_parts context
       return "" if new_parts.empty?
@@ -100,8 +100,7 @@ class Cardname
     end
 
     def user_part part
-      name_proc = self.class.session
-      name_proc ? name_proc.call : part
+      self.class.session || part
     end
 
     def ordinal_part pos, context

data/lib/cardname/manipulate.rb

@@ -75,17 +75,4 @@ class Cardname
       raise StandardError, "'#{part}' has to be simple. #{msg}"
     end
   end
-
-  # ~~~~~~~~~~~~~~~~~~~~ MISC ~~~~~~~~~~~~~~~~~~~~
-
-  # HACK. This doesn't belong here.
-  # shouldn't it use inclusions???
-  def self.substitute! str, hash
-    hash.keys.each do |var|
-      str.gsub! var_re do |x|
-        hash[var.to_sym]
-      end
-    end
-    str
-  end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Ethan McCutchen
 - Philipp Kühl
 - Gerry Gleason
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -61,7 +61,7 @@ licenses:
 - GPL-2.0
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -80,8 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Card names without all the cards
 test_files: []