smartname 0.1.7 → 0.1.8

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -13,10 +13,10 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
-    multi_json (1.3.7)
-    rake (10.0.2)
-    rdoc (3.12)
+    json (1.7.7)
+    multi_json (1.7.2)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/smart_name.rb

@@ -11,17 +11,16 @@ class Object
 end
 
 class SmartName < Object
-  RUBY19      = RUBY_VERSION =~ /^1\.9/
-  OK4KEY_RE   = RUBY19 ? '\p{Word}\*' : '\w\*'
+  RUBYENCODING = RUBY_VERSION =~ /^(2|1\.9)/
+  OK4KEY_RE    = RUBYENCODING ? '\p{Word}\*' : '\w\*'
 
   include ActiveSupport::Configurable
 
-  config_accessor :joint, :formal_joint, :name_attribute, :banned_array,
+  config_accessor :joint, :name_attribute, :banned_array,
     :var_re, :uninflect, :params, :codes, :lookup, :session
 
   # Wagny defaults:
   SmartName.joint          = '+'
-  SmartName.formal_joint   = " <span class=\"wiki-joint\">#{SmartName.joint}</span> " #let's get rid of this
   SmartName.banned_array   = [ '/', '~', '|' ]
   SmartName.name_attribute = :cardname
   SmartName.var_re         = /\{([^\}]*\})\}/
@@ -57,7 +56,7 @@ class SmartName < Object
 
   def initialize str
     @s = str.to_s.strip
-    @s = @s.encode('UTF-8') if RUBY19
+    @s = @s.encode('UTF-8') if RUBYENCODING
     @key = if @s.index(SmartName.joint)
         @parts = @s.split(/\s*#{JOINT_RE}\s*/)
         @parts << '' if @s[-1,1] == SmartName.joint

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartname
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3336685085994902956
+      hash: -2297301681558297744
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Wagn names without all the wagn