namelogic 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/name_logic.rb

@@ -9,30 +9,22 @@ end
 
 class NameLogic < Object
   require 'htmlentities'
-
-    # Wagny defaults
-    JOINT             = '+'
-    BANNED_ARRAY      = [ '/', '~', '|' ]
-    BANNED_RE         = /#{ (['['] + BANNED_ARRAY << JOINT )*'\\' + ']' }/
-    BANNED_CHARACTERS = BANNED_ARRAY * ' '
-    VAR_MATCH         = /\{([^\}]*})\}/
-    SINGULAR          = :singularize
-
-    RUBY19            = RUBY_VERSION =~ /^1\.9/
-    WORD_RE           = RUBY19 ? '\p{Word}' : '\w'
+  RUBY19            = RUBY_VERSION =~ /^1\.9/
+  WORD_RE           = RUBY19 ? '\p{Word}' : '\w'
 
   include ActiveSupport::Configurable
 
   config_accessor :joint, :formal_joint, :name_attribute, :banned_array,
-    :banned_re, :var_re, :uninflect, :params, :codes, :lookup
+    :var_re, :uninflect, :params, :codes, :lookup
 
+  # Wagny defaults:
+  JOINT                    = '+'
   NameLogic.joint          = JOINT
   NameLogic.formal_joint   = " <span class=\"wiki-joint\">#{JOINT}</span> "
-  NameLogic.name_attribute =  :cardname
-  NameLogic.banned_array   =  BANNED_ARRAY
-  NameLogic.banned_re      =  BANNED_RE
-  NameLogic.var_re         =  VAR_MATCH
-  NameLogic.uninflect      =  SINGULAR
+  NameLogic.banned_array   = [ '/', '~', '|' ]
+  NameLogic.name_attribute = :cardname
+  NameLogic.var_re         = /\{([^\}]*})\}/
+  NameLogic.uninflect      = :singularize
 
   @@name2nameobject = {}
 
@@ -53,6 +45,10 @@ class NameLogic < Object
       # if we could make that not happen, we could avoid this (and handle spaces in urls)
       uri.gsub(' ','+').gsub '_',' '
     end
+
+    def banned_re
+      %r{#{ (['['] + NameLogic.banned_array << NameLogic.joint )*'\\' + ']' }}
+    end
   end
 
 
@@ -78,11 +74,13 @@ class NameLogic < Object
     @@name2nameobject[str] = self
   end
 
-  def to_name()    self                                           end
-  def valid?()     not parts.find { |pt| pt.match NameLogic.banned_re }   end
-  def length()     parts.length                                   end
-  def size()       to_s.size                                      end
-  def blank?()     s.blank?                                       end
+  def valid?()
+    not parts.find { |pt| pt.match NameLogic.banned_re }
+  end
+  def to_name()    self         end
+  def length()     parts.length end
+  def size()       to_s.size    end
+  def blank?()     s.blank?     end
   alias empty? blank?
 
   def inspect
@@ -131,21 +129,21 @@ class NameLogic < Object
     #~~~~~~~~~~~~~~~~~~~ PARTS ~~~~~~~~~~~~~~~~~~~
 
     alias simple? simple
-    def junction?()     not simple?                                        end
+    def junction?()  not simple?                                             end
 
-    def left()          @left  ||= simple? ? nil : parts[0..-2]*NameLogic.joint      end
-    def right()         @right ||= simple? ? nil : parts[-1]               end
+    def left()       @left  ||= simple? ? nil : parts[0..-2]*NameLogic.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  && NameLogic.new( left  )         end
+    def right_name() @right_name ||= right && NameLogic.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()      @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 trunk_name() @trunk_name ||= simple? ? self : left_name              end
+    def tag_name()   @tag_name   ||= simple? ? self : right_name             end
 
     def pieces
       @pieces ||= if simple?

data/spec/inflection_helper.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format 
+# Add new inflection rules using the following format
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.irregular 'grave', 'graveyard'
   inflect.uncountable 'this'

data/spec/lib/name_logic_spec.rb

@@ -2,57 +2,57 @@
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe NameLogic do
-  
+
   describe "#key" do
     it "should remove spaces" do
       "this    Name".to_name.key.should == "this_name"
     end
-  
+
     it "should have initial _ for initial cap" do
       "This Name".to_name.key.should == "this_name"
     end
-  
+
     it "should have initial _ for initial cap" do
       "_This Name".to_name.key.should == "this_name"
     end
-  
+
     it "should singularize" do
       "ethans".to_name.key.should == "ethan"
-    end                               
-  
-    it "should underscore" do 
+    end
+
+    it "should underscore" do
       "ThisThing".to_name.key.should == "this_thing"
     end
-  
+
     it "should handle plus cards" do
       "ThisThing+Ethans".to_name.key.should == "this_thing+ethan"
-    end          
-  
+    end
+
     it "should retain * for star cards" do
       "*right".to_name.key.should == "*right"
     end
-  
+
     it "should not singularize double s's" do
-      "grass".to_name.key.should == 'grass'    
+      "grass".to_name.key.should == 'grass'
     end
-    
+
     it "should not singularize letter 'S'" do
       'S'.to_name.key.should == 's'
     end
-    
+
     it "should handle unicode characters" do
       "Mañana".to_name.key.should == 'mañana'
     end
-    
+
     it "should handle weird initial characters" do
       '__you motha @#$'.to_name.key.should == 'you_motha'
       '?!_you motha @#$'.to_name.key.should == 'you_motha'
     end
-    
+
     it "should allow numbers" do
       "3way".to_name.key.should == '3way'
     end
-    
+
     it "internal plurals" do
       "cards hooks label foos".to_name.key.should == 'card_hook_label_foo'
     end
@@ -62,40 +62,40 @@ describe NameLogic do
       "Jean-françois Noubel".to_name.key.should == 'jean_françoi_noubel'
     end
   end
-  
 
-  
+
+
 
 
   describe "#url_key" do
     cardnames = ["GrassCommons.org", 'Oh you @##', "Alice's Restaurant!", "PB & J", "Mañana"].map(&:to_name)
-  
-    cardnames.each do |cardname| 
+
+    cardnames.each do |cardname|
       it "should have the same key as the name" do
         k, k2 = cardname.key, cardname.url_key
         #warn "cn tok #{cardname.inspect}, #{k.inspect}, #{k2.inspect}"
         k.should == k2.to_name.key
       end
     end
-  end       
+  end
 
   describe "#valid" do
     it "accepts valid names" do
       "this+THAT".to_name.should be_valid
       "THE*ONE*AND$!ONLY".to_name.should be_valid
-    end           
-    
+    end
+
     it "rejects invalide names" do
       "Tes~sd".to_name.should_not be_valid
       "TEST/DDER".to_name.should_not be_valid
     end
-  end         
-  
+  end
+
   describe "#left_name" do
     it "returns nil for non junction" do
       "a".to_name.left_name.should == nil
     end
-    
+
     it "returns parent for parent" do
       "a+b+c+d".to_name.left_name.should == "a+b+c"
     end
@@ -103,9 +103,9 @@ describe NameLogic do
 
   describe "#tag_name" do
     it "returns last part of plus card" do
-      "a+b+c".to_name.tag.should == "c"  
+      "a+b+c".to_name.tag.should == "c"
     end
-    
+
     it "returns name of simple card" do
       "a".to_name.tag.should == "a"
     end
@@ -130,7 +130,7 @@ describe NameLogic do
     it "doesn't replace two part tag" do
       'a+b+c'.to_name.replace_part('b+c','x').to_s.should == 'a+b+c'
     end
-  end  
+  end
 
   describe "Cardnames star handling" do
     it "recognizes star cards" do
@@ -153,7 +153,7 @@ describe NameLogic do
       '*a+a'.to_name.rstar?.should be_false
     end
   end
-  
+
   describe "trait_name?" do
     it "returns true for content codename" do
       "bazoinga+*right+*content".to_name.trait_name?(:content).should be_true
@@ -162,19 +162,19 @@ describe NameLogic do
     it "handles arrays" do
       "bazoinga+*right+*content".to_name.trait_name?(:content, :default).should be_true
     end
-    
+
     it "returns false for non-template" do
       "bazoinga+*right+nontent".to_name.trait_name?(:content).should be_false
     end
   end
-  
+
   describe "#to_absolute" do
     it "handles _self, _whole, _" do
       "_self".to_name.to_absolute("foo").should == "foo"
       "_whole".to_name.to_absolute("foo").should == "foo"
       "_".to_name.to_absolute("foo").should == "foo"
     end
-    
+
     it "handles _left" do
       "_left+Z".to_name.to_absolute("A+B+C").should == "A+B+Z"
     end
@@ -182,20 +182,20 @@ describe NameLogic do
     it "handles white space" do
       "_left + Z".to_name.to_absolute("A+B+C").should == "A+B+Z"
     end
-    
+
     it "handles _right" do
       "_right+bang".to_name.to_absolute("nutter+butter").should == "butter+bang"
       "C+_right".to_name.to_absolute("B+A").should == "C+A"
     end
-    
+
     it "handles leading +" do
       "+bug".to_name.to_absolute("hum").should == "hum+bug"
     end
-    
+
     it "handles trailing +" do
       "bug+".to_name.to_absolute("tracks").should == "bug+tracks"
     end
-    
+
     it "handles _(numbers)" do
       "_1".to_name.to_absolute("A+B+C").should == "A"
       "_1+_2".to_name.to_absolute("A+B+C").should == "A+B"
@@ -212,7 +212,7 @@ describe NameLogic do
       "_LLLR".to_name.to_absolute("A+B+C+D+E").should == "B"
       "_LLLL".to_name.to_absolute("A+B+C+D+E").should == "A"
     end
-    
+
     context "mismatched requests" do
       it "returns _self for _left or _right on simple cards" do
         "_left+Z".to_name.to_absolute("A").should == "A+Z"
@@ -224,7 +224,7 @@ describe NameLogic do
         "_1+_2".to_name.to_absolute("A").should == "A+A"
         "_2+_3".to_name.to_absolute("A").should == "A+A"
       end
-      
+
       it "handles bogus _llr requests" do
            "_R".to_name.to_absolute("A").should == "A"
            "_L".to_name.to_absolute("A").should == "A"
@@ -237,7 +237,7 @@ describe NameLogic do
       end
     end
   end
-  
+
   describe "#to_show" do
     it "ignores ignorables" do
                'you+awe'.to_name.to_show('A', :ignore=>'you'        ).should == '+awe'
@@ -247,5 +247,5 @@ describe NameLogic do
                '?a?+awe'.to_name.to_show('B', :ignore=>'A'          ).should == '+awe'
     end
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -6,24 +6,18 @@ class CardMock < String
   def name() to_name end
 end
 
-NameLogic.config.name_attribute= :name
-NameLogic.config.codes= { :content => 1 }
-NameLogic.config.lookup= { 1 => CardMock.new('*content'), }
-
-#NameLogic.configure do |config|
-  #name_attribute= :name
-  #codes= { :content => 1 }
-  #lookup= { 1 => CardMock.new('*content'), }
-#end
+NameLogic.name_attribute= :name
+NameLogic.codes= { :content => 1 }
+NameLogic.lookup= { 1 => CardMock.new('*content'), }
 
 RSpec.configure do |config|
-  
+
   #config.include CustomMatchers
   #config.include ControllerMacros, :type=>:controllers
   #config.include AuthenticatedTestHelper, :type=>:controllers
   #config.include(EmailSpec::Helpers)
   #config.include(EmailSpec::Matchers)
-  
+
   # == Mock Framework
   # If you prefer to mock with mocha, flexmock or RR, uncomment the appropriate symbol:
   # :mocha, :flexmock, :rr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namelogic
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9475460 !ruby/object:Gem::Requirement
+  requirement: &9718440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9475460
+  version_requirements: *9718440
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &9473680 !ruby/object:Gem::Requirement
+  requirement: &9717180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *9473680
+  version_requirements: *9717180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9471900 !ruby/object:Gem::Requirement
+  requirement: &9716100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *9471900
+  version_requirements: *9716100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9470640 !ruby/object:Gem::Requirement
+  requirement: &9730920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *9470640
+  version_requirements: *9730920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9485520 !ruby/object:Gem::Requirement
+  requirement: &9729040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *9485520
+  version_requirements: *9729040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9484240 !ruby/object:Gem::Requirement
+  requirement: &9727380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *9484240
+  version_requirements: *9727380
 description: Wiki Segmented Name Logic
 email: gerryg@inbox.com
 executables: []
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1700480941420385505
+      hash: 1344875529140872551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: