rspec-rails-mocha 0.3.0 → 0.3.1

data/README.markdown

@@ -3,13 +3,28 @@ rspec-rails Mocha extension
 
 Functionality of `mock_model` and `stub_model` from rspec-rails for those using Mocha.
 
-Installation:
+Installation for **Rails 3** (rspec-rails v2.6 and above):
 
     # Gemfile
+    group :development, :test do
+      gem 'rspec-rails', '~> 2.4'
+    end
+
     group :test do
-      gem 'rspec-rails-mocha'
+      gem 'rspec-rails-mocha', '~> 0.3.1', :require => false
     end
 
+    # spec/spec_helper.rb
+    require 'rspec/rails'
+    require 'rspec/rails/mocha'
+
+For **Rails 2** (rspec-rails v1.3.x), use the '0.2.x' branch:
+
+    gem 'rspec-rails-mocha', '~> 0.2.1'
+
+Then, for any version of Rails, ensure that your "spec_helper.rb" file
+**doesn't contain** `config.mock_with :rspec`.
+
 Usage:
 
     describe "Mocha plugin" do
@@ -20,3 +35,7 @@ Usage:
         person.id.should == 66
       end
     end
+
+You should be able to use `mock_model` and `stub_model` in the same way
+you use them when mocking with rspec instead of mocha. [Here are the
+docs](http://relishapp.com/rspec/rspec-rails/v/2-6/dir/mocks/mock-model).

data/lib/rspec/rails/mocha.rb

@@ -1,12 +1,18 @@
+require 'active_support/core_ext'
 require 'active_model'
 
 module RSpec
   module Rails
+
+    unless defined? IllegalDataAccessException
+      class IllegalDataAccessException < StandardError; end
+    end
+
     module Mocha
+
       module ActiveModelInstanceMethods
         def as_new_record
-          self.stubs(:persisted?) { false }
-          self.stubs(:id) { nil }
+          self.stubs(:persisted? => false, :id => nil)
           self
         end
 
@@ -21,8 +27,11 @@ module RSpec
 
       module ActiveRecordInstanceMethods
         def destroy
-          self.stubs(:persisted?) { false }
-          self.stubs(:id) { nil }
+          self.stubs(:persisted? => false, :id => nil)
+        end
+
+        def [](key)
+          send(key)
         end
 
         def new_record?
@@ -71,21 +80,23 @@ It received #{model_class.inspect}
 EOM
         end
 
-        stubs = stubs.reverse_merge(:id => next_id)
+        stubs = stubs.reverse_merge \
+          :id => next_id,
+          :destroyed? => false,
+          :marked_for_destruction? => false,
+          :blank? => false
+
         stubs = stubs.reverse_merge(:persisted? => !!stubs[:id])
-        stubs = stubs.reverse_merge(:destroyed? => false)
-        stubs = stubs.reverse_merge(:marked_for_destruction? => false)
-        stubs = stubs.reverse_merge(:errors => stub("errors", :count => 0, :[] => [], :empty? => true))
 
         stub("#{model_class.name}_#{stubs[:id]}", stubs).tap do |m|
           m.extend ActiveModelInstanceMethods
-          model_class.__send__ :include, ActiveModel::Conversion
-          model_class.__send__ :include, ActiveModel::Validations
+          m.singleton_class.__send__ :include, ActiveModel::Conversion
+          m.singleton_class.__send__ :include, ActiveModel::Validations
           if defined?(ActiveRecord)
             m.extend ActiveRecordInstanceMethods
             [:save, :update_attributes].each do |key|
               if stubs[key] == false
-                m.errors.stubs(:empty?) { false }
+                m.errors.stubs(:empty? => false)
               end
             end
           end
@@ -108,10 +119,6 @@ EOM
             def to_s
               "#{model_class.name}_#{to_param}"
             end
-
-            def to_key
-              [id]
-            end
           CODE
           yield m if block_given?
         end
@@ -119,10 +126,13 @@ EOM
 
       module ActiveModelStubExtensions
         def as_new_record
-          self.stubs(:persisted?)  { false }
-          self.stubs(:id)          { nil }
+          self.stubs(:persisted? => false, :id => nil)
           self
         end
+
+        def persisted?
+          true
+        end
       end
 
       module ActiveRecordStubExtensions
@@ -136,7 +146,7 @@ EOM
         end
 
         def connection
-          raise RSpec::Rails::IllegalDataAccessException.new("stubbed models are not allowed to access the database")
+          raise IllegalDataAccessException.new("stubbed models are not allowed to access the database")
         end
       end
 
@@ -187,6 +197,7 @@ EOM
             stubs = stubs.reverse_merge(:id => next_id)
             stubs = stubs.reverse_merge(:persisted? => !!stubs[:id])
           end
+          stubs = stubs.reverse_merge(:blank? => false)
           stubs.each do |k,v|
             m.__send__("#{k}=", stubs.delete(k)) if m.respond_to?("#{k}=")
           end
@@ -202,6 +213,12 @@ EOM
       def next_id
         @@model_id += 1
       end
+
     end
   end
 end
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+  config.include RSpec::Rails::Mocha
+end

data/spec/mocha_spec.rb

@@ -1,5 +1,5 @@
 require 'rspec'
-require 'rspec-rails-mocha'
+require 'rspec/rails/mocha'
 
 # Simple stub for ActiveRecord::Base
 module ActiveRecord
@@ -16,9 +16,6 @@ module RSpec::Rails
   class IllegalDataAccessException < StandardError; end
 end
 
-require 'active_support/core_ext/hash/reverse_merge'
-require 'active_support/core_ext/object'
-
 class Person < ActiveRecord::Base
   attr_accessor :id, :name
   
@@ -59,13 +56,6 @@ describe "rspec-rails Mocha plugin" do
       person.id.should == 66
     end
     
-    it "should use given ID in to_key" do
-      personA = create(Person, :id => 66)
-      personA.to_key.should == [66]
-      personB = create(Person)
-      personB.to_key.first.should >= 1000
-    end
-    
     it "should mock a record with properties" do
       hacker = create(Hacker, :name => "Mislav", :skillz => 1337)
       hacker.name.should == "Mislav"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails-mocha
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +01:00
+date: 2011-06-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -62,10 +59,9 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - lib/rspec/rails/mocha.rb
-- lib/rspec-rails-mocha.rb
 - spec/mocha_spec.rb
 - README.markdown
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/mislav/rspec-rails-mocha
 licenses: []
 
@@ -79,7 +75,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -88,16 +83,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: mock_model and stub_model with Mocha
+summary: Mocha versions of mock_model and stub_model from rspec-rails
 test_files: []
 

data/lib/rspec-rails-mocha.rb

@@ -1,7 +0,0 @@
-require 'rspec/core'
-require 'rspec/rails/mocha'
-
-RSpec.configure do |config|
-  config.mock_with :mocha
-  config.include RSpec::Rails::Mocha
-end