nobrainer-rspec 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0c49605afc9e72f119e3d5ecb2809a556defc5ab84d52574eef569d8c08697
-  data.tar.gz: 6a71e9bcb29d5e29c8cc4071fbab8ece22bb3ecbc1d814619c442782032d0924
+  metadata.gz: 234a7a00fa53a4b5ac5837c8a649ee0f3cf47c4fcf726f81b13fff07f88801b7
+  data.tar.gz: 322c24fb8cb5bd99838d45df843b0875d847c4251f0cc64ae12a99f9d0fdb82f
 SHA512:
-  metadata.gz: 916dfe718138432512a974b258d5d6a9d86a46c184225889e41ebbcd2f13ec8989619f243b8a0ea05791fbcd87e88ad0ab328f4fda83090061275e0951f06fc2
-  data.tar.gz: 7416170408b071fbc3eb6c448e4d604ae771dec9a67b7b37202405d5b36521e2b3c860a29f2b6c77c368af48d2cb235da4175d7bced7572c74730e6419bfd53b
+  metadata.gz: 6bc9da488a3da37d29bb96722d3925b5cb86f66dfc4de6d276fcea9bbdbd8285a5fdbe26ea9b23420d6c9966c7cc76ad950dde6d610a5d51d0924af8171a0648
+  data.tar.gz: 3cdbf12fca120344ca14b904030e0770af84f906e614a9c00ec8933e6272866c077f3feecce09be46403e521634e87ee33d5205f81b8f42d223095c5174c32ca

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [1.1.0] - 2020-11-28
+### Fixed
+- have_field with a field using `unique: true` or `uniq: true`
+
 ## [1.0.1] - 2020-11-27
 ### Fixed
 - Fixes gem build which was creating an empty gem
@@ -31,7 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - validate_format_of
 - validate_numericality_of
 
-[Unreleased]: https://gitlab.com/zedtux/nobrainer-rspec/-/compare/v1.0.1...master
-[1.0.1]: https://gitlab.com/zedtux/nobrainer-rspec/-/compare/v1.0.0...v1.1.0
+[Unreleased]: https://gitlab.com/zedtux/nobrainer-rspec/-/compare/v1.1.0...master
+[1.1.0]: https://gitlab.com/zedtux/nobrainer-rspec/-/compare/v1.0.1...v1.1.0
+[1.0.1]: https://gitlab.com/zedtux/nobrainer-rspec/-/compare/v1.0.0...v1.0.1
 [1.0.0]: https://gitlab.com/zedtux/nobrainer-rspec/-/tags/v1.0.0
 

data/lib/matchers/have_field.rb

@@ -394,8 +394,18 @@ module NoBrainer
             end
 
             # Checking unique
-            if @unique && (@klass.fields[attr][:unique] != @unique)
-              error += ' unique'
+            if @unique
+              uniq_key = @klass.fields[attr][:unique] ||
+                         @klass.fields[attr][:uniq]
+
+              if @unique == true && uniq_key.nil?
+                error += ' unique'
+              end
+
+              if @unique.is_a?(Hash) && @unique.key?(:scope) &&
+                 @unique[:scope] != uniq_key[:scope]
+                error += " unique scoped to #{uniq_key[:scope]}"
+              end
             end
 
             # Checking primary key
@@ -465,7 +475,11 @@ module NoBrainer
         desc += ' allowing all values mentioned' if @allowed_values
         desc += ' to be readonly' if @readonly
         desc += ' to be lazy fetched' if @lazy_fetched
-        desc += ' to be unique' if @unique
+        if @unique == true
+          desc += ' to be unique'
+        elsif @unique.key?(:scope)
+          desc += " to be unique in the scope of #{@unique[:scope]}"
+        end
         desc += ' as primary key' if @primary_key
         desc += " with a length of #{@length}" if @length
         desc += " with a minimal length of #{@min_length}" if @min_length

data/lib/matchers/validations.rb

@@ -25,7 +25,10 @@ module NoBrainer
             return false
           end
 
-          true
+          @result = true
+          check_on if @options[:on]
+          check_expected_message if @expected_message
+          @result
         end
 
         def failure_message_for_should
@@ -42,6 +45,7 @@ module NoBrainer
         def description
           desc = "have #{@type.inspect} validator on #{@field.inspect}"
           desc += " on #{@options[:on]}" if @options[:on]
+          desc += " with message #{@expected_message.inspect}" if @expected_message
           desc
         end
 
@@ -50,6 +54,11 @@ module NoBrainer
           self
         end
 
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
         private
 
         def check_on
@@ -74,6 +83,19 @@ module NoBrainer
         def on_options_covered_by?(validator)
           ([@options[:on]].flatten - [validator.options[:on]].flatten).empty?
         end
+
+        def check_expected_message
+          actual_message = @validator.options[:message]
+          if actual_message.nil?
+            @negative_result_message << ' with no custom message'
+            @result = false
+          elsif actual_message == @expected_message
+            @positive_result_message << " with custom message '#{@expected_message}'"
+          else
+            @negative_result_message << " got message '#{actual_message}'"
+            @result = false
+          end
+        end
       end
     end
   end

data/lib/matchers/validations/uniqueness_of.rb

@@ -32,6 +32,7 @@ module NoBrainer
 
         def check_scope
           message = " scope to #{@validator.options[:scope]}"
+
           if @validator.options[:scope]
             if [@validator.options[:scope] || ''].flatten.map(&:to_sym) == @scope
               @positive_result_message += message

data/lib/nobrainer/rspec/version.rb

@@ -2,6 +2,6 @@
 
 module NoBrainer
   module RSpec
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nobrainer-rspec
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Guillaume Hain
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nobrainer