namelogic 0.0.9 → 0.0.10

data/Gemfile

@@ -1,7 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -13,5 +10,5 @@ group :development do
   #gem "rcov", ">= 0"
 end
 
+gem "activesupport"
 gem 'htmlentities', '~>4.3.0'
-gem 'ruby-configurable', '~>1.0.0'

data/Gemfile.lock

@@ -1,15 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     diff-lcs (1.1.3)
     git (1.2.5)
     htmlentities (4.3.1)
+    i18n (0.6.1)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.7.5)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -21,15 +26,14 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    ruby-configurable (1.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler (~> 1.1.0)
   htmlentities (~> 4.3.0)
   jeweler (~> 1.8.3)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
-  ruby-configurable (~> 1.0.0)

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/name_logic.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-require 'configurable'
+require 'active_support/configurable'
 require 'active_support/inflector'
 
 class Object
@@ -21,25 +21,25 @@ class NameLogic < Object
     RUBY19            = RUBY_VERSION =~ /^1\.9/
     WORD_RE           = RUBY19 ? '\p{Word}' : '\w'
 
-  include Configurable
+  include ActiveSupport::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
+  config_accessor :joint, :formal_joint, :name_attribute, :banned_array,
+    :banned_re, :var_re, :uninflect, :params, :codes, :lookup
+
+  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
 
   @@name2nameobject = {}
 
   class << self
     def new obj
       return obj if NameLogic===obj
-      str = Array===obj ? obj*config.joint : obj.to_s
+      str = Array===obj ? obj*NameLogic.joint : obj.to_s
       if known_name = @@name2nameobject[str]
         known_name
       else
@@ -53,10 +53,6 @@ class NameLogic < Object
       # if we could make that not happen, we could avoid this (and handle spaces in urls)
       uri.gsub(' ','+').gsub '_',' '
     end
-
-    def joint() config.joint end
-    def banned_array() config.banned_array end
-    def banned_re() config.banned_re end
   end
 
 
@@ -69,11 +65,11 @@ class NameLogic < Object
   def initialize str
     @s = str.to_s.strip
     @s = @s.encode('UTF-8') if RUBY19
-    @key = if @s.index(config.joint)
-        @parts = @s.split(/\s*#{Regexp.escape(config.joint)}\s*/)
-        @parts << '' if @s[-1] == config.joint
+    @key = if @s.index(NameLogic.joint)
+        @parts = @s.split(/\s*#{Regexp.escape(NameLogic.joint)}\s*/)
+        @parts << '' if @s[-1] == NameLogic.joint
         @simple = false
-        @parts.map { |p| p.to_name.key } * config.joint
+        @parts.map { |p| p.to_name.key } * NameLogic.joint
       else
         @parts = [str]
         @simple = true
@@ -83,7 +79,7 @@ class NameLogic < Object
   end
 
   def to_name()    self                                           end
-  def valid?()     not parts.find { |pt| pt.match config.banned_re }   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
@@ -106,7 +102,7 @@ class NameLogic < Object
   #~~~~~~~~~~~~~~~~~~~ VARIANTS ~~~~~~~~~~~~~~~~~~~
 
   def simple_key
-    decoded.underscore.gsub(/[^#{WORD_RE}\*]+/,'_').split(/_+/).reject(&:empty?).map(&(config.uninflect))*'_'
+    decoded.underscore.gsub(/[^#{WORD_RE}\*]+/,'_').split(/_+/).reject(&:empty?).map(&(NameLogic.uninflect))*'_'
   end
 
   def url_key
@@ -114,7 +110,7 @@ class NameLogic < Object
   end
 
   def safe_key
-    @safe_key ||= key.gsub('*','X').gsub config.joint, '-'
+    @safe_key ||= key.gsub('*','X').gsub NameLogic.joint, '-'
   end
 
   def decoded
@@ -129,7 +125,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~', config.joint
+      @post_cgi ||= s.gsub '~plus~', NameLogic.joint
     end
 
     #~~~~~~~~~~~~~~~~~~~ PARTS ~~~~~~~~~~~~~~~~~~~
@@ -137,11 +133,11 @@ class NameLogic < Object
     alias simple? simple
     def junction?()     not simple?                                        end
 
-    def left()          @left  ||= simple? ? nil : parts[0..-2]*config.joint      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  && self.class.new( left  )   end
-    def right_name()    @right_name ||= right && self.class.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
 
@@ -169,15 +165,15 @@ class NameLogic < Object
     junction? && begin
       right_key = right_name.key
       !!traitlist.find do |codename|
-        codecard = config.codes[ codename ] and codecard = config.lookup[ codecard ] and
-          codecard.send(config.name_attribute).key == right_key
+        codecard = NameLogic.codes[ codename ] and codecard = NameLogic.lookup[ codecard ] and
+          codecard.send(NameLogic.name_attribute).key == right_key
       end
     end
   end
 
   def trait_name tag_code
-    codecard = config.codes[ tag_code ] and codecard = config.lookup[ codecard ] and
-      [ self, codecard.send(config.name_attribute) ].to_name
+    codecard = NameLogic.codes[ tag_code ] and codecard = NameLogic.lookup[ codecard ] and
+      [ self, codecard.send(NameLogic.name_attribute) ].to_name
   end
 
   def trait tag_code
@@ -201,7 +197,7 @@ class NameLogic < Object
     initial_blank = show_parts[0].nil?
     show_name = show_parts.compact.to_name.s
 
-    initial_blank ? config.joint + show_name : show_name
+    initial_blank ? NameLogic.joint + show_name : show_name
   end
 
 
@@ -210,7 +206,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;            config.params[:main_name]
+        when /^_main$/i;            NameLogic.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
@@ -229,11 +225,11 @@ class NameLogic < Object
           part
         end.to_s.strip
       new_part.empty? ? context.to_s : new_part
-    end * config.joint
+    end * NameLogic.joint
   end
 
   def to_absolute_name *args
-    self.class.new to_absolute(*args)
+    NameLogic.new to_absolute(*args)
   end
 
   def nth_left n
@@ -272,7 +268,7 @@ class NameLogic < Object
 
   def self.substitute! str, hash
     hash.keys.each do |var|
-      str.gsub!(config.var_re) { |x| (v=hash[var.to_sym]).nil? ? x : v }
+      str.gsub!(NameLogic.var_re) { |x| (v=hash[var.to_sym]).nil? ? x : v }
     end
     str
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namelogic
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -12,30 +12,30 @@ cert_chain: []
 date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: &9199420 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &9475460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9199420
+  version_requirements: *9475460
 - !ruby/object:Gem::Dependency
-  name: ruby-configurable
-  requirement: &9198820 !ruby/object:Gem::Requirement
+  name: htmlentities
+  requirement: &9473680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *9198820
+  version_requirements: *9473680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9198020 !ruby/object:Gem::Requirement
+  requirement: &9471900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *9198020
+  version_requirements: *9471900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9197340 !ruby/object:Gem::Requirement
+  requirement: &9470640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *9197340
+  version_requirements: *9470640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9196700 !ruby/object:Gem::Requirement
+  requirement: &9485520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *9196700
+  version_requirements: *9485520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9196040 !ruby/object:Gem::Requirement
+  requirement: &9484240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *9196040
+  version_requirements: *9484240
 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: -2071270473877385600
+      hash: 1700480941420385505
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: