shoulda-matchers 2.4.0 → 2.5.0

data/spec/support/active_resource_builder.rb

@@ -1,3 +1,5 @@
+require 'active_resource'
+
 module ActiveResourceBuilder
   def self.included(example_group)
     example_group.class_eval do

data/spec/support/controller_builder.rb

@@ -1,7 +1,4 @@
 module ControllerBuilder
-  TMP_VIEW_PATH = File.expand_path(File.join(TESTAPP_ROOT, 'tmp',
-    'views')).freeze
-
   def self.included(example_group)
     example_group.class_eval do
       after do
@@ -18,8 +15,7 @@ module ControllerBuilder
   end
 
   def define_routes(&block)
-    Rails.application.routes.draw(&block)
-    @routes = Rails.application.routes
+    @routes = $test_app.draw_routes(&block)
     class << self
       include ActionDispatch::Assertions
     end
@@ -33,7 +29,7 @@ module ControllerBuilder
       layout false
       define_method(action, &block)
     end
-    controller_class.view_paths = [TMP_VIEW_PATH]
+    controller_class.view_paths = [ $test_app.temp_views_dir_path ]
 
     define_routes do
       get 'examples', :to => "examples##{action}"
@@ -59,15 +55,13 @@ module ControllerBuilder
   end
 
   def create_view(path, contents)
-    full_path = File.join(TMP_VIEW_PATH, path)
-    FileUtils.mkdir_p(File.dirname(full_path))
-    File.open(full_path, 'w') { |file| file.write(contents) }
+    $test_app.create_temp_view(path, contents)
   end
 
   private
 
   def delete_temporary_views
-    FileUtils.rm_rf(TMP_VIEW_PATH)
+    $test_app.delete_temp_views
   end
 
   def restore_original_routes

data/spec/support/model_builder.rb

@@ -48,8 +48,12 @@ module ModelBuilder
     class_name = name.to_s.pluralize.classify
     table_name = class_name.tableize
     table_block = lambda do |table|
-      columns.each do |name, type|
-        table.column name, type
+      columns.each do |name, specification|
+        if specification.is_a?(Hash)
+          table.column name, specification[:type], specification[:options]
+        else
+          table.column name, specification
+        end
       end
     end
 

data/spec/support/rails_versions.rb

@@ -0,0 +1,18 @@
+module RailsVersions
+  def rails_version
+    Gem::Version.new(Rails::VERSION::STRING)
+  end
+
+  def rails_3_x?
+    Gem::Requirement.new('~> 3.0').satisfied_by?(rails_version)
+  end
+
+  def rails_4_x?
+    Gem::Requirement.new('~> 4.0').satisfied_by?(rails_version)
+  end
+end
+
+RSpec.configure do |config|
+  config.include(RailsVersions)
+  config.extend(RailsVersions)
+end

data/spec/support/shared_examples/numerical_submatcher_spec.rb

@@ -13,11 +13,11 @@ shared_examples 'a numerical submatcher' do
     subject.should respond_to(:matches?).with(1).arguments
   end
 
-  it 'implements the failure_message_for_should method' do
-    subject.should respond_to(:failure_message_for_should).with(0).arguments
+  it 'implements the failure_message method' do
+    subject.should respond_to(:failure_message).with(0).arguments
   end
 
-  it 'implements the failure_message_for_should_not method' do
-    subject.should respond_to(:failure_message_for_should_not).with(0).arguments
+  it 'implements the failure_message_when_negated method' do
+    subject.should respond_to(:failure_message_when_negated).with(0).arguments
   end
 end

data/spec/support/test_application.rb

@@ -0,0 +1,97 @@
+require 'fileutils'
+
+class TestApplication
+  ROOT_DIR = File.expand_path('../../../tmp/aruba/testapp', __FILE__)
+
+  def create
+    clean
+    generate
+    within_app { install_gems }
+  end
+
+  def load
+    load_environment
+    run_migrations
+  end
+
+  def gemfile_path
+    File.join(ROOT_DIR, 'Gemfile')
+  end
+
+  def environment_file_path
+    File.join(ROOT_DIR, 'config/environment')
+  end
+
+  def temp_views_dir_path
+    File.join(ROOT_DIR, 'tmp/views')
+  end
+
+  def create_temp_view(path, contents)
+    full_path = temp_view_path_for(path)
+    FileUtils.mkdir_p(File.dirname(full_path))
+    File.open(full_path, 'w') { |file| file.write(contents) }
+  end
+
+  def delete_temp_views
+    FileUtils.rm_rf(temp_views_dir_path)
+  end
+
+  def draw_routes(&block)
+    Rails.application.routes.draw(&block)
+    Rails.application.routes
+  end
+
+  private
+
+  def migrations_dir_path
+    File.join(ROOT_DIR, 'db/migrate')
+  end
+
+  def temp_view_path_for(path)
+    File.join(temp_views_dir_path, path)
+  end
+
+  def clean
+    FileUtils.rm_rf(ROOT_DIR)
+  end
+
+  def generate
+    `rails new #{ROOT_DIR} --skip-bundle`
+  end
+
+  def load_environment
+    require environment_file_path
+  end
+
+  def run_migrations
+    ActiveRecord::Migration.verbose = false
+    ActiveRecord::Migrator.migrate(migrations_dir_path)
+  end
+
+  def install_gems
+    retrying('bundle install') do |command|
+      Bundler.with_clean_env { `#{command}` }
+    end
+  end
+
+  def within_app(&block)
+    Dir.chdir(ROOT_DIR, &block)
+  end
+
+  def retrying(command, &runner)
+    runner ||= -> { `#{command}` }
+
+    retry_count = 0
+    loop do
+      output = runner.call("#{command} 2>&1")
+      if $? == 0
+        break
+      else
+        retry_count += 1
+        if retry_count == 3
+          raise "Command '#{command}' failed:\n#{output}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,8 +172,10 @@ files:
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
-- gemfiles/4.0.gemfile
-- gemfiles/4.0.gemfile.lock
+- gemfiles/4.0.0.gemfile
+- gemfiles/4.0.0.gemfile.lock
+- gemfiles/4.0.1.gemfile
+- gemfiles/4.0.1.gemfile.lock
 - lib/shoulda-matchers.rb
 - lib/shoulda/matchers.rb
 - lib/shoulda/matchers/action_controller.rb
@@ -184,12 +186,12 @@ files:
 - lib/shoulda/matchers/action_controller/rescue_from_matcher.rb
 - lib/shoulda/matchers/action_controller/respond_with_matcher.rb
 - lib/shoulda/matchers/action_controller/route_matcher.rb
+- lib/shoulda/matchers/action_controller/route_params.rb
 - lib/shoulda/matchers/action_controller/set_session_matcher.rb
 - lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb
 - lib/shoulda/matchers/active_model.rb
 - lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
-- lib/shoulda/matchers/active_model/comparison_matcher.rb
 - lib/shoulda/matchers/active_model/disallow_value_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb
@@ -198,8 +200,10 @@ files:
 - lib/shoulda/matchers/active_model/exception_message_finder.rb
 - lib/shoulda/matchers/active_model/have_secure_password_matcher.rb
 - lib/shoulda/matchers/active_model/helpers.rb
-- lib/shoulda/matchers/active_model/odd_even_number_matcher.rb
-- lib/shoulda/matchers/active_model/only_integer_matcher.rb
+- lib/shoulda/matchers/active_model/numericality_matchers/comparison_matcher.rb
+- lib/shoulda/matchers/active_model/numericality_matchers/odd_even_number_matcher.rb
+- lib/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher.rb
+- lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_numericality_of_matcher.rb
@@ -212,9 +216,11 @@ files:
 - lib/shoulda/matchers/active_record/association_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/counter_cache_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/dependent_matcher.rb
+- lib/shoulda/matchers/active_record/association_matchers/model_reflection.rb
 - lib/shoulda/matchers/active_record/association_matchers/model_reflector.rb
 - lib/shoulda/matchers/active_record/association_matchers/option_verifier.rb
 - lib/shoulda/matchers/active_record/association_matchers/order_matcher.rb
+- lib/shoulda/matchers/active_record/association_matchers/source_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/through_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_column_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_index_matcher.rb
@@ -233,11 +239,11 @@ files:
 - spec/shoulda/matchers/action_controller/rescue_from_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/respond_with_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/route_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/route_params_spec.rb
 - spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
-- spec/shoulda/matchers/active_model/comparison_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
@@ -245,8 +251,10 @@ files:
 - spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
 - spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/shoulda/matchers/active_model/helpers_spec.rb
-- spec/shoulda/matchers/active_model/odd_even_number_matcher_spec.rb
-- spec/shoulda/matchers/active_model/only_integer_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/odd_even_number_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
@@ -255,6 +263,7 @@ files:
 - spec/shoulda/matchers/active_model/validation_message_finder_spec.rb
 - spec/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/shoulda/matchers/active_record/association_matcher_spec.rb
