namelogic 0.0.11 → 0.1.1

data/README.rdoc

@@ -1,5 +1,5 @@
 
-== namelogic
+== smartname
 
 Wiki Segmented Name Logic
 

data/Rakefile

@@ -60,7 +60,7 @@ require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "namelogic #{VERSION}"
+  rdoc.title = "smartname #{VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.1.1

data/lib/{name_logic.rb → smart_name.rb}

@@ -4,10 +4,10 @@ require 'active_support/configurable'
 require 'active_support/inflector'
 
 class Object
-  def to_name() NameLogic.new(self) end
+  def to_name() SmartName.new(self) end
 end
 
-class NameLogic < Object
+class SmartName < Object
   require 'htmlentities'
   RUBY19            = RUBY_VERSION =~ /^1\.9/
   WORD_RE           = RUBY19 ? '\p{Word}' : '\w'
@@ -19,19 +19,19 @@ class NameLogic < Object
 
   # Wagny defaults:
   JOINT                    = '+'
-  NameLogic.joint          = JOINT
-  NameLogic.formal_joint   = " <span class=\"wiki-joint\">#{JOINT}</span> "
-  NameLogic.banned_array   = [ '/', '~', '|' ]
-  NameLogic.name_attribute = :cardname
-  NameLogic.var_re         = /\{([^\}]*})\}/
-  NameLogic.uninflect      = :singularize
+  SmartName.joint          = JOINT
+  SmartName.formal_joint   = " <span class=\"wiki-joint\">#{JOINT}</span> "
+  SmartName.banned_array   = [ '/', '~', '|' ]
+  SmartName.name_attribute = :cardname
+  SmartName.var_re         = /\{([^\}]*})\}/
+  SmartName.uninflect      = :singularize
 
   @@name2nameobject = {}
 
   class << self
     def new obj
-      return obj if NameLogic===obj
-      str = Array===obj ? obj*NameLogic.joint : obj.to_s
+      return obj if SmartName===obj
+      str = Array===obj ? obj*SmartName.joint : obj.to_s
       if known_name = @@name2nameobject[str]
         known_name
       else
@@ -47,7 +47,7 @@ class NameLogic < Object
     end
 
     def banned_re
-      %r{#{ (['['] + NameLogic.banned_array << NameLogic.joint )*'\\' + ']' }}
+      %r{#{ (['['] + SmartName.banned_array << SmartName.joint )*'\\' + ']' }}
     end
   end
 
@@ -61,11 +61,11 @@ class NameLogic < Object
   def initialize str
     @s = str.to_s.strip
     @s = @s.encode('UTF-8') if RUBY19
-    @key = if @s.index(NameLogic.joint)
-        @parts = @s.split(/\s*#{Regexp.escape(NameLogic.joint)}\s*/)
-        @parts << '' if @s[-1] == NameLogic.joint
+    @key = if @s.index(SmartName.joint)
+        @parts = @s.split(/\s*#{Regexp.escape(SmartName.joint)}\s*/)
+        @parts << '' if @s[-1] == SmartName.joint
         @simple = false
-        @parts.map { |p| p.to_name.key } * NameLogic.joint
+        @parts.map { |p| p.to_name.key } * SmartName.joint
       else
         @parts = [str]
         @simple = true
@@ -75,7 +75,7 @@ class NameLogic < Object
   end
 
   def valid?()
-    not parts.find { |pt| pt.match NameLogic.banned_re }
+    not parts.find { |pt| pt.match SmartName.banned_re }
   end
   def to_name()    self         end
   def length()     parts.length end
@@ -84,7 +84,7 @@ class NameLogic < Object
   alias empty? blank?
 
   def inspect
-    "<NameLogic key=#{key}[#{self}]>"
+    "<SmartName key=#{key}[#{self}]>"
   end
 
   def == obj
@@ -100,7 +100,7 @@ class NameLogic < Object
   #~~~~~~~~~~~~~~~~~~~ VARIANTS ~~~~~~~~~~~~~~~~~~~
 
   def simple_key
-    decoded.underscore.gsub(/[^#{WORD_RE}\*]+/,'_').split(/_+/).reject(&:empty?).map(&(NameLogic.uninflect))*'_'
+    decoded.underscore.gsub(/[^#{WORD_RE}\*]+/,'_').split(/_+/).reject(&:empty?).map(&(SmartName.uninflect))*'_'
   end
 
   def url_key
@@ -108,7 +108,7 @@ class NameLogic < Object
   end
 
   def safe_key
-    @safe_key ||= key.gsub('*','X').gsub NameLogic.joint, '-'
+    @safe_key ||= key.gsub('*','X').gsub SmartName.joint, '-'
   end
 
   def decoded
@@ -123,7 +123,7 @@ class NameLogic < Object
 
     def post_cgi
       #hmm.  this could resolve to the key of some other card.  move to class method?
-      @post_cgi ||= s.gsub '~plus~', NameLogic.joint
+      @post_cgi ||= s.gsub '~plus~', SmartName.joint
     end
 
     #~~~~~~~~~~~~~~~~~~~ PARTS ~~~~~~~~~~~~~~~~~~~
@@ -131,11 +131,11 @@ class NameLogic < Object
     alias simple? simple
     def junction?()  not simple?                                             end
 
-    def left()       @left  ||= simple? ? nil : parts[0..-2]*NameLogic.joint 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  && NameLogic.new( left  )         end
-    def right_name() @right_name ||= right && NameLogic.new( right )         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
 
@@ -163,15 +163,15 @@ class NameLogic < Object
     junction? && begin
       right_key = right_name.key
       !!traitlist.find do |codename|
-        codecard = NameLogic.codes[ codename ] and codecard = NameLogic.lookup[ codecard ] and
-          codecard.send(NameLogic.name_attribute).key == right_key
+        codecard = SmartName.codes[ codename ] and codecard = SmartName.lookup[ codecard ] and
+          codecard.send(SmartName.name_attribute).key == right_key
       end
     end
   end
 
   def trait_name tag_code
-    codecard = NameLogic.codes[ tag_code ] and codecard = NameLogic.lookup[ codecard ] and
-      [ self, codecard.send(NameLogic.name_attribute) ].to_name
+    codecard = SmartName.codes[ tag_code ] and codecard = SmartName.lookup[ codecard ] and
+      [ self, codecard.send(SmartName.name_attribute) ].to_name
   end
 
   def trait tag_code
@@ -195,7 +195,7 @@ class NameLogic < Object
     initial_blank = show_parts[0].nil?
     show_name = show_parts.compact.to_name.s
 
-    initial_blank ? NameLogic.joint + show_name : show_name
+    initial_blank ? SmartName.joint + show_name : show_name
   end
 
 
@@ -204,7 +204,7 @@ class NameLogic < Object
     parts.map do |part|
       new_part = case part
         when /^_user$/i;            (user=Session.user_card) ? user.name : part
-        when /^_main$/i;            NameLogic.params[:main_name]
+        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
         when /^_right$/i;           context.tag
@@ -223,11 +223,11 @@ class NameLogic < Object
           part
         end.to_s.strip
       new_part.empty? ? context.to_s : new_part
-    end * NameLogic.joint
+    end * SmartName.joint
   end
 
   def to_absolute_name *args
-    NameLogic.new to_absolute(*args)
+    SmartName.new to_absolute(*args)
   end
 
   def nth_left n
@@ -266,7 +266,7 @@ class NameLogic < Object
 
   def self.substitute! str, hash
     hash.keys.each do |var|
-      str.gsub!(NameLogic.var_re) { |x| (v=hash[var.to_sym]).nil? ? x : v }
+      str.gsub!(SmartName.var_re) { |x| (v=hash[var.to_sym]).nil? ? x : v }
     end
     str
   end

data/spec/lib/{name_logic_spec.rb → smart_name_spec.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
-describe NameLogic do
+describe SmartName do
 
   describe "#key" do
     it "should remove spaces" do

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 
-require 'name_logic'
+require 'smart_name'
 require File.expand_path('./inflection_helper', File.dirname(__FILE__))
 
 class CardMock < String
   def name() to_name end
 end
 
-NameLogic.name_attribute= :name
-NameLogic.codes= { :content => 1 }
-NameLogic.lookup= { 1 => CardMock.new('*content'), }
+SmartName.name_attribute= :name
+SmartName.codes= { :content => 1 }
+SmartName.lookup= { 1 => CardMock.new('*content'), }
 
 RSpec.configure do |config|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namelogic
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9718440 !ruby/object:Gem::Requirement
+  requirement: &5308300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9718440
+  version_requirements: *5308300
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &9717180 !ruby/object:Gem::Requirement
+  requirement: &5305220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *9717180
+  version_requirements: *5305220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9716100 !ruby/object:Gem::Requirement
+  requirement: &5320400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *9716100
+  version_requirements: *5320400
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9730920 !ruby/object:Gem::Requirement
+  requirement: &5319080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *9730920
+  version_requirements: *5319080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9729040 !ruby/object:Gem::Requirement
+  requirement: &5317820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *9729040
+  version_requirements: *5317820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9727380 !ruby/object:Gem::Requirement
+  requirement: &5316700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *9727380
+  version_requirements: *5316700
 description: Wiki Segmented Name Logic
 email: gerryg@inbox.com
 executables: []
@@ -89,9 +89,9 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/name_logic.rb
+- lib/smart_name.rb
 - spec/inflection_helper.rb
-- spec/lib/name_logic_spec.rb
+- spec/lib/smart_name_spec.rb
 - spec/spec_helper.rb
 - test.rb
 - test2.rb
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1344875529140872551
+      hash: -4244501553404561950
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: