typecollection 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/typecollection/base.rb

@@ -0,0 +1,23 @@
+module TypeCollection
+  module Base
+    
+    module BaseClassMethods
+      # Returns all of the known subclass names for this collection
+      def all_type_names(); return __tc_members().keys(); end
+      # Returns all of the known subclasses for this collection
+      def all_types(); return __tc_members().values(); end
+      # Gets the type associated with the provided value (Class or Otherwise)
+      def get_type(type)
+        type = type.inferred_type() if (type.kind_of?(Class))
+        mems = __tc_members()
+        raise TypeCollection::UnknownChildType.new() unless (mems.has_key?(type))
+        return mems[type]
+      end
+    end
+    
+    def self.included(base)
+      base.extend(TypeCollection::ClassMethods)
+      base.extend(TypeCollection::Base::BaseClassMethods)
+    end
+  end
+end

data/lib/typecollection/class+inferred_type.rb

@@ -1,14 +1,18 @@
 class Class
   def 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))
-        return klass_name.gsub(/#{check}\z/, "")
+    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
       end
-      parent_klass = parent_klass.superclass
+      @__tc_inferred_type = nil
     end
-    return nil
+    return @__tc_inferred_type
   end
 end

data/lib/typecollection/class_methods.rb

@@ -14,17 +14,16 @@ module TypeCollection
     # Contains the Members mapped by type
     def __tc_members(); @_members ||= { }; end
     
-    # Returns all of the known subclasses for this collection
-    def all_types()
-      return __tc_members().values()
-    end
-    
-    # Gets the type associated with the provided value (Class or Otherwise)
-    def get_type(type)
-      type = type.inferred_type() if (type.kind_of?(Class))
-      mems = __tc_members()
-      raise TypeCollection::UnknownChildType.new() unless (mems.has_key?(type))
-      return mems[type]
+    # 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.
@@ -34,7 +33,9 @@ module TypeCollection
       super if (defined?(super))
       type = child.inferred_type()
       if (type.nil?)
-        error = "Invalid Name: #{child.name}! Child class names must end with \"#{self.name}\"."
+        cname = child.name.split("::").last
+        pname = self.name.split("::").last
+        error = "Invalid Name: #{ cname }! Child class names must end with \"#{ pname }\"."
         raise TypeCollection::InvalidChildType.new(error)
       end
       __tc_members()[type] = child

data/lib/typecollection.rb

@@ -1,11 +1,8 @@
 require 'typecollection'
 require 'typecollection/class+inferred_type'
 require 'typecollection/class_methods'
+require 'typecollection/base'
 
 module TypeCollection
-  # The intended means to use a TypeCollection is to include TypeCollection
-  # in your class definition.
-  def self.included(base)
-    base.extend(TypeCollection::ClassMethods)
-  end
+
 end

data/test/test_typecollection.rb

@@ -1,19 +1,36 @@
 require 'helper'
 
+# => Define a Type Collection
+class SomeType
+  include TypeCollection
+end
+# => Extend that Type Collection
+class ExtendedSomeType < SomeType
+  
+end
+
 class TestTypecollection < Test::Unit::TestCase
-  should "Actually Function" do
-    require 'typecollection'
+  should "Function inside packages" do
     # => Define a Type Collection
     class SomeType
       include TypeCollection
     end
     # => Extend that Type Collection
-    class ExtendedSomeType < SomeType
+    class ExtendedSomeType < TestTypecollection::SomeType
       
     end
     # => Ensure it can be retrieved
-    unless (SomeType.all_types().length == 1 and SomeType.get_type("Extended") == ExtendedSomeType)
-      flunk "Failed to Register Extended with SomeType!" 
+    
+    unless (TestTypecollection::SomeType.all_types().length == 1 and 
+              TestTypecollection::SomeType.get_type("Extended") == TestTypecollection::ExtendedSomeType)
+      flunk "Failed to Register TestTypecollection::Extended with TestTypecollection::SomeType!" 
+    end
+  end
+  
+  should "Function outside packages" do
+    unless(SomeType.all_types().length == 1 and
+            SomeType.get_type(ExtendedSomeType) == ExtendedSomeType)
+      raise "Failed to register ExtendedSomeType with SomeType!"
     end
   end
 end

data/typecollection.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "typecollection"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Petty"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/typecollection.rb",
+    "lib/typecollection/base.rb",
     "lib/typecollection/class+inferred_type.rb",
     "lib/typecollection/class_methods.rb",
     "test/helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typecollection
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   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: &70319050220100 !ruby/object:Gem::Requirement
+  requirement: &70345819384440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319050220100
+  version_requirements: *70345819384440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70319050215500 !ruby/object:Gem::Requirement
+  requirement: &70345819382800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70319050215500
+  version_requirements: *70345819382800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70319050210820 !ruby/object:Gem::Requirement
+  requirement: &70345819374820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70319050210820
+  version_requirements: *70345819374820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70319050200520 !ruby/object:Gem::Requirement
+  requirement: &70345819373620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319050200520
+  version_requirements: *70345819373620
 description: Easily map subtypes into their parent type for later retrieval
 email: jp@jibe.com
 executables: []
@@ -70,6 +70,7 @@ files:
 - Rakefile
 - VERSION
 - lib/typecollection.rb
+- lib/typecollection/base.rb
 - lib/typecollection/class+inferred_type.rb
 - lib/typecollection/class_methods.rb
 - test/helper.rb
@@ -90,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -698932350453145529
+      hash: -1935067382157549222
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: