spicycode-micronaut-rails 0.1.7.0 → 0.1.7.1

data/lib/micronaut/rails/configuration.rb

@@ -27,13 +27,16 @@ module Micronaut
         when /mocha/i
           require 'micronaut/rails/mocking/with_mocha'
           ::Micronaut.configuration.include(::Micronaut::Rails::Mocking::WithMocha, filter_options)
+         when /rr/i
+          require 'micronaut/rails/mocking/with_rr'
+          ::Micronaut.configuration.include(::Micronaut::Rails::Mocking::WithRR, filter_options)
         end
       end
       
       def enable_reasonable_defaults!
-        enable_active_record_transactional_support :describes => lambda { |dt| dt < ::ActiveRecord::Base }
-        enable_helper_support :describes => lambda { |dt| dt.to_s.ends_with?('Helper') }
-        enable_controller_support :describes => lambda { |dt| dt < ::ActionController::Base }
+        enable_active_record_transactional_support :behaviour => { :describes => lambda { |dt| dt < ::ActiveRecord::Base } }
+        enable_helper_support :behaviour => { :describes => lambda { |dt| dt.to_s.ends_with?('Helper') } }
+        enable_controller_support :behaviour => { :describes => lambda { |dt| dt < ::ActionController::Base } }
         enable_rails_specific_mocking_extensions
       end
       

data/lib/micronaut/rails/controllers.rb

@@ -97,8 +97,6 @@ module Micronaut
           @response.session = @request.session
         end
 
-
-
       end
 
     end

data/lib/micronaut/rails/mocking/model_stubber.rb

@@ -0,0 +1,24 @@
+module Micronaut
+  module Rails
+    module Mocking
+
+      module ModelStubber
+
+        def connection
+          raise MicronautRails::IllegalDataAccessException.new("stubbed/mocked models are not allowed to access the database")
+        end
+
+        def new_record?
+          id.nil?
+        end
+
+        def as_new_record
+          self.id = nil
+          self
+        end
+
+      end
+
+    end
+  end
+end

data/lib/micronaut/rails/mocking/with_mocha.rb

@@ -3,29 +3,12 @@ module Micronaut
     module Mocking
       module WithMocha
 
-        module ModelStubber
-
-          def connection
-            raise MicronautRails::IllegalDataAccessException.new("stubbed models are not allowed to access the database")
-          end
-
-          def new_record?
-            id.nil?
-          end
-
-          def as_new_record
-            self.id = nil
-            self
-          end
-
-        end
-
         def stub_model(model_class, params = {})
           params = params.dup
           model = model_class.new
           model.id = params.delete(:id) || next_id
 
-          model.extend ModelStubber
+          model.extend Micronaut::Rails::Mocking::ModelStubber
           params.keys.each do |prop|
             model[prop] = params.delete(prop) if model.has_attribute?(prop)
           end

data/lib/micronaut/rails/mocking/with_rr.rb

@@ -0,0 +1,44 @@
+module Micronaut
+  module Rails
+    module Mocking
+      
+      module WithRR
+        # Creates a mock object instance for a +model_class+ with common
+        # methods stubbed out. Additional methods may be easily stubbed (via
+        # add_stubs) if +stubs+ is passed.
+        def mock_or_stub_model(model_class, mock_or_stub, options = {})
+          model = model_class.new
+          model.extend Micronaut::Rails::Mocking::ModelStubber
+          model_id = next_id
+
+          stub(errors_stub = Object.new).count.returns(0)
+          full_params = { :id => model_id, :new_record? => false, :errors => errors_stub }.update(options)
+          
+          full_params.each do |method, value|
+            eval "#{mock_or_stub}(model).#{method}.returns(value)", binding, __FILE__, __LINE__
+          end
+          
+          yield model if block_given?
+          model
+        end
+        
+        def mock_model(model_class, options = {})
+          mock_or_stub_model(model_class, 'mock', options)
+        end
+
+        def stub_model(model_class, options = {})
+          mock_or_stub_model(model_class, 'stub', options)
+        end
+        
+        private
+        
+        @@model_id = 1000
+        def next_id
+          @@model_id += 1
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/micronaut/rails/version.rb

@@ -4,7 +4,7 @@ module Micronaut
       MAJOR = 0
       MINOR = 1
       TINY  = 7
-      MINISCULE = 0
+      MINISCULE = 1
       
       STRING = [MAJOR, MINOR, TINY, MINISCULE].join('.')
 

data/lib/micronaut-rails.rb

@@ -8,20 +8,12 @@ require 'micronaut/rails/version'
 require 'micronaut/rails/helpers'
 require 'micronaut/rails/controllers'
 require 'micronaut/rails/extensions/active_record'
+require 'micronaut/rails/mocking/model_stubber'
 
 module Micronaut
   module Rails
     class IllegalDataAccessException < StandardError; end
 
-    def self.include_in(config)
-      if config.mock_framework.to_s =~ /mocha/i
-        require 'micronaut/rails/mocking/with_mocha'
-        Micronaut::Behaviour.send(:include, Micronaut::Rails::Mocking::WithMocha)
-      end
-      config.extend(Micronaut::Rails::TransactionalDatabaseSupport, :behaviour => { :describes => lambda { |dt| dt < ActiveRecord::Base } })
-      config.extend(Micronaut::Rails::Helpers, :behaviour => { :describes => lambda { |dt| dt.to_s.ends_with?('Helper') } })
-      config.extend(Micronaut::Rails::Controllers, :behaviour => { :describes => lambda { |dt| dt < ActionController::Base } })
-    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.7.0
+  version: 0.1.7.1
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut-rails
 bindir: bin
 cert_chain: []
 
-date: 2008-12-28 00:00:00 -08:00
+date: 2008-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,9 @@ files:
 - lib/micronaut/rails/matchers/controllers/redirect_to.rb
 - lib/micronaut/rails/matchers/controllers/render_template.rb
 - lib/micronaut/rails/mocking
+- lib/micronaut/rails/mocking/model_stubber.rb
 - lib/micronaut/rails/mocking/with_mocha.rb
+- lib/micronaut/rails/mocking/with_rr.rb
 - lib/micronaut/rails/transactional_database_support.rb
 - lib/micronaut/rails/version.rb
 - lib/micronaut-rails.rb