+- spec/shoulda/matchers/active_record/association_matchers/model_reflection_spec.rb
 - spec/shoulda/matchers/active_record/have_db_column_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
@@ -269,7 +278,9 @@ files:
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
+- spec/support/rails_versions.rb
 - spec/support/shared_examples/numerical_submatcher_spec.rb
+- spec/support/test_application.rb
 homepage: http://thoughtbot.com/community/
 licenses:
 - MIT
@@ -290,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Making tests easy on the fingers and eyes
@@ -305,11 +316,11 @@ test_files:
 - spec/shoulda/matchers/action_controller/rescue_from_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/respond_with_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/route_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/route_params_spec.rb
 - spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
-- spec/shoulda/matchers/active_model/comparison_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
@@ -317,8 +328,10 @@ test_files:
 - spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
 - spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/shoulda/matchers/active_model/helpers_spec.rb
-- spec/shoulda/matchers/active_model/odd_even_number_matcher_spec.rb
-- spec/shoulda/matchers/active_model/only_integer_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/odd_even_number_matcher_spec.rb
+- spec/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_absence_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
@@ -327,6 +340,7 @@ test_files:
 - spec/shoulda/matchers/active_model/validation_message_finder_spec.rb
 - spec/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/shoulda/matchers/active_record/association_matcher_spec.rb
+- spec/shoulda/matchers/active_record/association_matchers/model_reflection_spec.rb
 - spec/shoulda/matchers/active_record/have_db_column_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
 - spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
@@ -341,4 +355,6 @@ test_files:
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
+- spec/support/rails_versions.rb
 - spec/support/shared_examples/numerical_submatcher_spec.rb
+- spec/support/test_application.rb

data/lib/shoulda/matchers/active_model/comparison_matcher.rb

@@ -1,57 +0,0 @@
-module Shoulda # :nodoc:
-  module Matchers
-    module ActiveModel # :nodoc:
-      # Examples:
-      #   it { should validate_numericality_of(:attr).
-      #                 is_greater_than(6).
-      #                 less_than(20)...(and so on) }
-      class ComparisonMatcher < ValidationMatcher
-        def initialize(value, operator)
-          @value = value
-          @operator = operator
-          @message = nil
-        end
-
-        def for(attribute)
-          @attribute = attribute
-          self
-        end
-
-        def matches?(subject)
-          @subject = subject
-          disallows_value_of(value_to_compare, @message)
-        end
-
-        def allowed_types
-          'integer'
-        end
-
-        def with_message(message)
-          @message = message
-        end
-
-        private
-
-        def value_to_compare
-          case @operator
-            when :> then [@value, @value - 1].sample
-            when :>= then @value - 1
-            when :== then @value + 1
-            when :< then [@value, @value + 1].sample
-            when :<= then @value + 1
-          end
-        end
-
-        def expectation
-          case @operator
-            when :> then "greater than"
-            when :>= then "greater than or equal to"
-            when :== then "equal to"
-            when :< then "less than"
-            when :<= then "less than or equal to"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/shoulda/matchers/active_model/odd_even_number_matcher.rb

@@ -1,47 +0,0 @@
-module Shoulda # :nodoc:
-  module Matchers
-    module ActiveModel # :nodoc:
-      class OddEvenNumberMatcher # :nodoc:
-        NON_EVEN_NUMBER_VALUE = 1
-        NON_ODD_NUMBER_VALUE  = 2
-
-        def initialize(attribute, options = {})
-          @attribute = attribute
-          options[:odd]   ||= true
-          options[:even]  ||= false
-
-          if options[:odd] && !options[:even]
-            @disallow_value_matcher = DisallowValueMatcher.new(NON_ODD_NUMBER_VALUE).
-              for(@attribute).
-              with_message(:odd)
-          else
-            @disallow_value_matcher = DisallowValueMatcher.new(NON_EVEN_NUMBER_VALUE).
-              for(@attribute).
-              with_message(:even)
-          end
-        end
-
-        def matches?(subject)
-          @disallow_value_matcher.matches?(subject)
-        end
-
-        def with_message(message)
-          @disallow_value_matcher.with_message(message)
-          self
-        end
-
-        def allowed_types
-          'integer'
-        end
-
-        def failure_message_for_should
-          @disallow_value_matcher.failure_message_for_should
-        end
-
-        def failure_message_for_should_not
-          @disallow_value_matcher.failure_message_for_should_not
-        end
-      end
-    end
-  end
-end