namelogic 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/name_logic.rb

@@ -29,7 +29,8 @@ class NameLogic < Object
   @@uninflect = SINGULAR
   @@name_attribute = :cardname
   @@main_hash = {:main_name=>''}
-  @@code_hash = defined?(Card) ? Card : {}
+  @@code_hash = defined?(Wagn::Codename) ? Wagn::Codename : {}
+  @@fetch = defined?(Card) ? Card : {}
 
   @@name2nameobject = {}
 
@@ -70,6 +71,8 @@ class NameLogic < Object
     def main_hash=(v)    @@main_hash = v end
     def code_hash()      @@code_hash end
     def code_hash=(v)    @@code_hash = v end
+    def fetch()          @@fetch end
+    def fetch=(v)        @@fetch = v end
   end
 
 
@@ -183,13 +186,14 @@ class NameLogic < Object
       right_key = right_name.key
       !!traitlist.find do |codename|
         #puts "tn? #{codename}, #{traitlist.inspect}, #{@@code_hash[codename]}\n"
-        codecard = @@code_hash[ codename ] and codecard.send(@@name_attribute).key == right_key
+        codecard = @@code_hash[ codename ] and codecard = @@fetch[ codecard ] and
+          codecard.send(@@name_attribute).key == right_key
       end
     end
   end
 
   def trait_name tag_code
-    codecard = @@code_hash[ tag_code ] and 
+    codecard = @@code_hash[ tag_code ] and codecard = @@fetch[ codecard ] and
       [ self, codecard.send(@@name_attribute) ].to_name
   end
 

data/spec/spec_helper.rb

@@ -7,7 +7,8 @@ class CardMock < String
 end
 
 NameLogic.name_attribute= :name
-NameLogic.code_hash= { :content => CardMock.new('*content'), }
+NameLogic.code_hash= { :content => 1 }
+NameLogic.fetch= { 1 => CardMock.new('*content'), }
 
 RSpec.configure do |config|
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namelogic
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &8627700 !ruby/object:Gem::Requirement
+  requirement: &8364180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *8627700
+  version_requirements: *8364180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8626960 !ruby/object:Gem::Requirement
+  requirement: &8363680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *8626960
+  version_requirements: *8363680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &8626380 !ruby/object:Gem::Requirement
+  requirement: &8362820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *8626380
+  version_requirements: *8362820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8625700 !ruby/object:Gem::Requirement
+  requirement: &8377120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *8625700
+  version_requirements: *8377120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &8625120 !ruby/object:Gem::Requirement
+  requirement: &8376200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *8625120
+  version_requirements: *8376200
 description: Wiki Segmented Name Logic
 email: gerryg@inbox.com
 executables: []
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2884976832025103889
+      hash: 2770193618282128559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: