cardname 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f37bd2c96222cfff562f06782c52e27a803dc0
-  data.tar.gz: 86752b10ed33282d3cafa93eaca1320aea1e8e94
+  metadata.gz: 5cc3696416bb4628e7059042f1e6761cf61f49a9
+  data.tar.gz: ade3ca4f9d5d2a312723442ebc6c16d6ffdd569b
 SHA512:
-  metadata.gz: d66817487594c22c30d7f1374c53711312c6d314609ec0d34ac8724def65bb7e853f1a5ce5e29a03aec902b4c28d136d535b2cbae2e87d7fa069575139ed8fdf
-  data.tar.gz: a3867d0234a9f27360e3bcf47328c5ff1380066b1af3ffad1487578796c0f6a47f14b5008d970d87b3ae3697fb12c86ebeafc8753d19cf13f9178437b416e498
+  metadata.gz: 3abca29801123d048d89189fbf9079ee70d6f14a24c63732a77fdcaa8c833c9481732f50a40248c8aad72b65438806eae7a23f930432f36a1575af7d6216b992
+  data.tar.gz: e44752dd9ba9670e5082d8cbe45b169d7d54d7e8b8497e18b61c7309e096884898fc78bbb0d4eba2ad152d46c1ba2fa1f13d5504c97ce8a2b1e629487408188f

data/lib/cardname/contextual.rb

@@ -2,14 +2,6 @@ class Cardname
   module Contextual
     RELATIVE_REGEXP = /\b_(left|right|whole|self|user|main|\d+|L*R?)\b/
 
-    def relative_name context_name
-      to_show(*context_name.to_name.parts).to_name
-    end
-
-    def absolute_name context_name
-      to_absolute_name(context_name)
-    end
-
     # @return true if name is left or right of context
     def child_of? context
       return false unless junction?
@@ -18,11 +10,11 @@ class Cardname
     end
 
     def relative?
-      s =~ RELATIVE_REGEXP || starts_with_joint?
+      starts_with_joint? || (s =~ RELATIVE_REGEXP).present?
     end
 
     def simple_relative?
-      relative? && stripped.to_name.starts_with_joint?
+      starts_with_joint? && (s =~ RELATIVE_REGEXP).nil?
     end
 
     def absolute?
@@ -34,43 +26,52 @@ class Cardname
     end
 
     def starts_with_joint?
-      length >= 2 && parts.first.empty?
+      junction? && parts.first.empty?
     end
 
-    def to_show *ignore
-      ignore.map!(&:to_name)
+    def from *from
+      name_from(*from).s
+    end
 
-      show_parts = parts.map do |part|
-        reject = (part.empty? || (part =~ /^_/) || ignore.member?(part.to_name))
-        reject ? nil : part
-      end
+    # if possible, relativize name into one beginning with a "+".  To do so, it must absolutize back to the correct
+    # original name in the context of "from"
+    def name_from *from
+      remaining = parts_excluding *from
+      return self unless context_relevant?(remaining)
+      compressed = remaining.compact.unshift(nil).to_name  # exactly one nil at beginning
+      key == compressed.absolute_name(from).key ? compressed : self
+    end
 
-      show_name = show_parts.compact.to_name.s
+    def context_relevant? remaining
+      remaining.compact.any? && # not all name parts in context
+        remaining != parts      # some name parts in context (could be faster test!)
+    end
 
-      case
-      when show_parts.compact.empty? then  self
-      when show_parts[0].nil?        then  self.class.joint + show_name
-      else show_name
-      end
+    def parts_excluding *string
+      exclude_name = string.to_name
+      exclude_keys = exclude_name ? exclude_name.part_names.map(&:key) : []
+      parts_minus exclude_keys
     end
 
-    def to_absolute context, args={}
-      context = context.to_name
+    def parts_minus keys_to_ignore
+      parts.map do |part|
+        next if part.empty?
+        next if part =~ /^_/ # this removes relative parts.  why?
+        next if keys_to_ignore.member? part.to_name.key
+        part
+      end
+    end
 
-      new_parts = replace_contextual_parts context
+    def absolute context, args={}
+      context = (context || "").to_name
+      new_parts = absolutize_contextual_parts context
       return "" if new_parts.empty?
-
-      if new_parts.first.empty? && !new_parts.to_name.starts_with?(context)
-        new_parts[0] = context.to_s
-      end
-      if new_parts.last.empty? && !new_parts.to_name.ends_with?(context)
-        new_parts[-1] = context.to_s
-      end
+      absolutize_extremes new_parts, context.s
       new_parts.join self.class.joint
     end
 
-    def to_absolute_name *args
-      self.class.new to_absolute(*args)
+    def absolute_name *args
+      absolute(*args).to_name
     end
 
     def nth_left n
@@ -80,35 +81,47 @@ class Cardname
 
     private
 
-    def replace_contextual_parts context
+    def absolutize_contextual_parts context
       parts.map do |part|
