y_support 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e5d5e63041346d0129e1ddbd75122c7e878cf92
-  data.tar.gz: b7b2e14abfcac7f070cb3b4a0a264c2086f73bd1
+  metadata.gz: f967a550973926b2ab9ad6d5df847b29bad6a27d
+  data.tar.gz: 95ad37737fff575a53db65f9da4ed829d58f8ccb
 SHA512:
-  metadata.gz: 771724a6d0d9c63655ef996443d1861f3c0cb59d94516393f3d7689669c860f6889fa4bf0cdb1673dda77fdfb6bb2498483cdce8b39e97db55ca8727c827c4e1
-  data.tar.gz: 0f4502be79ac39d5415ee965dab65419b58cb5b6dad5d76f646bc1037ba9ae01a65e9c0ad615d9bf584683e70ceb0c7ee21ad939d34842b0b436ad977759eb22
+  metadata.gz: ce8b98cfbc46430bde6d324045772e34ded7791a4fcb8470b71ebd9f01825bcc48f68afcf0670f28b70c728201b48acef96ac72cb4f2bbee8031f9da2200880d
+  data.tar.gz: 6709e08ebd27dcdd0202239ab4a00197bd2978353b7b6f1b2894dd6832ac18ac8288d4a7a5ceb6e0787561961d8462b4ecd316150ddbee7c9927f1af93af97ed

data/lib/y_support/name_magic.rb

@@ -135,7 +135,7 @@ module NameMagic
     # 
     def instances
       const_magic
-      __instances__.keys
+      __instances__.keys.select { |i| i.kind_of? self }
     end
 
     # Presents an array of all the instance names (disregarding anonymous
@@ -148,14 +148,14 @@ module NameMagic
     # Presents class-owned @instances without const_magic.
     # 
     def __instances__
-      namespace.instance_variable_get( :@instances ) or
+      namespace.instance_variable_get( :@instances ) ||
         namespace.instance_variable_set( :@instances, {} )
     end
 
     # Presents class-owned @avid_instances (no const_magic).
     # 
     def __avid_instances__
-      namespace.instance_variable_get( :@avid_instances ) or
+      namespace.instance_variable_get( :@avid_instances ) ||
         namespace.instance_variable_set( :@avid_instances, [] )
     end
 
@@ -167,26 +167,23 @@ module NameMagic
       self
     end
 
-    # Returns an instance identiified by the argument. NameError is raised, if
+    # Returns the instance identified by the argument. NameError is raised, if
     # the argument does not identify an instance. (It can be an instance name
-    # as string, symbol, or an instance itself, in which case it is merely
-    # returned without changes.)
+    # as string, symbol, or an instance itself, in which case, the instance in
+    # question is merely returned without changes.)
     # 
     def instance arg
-      const_magic
-      # Reject nil argument. (In @instances hash, nameless instances are given
-      # name nil, so 'nil' cannot be a real name.)
-      fail TypeError, "'nil' is not a valid argument type for " +
-        "NameMagic#instance method!" if arg.nil?
+      # In @instances hash, name 'nil' means nameless!
+      msg = "'nil' is not a valid argument type for NameMagic#instance method!"
+      fail TypeError, msg if arg.nil?
       # if the argument is an actual instance, just return it
-      return arg if __instances__.keys.include? arg
-      # otherwise, treat it as name
-      r = begin
-            __instances__.rassoc( arg ) || __instances__.rassoc( arg.to_sym )
-          rescue NoMethodError
-          end or
-        raise NameError, "No instance #{arg} in #{namespace}."
-      return r[0]
+      ii = instances
+      return arg if ii.include? arg
+      # otherwise, assume arg is a name
+      begin
+        ii.find { |i| i.name == arg || i.name == arg.to_sym }
+      rescue NoMethodError
+      end or raise NameError, "No instance #{arg} in #{namespace}."
     end
 
 

data/lib/y_support/version.rb

@@ -1,3 +1,3 @@
 module YSupport
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y_support
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - boris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport