remockable 0.0.12 → 0.1.0

data/README.markdown

@@ -66,7 +66,7 @@ when your specs do:
 ## Compatibility
 
 Remockable is compatible with Rails 3.0, but it has also been tested against
-3.1.0.rc4 and appears to be working fine there, too.
+3.1 and appears to be working fine there, too.
 
 
 ## Copyright

data/lib/remockable/active_model/allow_mass_assignment_of.rb

@@ -1,7 +1,8 @@
-RSpec::Matchers.define(:allow_mass_assignment_of) do |*attributes|
-  @options = attributes.extract_options!
+RSpec::Matchers.define(:allow_mass_assignment_of) do |*attribute|
+  @options = attribute.extract_options!
+  @attribute = attribute.shift
+
   @role = @options[:as] || :default
-  @attributes = attributes
   @authorizer = nil
 
   def authorizer(actual)
@@ -11,11 +12,11 @@ RSpec::Matchers.define(:allow_mass_assignment_of) do |*attributes|
   end
 
   match_for_should do |actual|
-    @attributes.all? { |attribute| !authorizer(actual).deny?(attribute) }
+    !authorizer(actual).deny?(@attribute)
   end
 
   match_for_should_not do |actual|
-    @attributes.all? { |attribute| authorizer(actual).deny?(attribute) }
+    authorizer(actual).deny?(@attribute)
   end
 
   failure_message_for_should do |actual|
@@ -27,6 +28,6 @@ RSpec::Matchers.define(:allow_mass_assignment_of) do |*attributes|
   end
 
   description do
-    "allow mass-assignment of #{@attributes.to_sentence}"
+    "allow mass-assignment of #{@attribute}"
   end
 end

data/lib/remockable/active_model/allow_values_for.rb

@@ -1,6 +1,6 @@
-RSpec::Matchers.define(:allow_values_for) do |*attributes_and_values|
-  @attribute = attributes_and_values.shift
-  @values = attributes_and_values
+RSpec::Matchers.define(:allow_values_for) do |*attribute_and_values|
+  @attribute = attribute_and_values.shift
+  @values = attribute_and_values
 
   match_for_should do |actual|
     @values.all? do |value|

data/lib/remockable/active_model/helpers.rb

@@ -3,6 +3,8 @@ module Remockable
     module Helpers
       include Remockable::Helpers
 
+      CONDITIONALS = [:if, :unless]
+
       attr_reader :type
 
       def validator_for(attribute)
@@ -11,8 +13,23 @@ module Remockable
         end
       end
 
-      def validate_attributes
-        @attributes.all? { |attribute| yield(validator_for(attribute)) }
+      def options_match(validator, expected=expected)
+        actual = validator.options.slice(*(expected.keys - CONDITIONALS))
+        actual == expected.except(*CONDITIONALS)
+      end
+
+      def conditionals_match(validator)
+        CONDITIONALS.all? do |option|
+          expected_value = expected[option]
+
+          if !expected_value.nil? && expected_value.is_a?(Symbol)
+            validator.options[option] == expected_value
+          elsif !expected_value.nil?
+            validator.options[option].call(expected_value) == true
+          else
+            true
+          end
+        end
       end
     end
   end

data/lib/remockable/active_model/validate_acceptance_of.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_acceptance_of) do |*attributes|
+RSpec::Matchers.define(:validate_acceptance_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :acceptance
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(allow_nil accept message on)
+  valid_options %w(allow_nil accept if message on unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_acceptance_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_model/validate_confirmation_of.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_confirmation_of) do |*attributes|
+RSpec::Matchers.define(:validate_confirmation_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :confirmation
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(message on)
+  valid_options %w(if message on unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_confirmation_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_model/validate_exclusion_of.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_exclusion_of) do |*attributes|
+RSpec::Matchers.define(:validate_exclusion_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :exclusion
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(allow_nil allow_blank in message on)
+  valid_options %w(allow_nil allow_blank if in message on unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_exclusion_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_model/validate_format_of.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_format_of) do |*attributes|
+RSpec::Matchers.define(:validate_format_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :format
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(allow_blank allow_nil message on with without)
+  valid_options %w(allow_blank allow_nil if message on unless with without)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_format_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_model/validate_inclusion_of.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_inclusion_of) do |*attributes|
+RSpec::Matchers.define(:validate_inclusion_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :inclusion
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(allow_nil allow_blank in message on)
+  valid_options %w(allow_nil allow_blank if in message on unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_inclusion_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_model/validate_length_of.rb

@@ -1,22 +1,23 @@
-RSpec::Matchers.define(:validate_length_of) do |*attributes|
+RSpec::Matchers.define(:validate_length_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :length
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless tokenizer)
-  valid_options %w(allow_blank allow_nil in is maximum message minimum on
-    too_long too_short within wrong_length)
+  unsupported_options %w(tokenizer)
+  valid_options %w(allow_blank allow_nil if in is maximum message minimum on
+    too_long too_short unless within wrong_length)
 
   match do |actual|
-    validate_attributes do |validator|
-      expected = normalize_expected
-      validator && validator.options.slice(*expected.keys) == expected
+    if validator = validator_for(@attribute)
+      options_match = options_match(validator, normalized_expected)
+      conditionals_match = conditionals_match(validator)
+      options_match && conditionals_match
     end
   end
 
-  def normalize_expected
+  def normalized_expected
     expected.dup.tap do |expected|
       if within = expected.delete(:within) || expected.delete(:in)
         expected[:minimum] = within.first
@@ -35,6 +36,6 @@ RSpec::Matchers.define(:validate_length_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_model/validate_numericality_of.rb

@@ -1,17 +1,16 @@
-RSpec::Matchers.define(:validate_numericality_of) do |*attributes|
+RSpec::Matchers.define(:validate_numericality_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :numericality
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(allow_nil equal_to even greater_than greater_than_or_equal_to less_than less_than_or_equal_to message odd on only_integer)
+  valid_options %w(allow_nil equal_to even greater_than greater_than_or_equal_to
+    if less_than less_than_or_equal_to message odd on only_integer unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +23,6 @@ RSpec::Matchers.define(:validate_numericality_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_model/validate_presence_of.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_presence_of) do |*attributes|
+RSpec::Matchers.define(:validate_presence_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :presence
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(message on)
+  valid_options %w(if message on unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_presence_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_record/accept_nested_attributes_for.rb

@@ -1,8 +1,8 @@
-RSpec::Matchers.define(:accept_nested_attributes_for) do |*attributes|
+RSpec::Matchers.define(:accept_nested_attributes_for) do |*association|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = attributes.extract_options!
-  @association = attributes.first
+  @expected = association.extract_options!
+  @association = association.shift
 
   unsupported_options %w(reject_if)
   valid_options %w(allow_destroy limit update_only)

data/lib/remockable/active_record/belong_to.rb

@@ -1,11 +1,13 @@
-RSpec::Matchers.define(:belong_to) do |*attributes|
+RSpec::Matchers.define(:belong_to) do |*association|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = attributes.extract_options!
-  @association = attributes.first
+  @expected = association.extract_options!
+  @association = association.shift
 
   unsupported_options %w(extend)
-  valid_options %w(class_name conditions select foreign_key primary_key dependent counter_cache include polymorphic readonly validate autosave touch inverse_of)
+  valid_options %w(class_name conditions select foreign_key primary_key
+    dependent counter_cache include polymorphic readonly validate autosave touch
+    inverse_of)
 
   match do |actual|
     if association = subject.class.reflect_on_association(@association)

data/lib/remockable/active_record/have_and_belong_to_many.rb

@@ -1,11 +1,13 @@
-RSpec::Matchers.define(:have_and_belong_to_many) do |*attributes|
+RSpec::Matchers.define(:have_and_belong_to_many) do |*association|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = attributes.extract_options!
-  @association = attributes.first
+  @expected = association.extract_options!
+  @association = association.shift
 
   unsupported_options %w(extend)
-  valid_options %w(class_name join_table foreign_key association_foreign_key conditions order uniq finder_sql counter_sql delete_sql insert_sql include group having limit offset select readonly validate autosave)
+  valid_options %w(class_name join_table foreign_key association_foreign_key
+    conditions order uniq finder_sql counter_sql delete_sql insert_sql include
+    group having limit offset select readonly validate autosave)
 
   match do |actual|
     if association = subject.class.reflect_on_association(@association)

data/lib/remockable/active_record/have_column.rb

@@ -1,8 +1,8 @@
-RSpec::Matchers.define(:have_column) do |*attributes|
+RSpec::Matchers.define(:have_column) do |*column|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = attributes.extract_options!
-  @column = attributes.first
+  @expected = column.extract_options!
+  @column = column.shift
 
   valid_options %w(default limit null precision scale type)
 

data/lib/remockable/active_record/have_index.rb

@@ -1,8 +1,8 @@
-RSpec::Matchers.define(:have_index) do |*attributes|
+RSpec::Matchers.define(:have_index) do |*columns|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = attributes.extract_options!
-  @columns = attributes
+  @expected = columns.extract_options!
+  @columns = columns
 
   valid_options %w(name unique)
 

data/lib/remockable/active_record/have_many.rb

@@ -1,8 +1,8 @@
-RSpec::Matchers.define(:have_many) do |*attributes|
+RSpec::Matchers.define(:have_many) do |*association|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = attributes.extract_options!
-  @association = attributes.first
+  @expected = association.extract_options!
+  @association = association.shift
 
   unsupported_options %w(extend)
   valid_options %w(class_name conditions order foreign_key primary_key dependent finder_sql counter_sql include group having limit offset select as through source source_type uniq readonly validate autosave inverse_of)

data/lib/remockable/active_record/have_one.rb

@@ -1,8 +1,8 @@
-RSpec::Matchers.define(:have_one) do |*attributes|
+RSpec::Matchers.define(:have_one) do |*association|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = attributes.extract_options!
-  @association = attributes.first
+  @expected = association.extract_options!
+  @association = association.shift
 
   unsupported_options %w(extend)
   valid_options %w(class_name conditions order dependent foreign_key primary_key include as select through source source_type readonly validate autosave inverse_of)

data/lib/remockable/active_record/have_scope.rb

@@ -1,8 +1,8 @@
-RSpec::Matchers.define(:have_scope) do |*expected|
+RSpec::Matchers.define(:have_scope) do |*name|
   extend Remockable::ActiveRecord::Helpers
 
-  @expected = expected.extract_options!
-  @name = expected.first
+  @expected = name.extract_options!
+  @name = name.shift
   @relation = nil
 
   valid_options %w(with)

data/lib/remockable/active_record/validate_associated.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_associated) do |*attributes|
+RSpec::Matchers.define(:validate_associated) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :associated
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(message on)
+  valid_options %w(if message on unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_associated) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} #{@attributes.to_sentence}#{with}"
+    "validate #{type} #{@attribute}#{with}"
   end
 end

data/lib/remockable/active_record/validate_uniqueness_of.rb

@@ -1,17 +1,15 @@
-RSpec::Matchers.define(:validate_uniqueness_of) do |*attributes|
+RSpec::Matchers.define(:validate_uniqueness_of) do |*attribute|
   extend Remockable::ActiveModel::Helpers
 
   @type = :uniqueness
-  @expected = attributes.extract_options!
-  @attributes = attributes
+  @expected = attribute.extract_options!
+  @attribute = attribute.shift
 
-  unsupported_options %w(if unless)
-  valid_options %w(allow_nil allow_blank case_sensitive message scope)
+  valid_options %w(allow_nil allow_blank case_sensitive if message scope unless)
 
   match do |actual|
-    validate_attributes do |validator|
-      validator && validator.options.slice(*expected.keys) == expected
-    end
+    validator = validator_for(@attribute)
+    validator && options_match(validator) && conditionals_match(validator)
   end
 
   failure_message_for_should do |actual|
@@ -24,6 +22,6 @@ RSpec::Matchers.define(:validate_uniqueness_of) do |*attributes|
 
   description do
     with = " with #{expected.inspect}" if expected.any?
-    "validate #{type} of #{@attributes.to_sentence}#{with}"
+    "validate #{type} of #{@attribute}#{with}"
   end
 end

data/lib/remockable/version.rb

@@ -1,3 +1,3 @@
 module Remockable
-  VERSION = '0.0.12'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remockable
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-02-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70287238067860 !ruby/object:Gem::Requirement
+  requirement: &70234091122900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287238067860
+  version_requirements: *70234091122900
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70287238067360 !ruby/object:Gem::Requirement
+  requirement: &70234091122400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287238067360
+  version_requirements: *70234091122400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70287238066900 !ruby/object:Gem::Requirement
+  requirement: &70234091121940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287238066900
+  version_requirements: *70234091121940
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70287238066440 !ruby/object:Gem::Requirement
+  requirement: &70234091121480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287238066440
+  version_requirements: *70234091121480
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70287238099760 !ruby/object:Gem::Requirement
+  requirement: &70234091121020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287238099760
+  version_requirements: *70234091121020
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &70287238099300 !ruby/object:Gem::Requirement
+  requirement: &70234091153580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287238099300
+  version_requirements: *70234091153580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70287238098840 !ruby/object:Gem::Requirement
+  requirement: &70234091153120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *70287238098840
+  version_requirements: *70234091153120
 description: 
 email: 
 executables: []