cardname 0.9.4 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f9983485ba7a4ca6c9d9c07bff87c1992b744b3207dbc2614ec621c0837359
-  data.tar.gz: 54aa453ad50c90756557bf6b59251ca5c3e6630fb8afe89e29d4d49f7d2e955d
+  metadata.gz: bf803bf5912ae399a82c94a44bcc353a75f3d21894f292db0aacce5b40fde00c
+  data.tar.gz: d069f7f3d0a329d01fa67d7f20720e32d30ed3ca52d9e2ec360a9537d05152dc
 SHA512:
-  metadata.gz: 24829af883423df11b687d1cc6823202d1f91c621c05f9d8a868122dfec169bdfe4c99d0e499722b5927b219ea0313697c04c0b19c3a90ca7047f2af6105844b
-  data.tar.gz: e1f737c7b6173a299252f79db4cdec21f3c6621e7364a455d8099a22aeaa4bf8442606561336957c3e3db4325d1805ad62a5ab041dd982e974cd077fb06b3da9
+  metadata.gz: fe7f9d7f7c0d16e9100da7689ec8a26d250a27d87c6445bdc1e62aa359c299760478f5c35a740cc50c7d190b43dd9788963cdf6190c9d098388e287decc26dc7
+  data.tar.gz: 91cabf13b19181f1b967830cad3fbcfd0c7faae4bbc5e6a4bde6d7a2bf7bd88ec4f31a65dac27902ffa8f771480c7d9a9728ac9b7d662bd83c0595b7fdd8d474

data/README.md

@@ -0,0 +1,7 @@
+<!--
+# @title README - Cardname
+-->
+# Cardname
+
+Wiki Segmented Name Logic
+

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
@@ -117,13 +116,15 @@ class Cardname
 
     def absolutize_extremes new_parts, context
       [0, -1].each do |i|
-        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_parts?", context
-        new_parts[i] = context
+        new_parts[i] = context if absolutize_extreme? new_parts, context, i
       end
     end
 
+    def absolutize_extreme? new_parts, context, index
+      return false if new_parts[index].present?
+      # following avoids recontextualizing with relative contexts.
+      # Eg, `+A+B+.absolute('+A')` should be +A+B, not +A+A+B.
+      !new_parts.to_name.send "#{[ :start, :end ][index]}s_with_parts?", context
+    end
   end
 end

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.4
+  version: 0.11.1
 platform: ruby
 authors:
 - Ethan McCutchen
 - Philipp Kühl
 - Gerry Gleason
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -41,13 +41,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 description: Naming patterns abstracted from Decko cards
-email: info@decko.org
+email:
+- info@decko.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
-- README.rdoc
+- README.md
 - Rakefile
 - lib/cardname.rb
 - lib/cardname/contextual.rb
@@ -58,15 +58,10 @@ files:
 - lib/core_ext.rb
 homepage: http://decko.org
 licenses:
-- GPL-2.0
 - GPL-3.0
 metadata: {}
-post_install_message: 
-rdoc_options:
-- "--main"
-- README.rdoc
-- "--inline-source"
-- "--line-numbers"
+post_install_message:
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -80,8 +75,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: []

data/README.rdoc

@@ -1,7 +0,0 @@
-
-== Cardname
-
-Wiki Segmented Name Logic
-
-== Abstract
-