schizo 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.1.2
+	* Allow roles to be namespaced
+
 0.1.1
 	* Updated gemspec info
 

data/README.rdoc

@@ -34,7 +34,7 @@ Dive in...
 
     poster.kind_of?(User)     # => true
     poster.instance_of?(User) # => true
-    
+
     poster.class.name # => "User"
   end
 
@@ -52,8 +52,8 @@ Dive in...
 
 == The Problem
 
-So what's wrong with just using <tt>Object#extend</tt>?  Nothing, until you want to alter an instance's class
-as a side effect of adorning it with a role... which happens often when using ActiveRecord.
+So what's wrong with just using <tt>Object#extend</tt>?  Nothing, until you want to avoid altering an instance's class
+as a side effect of adorning the instance with a role... which happens often when using ActiveRecord.
 
 Consider the following use of DCI and ActiveRecord with plain old <tt>Object#extend</tt>:
 

data/lib/schizo/facade/class_builder.rb

@@ -8,13 +8,26 @@ module Schizo
         @base, @role = base, role
       end
 
+      # Returns a new class derived off of +base+ and namespaced under role.
+      # Ex:
+      #   builder = ClassBuilder.new(User, Poster)
+      #   builder.product                           # => Schizo::Facades::User::Poster
+      #   builder.product.kind_of?(User)            # => true
       def product
-        @product ||= role_class
+        @product ||= begin
+          if container_module.const_defined?(class_name, false)
+            container_module.const_get(class_name)
+          else
+            klass = Class.new(base){ include Base }
+            klass.class_eval(&role.extended_block) if role.extended_block
+            container_module.const_set(class_name, klass)
+          end
+        end
       end
 
     private
 
-      def module_name
+      def base_name
         base.name || "AnonClass#{base.object_id}"
       end
 
@@ -22,29 +35,38 @@ module Schizo
         role.name || "AnonRole#{role.object_id}"
       end
 
+      def full_name
+        @full_name ||= "Schizo::Facades::#{base_name}::#{role_name}"
+      end
+
+      def parsed_full_name
+        @parsed_full_name ||= full_name.split("::")
+      end
+
+      def module_names
+        @container_module_name ||= parsed_full_name[0..-2]
+      end
+
+      def class_name
+        @class_name ||= parsed_full_name[-1]
+      end
+
       def container_module
         @container_module ||= begin
-          if Schizo::Facades.const_defined?(module_name, false)
-            Schizo::Facades.const_get(module_name)
-          else
-            Schizo::Facades.const_set(module_name, Module.new)
+          names = module_names
+          mod = get_or_create_module(Object, names.shift)
+          while not names.empty?
+            mod = get_or_create_module(mod, names.shift)
           end
+          mod
         end
       end
 
-      def role_class
-        @role_class ||= begin
-          if container_module.const_defined?(role_name, false)
-            container_module.const_get(role_name)
-          else
-            container_module.const_set(role_name, build)
-          end
-        end
-      end
-      
-      def build
-        Class.new(base){ include Base }.tap do |klass|
-          klass.class_eval(&role.extended_block) if role.extended_block
+      def get_or_create_module(mod, name)
+        if mod.const_defined?(name, false)
+          mod.const_get(name)
+        else
+          mod.const_set(name, Module.new)
         end
       end
 

data/lib/schizo/version.rb

@@ -1,3 +1,3 @@
 module Schizo #:nodoc:
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/facade/class_builder_spec.rb

@@ -25,6 +25,15 @@ module Schizo
         ClassBuilder.new(base, role)
       end
 
+      it "works with namespaced roles" do
+        role.module_eval do
+          def self.name
+            "Namespaced::Role"
+          end
+        end
+        builder.product.to_s.should == "Schizo::Facades::Foo::Namespaced::Role"
+      end
+
       context "#initialize" do
 
         it "sets base and role" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schizo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70202402544160 !ruby/object:Gem::Requirement
+  requirement: &70253933607880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202402544160
+  version_requirements: *70253933607880
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70202402543320 !ruby/object:Gem::Requirement
+  requirement: &70253933607240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202402543320
+  version_requirements: *70253933607240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70202402542560 !ruby/object:Gem::Requirement
+  requirement: &70253933606580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202402542560
+  version_requirements: *70253933606580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70202402541760 !ruby/object:Gem::Requirement
+  requirement: &70253933605840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202402541760
+  version_requirements: *70253933605840
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70202402706420 !ruby/object:Gem::Requirement
+  requirement: &70253933604920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202402706420
+  version_requirements: *70253933604920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202402705740 !ruby/object:Gem::Requirement
+  requirement: &70253933604120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202402705740
+  version_requirements: *70253933604120
 description: DCI (data, context and interaction) for Ruby / Rails / ActiveRecord
 email:
 - cjbottaro@alumni.cs.utexas.edu
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -910995716218782308
+      hash: -2531469905963506492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -910995716218782308
+      hash: -2531469905963506492
 requirements: []
 rubyforge_project: schizo
 rubygems_version: 1.8.11