typecollection 0.0.3 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.7

data/lib/typecollection/base.rb

@@ -13,6 +13,17 @@ module TypeCollection
         raise TypeCollection::UnknownChildType.new() unless (mems.has_key?(type))
         return mems[type]
       end
+      # Get similar type based on the object passed in which can be a String, 
+      # Object (using the inferred type), or Class
+      def get_associated_type(associate)
+        if (!associate.kind_of?(String))
+          if (!associate.kind_of?(Class))
+            associate = associate.class
+          end
+          associate = associate.inferred_type()
+        end
+        return self.get_type(associate)
+      end
     end
     
     def self.included(base)

data/lib/typecollection/class+inferred_type.rb

@@ -1,18 +1,14 @@
 class Class
   def inferred_type()
-    if (!defined?(@__tc_inferred_type))
-      klass_name   = self.name.split("::").last
-      parent_klass = self.superclass
-      while(parent_klass != nil)
-        check = parent_klass.name.split("::").last
-        if (klass_name.end_with?(check))
-          @__tc_inferred_type = klass_name.gsub(/#{check}\z/, "")
-          break
-        end
-        parent_klass = parent_klass.superclass
+    klass_name   = self.name.split("::").last
+    parent_klass = self.superclass
+    while(parent_klass != nil)
+      check = parent_klass.name.split("::").last
+      if (klass_name.match(check))
+        return klass_name.gsub(check, "")
       end
-      @__tc_inferred_type = nil
+      parent_klass = parent_klass.superclass
     end
-    return @__tc_inferred_type
+    return nil
   end
 end

data/lib/typecollection/class_methods.rb

@@ -14,18 +14,6 @@ module TypeCollection
     # Contains the Members mapped by type
     def __tc_members(); @_members ||= { }; end
     
-    # Get similar type based on the object passed in which can be a String, 
-    # Object (using the inferred type), or Class
-    def get_associated_type(associate)
-      if (!associate.kind_of?(String))
-        if (!associate.kind_of?(Class))
-          associate = associate.class
-        end
-        associate = associate.inferred_type()
-      end
-      return self.get_type(associate)
-    end
-    
     # Overrides the default behavior when being extended by a child class.
     # It ensures the child is mapped for future retrieval and checks the
     # subclass name to ensure it is a valid one

data/test/test_typecollection.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 # => Define a Type Collection
 class SomeType
-  include TypeCollection
+  include TypeCollection::Base
 end
 # => Extend that Type Collection
 class ExtendedSomeType < SomeType
@@ -13,7 +13,7 @@ class TestTypecollection < Test::Unit::TestCase
   should "Function inside packages" do
     # => Define a Type Collection
     class SomeType
-      include TypeCollection
+      include TypeCollection::Base
     end
     # => Extend that Type Collection
     class ExtendedSomeType < TestTypecollection::SomeType

data/typecollection.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "typecollection"
-  s.version = "0.0.3"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Petty"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typecollection
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70345819384440 !ruby/object:Gem::Requirement
+  requirement: &70276684879360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345819384440
+  version_requirements: *70276684879360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70345819382800 !ruby/object:Gem::Requirement
+  requirement: &70276684878260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70345819382800
+  version_requirements: *70276684878260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70345819374820 !ruby/object:Gem::Requirement
+  requirement: &70276684877420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70345819374820
+  version_requirements: *70276684877420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70345819373620 !ruby/object:Gem::Requirement
+  requirement: &70276684876720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345819373620
+  version_requirements: *70276684876720
 description: Easily map subtypes into their parent type for later retrieval
 email: jp@jibe.com
 executables: []
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1935067382157549222
+      hash: -1304574825924315228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: