schizo 0.1.3 → 0.2.0

data/.travis.yml

@@ -1,10 +1,7 @@
-rvm:
-  - 1.9.2
-  - 1.9.3
-gemfiles:
-  - .gemfiles/Gemfile.activerecord-3.2
-  - Gemfile
 matrix:
+  exclude:
+    - rvm: ""
+      gemfile: ""
   include:
     - rvm: 1.9.2
       gemfile: .gemfiles/Gemfile.activerecord-3.2

data/CHANGELOG

@@ -1,11 +1,14 @@
+0.2.0
+  * Support for ActiveSupport::Concern
+
 0.1.3
   * Specify multiple roles as argument list to #as (andriytyurnikov)
 
 0.1.2
-	* Allow roles to be namespaced
+  * Allow roles to be namespaced
 
 0.1.1
-	* Updated gemspec info
+  * Updated gemspec info
 
 0.1.0
-	* Initial release
+  * Initial release

data/README.rdoc

@@ -162,6 +162,19 @@ Alternatively...
     end
   end
 
+== ActiveSupport::Concern
+
+You can use <tt>ActiveSupport::Concern</tt> instead of <tt>Schizo::Role</tt>
+
+  module Baz
+    extend ActiveSupport::Concern
+    def something; end
+  end
+  
+  foo = Foo.new
+  baz = foo.as(Baz)
+  baz.something
+
 == Documentation
 
 {\http://doc.stochasticbytes.com/schizo/index.html}[http://doc.stochasticbytes.com/schizo/index.html]

data/lib/schizo/facade/class_builder.rb

@@ -19,7 +19,11 @@ module Schizo
             container_module.const_get(class_name)
           else
             klass = Class.new(base){ include Base }
-            klass.class_eval(&role.extended_block) if role.extended_block
+            if defined?(ActiveSupport::Concern) and role.is_a?(ActiveSupport::Concern)
+              klass.send :include, role
+            elsif role.is_a?(Schizo::Role)
+              klass.class_eval(&role.extended_block) if role.extended_block
+            end
             container_module.const_set(class_name, klass)
           end
         end

data/lib/schizo/facade/object_builder.rb

@@ -35,11 +35,15 @@ module Schizo
           # its role into facade we're building.
           previous_facade = object
           while previous_facade.respond_to?(:dci)
-            facade.extend(previous_facade.dci.role)
+            if previous_facade.dci.role.is_a?(Schizo::Role)
+              facade.extend(previous_facade.dci.role)
+            end
             previous_facade = previous_facade.dci.object
           end
-
-          facade.extend(role)
+          
+          if role.is_a?(Schizo::Role)
+            facade.extend(role)
+          end
           Schizo::Facade.copy_instance_variables(object, facade)
         end
       end

data/lib/schizo/version.rb

@@ -1,3 +1,3 @@
 module Schizo #:nodoc:
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/facade/class_builder_spec.rb

@@ -21,17 +21,38 @@ module Schizo
         end
       end
 
+      let(:concern) do
+        Module.new do
+          extend ActiveSupport::Concern
+          included do
+            @test_concern_var = 1
+          end
+        end
+      end
+
       let(:builder) do
         ClassBuilder.new(base, role)
       end
 
+      let(:builder_concern) do
+        ClassBuilder.new(base, concern)
+      end
+
       it "works with namespaced roles" do
         role.module_eval do
           def self.name
             "Namespaced::Role"
           end
         end
+
+        concern.module_eval do
+          def self.name
+            "Namespaced::Concern"
+          end
+        end
+
         builder.product.to_s.should == "Schizo::Facades::Foo::Namespaced::Role"
+        builder_concern.product.to_s.should == "Schizo::Facades::Foo::Namespaced::Concern"
       end
 
       context "#initialize" do
@@ -39,6 +60,9 @@ module Schizo
         it "sets base and role" do
           builder.base.should == base
           builder.role.should == role
+          
+          builder_concern.base.should == base
+          builder_concern.role.should == concern
         end
 
       end
@@ -51,6 +75,12 @@ module Schizo
             facade.ancestors.should include(base)
             facade.ancestors.should include(Base)
           end
+
+          builder_concern.product.tap do |facade|
+            facade.should be_a(Class)
+            facade.ancestors.should include(base)
+            facade.ancestors.should include(Base)
+          end
         end
 
       end

data/spec/facade/class_spec.rb

@@ -20,6 +20,19 @@ module Schizo
         end
       end
 
+      let(:concern) do
+        Module.new do
+          extend ActiveSupport::Concern
+          included do
+            @test_concern_var = 1
+          end
+        end
+      end
+
+      let(:concern_builder) do
+        ClassBuilder.new(base, concern)
+      end
+
       let(:builder) do
         ClassBuilder.new(base, role)
       end
@@ -28,26 +41,35 @@ module Schizo
         builder.product
       end
 
+      let(:concern_facade) do
+        concern_builder.product
+      end
+
       it "has the same #name as its superclass" do
         facade.name.should == "Foo"
+        concern_facade.name.should == "Foo"
         base.name.should == "Foo"
       end
 
       it "#initialize has arity == 2" do
         base.instance_method(:initialize).arity.should < 2
         facade.instance_method(:initialize).arity.should == 2
+        concern_facade.instance_method(:initialize).arity.should == 2
       end
 
       it "has class evaled the extended block of the role" do
         facade.should be_instance_variable_defined(:@test_var)
+        concern_facade.should be_instance_variable_defined(:@test_concern_var)
       end
 
       it "is defined in Schizo::Facades" do
         facade.should == Schizo::Facades.const_get(base.name).const_get("AnonRole#{role.object_id}")
+        concern_facade.should == Schizo::Facades.const_get(base.name).const_get("AnonRole#{concern.object_id}")
       end
 
       it "is a singleton" do
         facade.object_id.should == ClassBuilder.new(base, role).product.object_id
+        concern_facade.object_id.should == ClassBuilder.new(base, concern).product.object_id
       end
 
     end

data/spec/facade/object_builder_spec.rb

@@ -19,6 +19,15 @@ module Schizo
         end
       end
 
+      let(:concern) do
+        Module.new do
+          extend ActiveSupport::Concern
+          def bar(v)
+            @bar = v
+          end
+        end
+      end
+
       let(:object) do
         base.new
       end
@@ -27,11 +36,18 @@ module Schizo
         ObjectBuilder.new(object, role)
       end
 
+      let(:concern_builder) do
+        ObjectBuilder.new(object, concern)
+      end
+
       context "#initialize" do
 
         it "sets object and role" do
           builder.object.should == object
           builder.role.should == role
+
+          concern_builder.object.should == object
+          concern_builder.role.should == concern
         end
 
       end
@@ -41,6 +57,9 @@ module Schizo
         it "returns a facade object" do
           builder.product.should be_a(base)
           builder.product.should be_instance_of(base)
+
+          concern_builder.product.should be_a(base)
+          concern_builder.product.should be_instance_of(base)
         end
 
       end

data/spec/facade/object_spec.rb

@@ -19,6 +19,15 @@ module Schizo
         end
       end
 
+      let(:concern) do
+        Module.new do
+          extend ActiveSupport::Concern
+          def baz(v)
+            @baz = v
+          end
+        end
+      end
+
       let(:object) do
         base.new
       end
@@ -27,22 +36,35 @@ module Schizo
         ObjectBuilder.new(object, role)
       end
 
+      let(:concern_builder) do
+        ObjectBuilder.new(object, concern)
+      end
+
       let(:facade) do
         builder.product
       end
 
+      let(:concern_facade) do
+        concern_builder.product
+      end
+
       it "is not the same as the original object" do
         facade.should_not == object
+        concern_facade.should_not == object
       end
 
       it "responds to methods defined in its role" do
         facade.should respond_to(:bar)
+        concern_facade.should respond_to(:baz)
       end
 
       it "calling methods should not affect original object" do
         facade.bar("test")
         facade.instance_variable_get(:@bar).should == "test"
+        concern_facade.baz("test")
+        concern_facade.instance_variable_get(:@baz).should == "test"
         object.instance_variable_get(:@bar).should be_nil
+        object.instance_variable_get(:@baz).should be_nil
       end
 
       context "#actualize" do
@@ -50,14 +72,19 @@ module Schizo
         before(:all) do
           facade.bar("blah")
           facade.actualize
+
+          concern_facade.baz("blah")
+          concern_facade.actualize
         end
 
         it "returns the original object" do
           facade.actualize.should == object
+          concern_facade.actualize.should == object
         end
 
         it "sets instance variables in the original object" do
           object.instance_variable_get(:@bar).should == "blah"
+          object.instance_variable_get(:@baz).should == "blah"
         end
 
         it "does not set any internal dci instance variables" do

data/spec/nested_spec.rb

@@ -25,7 +25,7 @@ describe "a nested facade for ClassA with RoleA, RoleB and RoleC" do
 
   let(:role_c) do
     Module.new do
-      extend Schizo::Role
+      extend ActiveSupport::Concern
       def set_baz; @baz = "baz"; end
     end
   end

metadata

@@ -2,14 +2,14 @@
 name: schizo
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Christopher J. Bottaro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3318887318708841529
+      hash: -1275366458980579646
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3318887318708841529
+      hash: -1275366458980579646
       version: '0'
   none: false
 requirements: []