shoulda-matchers 1.0.0.beta1 → 1.0.0.beta2

data/Gemfile

@@ -1,10 +1,4 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.3'
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'mocha'
-gem 'rspec-rails'
-gem 'ruby-debug'
-gem 'cucumber'
-gem "aruba"
+gemspec
 

data/Gemfile.lock

@@ -1,3 +1,8 @@
+PATH
+  remote: .
+  specs:
+    shoulda-matchers (1.0.0.beta2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -28,12 +33,15 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    arel (2.0.6)
-    aruba (0.2.7)
-      background_process
+    archive-tar-minitar (0.5.2)
+    arel (2.0.8)
+    aruba (0.2.8)
+      childprocess (~> 0.1.6)
       cucumber (~> 0.10.0)
-    background_process (1.2)
+      rspec (~> 2.3.0)
     builder (2.1.2)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
     columnize (0.3.2)
     cucumber (0.10.0)
       builder (>= 2.1.2)
@@ -44,13 +52,15 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    gherkin (2.3.2)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
     i18n (0.5.0)
     json (1.4.6)
-    linecache (0.43)
-    mail (2.2.12)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -62,7 +72,7 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
     rails (3.0.3)
       actionmailer (= 3.0.3)
@@ -82,35 +92,43 @@ GEM
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
       rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.0)
+    rspec-core (2.3.1)
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    rspec-rails (2.3.0)
+    rspec-rails (2.3.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sqlite3-ruby (1.3.2)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cucumber
-  mocha
+  aruba (~> 0.2.7)
+  cucumber (~> 0.10.0)
+  mocha (~> 0.9.10)
   rails (= 3.0.3)
-  rspec-rails
-  ruby-debug
-  sqlite3-ruby
+  rspec-rails (~> 2.3.0)
+  ruby-debug19 (~> 0.11.6)
+  shoulda-matchers!
+  sqlite3-ruby (~> 1.3.2)

data/lib/shoulda-matchers.rb

@@ -1,8 +1 @@
-require 'shoulda/matchers/version'
-
-if defined?(RSpec)
-  require 'shoulda/matchers/integrations/rspec'
-else
-  require 'shoulda/matchers/integrations/test_unit'
-end
-
+require 'shoulda/matchers'

data/lib/shoulda/matchers.rb

@@ -0,0 +1,8 @@
+require 'shoulda/matchers/version'
+require 'shoulda/matchers/assertion_error'
+
+if defined?(RSpec)
+  require 'shoulda/matchers/integrations/rspec'
+else
+  require 'shoulda/matchers/integrations/test_unit'
+end

data/lib/shoulda/matchers/action_controller/assign_to_matcher.rb

@@ -60,7 +60,7 @@ module Shoulda # :nodoc:
         private
 
         def assigned_value?
-          if !@controller.instance_variables.include?("@#{@variable}")
+          if !@controller.instance_variables.map(&:to_s).include?("@#{@variable}")
             @failure_message =
               "Expected action to assign a value for @#{@variable}"
             false

data/lib/shoulda/matchers/action_controller/redirect_to_matcher.rb

@@ -49,7 +49,7 @@ module Shoulda # :nodoc:
             @context.send(:assert_redirected_to, @url)
             @negative_failure_message = "Didn't expect to redirect to #{@url}"
             true
-          rescue Test::Unit::AssertionFailedError => error
+          rescue Shoulda::Matchers::AssertionError => error
             @failure_message = error.message
             false
           end

data/lib/shoulda/matchers/action_controller/render_template_matcher.rb

@@ -41,7 +41,7 @@ module Shoulda # :nodoc:
             @context.send(:assert_template, @template)
             @negative_failure_message = "Didn't expect to render #{@template}"
             true
-          rescue Test::Unit::AssertionFailedError => error
+          rescue Shoulda::Matchers::AssertionError => error
             @failure_message = error.message
             false
           end

data/lib/shoulda/matchers/action_controller/route_matcher.rb

@@ -80,7 +80,7 @@ module Shoulda # :nodoc:
           rescue ::ActionController::RoutingError => error
             @failure_message = error.message
             false
-          rescue Test::Unit::AssertionFailedError => error
+          rescue Shoulda::Matchers::AssertionError => error
             @failure_message = error.message
             false
           end

data/lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb

@@ -29,7 +29,7 @@ module Shoulda # :nodoc:
                 "is not read-only"
             else
               @failure_message = "#{class_name} is making " <<
-                "#{readonly_attributes.to_sentence} " <<
+                "#{readonly_attributes.to_a.to_sentence} " <<
                 "read-only, but not #{@attribute}."
             end
             false

data/lib/shoulda/matchers/active_record/helpers.rb

@@ -17,13 +17,8 @@ module Shoulda # :nodoc:
         #   default_error_message(:too_short, :count => 5)
         #   default_error_message(:too_long, :count => 60)
         def default_error_message(key, values = {})
-          if Object.const_defined?(:I18n) # Rails >= 2.2
-            result = I18n.translate("activerecord.errors.messages.#{key}", values)
-            if result =~ /^translation missing/
-              I18n.translate("errors.messages.#{key}", values)
-            else
-              result
-            end
+          if Object.const_defined?(:I18n) # Rails >= 2.2           
+            I18n.translate(:"activerecord.errors.messages.#{key}", {:default => :"errors.messages.#{key}"}.merge(values))
           else # Rails <= 2.1.x
             ::ActiveRecord::Errors.default_error_messages[key] % values[:count]
           end

data/lib/shoulda/matchers/active_record/validate_format_of_matcher.rb

@@ -8,7 +8,7 @@ module Shoulda # :nodoc:
       # Options:
       # * <tt>with_message</tt> - value the test expects to find in
       #   <tt>errors.on(:attribute)</tt>. <tt>Regexp</tt> or <tt>String</tt>.
-      #   Defaults to the translation for <tt>:blank</tt>.
+      #   Defaults to the translation for <tt>:invalid</tt>.
       # * <tt>with(string to test against)</tt>
       # * <tt>not_with(string to test against)</tt>
       #
@@ -49,7 +49,7 @@ module Shoulda # :nodoc:
 
         def matches?(subject)
           super(subject)
-          @expected_message ||= :blank
+          @expected_message ||= :invalid
           return disallows_value_of(@value_to_fail, @expected_message) if @value_to_fail
           allows_value_of(@value_to_pass, @expected_message) if @value_to_pass
         end

data/lib/shoulda/matchers/active_record/validate_presence_of_matcher.rb

@@ -47,7 +47,8 @@ module Shoulda # :nodoc:
         end
 
         def collection?
-          if reflection = @subject.class.reflect_on_association(@attribute)
+          if @subject.class.respond_to?(:reflect_on_association) &&
+              reflection = @subject.class.reflect_on_association(@attribute)
             [:has_many, :has_and_belongs_to_many].include?(reflection.macro)
           else
             false

data/lib/shoulda/matchers/assertion_error.rb

@@ -0,0 +1,11 @@
+module Shoulda
+  module Matchers
+    if RUBY_VERSION > "1.9"
+      require 'minitest/unit'
+      AssertionError = MiniTest::Assertion
+    else
+      require 'test/unit/assertionfailederror'
+      AssertionError = Test::Unit::AssertionFailedError
+    end
+  end
+end

data/lib/shoulda/matchers/integrations/rspec.rb

@@ -9,15 +9,23 @@ end
 
 if defined?(::ActionController)
   require 'shoulda/matchers/action_controller'
-  module RSpec::Rails::ControllerExampleGroup
-    include Shoulda::Matchers::ActionController
+  module RSpec
+    module Rails
+      module ControllerExampleGroup
+        include Shoulda::Matchers::ActionController
+      end
+    end
   end
 end
 
 if defined?(::ActionMailer)
   require 'shoulda/matchers/action_mailer'
-  module RSpec::Rails::MailerExampleGroup
-    include Shoulda::Matchers::ActionMailer
+  module RSpec
+    module Rails
+      module MailerExampleGroup
+        include Shoulda::Matchers::ActionMailer
+      end
+    end
   end
 end
 

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = "1.0.0.beta1"
+    VERSION = "1.0.0.beta2".dup
   end
 end

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda-matchers
 version: !ruby/object:Gem::Version 
-  hash: 299253597
-  prerelease: true
-  segments: 
-  - 1
-  - 0
-  - 0
-  - beta1
-  version: 1.0.0.beta1
+  prerelease: 6
+  version: 1.0.0.beta2
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -20,10 +14,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
+date: 2011-03-17 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.0.3
+  type: :development
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.2
+  type: :development
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.10
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.2.7
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.6
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: Making tests easy on the fingers and eyes
 email: support@thoughtbot.com
 executables: []
@@ -69,9 +139,11 @@ files:
 - lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb
 - lib/shoulda/matchers/active_record/validation_matcher.rb
 - lib/shoulda/matchers/active_record.rb
+- lib/shoulda/matchers/assertion_error.rb
 - lib/shoulda/matchers/integrations/rspec.rb
 - lib/shoulda/matchers/integrations/test_unit.rb
 - lib/shoulda/matchers/version.rb
+- lib/shoulda/matchers.rb
 - lib/shoulda-matchers.rb
 has_rdoc: true
 homepage: http://thoughtbot.com/community/
@@ -89,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3667913558593923355
       segments: 
       - 0
       version: "0"
@@ -98,14 +170,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Making tests easy on the fingers and eyes