shoulda-matchers 4.0.1 → 4.1.0

data/lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb

@@ -276,7 +276,7 @@ module Shoulda
         end
 
         def scoped_to(*scopes)
-          @options[:scopes] = [*scopes].flatten
+          @options[:scopes] = [*scopes].flatten.map(&:to_sym)
           self
         end
 
@@ -477,7 +477,7 @@ module Shoulda
 
         def actual_sets_of_scopes
           validations.map do |validation|
-            Array.wrap(validation.options[:scope])
+            Array.wrap(validation.options[:scope]).map(&:to_sym)
           end.reject(&:empty?)
         end
 
@@ -538,20 +538,12 @@ module Shoulda
 
         def create_existing_record
           @given_record.tap do |existing_record|
-            ensure_secure_password_set(existing_record)
             existing_record.save(validate: false)
           end
         rescue ::ActiveRecord::StatementInvalid => error
           raise ExistingRecordInvalid.create(underlying_exception: error)
         end
 
-        def ensure_secure_password_set(instance)
-          if has_secure_password?
-            instance.password = "password"
-            instance.password_confirmation = "password"
-          end
-        end
-
         def update_existing_record!(value)
           if existing_value_read != value
             set_attribute_on_existing_record!(@attribute, value)
@@ -576,9 +568,7 @@ module Shoulda
         end
 
         def has_secure_password?
-          model.ancestors.map(&:to_s).include?(
-            'ActiveModel::SecurePassword::InstanceMethodsOnActivation'
-          )
+          Shoulda::Matchers::RailsShim.has_secure_password?(subject, @attribute)
         end
 
         def build_new_record

data/lib/shoulda/matchers/configuration.rb

@@ -5,6 +5,11 @@ module Shoulda
       yield configuration
     end
 
+    # @private
+    def self.integrations
+      configuration.integrations
+    end
+
     # @private
     def self.configuration
       @_configuration ||= Configuration.new
@@ -12,8 +17,14 @@ module Shoulda
 
     # @private
     class Configuration
+      attr_reader :integrations
+
+      def initialize
+        @integrations = nil
+      end
+
       def integrate(&block)
-        Integrations::Configuration.apply(self, &block)
+        @integrations = Integrations::Configuration.apply(&block)
       end
     end
   end

data/lib/shoulda/matchers/integrations/configuration.rb

@@ -5,11 +5,13 @@ module Shoulda
     module Integrations
       # @private
       class Configuration
-        def self.apply(configuration, &block)
-          new(configuration, &block).apply
+        def self.apply(&block)
+          new(&block).apply
         end
 
-        def initialize(configuration, &block)
+        attr_reader :test_frameworks
+
+        def initialize(&block)
           @test_frameworks = Set.new
           @libraries = Set.new
 
@@ -47,6 +49,8 @@ EOT
             test_framework.include(Shoulda::Matchers::Independent)
             @libraries.each { |library| library.integrate_with(test_framework) }
           end
+
+          self
         end
 
         private

data/lib/shoulda/matchers/rails_shim.rb

@@ -119,6 +119,43 @@ module Shoulda
           end
         end
 
+        def parent_of(mod)
+          if mod.respond_to?(:module_parent)
+            mod.module_parent
+          else
+            mod.parent
+          end
+        end
+
+        def has_secure_password?(record, attribute_name)
+          if secure_password_module
+            attribute_name == :password &&
+              record.class.ancestors.include?(secure_password_module)
+          else
+            record.respond_to?("authenticate_#{attribute_name}")
+          end
+        end
+
+        def digestible_attributes_in(record)
+          record.methods.inject([]) do |array, method_name|
+            match = method_name.to_s.match(
+              /\A(\w+)_(?:confirmation|digest)=\Z/,
+            )
+
+            if match
+              array.concat([match[1].to_sym])
+            else
+              array
+            end
+          end
+        end
+
+        def secure_password_module
+          ::ActiveModel::SecurePassword::InstanceMethodsOnActivation
+        rescue NameError
+          nil
+        end
+
         private
 
         def simply_generate_validation_message(

data/lib/shoulda/matchers/util.rb

@@ -33,7 +33,7 @@ module Shoulda
       end
 
       def self.a_or_an(next_word)
-        if next_word =~ /\A[aeiou]/i
+        if next_word =~ /\A[aeiou]/i && next_word != 'unique'
           "an #{next_word}"
         else
           "a #{next_word}"

data/lib/shoulda/matchers/util/word_wrap.rb

@@ -2,6 +2,8 @@ module Shoulda
   module Matchers
     # @private
     module WordWrap
+      TERMINAL_WIDTH = 72
+
       def word_wrap(document, options = {})
         Document.new(document, options).wrap
       end
@@ -112,7 +114,6 @@ module Shoulda
 
     # @private
     class Line
-      TERMINAL_WIDTH = 72
       OFFSETS = { left: -1, right: +1 }
 
       def initialize(line, indent: 0)
@@ -171,7 +172,7 @@ module Shoulda
       def wrap_line(line, direction: :left)
         index = nil
 
-        if line.length > TERMINAL_WIDTH
+        if line.length > Shoulda::Matchers::WordWrap::TERMINAL_WIDTH
           index = determine_where_to_break_line(line, direction: :left)
 
           if index == -1
@@ -192,7 +193,7 @@ module Shoulda
 
       def determine_where_to_break_line(line, args)
         direction = args.fetch(:direction)
-        index = TERMINAL_WIDTH
+        index = Shoulda::Matchers::WordWrap::TERMINAL_WIDTH
         offset = OFFSETS.fetch(direction)
 
         while line[index] !~ /\s/ && (0...line.length).cover?(index)

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '4.0.1'.freeze
+    VERSION = '4.1.0'.freeze
   end
 end

data/shoulda-matchers.gemspec

@@ -2,30 +2,37 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'shoulda/matchers/version'
 
 Gem::Specification.new do |s|
-  s.name        = "shoulda-matchers"
+  s.name        = 'shoulda-matchers'
   s.version     = Shoulda::Matchers::VERSION.dup
-  s.authors     = ["Tammer Saleh", "Joe Ferris", "Ryan McGeary", "Dan Croak",
-                   "Matt Jankowski", "Stafford Brunk", "Elliot Winkler"]
-  s.date        = Time.now.strftime("%Y-%m-%d")
-  s.email       = "support@thoughtbot.com"
-  s.homepage    = "https://matchers.shoulda.io/"
-  s.summary     = "Making tests easy on the fingers and eyes"
-  s.license     = "MIT"
-  s.description = "Making tests easy on the fingers and eyes"
+  s.authors     = [
+    'Tammer Saleh',
+    'Joe Ferris',
+    'Ryan McGeary',
+    'Dan Croak',
+    'Matt Jankowski',
+    'Stafford Brunk',
+    'Elliot Winkler',
+  ]
+  s.date        = Time.now.strftime('%Y-%m-%d')
+  s.email       = 'support@thoughtbot.com'
+  s.homepage    = 'https://matchers.shoulda.io/'
+  s.summary     = 'Simple one-liner tests for common Rails functionality'
+  s.license     = 'MIT'
+  s.description = 'Shoulda Matchers provides RSpec- and Minitest-compatible one-liners to test common Rails functionality that, if written by hand, would be much longer, more complex, and error-prone.'
   s.metadata    = {
     'bug_tracker_uri' => 'https://github.com/thoughtbot/shoulda-matchers/issues',
     'changelog_uri' => 'https://github.com/thoughtbot/shoulda-matchers/blob/master/NEWS.md',
     'documentation_uri' => 'https://matchers.shoulda.io/docs',
     'homepage_uri' => 'https://matchers.shoulda.io',
-    'source_code_uri' => 'https://github.com/thoughtbot/shoulda-matchers'
+    'source_code_uri' => 'https://github.com/thoughtbot/shoulda-matchers',
   }
 
-  s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  s.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z -- {docs,lib,README.md,MIT-LICENSE,shoulda-matchers.gemspec}`.
       split("\x0")
   end
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.4.0'
   s.add_dependency('activesupport', '>= 4.2.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,7 +30,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-description: Making tests easy on the fingers and eyes
+description: Shoulda Matchers provides RSpec- and Minitest-compatible one-liners to
+  test common Rails functionality that, if written by hand, would be much longer,
+  more complex, and error-prone.
 email: support@thoughtbot.com
 executables: []
 extensions: []
@@ -79,6 +81,7 @@ files:
 - lib/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher.rb
 - lib/shoulda/matchers/active_model/qualifiers.rb
+- lib/shoulda/matchers/active_model/qualifiers/allow_nil.rb
 - lib/shoulda/matchers/active_model/qualifiers/ignore_interference_by_writer.rb
 - lib/shoulda/matchers/active_model/qualifiers/ignoring_interference_by_writer.rb
 - lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb
@@ -181,15 +184,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Making tests easy on the fingers and eyes
+summary: Simple one-liner tests for common Rails functionality
 test_files: []