dci-rails 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/dci-rails.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dci-rails}
-  s.version = "0.1.3"
+  s.name = "dci-rails"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Jackson"]
-  s.date = %q{2011-09-19}
-  s.description = %q{helpers for rails to implement DCI pattern (http://andrzejonsoftware.blogspot.com/2011/02/dci-and-rails.html)}
-  s.email = %q{nate.d.jackson@gmail.com}
+  s.date = "2012-03-27"
+  s.description = "helpers for rails to implement DCI pattern (http://andrzejonsoftware.blogspot.com/2011/02/dci-and-rails.html)"
+  s.email = "nate.d.jackson@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -35,11 +35,11 @@ Gem::Specification.new do |s|
     "spec/role_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/njackson/dci-rails}
+  s.homepage = "http://github.com/njackson/dci-rails"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{DCI helpers for Rails}
+  s.rubygems_version = "1.8.10"
+  s.summary = "DCI helpers for Rails"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/role.rb

@@ -5,13 +5,22 @@ module DCI
     end
 
     module ModuleMethods
-      def extended_metaclass_eval(&block)
-        (class << self; self; end).instance_eval do
+      def extended_singleton_class_eval(&block)
+        singleton_class_for(self).instance_eval do
           define_method("extended") do |obj|
-            (class << obj; self; end).instance_eval(&block)
+            singleton_class_for(obj).instance_eval(&block)
           end
         end
       end
+
+      private
+      def singleton_class_for(obj)
+        if obj.respond_to?(:singleton_class)
+          obj.singleton_class
+        else
+          class << obj; self; end
+        end
+      end
     end
   end
 end

data/spec/role_spec.rb

@@ -1,32 +1,28 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-class DCI::TestModel
-  class << self
-    attr_accessor :model_class_method_invoked
-    def model_class_method
-      self.model_class_method_invoked = true
-    end
-  end
-end
+class DCI::TestModel; end
 
 module DCI::TestRole
   include DCI::Role
 
-  extended_metaclass_eval do
+  extended_singleton_class_eval do
     self.model_class_method
   end
 end
 
 describe DCI::Role do
   let(:instance) { DCI::TestModel.new }
+  let(:other_instance) { DCI::TestModel.new }
+  let(:instance_singleton_class) { class << instance; self; end }
+  let(:other_instance_singleton_class) { class << other_instance; self; end }
 
   context "mixed into a model class" do
     describe "#extended_metaclass_eval" do
       it "invokes the block on the extended object's metaclass" do
-        instance.extend(DCI::TestRole)
+        instance_singleton_class.should_receive(:model_class_method)
+        other_instance_singleton_class.should_not_receive(:model_class_method)
 
-        (class << instance; self; end).model_class_method_invoked.should be_true
-        DCI::TestModel.model_class_method_invoked.should be_false
+        instance.extend(DCI::TestRole)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dci-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000 -05:00
-default_executable: 
+date: 2012-03-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170204775520 !ruby/object:Gem::Requirement
+  requirement: &70238709718080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70170204775520
+  version_requirements: *70238709718080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70170204774960 !ruby/object:Gem::Requirement
+  requirement: &70238709717320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70170204774960
+  version_requirements: *70238709717320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70170204774380 !ruby/object:Gem::Requirement
+  requirement: &70238709716400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70170204774380
+  version_requirements: *70238709716400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70170204773380 !ruby/object:Gem::Requirement
+  requirement: &70238709702880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170204773380
+  version_requirements: *70238709702880
 description: helpers for rails to implement DCI pattern (http://andrzejonsoftware.blogspot.com/2011/02/dci-and-rails.html)
 email: nate.d.jackson@gmail.com
 executables: []
@@ -81,7 +80,6 @@ files:
 - spec/controller/dsl_spec.rb
 - spec/role_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/njackson/dci-rails
 licenses:
 - MIT
@@ -97,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3087653526277293251
+      hash: -4550488307404058322
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DCI helpers for Rails