ubazu 0.1.2 → 0.1.3

data/lib/ubazu/rspec/matchers/active_record/validate_inclusion_of_matcher.rb

@@ -36,7 +36,17 @@ module Ubazu
             super(instance)
 
             @expected_message ||= :blank
-            !@instance.valid? and @instance.errors.include? @expected_message
+            logger.debug "Expected to be validated with message: #{@expected_message}" if !@expected_message.blank?
+            wrong_value = rand(99999999999).to_s.to_sym #wrong symbol
+            @instance.send("#{@attribute}=", wrong_value)
+            result = !errors_match?
+
+            if result
+              true
+            else
+              @failure_message = "#{@attribute} is not validated for inclusion in #{@array.inspect}"
+              false
+            end
           end
 
           def description
@@ -45,6 +55,31 @@ module Ubazu
 
           private
 
+          def errors_match?
+            @instance.valid?
+            @errors = errors_for_attribute(@instance, @attribute)
+            @errors = [@errors] unless @errors.is_a?(Array)
+            @expected_message ? (errors_match_regexp? || errors_match_string?) : (@errors.compact.any?)
+          end
+
+          def errors_match_regexp?
+            if Regexp === @expected_message
+              @matched_error = @errors.detect { |e| e =~ @expected_message }
+              !@matched_error.nil?
+            else
+              false
+            end
+          end
+
+          def errors_match_string?
+            if @errors.include?(@expected_message)
+              @matched_error = @expected_message
+              true
+            else
+              false
+            end
+          end
+
           def blank_value
             if collection?
               []

data/ubazu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ubazu}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Silviu Rosu"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ubazu
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Silviu Rosu