warp 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c7c3c6f9e427418e76e0be7e7a5f14fe6cc669b
-  data.tar.gz: 1ce6c0bf3dec5650c89f3016f27bd3735840808b
+  metadata.gz: 60b73b1325558e48f2447ef0632539a6dbbc4e58
+  data.tar.gz: 17fd79a36fc52445ef884ee478d38dd7d52f0e43
 SHA512:
-  metadata.gz: f53d6173f69d9da373f3632bb406a002ff55417ef7f1adba46eb01e5c6ff2576f6eb9d7101d2a9388ec2c2652d65166b09c2d2d2cf2941c659e17ce1a04ecc31
-  data.tar.gz: 6a9eaf01f40faf8866608e8f03c1b0579702f8f92f18fbe3d1e5d82caeac436b57aaa1a325a9e89cbc3284000fe738dce3d2e72a87138afec123ed8a21e8bc25
+  metadata.gz: 97ce3a52507bcd0ac44192f4f1b8c56b237eb5282cc2dd019785d2ee24b7af29067ab93eb12ca871fc848c660f60da7f1960ace71230cb7901ae0fd1c30d7b65
+  data.tar.gz: cef1710d60cc88e08622c00207d6a2ad021c393a04b877e42d9c7c7b5d5ca6ca2912e3baaffa9115c61c4c716f4067b7c8066b89d9a4c404ccd56e346627d27b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+- 1.2.1
+  - Altered model matchers to be more robust against non-ActiveRecord objects.
+
 - 1.2.0
   - Updated model descriptions and failure messages.
 

data/README.md

@@ -74,12 +74,12 @@ specify { expect(controller).to set_flash(:notice).to("Your order has been proce
 
 ### Association Matchers
 
-#### belongs_to(association)
+#### belong_to(association)
 
-Ensures that a `belongs_to` association is present:
+Ensures that a `belong_to` association is present:
 
 ```ruby
-specify { expect(comment).to belongs_to(:post) }
+specify { expect(comment).to belong_to(:post) }
 ```
 
 Works with either model classes or model objects.

data/lib/warp/model_matchers/attribute_matcher.rb

@@ -24,11 +24,11 @@
       def failure_message_when_negated
         "expected #{model_name} to not #{description}"
       end
-      
+
       private
 
       def attributes
-        model.column_names.map(&:to_sym)
+        model.attribute_names.map(&:to_sym)
       end
     end
 

data/lib/warp/model_matchers/validation_matcher.rb

@@ -1,42 +1,41 @@
 module Warp
   module ModelMatchers
     class ValidationMatcher < Warp::ModelMatchers::Matcher
-      VALIDATORS = [
-        ActiveModel::Validations::AcceptanceValidator,
-        ActiveModel::Validations::ConfirmationValidator,
-        ActiveModel::Validations::ExclusionValidator,
-        ActiveModel::Validations::FormatValidator,
-        ActiveModel::Validations::InclusionValidator,
-        ActiveModel::Validations::LengthValidator,
-        ActiveModel::Validations::NumericalityValidator,
-        ActiveModel::Validations::PresenceValidator
-      ]
+      VALIDATORS = {
+        acceptance: [ActiveModel::Validations::AcceptanceValidator],
+        confirmation: [ActiveModel::Validations::ConfirmationValidator],
+        exclusion: [ActiveModel::Validations::ExclusionValidator],
+        format: [ActiveModel::Validations::FormatValidator],
+        inclusion: [ActiveModel::Validations::InclusionValidator],
+        length: [ActiveModel::Validations::LengthValidator],
+        numericality: [ActiveModel::Validations::NumericalityValidator],
+        presence: [ActiveModel::Validations::PresenceValidator]
+      }
 
       # AbsenceValidator added in Rails 4
       if defined?(ActiveModel::Validations::AbsenceValidator)
-        VALIDATORS << ActiveModel::Validations::AbsenceValidator
+        VALIDATORS[:absence] = [ActiveModel::Validations::AbsenceValidator]
       end
 
       if defined?(ActiveRecord)
-        VALIDATORS.concat [
-          ActiveRecord::Validations::AssociatedValidator,
-          ActiveRecord::Validations::UniquenessValidator
-        ]
+        VALIDATORS.merge!({
+          associated: [ActiveRecord::Validations::AssociatedValidator],
+          uniqueness: [ActiveRecord::Validations::UniquenessValidator]
+        })
       end
 
       # In Rails 4 PresenceValidator is subclassed by AR
       if defined?(ActiveRecord::Validations::PresenceValidator)
-        VALIDATORS.delete(ActiveModel::Validations::PresenceValidator)
-        VALIDATORS.push(ActiveRecord::Validations::PresenceValidator)
+        VALIDATORS[:presence] << ActiveRecord::Validations::PresenceValidator
       end
 
       VALIDATORS.freeze
 
-      attr_reader :attr_name, :validator_class, :validator_options, :display_options
+      attr_reader :attr_name, :validator_classes, :validator_options, :display_options
 
-      def initialize(attr_name, validator_class, validator_options, display_options)
+      def initialize(attr_name, validator_classes, validator_options, display_options)
         @attr_name = attr_name
-        @validator_class = validator_class
+        @validator_classes = validator_classes
         @validator_options = validator_options
         @display_options = display_options
       end
@@ -45,7 +44,7 @@ module Warp
         @model_or_instance = model_or_instance
 
         validators.any? do |validator|
-          if values_match?(validator_class, validator.class)
+          if validator_classes.any? {|validator_class| values_match?(validator_class, validator.class) }
             validator_options.nil? || values_match?(validator_options, validator.options)
           else
             false
@@ -62,7 +61,7 @@ module Warp
       end
 
       def description
-        str = "have validator #{validator_class.name} on :#{attr_name}"
+        str = "have validator #{validator_classes.map(&:name).join(", or ")} on :#{attr_name}"
         str << " with options #{description_of(display_options)}" if display_options.present?
         str
       end
@@ -74,15 +73,14 @@ module Warp
       end
     end
 
-    ValidationMatcher::VALIDATORS.each do |validator|
-      validator_name = validator.name.match(/::(?<name>\w+)Validator/)[:name].underscore.to_sym
-      method_name = (validator_name == :associated) ? "validate_associated" : "validate_#{validator_name}_of"
+    ValidationMatcher::VALIDATORS.each do |validator, validator_classes|
+      method_name = (validator == :associated) ? "validate_associated" : "validate_#{validator}_of"
 
       define_method method_name do |attr_name, *options|
         display_options = options.first
         options = display_options.try(:dup) || {}
 
-        case validator_name 
+        case validator
         when :uniqueness
           options = {case_sensitive: true}.merge(options)
         when :acceptance
@@ -91,7 +89,7 @@ module Warp
 
         options = nil if options.empty?
 
-        ValidationMatcher.new(attr_name, validator, options, display_options)
+        ValidationMatcher.new(attr_name, validator_classes, options, display_options)
       end
     end
   end

data/lib/warp/version.rb

@@ -2,7 +2,7 @@ module Warp
   module VERSION
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     BETA = nil
 

data/spec/support/model_helpers.rb

@@ -14,6 +14,10 @@ module ModelHelpers
           @columns ||= []
         end
 
+        def self.attribute_names
+          @columns.map(&:name)
+        end
+
         def self.attribute_method?(method)
           method = method.to_s.sub("=", "")
           columns.any? {|c| c.name == method }

data/spec/warp/model_helpers/validation_matcher_spec.rb

@@ -10,7 +10,7 @@ describe Warp::ModelMatchers::ValidationMatcher do
   let(:matcher) { send(matcher_method, attr_name) }
   let(:matcher_with_options) { send(matcher_method, attr_name, matcher_options) }
 
-  let(:validator_name) { matcher.validator_class.name }
+  let(:validator_names) { matcher.validator_classes.map(&:name).join(", or ") }
 
   with_contexts do
     context "with model" do
@@ -111,7 +111,7 @@ describe Warp::ModelMatchers::ValidationMatcher do
               specify { expect(subject).to_not match(model_or_instance) }
 
               describe_failure_message do
-                specify { expect(subject).to eq "expected TestModel to have validator #{validator_name} on :#{attr_name}" }
+                specify { expect(subject).to eq "expected TestModel to have validator #{validator_names} on :#{attr_name}" }
               end
             end
 
@@ -123,7 +123,7 @@ describe Warp::ModelMatchers::ValidationMatcher do
               specify { expect(subject).to match(model_or_instance) }
 
               describe_failure_message_when_negated do
-                specify { expect(subject).to eq "expected TestModel to not have validator #{validator_name} on :#{attr_name}" }
+                specify { expect(subject).to eq "expected TestModel to not have validator #{validator_names} on :#{attr_name}" }
               end
             end
           end
@@ -135,7 +135,7 @@ describe Warp::ModelMatchers::ValidationMatcher do
               specify { expect(subject).to_not match(model_or_instance) }
 
               describe_failure_message do
-                specify { expect(subject).to eq "expected TestModel to have validator #{validator_name} on :#{attr_name} with options #{matcher_options.inspect}" }
+                specify { expect(subject).to eq "expected TestModel to have validator #{validator_names} on :#{attr_name} with options #{matcher_options.inspect}" }
               end
             end
 
@@ -148,7 +148,7 @@ describe Warp::ModelMatchers::ValidationMatcher do
                 specify { expect(subject).to_not match(model_or_instance) }
 
                 describe_failure_message do
-                  specify { expect(subject).to eq "expected TestModel to have validator #{validator_name} on :#{attr_name} with options #{matcher_options.inspect}" }
+                  specify { expect(subject).to eq "expected TestModel to have validator #{validator_names} on :#{attr_name} with options #{matcher_options.inspect}" }
                 end
               end
 
@@ -160,7 +160,7 @@ describe Warp::ModelMatchers::ValidationMatcher do
                 specify { expect(subject).to match(model_or_instance) }
 
                 describe_failure_message_when_negated do
-                  specify { expect(subject).to eq "expected TestModel to not have validator #{validator_name} on :#{attr_name} with options #{matcher_options.inspect}" }
+                  specify { expect(subject).to eq "expected TestModel to not have validator #{validator_names} on :#{attr_name} with options #{matcher_options.inspect}" }
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Thomas Drake-Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec