smartname 0.1.2 → 0.1.3

data/Gemfile

@@ -5,7 +5,7 @@ source "http://rubygems.org"
 group :development do
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.0"
+  gem "bundler", "~> 1.1"
   gem "jeweler", "~> 1.8.3"
   #gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,21 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       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)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.7.5)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
+    multi_json (1.3.7)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -32,7 +32,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  bundler (~> 1.1.0)
+  bundler (~> 1.1)
   htmlentities (~> 4.3.0)
   jeweler (~> 1.8.3)
   rdoc (~> 3.12)

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/smart_name.rb

@@ -24,7 +24,7 @@ class SmartName < Object
   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         = /\{([^\}]*})\}/
+  SmartName.var_re         = /\{([^\}]*\})\}/
   SmartName.uninflect      = :singularize
 
   JOINT_RE    = Regexp.escape SmartName.joint
@@ -162,6 +162,8 @@ class SmartName < Object
 
 
     #~~~~~~~~~~~~~~~~~~~ TRAITS / STARS ~~~~~~~~~~~~~~~~~~~
+    
+    #all the below seems pretty wagn-specific
 
   def star?()         simple?   and '*' == s[0,1]               end
   def rstar?()        right     and '*' == right[0,1]           end
@@ -170,15 +172,15 @@ class SmartName < Object
     junction? && begin
       right_key = right_name.key
       !!traitlist.find do |codename|
-        codecard = SmartName.codes[ codename ] and codecard = SmartName.lookup[ codecard ] and
-          codecard.send(SmartName.name_attribute).key == right_key
+        card_id = SmartName.codes[ codename ] and card = SmartName.lookup[ card_id ] and
+          card.send(SmartName.name_attribute).key == right_key
       end
     end
   end
 
   def trait_name tag_code
-    codecard = SmartName.codes[ tag_code ] and codecard = SmartName.lookup[ codecard ] and
-      [ self, codecard.send(SmartName.name_attribute) ].to_name
+    card_id = SmartName.codes[ tag_code ] and card = SmartName.lookup[ card_id ] and
+      [ self, card.send(SmartName.name_attribute) ].to_name
   end
 
   def trait tag_code
@@ -277,7 +279,7 @@ class SmartName < Object
   def self.substitute! str, hash
     hash.keys.each do |var|
       str.gsub! SmartName.var_re do |x| 
-        (v=hash[var.to_sym]).nil? ? x : v
+        hash[var.to_sym]
       end
     end
     str

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartname
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2045740443953383621
+      hash: 553542822797898522
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: