typecollection 0.0.10 → 0.0.11

data/Rakefile

@@ -35,12 +35,3 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "typecollection #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/typecollection/base.rb

@@ -1,6 +1,8 @@
 module TypeCollection
+  NAME_DECOMPOSER = /(^|(?<namespace>.*):{2})(?<constant>[^:]+)$/
+  class << self; attr_accessor :create_unknown_types; end
+
   module Base
-    
     module BaseClassMethods
       # Returns all of the known subclass names for this collection
       def all_type_names(); return __tc_members().keys(); end
@@ -13,19 +15,48 @@ module TypeCollection
         raise TypeCollection::UnknownChildType.new("Unregistered type: #{type}") unless (mems.has_key?(type))
         return mems[type]
       end
-      # Get similar type based on the object passed in which can be a String, 
+      # Creates the type associated with the provided value (Class or Otherwise)
+      def generate_type(type)
+        type = type.inferred_type() if (type.kind_of?(Class))
+        root = __tc_collection_root()
+
+        name = TypeCollection::NAME_DECOMPOSER.match(root.name)
+
+        new_type = Class.new(root)
+        new_type_name = type + name[:constant]
+
+        # Back away.  Just BACK. AWAY.
+        #
+        # We need to take this new class we've just created here
+        # and assign it to a constant in the same namespace as its
+        # collection root.  That may be the global namespace.
+        # This mess accomplishes that.
+        ::Kernel.instance_exec(new_type, &eval("->(klass){ #{name[:namespace]}::#{new_type_name} = klass }"))
+
+        root.__tc_register_member(new_type)
+        new_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)
+      def get_associated_type(associate, create_if_unknown=TypeCollection.create_unknown_types)
         if (!associate.kind_of?(String))
           if (!associate.kind_of?(Class))
             associate = associate.class
           end
           associate = associate.inferred_type()
         end
-        return self.get_type(associate)
+        begin
+          self.get_type(associate)
+        rescue TypeCollection::UnknownChildType => uct
+          if create_if_unknown
+            self.generate_type(associate)
+          else
+            raise
+          end
+        end
       end
     end
-    
+
     def self.included(base)
       base.extend(TypeCollection::ClassMethods)
       base.extend(TypeCollection::Base::BaseClassMethods)

data/lib/typecollection/class+inferred_type.rb

@@ -1,14 +1,15 @@
 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.match(check))
-        return klass_name.gsub(check, '')
-      end
-      parent_klass = parent_klass.superclass
+  def __tc_collection_root()
+    root = self
+    while root.superclass && root.superclass.include?(TypeCollection::Base)
+      root = root.superclass
     end
-    return nil
+    root
+  end
+
+  def inferred_type()
+    klass_name = self.name.split("::").last
+    root_name = __tc_collection_root.name.split("::").last
+    klass_name.gsub(root_name, "")
   end
-end
+end

data/lib/typecollection/class_methods.rb

@@ -3,30 +3,37 @@ module TypeCollection
   # fails to comply with the correct naming convention for TypeCollection
   # to function properly
   class InvalidChildType < StandardError; end
-  
+
   # Indicates that a request has been made to retrieve a child type that
   # is not currently registered with the type collection
   class UnknownChildType < StandardError; end
-  
+
   # Extended by TypeCollections to provide class level functionality (almost
   # all functionality is class level as of the current design)
   module ClassMethods
     # Contains the Members mapped by type
     def __tc_members(); @_members ||= { }; 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
-    def inherited(child)
-      super if (defined?(super))
+
+    # Registers a member
+    def __tc_register_member(child)
       type = child.inferred_type()
       if (type.nil?)
         cname = child.name.split("::").last
         pname = self.name.split("::").last
-        error = "Invalid Name: #{ cname }! Child class names must end with \"#{ pname }\"."
+        error = "Invalid name: '#{cname}'! Child class names must end with '#{pname}'."
         raise TypeCollection::InvalidChildType.new(error)
       end
       __tc_members()[type] = child
     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
+    def inherited(child)
+      super if (defined?(super))
+      unless child.name.nil?
+        __tc_collection_root.__tc_register_member(child)
+      end
+    end
   end
-end
+end

data/typecollection.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "typecollection"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Petty"]
-  s.date = "2012-08-13"
+  s.date = "2013-04-04"
   s.description = "Easily map subtypes into their parent type for later retrieval"
   s.email = "jp@jibe.com"
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pettyjamesm/TypeCollection"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "TypeCollection maintains a record of sub-types for a given class based on a common suffix."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typecollection
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 110654369381516186
+      hash: 160659592697084515
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: TypeCollection maintains a record of sub-types for a given class based on