-        new_part =
-          case part
-          when /^_user$/i
-            name_proc = self.class.session
-            name_proc ? name_proc.call : part
-          when /^_main$/i            then self.class.params[:main_name]
-          when /^(_self|_whole|_)$/i then context.s
-          when /^_left$/i            then context.trunk
-            # note - inconsistent use of left v. trunk
-          when /^_right$/i           then context.tag
-          when /^_(\d+)$/i
-            pos = $~[1].to_i
-            pos = context.length if pos > context.length
-            context.parts[pos - 1]
-          when /^_(L*)(R?)$/i
-            l_s, r_s = $~[1].size, !$~[2].empty?
-            l_part = context.nth_left l_s
-            r_s ? l_part.tag : l_part.s
-            # when /^_/
-            #   custom = args[:params] ? args[:params][part] : nil
-            #   custom ? CGI.escapeHTML(custom) : part
-            # why are we escaping HTML here?
-          else
-            part
-          end.to_s.strip
-        new_part
+        case part
+        when /^_user$/i            then user_part part
+        when /^_main$/i            then self.class.params[:main_name]
+        when /^(_self|_whole|_)$/i then context.s
+        when /^_left$/i            then context.trunk
+        # note - inconsistent use of left v. trunk
+        when /^_right$/i           then context.tag
+        when /^_(\d+)$/i           then ordinal_part $~[1].to_i, context
+        when /^_(L*)(R?)$/i        then partmap_part $~, context
+        else                            part
+        end.to_s.strip
+      end
+    end
+
+    def user_part part
+      name_proc = self.class.session
+      name_proc ? name_proc.call : part
+    end
+
+    def ordinal_part pos, context
+      pos = context.length if pos > context.length
+      context.parts[pos - 1]
+    end
+
+    def partmap_part match, context
+      l_s, r_s = match[1].size, !match[2].empty?
+      l_part = context.nth_left l_s
+      r_s ? l_part.tag : l_part.s
+    end
+
+    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?", context
+        new_parts[i] = context
       end
     end
+
   end
 end

data/lib/cardname/variants.rb

@@ -7,7 +7,7 @@ class Cardname
         .gsub(/[^#{OK4KEY_RE}]+/, '_')
         .split(/_+/)
         .reject(&:empty?)
-        .map { |key| Cardname.stable_uninflect(key) }
+        .map { |key| self.class.stable_key(key) }
         .join('_')
     end
 

data/lib/cardname.rb

@@ -26,24 +26,28 @@ class Cardname < Object
                   :session, :stabilize
 
   Cardname.joint          = '+'
-  Cardname.banned_array   = ['/', '~', '|']
+  Cardname.banned_array   = %w{ / }
   Cardname.var_re         = /\{([^\}]*\})\}/
   Cardname.uninflect      = :singularize
   Cardname.stabilize      = false
 
   JOINT_RE = Regexp.escape joint
 
-  @@name2nameobject = {} # name cache
+  @@cache = {}
 
   class << self
     def new obj
       return obj if obj.is_a? self.class
       str = stringify obj
-      known_name(str) || super(str.strip)
+      cached_name(str) || super(str)
     end
 
-    def known_name str
-      @@name2nameobject[str]
+    def cached_name str
+      @@cache[str]
+    end
+
+    def reset_cache str=nil
+      str ? @@cache.delete(str) : @@cache = {}
     end
 
     def stringify obj
@@ -63,13 +67,12 @@ class Cardname < Object
     # Usually that means the name is a proper noun and not a plural.
     # You can choose between two solutions:
     # 1. don't uninflect if the uninflected key is not stable (stabilize = false)
-    #    (probably the best choice because you want Matthias not to be the same  as Matthium)
     # 2. uninflect until the key is stable (stabilize = true)
-    def stable_uninflect name
-      key_one = name.send(Cardname.uninflect)
-      key_two = key_one.send(Cardname.uninflect)
+    def stable_key name
+      key_one = name.send(uninflect)
+      key_two = key_one.send(uninflect)
       return key_one unless key_one != key_two
-      Cardname.stabilize ? stable_uninflect(key_two) : name
+      stabilize ? stable_key(key_two) : name
     end
   end
 
@@ -77,13 +80,14 @@ class Cardname < Object
   # ~~~~~~~~~~~~~~~~~~~~~~ INSTANCE ~~~~~~~~~~~~~~~~~~~~~~~~~
   attr_reader :key, :s
   alias to_s s
+  alias to_str s
 
   def initialize str
     @s = str.to_s.strip
     @s = @s.encode('UTF-8') if RUBYENCODING
     initialize_parts
     @key = @part_keys.join(self.class.joint)
-    @@name2nameobject[str] = self
+    @@cache[str] = self
   end
 
   def to_name

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
-- Gerry Gleason
 - Ethan McCutchen
 - Philipp Kühl
+- Gerry Gleason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Card names without all the cards