rspec-mocks 3.5.0.beta4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e619f239f393038a41c5ae5283931d45177060
-  data.tar.gz: bcf202094e33445c187ad03bae7b8f02e063175f
+  metadata.gz: 369230b27c82d856c459fbae0bb3edbf679860ec
+  data.tar.gz: 1503479a7c3fb2ecbd49440a6adcb5694de0b9c1
 SHA512:
-  metadata.gz: 0356559cb69bb41529fbde684aae9a8c743b6a4c039c6a6fac8ae68817b61843ad441e77c76a31185d24d9b6cfec2fe275fbe68c47c89b60ea76eb150d642065
-  data.tar.gz: 6ce3a3dcfedc4d2bda16387ec08774424947201a50e88ebc12eb653d7d21eefbc466ac5d7aa5d60cdb370e75b0463176317b784ca6260980a51b8b99a01550a9
+  metadata.gz: 3d48bea5a6043e2558b42478f71dd029b26ebafdc788de72547024f78cfdca5aabdd704a54b1c1de18b6992e61f2ab16c812bdd860e42c0295608ac51be7c9eb
+  data.tar.gz: 8e4ce2f66bc481a487d601e38674f5d02b8c7ed61e31608e2b3c49c5112a09c39d64b9fa71a7263908e2360d5e9bcb56c040fad6837786ff179efee17a124901

data/Changelog.md

@@ -1,5 +1,10 @@
-### 3.5 Development
-[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.5.0.beta4...master)
+### 3.5.0 / 2016-07-01
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.5.0.beta4...v3.5.0)
+
+Enhancements:
+
+* Provides a nice string representation of
+  `RSpec::Mocks::MessageExpectation` (Myron Marston, #1095)
 
 ### 3.5.0.beta4 / 2016-06-05
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.5.0.beta3...v3.5.0.beta4)

data/lib/rspec/mocks/error_generator.rb

@@ -218,6 +218,33 @@ module RSpec
         "To disallow expectations on `nil`, set `config.allow_message_expectations_on_nil` to `false`"
       end
 
+      # @private
+      def intro(unwrapped=false)
+        case @target
+        when TestDouble then TestDoubleFormatter.format(@target, unwrapped)
+        when Class then
+          formatted = "#{@target.inspect} (class)"
+          return formatted if unwrapped
+          "#<#{formatted}>"
+        when NilClass then "nil"
+        else @target.inspect
+        end
+      end
+
+      # @private
+      def method_call_args_description(args, generic_prefix=" with arguments: ", matcher_prefix=" with ")
+        case args.first
+        when ArgumentMatchers::AnyArgsMatcher then "#{matcher_prefix}any arguments"
+        when ArgumentMatchers::NoArgsMatcher  then "#{matcher_prefix}no arguments"
+        else
+          if yield
+            "#{generic_prefix}#{format_args(args)}"
+          else
+            ""
+          end
+        end
+      end
+
     private
 
       def received_part_of_expectation_error(actual_received_count, args)
@@ -234,19 +261,6 @@ module RSpec
           end
       end
 
-      def method_call_args_description(args)
-        case args.first
-        when ArgumentMatchers::AnyArgsMatcher then " with any arguments"
-        when ArgumentMatchers::NoArgsMatcher  then " with no arguments"
-        else
-          if yield
-            " with arguments: #{format_args(args)}"
-          else
-            ""
-          end
-        end
-      end
-
       def unexpected_arguments_message(expected_args_string, actual_args_string)
         "with unexpected arguments\n  expected: #{expected_args_string}\n       got: #{actual_args_string}"
       end
@@ -290,18 +304,6 @@ module RSpec
         RSpec::Support::Differ.new(:color => RSpec::Mocks.configuration.color?)
       end
 
-      def intro(unwrapped=false)
-        case @target
-        when TestDouble then TestDoubleFormatter.format(@target, unwrapped)
-        when Class then
-          formatted = "#{@target.inspect} (class)"
-          return formatted if unwrapped
-          "#<#{formatted}>"
-        when NilClass then "nil"
-        else @target
-        end
-      end
-
       def __raise(message, backtrace_line=nil, source_id=nil)
         message = opts[:message] unless opts[:message].nil?
         exception = RSpec::Mocks::MockExpectationError.new(message)

data/lib/rspec/mocks/message_expectation.rb

@@ -343,6 +343,14 @@ module RSpec
         self
       end
 
+      # @return [String] a nice representation of the message expectation
+      def to_s
+        args_description = error_generator.method_call_args_description(@argument_list_matcher.expected_args, "", "") { true }
+        args_description = "(#{args_description})" unless args_description.start_with?("(")
+        "#<#{self.class} #{error_generator.intro}.#{message}#{args_description}>"
+      end
+      alias inspect to_s
+
       # @private
       # Contains the parts of `MessageExpectation` that aren't part of
       # rspec-mocks' public API. The class is very big and could really use

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.5.0.beta4'
+      STRING = '3.5.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta4
+  version: 3.5.0
 platform: ruby
 authors:
 - Steven Baker
@@ -45,22 +45,22 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta4
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta4
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -205,14 +205,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.5.0.beta4
+summary: rspec-mocks-3.5.0
 test_files: []
 has_rdoc: