dci-rails 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/dci-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dci-rails}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Jackson"]
-  s.date = %q{2011-09-16}
+  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.extra_rdoc_files = [

data/lib/controller/dsl.rb

@@ -9,13 +9,17 @@ module DCI
         def extend_resource(resource_method, *extensions)
           class_eval do
             extensions.each do |extension|
-              define_method("#{resource_method}_with_#{extension}") do
-                send("#{resource_method}_without_#{extension}").tap do |obj|
+              with_method = "#{resource_method}_with_#{extension}"
+              without_method = "#{resource_method}_without_#{extension}"
+
+              define_method(with_method) do |*args|
+                instance_variable_get("@#{with_method}") || send(without_method, *args).tap do |obj|
                   obj.extend(extension)
+                  instance_variable_set("@#{with_method}", obj)
                 end
               end
-              alias_method "#{resource_method}_without_#{extension}", resource_method
-              alias_method resource_method, "#{resource_method}_with_#{extension}"
+              alias_method without_method, resource_method
+              alias_method resource_method, with_method
             end
           end
         end

data/spec/controller/dsl_spec.rb

@@ -32,6 +32,33 @@ describe "DCI::Controller::DSL" do
         controller.resource.should respond_to(:extended_with_TestExtension2)
         controller.resource.should respond_to(:extended_with_TestExtension3)
       end
+
+      it "passes arguments through to the original resource method" do
+        resource_args = ["arg1", "arg2"]
+
+        controller.stub(:resource) do |*args|
+          args.should == resource_args
+          resource
+        end
+
+        (class << controller; self; end).instance_eval do
+          extend_resource :resource, TestExtension1
+        end
+
+        controller.resource(*resource_args).should respond_to(:extended_with_TestExtension1)
+      end
+
+      it "only extends the resource once" do
+        controller.resource = resource
+
+        resource.should_receive(:extend).once
+
+        (class << controller; self; end).instance_eval do
+          extend_resource :resource, TestExtension1
+        end
+
+        5.times { controller.resource }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dci-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000 -05:00
+date: 2011-09-19 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70258847961740 !ruby/object:Gem::Requirement
+  requirement: &70170204775520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70258847961740
+  version_requirements: *70170204775520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70258847961100 !ruby/object:Gem::Requirement
+  requirement: &70170204774960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70258847961100
+  version_requirements: *70170204774960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70258847960460 !ruby/object:Gem::Requirement
+  requirement: &70170204774380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70258847960460
+  version_requirements: *70170204774380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70258847959820 !ruby/object:Gem::Requirement
+  requirement: &70170204773380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70258847959820
+  version_requirements: *70170204773380
 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: []
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4225227550041907610
+      hash: 3087653526277293251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: