smartname 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/cardname.rb

@@ -0,0 +1,258 @@
+# -*- encoding : utf-8 -*-
+module Wagn
+  class SmartName < Object
+    require 'htmlentities'
+
+    JOINT = '+'
+    JOINT_RE = Regexp.escape JOINT
+    BANNED_ARRAY = [ '/', '~', '|' ]
+    BANNED_RE = /#{ (['['] + BANNED_ARRAY << JOINT )*'\\' }]/
+
+    RUBY19 = RUBY_VERSION =~ /^1\.9/
+    OK4KEY_RE = RUBY19 ? '\p{Word}\*' : '\w\*'
+
+    @@name2nameobject = {}
+
+    class << self
+      def new obj
+        return obj if SmartName===obj
+        str = Array===obj ? obj*SmartName.joint : obj.to_s
+        if known_name = @@name2nameobject[str]
+          known_name
+        else
+          super str.strip
+        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
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~~~~~~~~~~~~~~~~~~~~~~ INSTANCE ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    attr_reader :simple, :parts, :key, :s
+    alias to_s s
+
+    def initialize str
+      @s = str.to_s.strip
+      @s = @s.encode('UTF-8') if RUBY19
+      @key = if @s.index(SmartName.joint)
+          @parts = @s.split(/\s*#{SmartName.joint}\s*/)
+          @parts << '' if @s.last == SmartName.joint
+          @simple = false
+          @parts.map { |p| p.to_name.key } * SmartName.joint
+        else
+          @parts = [str]
+          @simple = true
+          str.blank? ? '' : simple_key
+        end
+      @@name2nameobject[str] = self
+    end
+
+    def to_name()    self                                           end
+    def valid?()         not parts.find { |pt| pt.match BANNED_RE }     end
+    def size()           parts.size                                     end # size of name = number of parts??  not intuitive.    maybe depth? psize?
+    def blank?()         s.blank?                                       end
+    alias empty? blank?
+
+    def inspect
+      "<SmartName key=#{key}[#{self}]>"
+    end
+
+    def == obj
+      object_key = case
+        when obj.respond_to?(:key)      ; obj.key
+        when obj.respond_to?(:to_name) ; obj.to_name.key
+        else                               ; obj.to_s
+        end
+      object_key == key
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~ VARIANTS ~~~~~~~~~~~~~~~~~~~
+
+    def simple_key
+      decoded.underscore.gsub(/[^#{OK4KEY_RE}]+/,'_').split(/_+/).reject(&:blank?).map(&:singularize)*'_'
+    end
+
+    def url_key
+      @url_key ||= decoded.gsub(/[^#{OK4KEY_RE}#{JOINT_RE}]+/,' ').strip.gsub /[\s\_]+/, '_'
+    end
+
+    def safe_key
+      @safe_key ||= key.gsub('*','X').gsub SmartName.joint, '-'
+    end
+
+    def decoded
+      @decoded ||= (s.index('&') ?  HTMLEntities.new.decode(s) : s)
+    end
+
+    def pre_cgi
+      #why is this necessary?? doesn't real CGI escaping handle this??
+      # hmmm.  is this to prevent absolutizing
+      @pre_cgi ||= parts.join '~plus~'
+    end
+
+    def post_cgi
+      #hmm.  this could resolve to the key of some other card.  move to class method?
+      @post_cgi ||= s.gsub '~plus~', SmartName.joint
+    end
+
+    #~~~~~~~~~~~~~~~~~~~ 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  && self.class.new( left  )   end
+    def right_name()    @right_name ||= right && self.class.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 pieces
+      @pieces ||= if simple?
+        [ self ]
+      else
+        trunk_name.pieces + [ tag_name ]
+      end
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~ TRAITS / STARS ~~~~~~~~~~~~~~~~~~~
+
+    # note that [0] breaks in ruby 1.8.x but [0,1] doesn't
+    def star?()         simple?   and '*' == s[0,1]               end
+    def rstar?()        right     and '*' == right[0,1]           end
+
+    def trait_name? *traitlist
+      junction? && begin
+        right_key = right_name.key
+        !!traitlist.find do |codename|
+          Card[ codename ].cardname.key == right_key
+        end
+      end
+    end
+
+    def trait_name tag_code
+      [ self, Card[ tag_code ].name ].to_name
+    end
+
+    def trait tag_code
+      trait_name( tag_code ).s
+    end
+
+
+
+    #~~~~~~~~~~~~~~~~~~~~ SHOW / ABSOLUTE ~~~~~~~~~~~~~~~~~~~~
+
+    def to_show context, args={}
+#      ignore = [ args[:ignore], context.to_name.parts ].flatten.compact.map &:to_name
+      ignore = [ args[:ignore] ].flatten.map &:to_name
+      fullname = parts.to_name.to_absolute_name context, args
+
+      show_parts = fullname.parts.map do |part|
+        reject = ( part.blank? or part =~ /^_/ or ignore.member? part.to_name )
+        reject ? nil : part
+      end
+
+      show_name = show_parts.compact.to_name.s
+      
+      case
+      when show_parts.compact.empty?;  fullname
+      when show_parts[0].nil?       ;  SmartName.joint + show_name
+      else show_name
+      end
+    end
+
+
+    def to_absolute context, args={}
+      context = context.to_name
+      parts.map do |part|
+        new_part = case part
+          when /^_user$/i;            (user=Session.user_card) ? user.name : part
+          when /^_main$/i;            Wagn::Conf[:main_name]
+          when /^(_self|_whole|_)$/i; context.s
+          when /^_left$/i;            context.trunk #note - inconsistent use of left v. trunk
+          when /^_right$/i;           context.tag
+          when /^_(\d+)$/i
+            pos = $~[1].to_i
+            pos = context.size if pos > context.size
+            context.parts[pos-1]
+          when /^_(L*)(R?)$/i
+            l_s, r_s = $~[1].size, !$~[2].blank?
+            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.blank? ? context.to_s : new_part
+      end * SmartName.joint
+    end
+
+    def to_absolute_name *args
+      self.class.new to_absolute(*args)
+    end
+
+    def nth_left n
+      # 1 = left; 2= left of left; 3 = left of left of left....
+      ( n >= size ? parts[0] : parts[0..-n-1] ).to_name
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~~ MISC ~~~~~~~~~~~~~~~~~~~~
+
+    def replace_part oldpart, newpart
+      oldpart = oldpart.to_name
+      newpart = newpart.to_name
+      if oldpart.simple?
+        if simple?
+          self == oldpart ? newpart : self
+        else
+          parts.map do |p|
+            oldpart == p ? newpart.to_s : p
+          end.to_name
+        end
+      elsif simple?
+        self
+      else
+        if oldpart == parts[0, oldpart.size]
+          if self.size == oldpart.size
+            newpart
+          else
+            (newpart.parts+(parts[oldpart.size,].lines.to_a)).to_name
+          end
+        else
+          self
+        end
+      end
+    end
+
+    def self.substitute! str, hash
+      # HACK. This doesn't belong here.
+      # shouldn't thus use inclusions???
+      hash.keys.each do |var|
+        str.gsub!(/\{(#{var})\}/) {|x| hash[var.to_sym]}
+      end
+      str
+    end
+
+  end
+end
+

data/lib/smart_name.rb

@@ -17,7 +17,7 @@ class SmartName < Object
   include ActiveSupport::Configurable
 
   config_accessor :joint, :formal_joint, :name_attribute, :banned_array,
-    :var_re, :uninflect, :params, :codes, :lookup
+    :var_re, :uninflect, :params, :codes, :lookup, :session
 
   # Wagny defaults:
   SmartName.joint          = '+'
@@ -217,7 +217,7 @@ class SmartName < Object
     context = context.to_name
     parts.map do |part|
       new_part = case part
-        when /^_user$/i;            (user=Session.user_card) ? user.name : part
+        when /^_user$/i;            name_proc = SmartName.session and name_proc.call or part
         when /^_main$/i;            SmartName.params[:main_name]
         when /^(_self|_whole|_)$/i; context.s
         when /^_left$/i;            context.trunk #note - inconsistent use of left v. trunk

data/orig_cardname.rb

@@ -0,0 +1,258 @@
+# -*- encoding : utf-8 -*-
+module Wagn
+  class Cardname < Object
+    require 'htmlentities'
+
+    JOINT = '+'
+    JOINT_RE = Regexp.escape JOINT
+    BANNED_ARRAY = [ '/', '~', '|' ]
+    BANNED_RE = /#{ (['['] + BANNED_ARRAY << JOINT )*'\\' }]/
+
+    RUBY19 = RUBY_VERSION =~ /^1\.9/
+    OK4KEY_RE = RUBY19 ? '\p{Word}\*' : '\w\*'
+
+    @@name2cardname = {}
+
+    class << self
+      def new obj
+        return obj if Cardname===obj
+        str = Array===obj ? obj*JOINT : obj.to_s
+        if known_name = @@name2cardname[str]
+          known_name
+        else
+          super str.strip
+        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
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #~~~~~~~~~~~~~~~~~~~~~~ INSTANCE ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    attr_reader :simple, :parts, :key, :s
+    alias to_s s
+
+    def initialize str
+      @s = str.to_s.strip
+      @s = @s.encode('UTF-8') if RUBY19
+      @key = if @s.index(JOINT)
+          @parts = @s.split(/\s*#{JOINT_RE}\s*/)
+          @parts << '' if @s.last == JOINT
+          @simple = false
+          @parts.map { |p| p.to_cardname.key } * JOINT
+        else
+          @parts = [str]
+          @simple = true
+          str.blank? ? '' : simple_key
+        end
+      @@name2cardname[str] = self
+    end
+
+    def to_cardname()    self                                           end
+    def valid?()         not parts.find { |pt| pt.match BANNED_RE }     end
+    def size()           parts.size                                     end # size of name = number of parts??  not intuitive.    maybe depth? psize?
+    def blank?()         s.blank?                                       end
+    alias empty? blank?
+
+    def inspect
+      "<CardName key=#{key}[#{self}]>"
+    end
+
+    def == obj
+      object_key = case
+        when obj.respond_to?(:key)      ; obj.key
+        when obj.respond_to?(:to_cardname) ; obj.to_cardname.key
+        else                               ; obj.to_s
+        end
+      object_key == key
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~ VARIANTS ~~~~~~~~~~~~~~~~~~~
+
+    def simple_key
+      decoded.underscore.gsub(/[^#{OK4KEY_RE}]+/,'_').split(/_+/).reject(&:blank?).map(&:singularize)*'_'
+    end
+
+    def url_key
+      @url_key ||= decoded.gsub(/[^#{OK4KEY_RE}#{JOINT_RE}]+/,' ').strip.gsub /[\s\_]+/, '_'
+    end
+
+    def safe_key
+      @safe_key ||= key.gsub('*','X').gsub JOINT, '-'
+    end
+
+    def decoded
+      @decoded ||= (s.index('&') ?  HTMLEntities.new.decode(s) : s)
+    end
+
+    def pre_cgi
+      #why is this necessary?? doesn't real CGI escaping handle this??
+      # hmmm.  is this to prevent absolutizing
+      @pre_cgi ||= parts.join '~plus~'
+    end
+
+    def post_cgi
+      #hmm.  this could resolve to the key of some other card.  move to class method?
+      @post_cgi ||= s.gsub '~plus~', JOINT
+    end
+
+    #~~~~~~~~~~~~~~~~~~~ PARTS ~~~~~~~~~~~~~~~~~~~
+
+    alias simple? simple
+    def junction?()     not simple?                                        end
+
+    def left()          @left  ||= simple? ? nil : parts[0..-2]*JOINT      end
+    def right()         @right ||= simple? ? nil : parts[-1]               end
+
+    def left_name()     @left_name  ||= left  && self.class.new( left  )   end
+    def right_name()    @right_name ||= right && self.class.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 pieces
+      @pieces ||= if simple?
+        [ self ]
+      else
+        trunk_name.pieces + [ tag_name ]
+      end
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~ TRAITS / STARS ~~~~~~~~~~~~~~~~~~~
+
+    # note that [0] breaks in ruby 1.8.x but [0,1] doesn't
+    def star?()         simple?   and '*' == s[0,1]               end
+    def rstar?()        right     and '*' == right[0,1]           end
+
+    def trait_name? *traitlist
+      junction? && begin
+        right_key = right_name.key
+        !!traitlist.find do |codename|
+          Card[ codename ].cardname.key == right_key
+        end
+      end
+    end
+
+    def trait_name tag_code
+      [ self, Card[ tag_code ].name ].to_cardname
+    end
+
+    def trait tag_code
+      trait_name( tag_code ).s
+    end
+
+
+
+    #~~~~~~~~~~~~~~~~~~~~ SHOW / ABSOLUTE ~~~~~~~~~~~~~~~~~~~~
+
+    def to_show context, args={}
+#      ignore = [ args[:ignore], context.to_cardname.parts ].flatten.compact.map &:to_cardname
+      ignore = [ args[:ignore] ].flatten.map &:to_cardname
+      fullname = parts.to_cardname.to_absolute_name context, args
+
+      show_parts = fullname.parts.map do |part|
+        reject = ( part.blank? or part =~ /^_/ or ignore.member? part.to_cardname )
+        reject ? nil : part
+      end
+
+      show_name = show_parts.compact.to_cardname.s
+      
+      case
+      when show_parts.compact.empty?;  fullname
+      when show_parts[0].nil?       ;  JOINT + show_name
+      else show_name
+      end
+    end
+
+
+    def to_absolute context, args={}
+      context = context.to_cardname
+      parts.map do |part|
+        new_part = case part
+          when /^_user$/i;            (user=Session.user_card) ? user.name : part
+          when /^_main$/i;            Wagn::Conf[:main_name]
+          when /^(_self|_whole|_)$/i; context.s
+          when /^_left$/i;            context.trunk #note - inconsistent use of left v. trunk
+          when /^_right$/i;           context.tag
+          when /^_(\d+)$/i
+            pos = $~[1].to_i
+            pos = context.size if pos > context.size
+            context.parts[pos-1]
+          when /^_(L*)(R?)$/i
+            l_s, r_s = $~[1].size, !$~[2].blank?
+            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.blank? ? context.to_s : new_part
+      end * JOINT
+    end
+
+    def to_absolute_name *args
+      self.class.new to_absolute(*args)
+    end
+
+    def nth_left n
+      # 1 = left; 2= left of left; 3 = left of left of left....
+      ( n >= size ? parts[0] : parts[0..-n-1] ).to_cardname
+    end
+
+
+    #~~~~~~~~~~~~~~~~~~~~ MISC ~~~~~~~~~~~~~~~~~~~~
+
+    def replace_part oldpart, newpart
+      oldpart = oldpart.to_cardname
+      newpart = newpart.to_cardname
+      if oldpart.simple?
+        if simple?
+          self == oldpart ? newpart : self
+        else
+          parts.map do |p|
+            oldpart == p ? newpart.to_s : p
+          end.to_cardname
+        end
+      elsif simple?
+        self
+      else
+        if oldpart == parts[0, oldpart.size]
+          if self.size == oldpart.size
+            newpart
+          else
+            (newpart.parts+(parts[oldpart.size,].lines.to_a)).to_cardname
+          end
+        else
+          self
+        end
+      end
+    end
+
+    def self.substitute! str, hash
+      # HACK. This doesn't belong here.
+      # shouldn't thus use inclusions???
+      hash.keys.each do |var|
+        str.gsub!(/\{(#{var})\}/) {|x| hash[var.to_sym]}
+      end
+      str
+    end
+
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartname
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10167240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10167240
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10166260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,15 +33,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.3.0
+  version_requirements: *10166260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10165120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,15 +44,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  version_requirements: *10165120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10164400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,15 +55,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *10164400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10163380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -86,15 +66,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  version_requirements: *10163380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10189020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,12 +77,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+  version_requirements: *10189020
 description: Naming patterns abstracted from the Wagn platform
 email: gerryg@inbox.com
 executables: []
@@ -120,7 +90,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- cardname.rb
 - lib/smart_name.rb
+- orig_cardname.rb
 - spec/inflection_helper.rb
 - spec/lib/smart_name_spec.rb
 - spec/spec_helper.rb
@@ -143,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4104289195100780208
+      hash: 1118870288458290680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Wagn names without all the wagn