cardname 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf908ff88412470eef1eb037b0a90b398e419ad4
-  data.tar.gz: 791c5cf2d06a2b7d572262fb9f16d56cb647c0b3
+  metadata.gz: 3bf83ab1baf1acc98f7083d750adf1ebbb1c13f3
+  data.tar.gz: a5a427c2728a53b8065ec4ec20a689c277aa7307
 SHA512:
-  metadata.gz: 4298e82e31e1b987bd42a589f52bb13f3ee0e9e611277f64307de182db345ad34436ec4f53310b2901d447f0063338d2e53081132c288b9fa1d0e4b65c9ab985
-  data.tar.gz: ed7fe969ab7f71ff59ff998640b0d5489d02147501e92aedf1f6e9f30028ed178ef72f38765a5c144ffbeda2fb2f827808d4b47d2d7296e7a8296cd08e30600c
+  metadata.gz: a64f1c20ffbba8353d8f735a2d98549538e11e1cd361b0ffb7b6bb25d24164ac6d509c295118c6c3e3280c9bed7af630636aee75fdef1782eaf14b8e1fa5f249
+  data.tar.gz: c17c5aa49021512195ce5213e0ac0fb37f5064829b718ffd72eee44d94b96b27c57d702b016fa97197cd6640c81eacf439d49a4e8005f096f455999d70c94a93

data/lib/cardname/contextual.rb

@@ -33,18 +33,20 @@ class Cardname
       name_from(*from).s
     end
 
-    # if possible, relativize name into one beginning with a "+".  To do so, it must absolutize back to the correct
+    # if possible, relativize name into one beginning with a "+".  The new name 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)
+      return self unless (remaining = remove_context *from)
       compressed = remaining.compact.unshift(nil).to_name  # exactly one nil at beginning
       key == compressed.absolute_name(from).key ? compressed : self
     end
 
-    def context_relevant? remaining
-      remaining.compact.any? && # not all name parts in context
-        remaining != parts      # some name parts in context (could be faster test!)
+    def remove_context *from
+      return false unless from.compact.present?
+      remaining = parts_excluding *from
+      return false if remaining.compact.empty? || # all name parts in context
+                      remaining == parts          # no name parts in context
+      remaining
     end
 
     def parts_excluding *string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardname
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport