namelogic 0.0.8 → 0.0.9

data/Gemfile

@@ -14,3 +14,4 @@ group :development do
 end
 
 gem 'htmlentities', '~>4.3.0'
+gem 'ruby-configurable', '~>1.0.0'

data/Gemfile.lock

@@ -21,6 +21,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    ruby-configurable (1.0.2)
 
 PLATFORMS
   ruby
@@ -31,3 +32,4 @@ DEPENDENCIES
   jeweler (~> 1.8.3)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
+  ruby-configurable (~> 1.0.0)

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/name_logic.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 
+require 'configurable'
 require 'active_support/inflector'
 
 class Object
@@ -9,35 +10,36 @@ end
 class NameLogic < Object
   require 'htmlentities'
 
-  # Wagny defaults
-  JOINT             = '+'
-  BANNED_ARRAY      = [ '/', '~', '|' ]
-  BANNED_CHARACTERS = BANNED_ARRAY * ' '
-
-  VAR_MATCH         = /\{([^\}]*})\}/
-  SINGULAR          = :singularize
-
-  RUBY19            = RUBY_VERSION =~ /^1\.9/
-  WORD_RE           = RUBY19 ? '\p{Word}' : '\w'
-
-  # reset these class instance vars to your system's to customize name syntax
-  @@joint = JOINT
-  @@formal_joint = " <span class=\"wiki-joint\">#{JOINT}</span> "
-  @@banned_array = BANNED_ARRAY
-  @@banned_re = /#{ (['['] + @@banned_array << @@joint )*'\\' }#{ ']' }/
-  @@var_match = VAR_MATCH
-  @@uninflect = SINGULAR
-  @@name_attribute = :cardname
-  @@main_hash = {:main_name=>''}
-  @@code_hash = {}
-  @@fetch = {}
+    # 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'
+
+  include Configurable
+
+  configurable_options :joint, :formal_joint, :name_attribute, :banned_array,
+    :banned_re, :var_re, :uninflect, :params, :codes, :lookup,
+    :joint => JOINT,
+    :formal_joint   => " <span class=\"wiki-joint\">#{JOINT}</span> ",
+    :name_attribute => :cardname,
+    :banned_array   => BANNED_ARRAY,
+    :banned_re      => BANNED_RE,
+    #BANNED_RE         = /#{ (['['] + BANNED_ARRAY << JOINT )*'\\' }#{ ']' }/,
+    :var_re         => VAR_MATCH,
+    :uninflect      => SINGULAR
 
   @@name2nameobject = {}
 
   class << self
     def new obj
       return obj if NameLogic===obj
-      str = Array===obj ? obj*@@joint : obj.to_s
+      str = Array===obj ? obj*config.joint : obj.to_s
       if known_name = @@name2nameobject[str]
         known_name
       else
@@ -52,21 +54,9 @@ class NameLogic < Object
       uri.gsub(' ','+').gsub '_',' '
     end
 
-    # class var setters to change defaults, consider a config obect?
-    def joint()          @@joint end
-    def joint=(v)        @@joint = v end
-    def formal_joint()   @@formal_joint end
-    def formal_joint=(v) @@formal_joint = v end
-    def banned_array()   @@banned_array end
-    def banned_array=(v) @@banned_array = v end
-    def banned_re()      @@banned_re end
-    def banned_re=(v)    @@banned_re = v end
-    def var_match=(v)    @@var_match = v end
-    def uninflect=(v)    @@uninflect = v end
-    def name_attribute=(v) @@name_attribute = v end
-    def main_hash=(v)    @@main_hash = v end
-    def code_hash=(v)    @@code_hash = v end
-    def fetch=(v)        @@fetch = v end
+    def joint() config.joint end
+    def banned_array() config.banned_array end
+    def banned_re() config.banned_re end
   end
 
 
@@ -79,11 +69,11 @@ class NameLogic < Object
   def initialize str
     @s = str.to_s.strip
     @s = @s.encode('UTF-8') if RUBY19
-    @key = if @s.index(@@joint)
-        @parts = @s.split(/\s*#{Regexp.escape(@@joint)}\s*/)
-        @parts << '' if @s[-1] == @@joint
+    @key = if @s.index(config.joint)
+        @parts = @s.split(/\s*#{Regexp.escape(config.joint)}\s*/)
+        @parts << '' if @s[-1] == config.joint
         @simple = false
-        @parts.map { |p| p.to_name.key } * @@joint
+        @parts.map { |p| p.to_name.key } * config.joint
       else
         @parts = [str]
         @simple = true
@@ -93,7 +83,7 @@ class NameLogic < Object
   end
 
   def to_name()    self                                           end
-  def valid?()     not parts.find { |pt| pt.match @@banned_re }   end
+  def valid?()     not parts.find { |pt| pt.match config.banned_re }   end
   def length()     parts.length                                   end
   def size()       to_s.size                                      end
   def blank?()     s.blank?                                       end
@@ -116,7 +106,7 @@ class NameLogic < Object
   #~~~~~~~~~~~~~~~~~~~ VARIANTS ~~~~~~~~~~~~~~~~~~~
 
   def simple_key
-    decoded.underscore.gsub(/[^#{WORD_RE}\*]+/,'_').split(/_+/).reject(&:empty?).map(&@@uninflect)*'_'
+    decoded.underscore.gsub(/[^#{WORD_RE}\*]+/,'_').split(/_+/).reject(&:empty?).map(&(config.uninflect))*'_'
   end
 
   def url_key
@@ -124,7 +114,7 @@ class NameLogic < Object
   end
 
   def safe_key
-    @safe_key ||= key.gsub('*','X').gsub @@joint, '-'
+    @safe_key ||= key.gsub('*','X').gsub config.joint, '-'
   end
 
   def decoded
@@ -139,7 +129,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~', @@joint
+      @post_cgi ||= s.gsub '~plus~', config.joint
     end
 
     #~~~~~~~~~~~~~~~~~~~ PARTS ~~~~~~~~~~~~~~~~~~~
@@ -147,7 +137,7 @@ class NameLogic < Object
     alias simple? simple
     def junction?()     not simple?                                        end
 
-    def left()          @left  ||= simple? ? nil : parts[0..-2]*@@joint      end
+    def left()          @left  ||= simple? ? nil : parts[0..-2]*config.joint      end
     def right()         @right ||= simple? ? nil : parts[-1]               end
 
     def left_name()     @left_name  ||= left  && self.class.new( left  )   end
@@ -179,16 +169,15 @@ class NameLogic < Object
     junction? && begin
       right_key = right_name.key
       !!traitlist.find do |codename|
-        #puts "tn? #{codename}, #{traitlist.inspect}, #{@@code_hash[codename]}\n"
-        codecard = @@code_hash[ codename ] and codecard = @@fetch[ codecard ] and
-          codecard.send(@@name_attribute).key == right_key
+        codecard = config.codes[ codename ] and codecard = config.lookup[ codecard ] and
+          codecard.send(config.name_attribute).key == right_key
       end
     end
   end
 
   def trait_name tag_code
-    codecard = @@code_hash[ tag_code ] and codecard = @@fetch[ codecard ] and
-      [ self, codecard.send(@@name_attribute) ].to_name
+    codecard = config.codes[ tag_code ] and codecard = config.lookup[ codecard ] and
+      [ self, codecard.send(config.name_attribute) ].to_name
   end
 
   def trait tag_code
@@ -212,7 +201,7 @@ class NameLogic < Object
     initial_blank = show_parts[0].nil?
     show_name = show_parts.compact.to_name.s
 
-    initial_blank ? @@joint + show_name : show_name
+    initial_blank ? config.joint + show_name : show_name
   end
 
 
@@ -221,7 +210,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;            @@main_hash[:main_name]
+        when /^_main$/i;            config.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
@@ -240,7 +229,7 @@ class NameLogic < Object
           part
         end.to_s.strip
       new_part.empty? ? context.to_s : new_part
-    end * @@joint
+    end * config.joint
   end
 
   def to_absolute_name *args
@@ -283,7 +272,7 @@ class NameLogic < Object
 
   def self.substitute! str, hash
     hash.keys.each do |var|
-      str.gsub!(@@var_match) { |x| (v=hash[var.to_sym]).nil? ? x : v }
+      str.gsub!(config.var_re) { |x| (v=hash[var.to_sym]).nil? ? x : v }
     end
     str
   end

data/spec/spec_helper.rb

@@ -6,9 +6,15 @@ class CardMock < String
   def name() to_name end
 end
 
-NameLogic.name_attribute= :name
-NameLogic.code_hash= { :content => 1 }
-NameLogic.fetch= { 1 => CardMock.new('*content'), }
+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
 
 RSpec.configure do |config|
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namelogic
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &9651140 !ruby/object:Gem::Requirement
+  requirement: &9199420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *9651140
+  version_requirements: *9199420
+- !ruby/object:Gem::Dependency
+  name: ruby-configurable
+  requirement: &9198820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *9198820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9649060 !ruby/object:Gem::Requirement
+  requirement: &9198020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *9649060
+  version_requirements: *9198020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9647280 !ruby/object:Gem::Requirement
+  requirement: &9197340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *9647280
+  version_requirements: *9197340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9644340 !ruby/object:Gem::Requirement
+  requirement: &9196700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *9644340
+  version_requirements: *9196700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &8387400 !ruby/object:Gem::Requirement
+  requirement: &9196040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *8387400
+  version_requirements: *9196040
 description: Wiki Segmented Name Logic
 email: gerryg@inbox.com
 executables: []
@@ -103,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1839331546064031105
+      hash: -2071270473877385600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: