shoulda-matchers 4.4.0 → 5.0.0

data/lib/shoulda/matchers/util.rb

@@ -1,3 +1,5 @@
+require 'shoulda/matchers/util/word_wrap'
+
 module Shoulda
   module Matchers
     # @private
@@ -5,8 +7,10 @@ module Shoulda
       MAXIMUM_LENGTH_OF_VALUE_TO_DISPLAY = 500
 
       def self.deconstantize(path)
-        if defined?(ActiveSupport::Inflector) &&
+        if (
+          defined?(ActiveSupport::Inflector) &&
           ActiveSupport::Inflector.respond_to?(:deconstantize)
+        )
           ActiveSupport::Inflector.deconstantize(path)
         else
           path.to_s[0...(path.to_s.rindex('::') || 0)]
@@ -14,8 +18,10 @@ module Shoulda
       end
 
       def self.safe_constantize(camel_cased_word)
-        if defined?(ActiveSupport::Inflector) &&
+        if (
+          defined?(ActiveSupport::Inflector) &&
           ActiveSupport::Inflector.respond_to?(:safe_constantize)
+        )
           ActiveSupport::Inflector.safe_constantize(camel_cased_word)
         else
           begin
@@ -28,6 +34,7 @@ module Shoulda
 
       def self.indent(string, width)
         return if !string
+
         indentation = ' ' * width
         string.split(/[\n\r]/).map { |line| indentation + line }.join("\n")
       end

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

@@ -41,10 +41,10 @@ module Shoulda
 
     # @private
     class Text < ::String
-      LIST_ITEM_REGEXP = /\A((?:[a-z0-9]+(?:\)|\.)|\*) )/
+      LIST_ITEM_REGEXP = /\A((?:[a-z0-9]+(?:\)|\.)|\*) )/.freeze
 
       def indented?
-        self =~ /\A[ ]+/
+        self =~ /\A +/
       end
 
       def list_item?
@@ -88,11 +88,11 @@ module Shoulda
       end
 
       def combine_list_item_lines(lines)
-        lines.reduce([]) do |combined_lines, line|
+        lines.inject([]) do |combined_lines, line|
           if line.list_item?
             combined_lines << line
           else
-            combined_lines.last << (' ' + line).squeeze(' ')
+            combined_lines.last << (" #{line}").squeeze(' ')
           end
 
           combined_lines
@@ -114,7 +114,7 @@ module Shoulda
 
     # @private
     class Line
-      OFFSETS = { left: -1, right: +1 }
+      OFFSETS = { left: -1, right: +1 }.freeze
 
       def initialize(line, indent: 0)
         @indent = indent
@@ -169,7 +169,7 @@ module Shoulda
         end
       end
 
-      def wrap_line(line, direction: :left)
+      def wrap_line(line)
         index = nil
 
         if line.length > Shoulda::Matchers::WordWrap::TERMINAL_WIDTH
@@ -185,7 +185,7 @@ module Shoulda
           leftover = ''
         else
           fitted_line = line[0..index].rstrip
-          leftover = line[index + 1 .. -1]
+          leftover = line[index + 1..]
         end
 
         { fitted_line: fitted_line, leftover: leftover }

data/lib/shoulda/matchers/version.rb

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

data/lib/shoulda/matchers/warn.rb

@@ -5,13 +5,13 @@ module Shoulda
 
     # @private
     def self.warn(message)
-      header = "Warning from shoulda-matchers:"
-      divider = "*" * TERMINAL_MAX_WIDTH
+      header = 'Warning from shoulda-matchers:'
+      divider = '*' * TERMINAL_MAX_WIDTH
       wrapped_message = word_wrap(message)
       full_message = [
         divider,
         [header, wrapped_message.strip].join("\n\n"),
-        divider
+        divider,
       ].join("\n")
 
       Kernel.warn(full_message)

data/shoulda-matchers.gemspec

@@ -18,21 +18,24 @@ Gem::Specification.new do |s|
   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    = {
+  s.description = <<~DESC.tr("\n", ' ').squeeze(' ')
+    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.
+  DESC
+
+  s.metadata = {
     'bug_tracker_uri' => 'https://github.com/thoughtbot/shoulda-matchers/issues',
-    'changelog_uri' => 'https://github.com/thoughtbot/shoulda-matchers/blob/master/NEWS.md',
+    'changelog_uri' => 'https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md',
     'documentation_uri' => 'https://matchers.shoulda.io/docs',
     'homepage_uri' => 'https://matchers.shoulda.io',
     'source_code_uri' => 'https://github.com/thoughtbot/shoulda-matchers',
   }
 
-  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.files = Dir['{docs,lib}/**/*', 'README.md', 'LICENSE',
+    'shoulda-matchers.gemspec']
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.4.0'
-  s.add_dependency('activesupport', '>= 4.2.0')
+  s.required_ruby_version = '>= 2.6.0'
+  s.add_dependency('activesupport', '>= 5.2.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -11,10 +11,10 @@ authors:
 - Matt Jankowski
 - Stafford Brunk
 - Elliot Winkler
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -22,22 +22,23 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-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.
+        version: 5.2.0
+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: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - docs/errors/NonCaseSwappableValueError.md
 - lib/shoulda-matchers.rb
@@ -59,7 +60,6 @@ files:
 - lib/shoulda/matchers/action_controller/set_session_matcher.rb
 - lib/shoulda/matchers/action_controller/set_session_or_flash_matcher.rb
 - lib/shoulda/matchers/active_model.rb
-- lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher/attribute_changed_value_error.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher/attribute_does_not_exist_error.rb
@@ -173,11 +173,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/thoughtbot/shoulda-matchers/issues
-  changelog_uri: https://github.com/thoughtbot/shoulda-matchers/blob/master/NEWS.md
+  changelog_uri: https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md
   documentation_uri: https://matchers.shoulda.io/docs
   homepage_uri: https://matchers.shoulda.io
   source_code_uri: https://github.com/thoughtbot/shoulda-matchers
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -185,15 +185,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.15
+signing_key: 
 specification_version: 4
 summary: Simple one-liner tests for common Rails functionality
 test_files: []

data/lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb

@@ -1,159 +0,0 @@
-module Shoulda
-  module Matchers
-    module ActiveModel
-      # The `allow_mass_assignment_of` matcher tests usage of Rails 3's
-      # `attr_accessible` and `attr_protected` macros, asserting that an
-      # attribute in your model is contained in either the whitelist or
-      # blacklist and thus can or cannot be set via mass assignment.
-      #
-      #     class Post
-      #       include ActiveModel::Model
-      #       include ActiveModel::MassAssignmentSecurity
-      #       attr_accessor :title
-      #
-      #       attr_accessible :title
-      #     end
-      #
-      #     class User
-      #       include ActiveModel::Model
-      #       include ActiveModel::MassAssignmentSecurity
-      #       attr_accessor :encrypted_password
-      #
-      #       attr_protected :encrypted_password
-      #     end
-      #
-      #     # RSpec
-      #     RSpec.describe Post, type: :model do
-      #       it { should allow_mass_assignment_of(:title) }
-      #     end
-      #
-      #     RSpec.describe User, type: :model do
-      #       it { should_not allow_mass_assignment_of(:encrypted_password) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class PostTest < ActiveSupport::TestCase
-      #       should allow_mass_assignment_of(:title)
-      #     end
-      #
-      #     class UserTest < ActiveSupport::TestCase
-      #       should_not allow_mass_assignment_of(:encrypted_password)
-      #     end
-      #
-      # #### Optional qualifiers
-      #
-      # ##### as
-      #
-      # Use `as` if your mass-assignment rules apply only under a certain role
-      # *(Rails >= 3.1 only)*.
-      #
-      #     class Post
-      #       include ActiveModel::Model
-      #       include ActiveModel::MassAssignmentSecurity
-      #       attr_accessor :title
-      #
-      #       attr_accessible :title, as: :admin
-      #     end
-      #
-      #     # RSpec
-      #     RSpec.describe Post, type: :model do
-      #       it { should allow_mass_assignment_of(:title).as(:admin) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class PostTest < ActiveSupport::TestCase
-      #       should allow_mass_assignment_of(:title).as(:admin)
-      #     end
-      #
-      # @return [AllowMassAssignmentOfMatcher]
-      #
-      def allow_mass_assignment_of(value)
-        AllowMassAssignmentOfMatcher.new(value)
-      end
-
-      # @private
-      class AllowMassAssignmentOfMatcher
-        attr_reader :failure_message, :failure_message_when_negated
-
-        def initialize(attribute)
-          @attribute = attribute.to_s
-          @options = {}
-        end
-
-        def as(role)
-          @options[:role] = role
-          self
-        end
-
-        def matches?(subject)
-          @subject = subject
-          if attr_mass_assignable?
-            if whitelisting?
-              @failure_message_when_negated = "#{@attribute} was made accessible"
-            else
-              if protected_attributes.empty?
-                @failure_message_when_negated = 'no attributes were protected'
-              else
-                @failure_message_when_negated = "#{class_name} is protecting " <<
-                  "#{protected_attributes.to_a.to_sentence}, " <<
-                  "but not #{@attribute}."
-              end
-            end
-            true
-          else
-            if whitelisting?
-              @failure_message = "Expected #{@attribute} to be accessible"
-            else
-              @failure_message = "Did not expect #{@attribute} to be protected"
-            end
-            false
-          end
-        end
-
-        def description
-          [base_description, role_description].compact.join(' ')
-        end
-
-        private
-
-        def base_description
-          "allow mass assignment of #{@attribute}"
-        end
-
-        def role_description
-          if role != :default
-            "as #{role}"
-          end
-        end
-
-        def role
-          @options[:role] || :default
-        end
-
-        def protected_attributes
-          @protected_attributes ||= (@subject.class.protected_attributes || [])
-        end
-
-        def accessible_attributes
-          @accessible_attributes ||= (@subject.class.accessible_attributes || [])
-        end
-
-        def whitelisting?
-          authorizer.kind_of?(::ActiveModel::MassAssignmentSecurity::WhiteList)
-        end
-
-        def attr_mass_assignable?
-          !authorizer.deny?(@attribute)
-        end
-
-        def authorizer
-          @subject.class.active_authorizer[role]
-        end
-
-        def class_name
-          @subject.class.name
-        end
-      end
-    end
-  end
-end