nobrainer-rspec 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0c49605afc9e72f119e3d5ecb2809a556defc5ab84d52574eef569d8c08697
-  data.tar.gz: 6a71e9bcb29d5e29c8cc4071fbab8ece22bb3ecbc1d814619c442782032d0924
+  metadata.gz: a085f3d69d83e7deb6a1278c422ff1d0206884838aba9554567bb33947c2f2ec
+  data.tar.gz: 44c49d5de1198e404b47d724bc2d2763bee893067c50a53be3cf3a6076cfb124
 SHA512:
-  metadata.gz: 916dfe718138432512a974b258d5d6a9d86a46c184225889e41ebbcd2f13ec8989619f243b8a0ea05791fbcd87e88ad0ab328f4fda83090061275e0951f06fc2
-  data.tar.gz: 7416170408b071fbc3eb6c448e4d604ae771dec9a67b7b37202405d5b36521e2b3c860a29f2b6c77c368af48d2cb235da4175d7bced7572c74730e6419bfd53b
+  metadata.gz: 4abda54b105aec54fbf7f36aa3f99d0341a839edf270f1f9d499beed4b6115e4d7162208e53d84290ba31bec7dc4540a1f3d023f177ace45adae676efba15419
+  data.tar.gz: d6b1bb509c8376652546134665d442c70ac6dab87f2995db0b8f64ae4d2f68b56505b4d2cf9aab5fe734d47831259bacfab84cf133260175d72694c69bab8a52

data/CHANGELOG.md

@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [1.1.2] - 2022-05-09
+### Fixed
+- have_index_for with a coupound index
+
+## [1.1.1] - 2021-02-09
+### Fixed
+- error on generating failure description #1
+
+## [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 +44,9 @@ 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.2...master
+[1.1.2]: https://gitlab.com/zedtux/nobrainer-rspec/-/compare/v1.1.1...v1.1.2
+[1.1.1]: https://gitlab.com/zedtux/nobrainer-rspec/-/compare/v1.1.0...v1.1.1
+[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/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'nobrainer', '~> 0.34', github: 'nviennot/nobrainer'
 gem 'byebug'

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/have_index_for.rb

@@ -68,7 +68,7 @@ module NoBrainer
     class HaveIndexFor # :nodoc:
       def initialize(*attrs)
         @attributes = attrs.collect do |attributes|
-          if attributes.is_a?(Array)
+          if attributes.is_a?(Enumerable)
             attributes.collect(&:to_sym)
           else
             attributes.to_sym
@@ -90,7 +90,7 @@ module NoBrainer
         @klass = klass.is_a?(Class) ? klass : klass.class
         @errors = []
         @attributes.each do |attr|
-          if attr.is_a?(Array)
+          if attr.is_a?(Enumerable)
             missing_fields = attr - @klass.fields.keys
             if missing_fields.empty?
               index_key = @index_name || attr.join('_').to_sym

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/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/nobrainer/rspec/version.rb

@@ -2,6 +2,6 @@
 
 module NoBrainer
   module RSpec
-    VERSION = '1.0.1'
+    VERSION = '1.1.2'
   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.2
 platform: ruby
 authors:
 - Guillaume Hain
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nobrainer
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Nobrainer