smartname 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/smart_name.rb

@@ -43,13 +43,6 @@ class SmartName < Object
       end
     end
 
-    def unescape uri
-      # can't instantiate because key doesn't resolve correctly in unescaped form
-      # issue is peculiar to plus sign (+), which are interpreted as a space.
-      # if we could make that not happen, we could avoid this (and handle spaces in urls)
-      uri.gsub(' ','+').gsub '_',' '
-    end
-
     def banned_re
       %r{#{ (['['] + SmartName.banned_array << SmartName.joint )*'\\' + ']' }}
     end
@@ -136,35 +129,42 @@ class SmartName < Object
   #~~~~~~~~~~~~~~~~~~~ PARTS ~~~~~~~~~~~~~~~~~~~
 
   alias simple? simple
-  def junction?()  not simple?                                             end
-
-  def left()       @left  ||= simple? ? nil : parts[0..-2]*SmartName.joint end
-  def right()      @right ||= simple? ? nil : parts[-1]                    end
-
-  def left_name()  @left_name  ||= left  && SmartName.new( left  )         end
-  def right_name() @right_name ||= right && SmartName.new( right )         end
-
-  # Note that all names have a trunk and tag, but only junctions have left and right
-
-  def trunk()      @trunk ||= simple? ? s : left                           end
-  def tag()        @tag   ||= simple? ? s : right                          end
-
-  def trunk_name() @trunk_name ||= simple? ? self : left_name              end
-  def tag_name()   @tag_name   ||= simple? ? self : right_name             end
-
-  def part_names() @part_names ||= parts.map &:to_name                     end
-  def pieces()     @pieces     ||= piece_names.map &:s                     end    
-
-  def piece_names
-    @piece_names ||= if simple?
+  def junction?()   not simple?                                             end
+
+  def left()        @left  ||= simple? ? nil : parts[0..-2]*SmartName.joint end
+  def right()       @right ||= simple? ? nil : parts[-1]                    end
+                    
+  def left_name()   @left_name   ||= left  && SmartName.new( left  )        end
+  def right_name()  @right_name  ||= right && SmartName.new( right )        end
+                    
+  # Note that all n ames have a trunk and tag, but only junctions have left and right
+                    
+  def trunk()       @trunk ||= simple? ? s : left                           end
+  def tag()         @tag   ||= simple? ? s : right                          end
+                    
+  def trunk_name()  @trunk_name  ||= simple? ? self : left_name             end
+  def tag_name()    @tag_name    ||= simple? ? self : right_name            end
+                                                                            
+  def part_names()  @part_names  ||= parts.map  &:to_name                   end
+  def piece_names() @piece_names ||= pieces.map &:to_name                   end
+                                                                            
+  def pieces
+    @pieces ||= if simple?
       [ self ]
     else
-      trunk_name.piece_names + [ tag_name ]
+      junction_pieces = []
+      parts[1..-1].inject parts[0] do |left, right|
+        piece = [left, right] * SmartName.joint
+        junction_pieces << piece
+        piece
+      end
+      parts + junction_pieces
     end
   end
 
 
 
+
     #~~~~~~~~~~~~~~~~~~~ TRAITS / STARS ~~~~~~~~~~~~~~~~~~~
     
     #all the below seems pretty wagn-specific

data/spec/lib/smart_name_spec.rb

@@ -64,6 +64,25 @@ describe SmartName do
   end
 
 
+  describe "parts and pieces" do
+    it "should produce simple strings for parts" do
+      "A+B+C+D".to_name.parts.should == %w{ A B C D }
+    end
+
+    it "should produce simple name objects for part_names" do
+      "A+B+C+D".to_name.part_names.should == %w{ A B C D }.map( &:to_name )
+    end
+    
+    it "should produce compound strings for pieces" do
+      "A+B+C+D".to_name.pieces.should == %w{ A B C D A+B A+B+C A+B+C+D }
+    end
+    
+    it "should produce compound name objects for piece_names" do
+      "A+B+C+D".to_name.piece_names.should == %w{ A B C D A+B A+B+C A+B+C+D }.map( &:to_name )
+    end
+  end
+  
+
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartname
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4151662497955382901
+      hash: 3336685085994902956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: