rspec-support 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe50cb7f542a64bbfaf228bf0d4222210131c9c
-  data.tar.gz: 3252ea5991d2b3583a042f16843f81195ea60ffb
+  metadata.gz: 631283161faf72604c2081235f9acbbda6ea980f
+  data.tar.gz: 99170c1beccff1f998787873e0bd156af46ca9ef
 SHA512:
-  metadata.gz: 505b60919c61f1615270f98a9c6cdafcb8553eef14661423a1ca32bef71bd7bd1aae7e9f8fef6da4cd6de0c207cf666aa429e525915b41310b1f7195d1703932
-  data.tar.gz: 2a8d7ffcd478cd7e9dfd90dd97daf14e9296b32fad88e39391d60e785c9326c02db0940b47873ba04dcb98c252dca9535171f9a56633992fbfe7e0930042fc60
+  metadata.gz: 23464780384e45e24c4a8a8255dce0f78d0afd406723d817d68ef66d20a8c0d973d40bdc6bee54188e9714c6ffb20b116045a08bb9c90aa11cb2ec2bdea453a6
+  data.tar.gz: 4b08b17ebd14c92b615d9d6838d1be78c32b9e695933c895bb99710693bec391736ce26864f139c0e22f794e085367aa5cf0081b659068994cffddbfea23f0bc

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-X+�
ӄ��kʕH���|��Ǫձ�(+��4'��i.���tI����DM���٢ �ii���b�n�����
0����(�YQds��!�sA�֒�� $ ��b�Oy��
TV�{ϒ=�߂fDg��s�1�<"�.~w����T{�5x\��	wGݿ�����=��4�ϐ�@J��Z��{��k��t�6�e�`
�P�|^k��{C~I6��۵�?�#���
+�7��,�H�X�j'�:������V����Mu��<�[%�8��b8���)ž
N�$�tA�N�`ʘ>zQ(���8��������,���BM��g辋g�}Ԅ�&�_
+q��ѡ�>e-���}8Yn+߀��>���?r����O9��;l�����Sw��?�AZ�H���B���o�Ę!�Z�p��b�/s�Q�H��B�]K����� ���.`�ƿ��ĹO�R���P��Z6Ȯ���

data/Changelog.md

@@ -1,3 +1,11 @@
+### 3.8.0 / 2018-08-04
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.7.1...v3.8.0)
+
+Bug Fixes:
+
+* Order hash keys before diffing to improve diff accuracy when using mocked calls.
+  (James Crisp, #334)
+
 ### 3.7.1 / 2018-01-29
 [Full Changelog](http://github.com/rspec/rspec-support/compare/v3.7.0...v3.7.1)
 

data/README.md

@@ -13,7 +13,7 @@ RSpec repos as well. Add the following to your `Gemfile`:
 
 ```ruby
 %w[rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
-  gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => 'master'
+  gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
 end
 ```
 

data/lib/rspec/support/method_signature_verifier.rb

@@ -33,6 +33,18 @@ module RSpec
           optional_max_arg_count <= max_non_kw_args
       end
 
+      def classify_arity(arity=@method.arity)
+        if arity < 0
+          # `~` inverts the one's complement and gives us the
+          # number of required args
+          @min_non_kw_args = ~arity
+          @max_non_kw_args = INFINITY
+        else
+          @min_non_kw_args = arity
+          @max_non_kw_args = arity
+        end
+      end
+
       if RubyFeatures.optional_and_splat_args_supported?
         def description
           @description ||= begin
@@ -137,36 +149,58 @@ module RSpec
           false
         end
 
-        def classify_parameters
-          arity = @method.arity
-          if arity < 0
-            # `~` inverts the one's complement and gives us the
-            # number of required args
-            @min_non_kw_args = ~arity
-            @max_non_kw_args = INFINITY
-          else
-            @min_non_kw_args = arity
-            @max_non_kw_args = arity
-          end
-        end
+        alias_method :classify_parameters, :classify_arity
       end
 
       INFINITY = 1 / 0.0
     end
 
-    # Some versions of JRuby have a nasty bug we have to work around :(.
-    # https://github.com/jruby/jruby/issues/2816
-    if RSpec::Support::Ruby.jruby? &&
-       RubyFeatures.optional_and_splat_args_supported? &&
-       Class.new { attr_writer :foo }.instance_method(:foo=).parameters == []
+    if RSpec::Support::Ruby.jruby?
+      # JRuby has only partial support for UnboundMethod#parameters, so we fall back on using #arity
+      # https://github.com/jruby/jruby/issues/2816 and https://github.com/jruby/jruby/issues/2817
+      if RubyFeatures.optional_and_splat_args_supported? &&
+         Java::JavaLang::String.instance_method(:char_at).parameters == []
 
-      class MethodSignature < remove_const(:MethodSignature)
-      private
+        class MethodSignature < remove_const(:MethodSignature)
+        private
 
-        def classify_parameters
-          super
-          return unless @method.parameters == [] && @method.arity == 1
-          @max_non_kw_args = @min_non_kw_args = 1
+          def classify_parameters
+            super
+            if (arity = @method.arity) != 0 && @method.parameters.empty?
+              classify_arity(arity)
+            end
+          end
+        end
+      end
+
+      # JRuby used to always report -1 arity for Java proxy methods.
+      # The workaround essentially makes use of Java's introspection to figure
+      # out matching methods (which could be more than one partly because Java
+      # supports multiple overloads, and partly because JRuby introduces
+      # aliases to make method names look more Rubyesque). If there is only a
+      # single match, we can use that methods arity directly instead of the
+      # default -1 arity.
+      #
+      # This workaround only works for Java proxy methods, and in order to
+      # support regular methods and blocks, we need to be careful about calling
+      # owner and java_class as they might not be available
+      if Java::JavaLang::String.instance_method(:char_at).arity == -1
+        class MethodSignature < remove_const(:MethodSignature)
+        private
+
+          def classify_parameters
+            super
+            return unless @method.arity == -1
+            return unless @method.respond_to?(:owner)
+            return unless @method.owner.respond_to?(:java_class)
+            java_instance_methods = @method.owner.java_class.java_instance_methods
+            compatible_overloads = java_instance_methods.select do |java_method|
+              @method == @method.owner.instance_method(java_method.name)
+            end
+            if compatible_overloads.size == 1
+              classify_arity(compatible_overloads.first.arity)
+            end
+          end
         end
       end
     end

data/lib/rspec/support/object_formatter.rb

@@ -5,7 +5,7 @@ module RSpec
     # Provide additional output details beyond what `inspect` provides when
     # printing Time, DateTime, or BigDecimal
     # @api private
-    class ObjectFormatter # rubocop:disable Style/ClassLength
+    class ObjectFormatter # rubocop:disable Metrics/ClassLength
       ELLIPSIS = "..."
 
       attr_accessor :max_formatted_output_length
@@ -31,15 +31,15 @@ module RSpec
 
       def format(object)
         if max_formatted_output_length.nil?
-          return prepare_for_inspection(object).inspect
+          prepare_for_inspection(object).inspect
         else
           formatted_object = prepare_for_inspection(object).inspect
           if formatted_object.length < max_formatted_output_length
-            return formatted_object
+            formatted_object
           else
             beginning = truncate_string formatted_object, 0, max_formatted_output_length / 2
             ending = truncate_string formatted_object, -max_formatted_output_length / 2, -1
-            return beginning + ELLIPSIS + ending
+            beginning + ELLIPSIS + ending
           end
         end
       end
@@ -73,7 +73,7 @@ module RSpec
 
       def prepare_hash(input_hash)
         with_entering_structure(input_hash) do
-          input_hash.inject({}) do |output_hash, key_and_value|
+          sort_hash_keys(input_hash).inject({}) do |output_hash, key_and_value|
             key, value = key_and_value.map { |element| prepare_element(element) }
             output_hash[key] = value
             output_hash
@@ -81,6 +81,14 @@ module RSpec
         end
       end
 
+      def sort_hash_keys(input_hash)
+        if input_hash.keys.all? { |k| k.is_a?(String) || k.is_a?(Symbol) }
+          Hash[input_hash.sort_by { |k, _v| k.to_s }]
+        else
+          input_hash
+        end
+      end
+
       def prepare_element(element)
         if recursive_structure?(element)
           case element

data/lib/rspec/support/ruby_features.rb

@@ -56,6 +56,22 @@ module RSpec
     module RubyFeatures
       module_function
 
+      if Ruby.jruby?
+        # On JRuby 1.7 `--1.8` mode, `Process.respond_to?(:fork)` returns true,
+        # but when you try to fork, it raises an error:
+        #   NotImplementedError: fork is not available on this platform
+        #
+        # When we drop support for JRuby 1.7 and/or Ruby 1.8, we can drop
+        # this special case.
+        def fork_supported?
+          false
+        end
+      else
+        def fork_supported?
+          Process.respond_to?(:fork)
+        end
+      end
+
       def optional_and_splat_args_supported?
         Method.method_defined?(:parameters)
       end
@@ -109,7 +125,6 @@ module RSpec
         end
       else
         # RBX / JRuby et al support is unknown for keyword arguments
-        # rubocop:disable Lint/Eval
         begin
           eval("o = Object.new; def o.m(a: 1); end;"\
                " raise SyntaxError unless o.method(:m).parameters.include?([:key, :a])")
@@ -147,7 +162,6 @@ module RSpec
             false
           end
         end
-        # rubocop:enable Lint/Eval
       end
 
       def module_refinement_supported?

data/lib/rspec/support/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.7.1'
+      STRING = '3.8.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - David Chelimsky
@@ -48,7 +48,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,5 +156,5 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: rspec-support-3.7.1
+summary: rspec-support-3.8.0
 test_files: []