rspec-support 3.4.1 → 3.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c6ea6acc982a2910d925f597f145145b22cf7f
-  data.tar.gz: 4603a8c3f85cf003193e7482a19a1970339051ce
+  metadata.gz: ec9c4fd5101ce3289e09d787448cffbab08a563e
+  data.tar.gz: d2037dfbf1e7198702ea76a715322de33fc620c4
 SHA512:
-  metadata.gz: 74d0dd544377bef599af14522a512690eff3a21b317161aee428be724da07cfb5da7edb981f2440e72f374aa960b65deb9ceaab5e59ad377200df693063494d4
-  data.tar.gz: cc57fd580aaf7a0a78985a86f2d995f6a69637b5d379e048cfdb02ae523eea5517d8654e4d9ae6febb377f93fac19c68d6b0f0737f5c2a07e7359650af6b0db7
+  metadata.gz: 772ca53099ce0eadc50476aded4ae68c9485b15d1bdad55d2852dc463f3efcc1cb07a043b4bd1da755f28ffce8fe3693ae06b6691d5a2267cf155c2dd8a313be
+  data.tar.gz: 633fc69929b63caa86b8f29f06dad98ad0b3c74e205143225b910652388f36fa783b2b05cebdd884366b70b3fba2b0dad0960ca1318f12febb5ba6d7e9a9ada6

data/Changelog.md

@@ -1,3 +1,14 @@
+### Development
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.5.0.beta1...master)
+
+### 3.5.0.beta1 / 2016-02-06
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.4.1...v3.5.0.beta1)
+
+Enhancements:
+
+* Improve formatting of objects by allowing truncation to a pre-configured length.
+  (Liam M, #256)
+
 ### 3.4.1 / 2015-11-20
 [Full Changelog](http://github.com/rspec/rspec-support/compare/v3.4.0...v3.4.1)
 
@@ -8,6 +19,10 @@ Bug Fixes:
   it. This prevents rspec-core from trying to load and use ripper to
   extract failure snippets. (Aaron Stone, #251)
 
+Changes:
+
+* Remove `VersionChecker` in favor of `ComparableVersion`. (Yuji Nakayama, #266)
+
 ### 3.4.0 / 2015-11-11
 [Full Changelog](http://github.com/rspec/rspec-support/compare/v3.3.0...v3.4.0)
 

data/README.md

@@ -33,8 +33,8 @@ can treat each RSpec repo as an independent project.
 
 ## Patches
 
-Please submit a pull request or a github issue to one of the issue trackers
-listed below. If you submit an issue, please include a link to either of:
+Please submit a pull request or a github issue. If you submit an issue, please
+include a link to either of:
 
 * a gist (or equivalent) of the patch
 * a branch or commit in your github fork of the repo

data/lib/rspec/support/object_formatter.rb

@@ -2,15 +2,41 @@ module RSpec
   module Support
     # Provide additional output details beyond what `inspect` provides when
     # printing Time, DateTime, or BigDecimal
-    module ObjectFormatter
-      # @api private
+    # @api private
+    class ObjectFormatter
+      attr_accessor :max_formatted_output_length
+
+      def initialize(max_formatted_output_length=200)
+        @max_formatted_output_length = max_formatted_output_length
+      end
+
+      # Methods are deferred to a default instance of the class to maintain the interface
+      # For example, calling ObjectFormatter.format is still possible
+      @default_instance = new(200)
+
+      ELLIPSIS = "..."
+
+      def format(object)
+        if max_formatted_output_length.nil?
+          return prepare_for_inspection(object).inspect
+        else
+          formatted_object = prepare_for_inspection(object).inspect
+          if formatted_object.length < max_formatted_output_length
+            return formatted_object
+          else
+            beginning = formatted_object[0 .. max_formatted_output_length / 2]
+            ending = formatted_object[-max_formatted_output_length / 2 ..-1]
+            return beginning + ELLIPSIS + ending
+          end
+        end
+      end
+
       def self.format(object)
-        prepare_for_inspection(object).inspect
+        @default_instance.format(object)
       end
 
       # rubocop:disable MethodLength
 
-      # @private
       # Prepares the provided object to be formatted by wrapping it as needed
       # in something that, when `inspect` is called on it, will produce the
       # desired output.
@@ -20,7 +46,7 @@ module RSpec
       # with custom items that have `inspect` defined to return the desired output
       # for that item. Then we can just use `Array#inspect` or `Hash#inspect` to
       # format the entire thing.
-      def self.prepare_for_inspection(object)
+      def prepare_for_inspection(object)
         case object
         when Array
           return object.map { |o| prepare_for_inspection(o) }
@@ -44,33 +70,41 @@ module RSpec
       end
       # rubocop:enable MethodLength
 
-      # @private
-      def self.prepare_hash(input)
+      def self.prepare_for_inspection(object)
+        @default_instance.prepare_for_inspection(object)
+      end
+
+      def prepare_hash(input)
         input.inject({}) do |hash, (k, v)|
           hash[prepare_for_inspection(k)] = prepare_for_inspection(v)
           hash
         end
       end
 
+      def self.prepare_hash(input)
+        @default_instance.prepare_hash(input)
+      end
+
       TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
 
       if Time.method_defined?(:nsec)
-        # @private
-        def self.format_time(time)
+        def format_time(time)
           time.strftime("#{TIME_FORMAT}.#{"%09d" % time.nsec} %z")
         end
       else # for 1.8.7
-        # @private
-        def self.format_time(time)
+        def format_time(time)
           time.strftime("#{TIME_FORMAT}.#{"%06d" % time.usec} %z")
         end
       end
 
+      def self.format_time(time)
+        @default_instance.format_time(time)
+      end
+
       DATE_TIME_FORMAT = "%a, %d %b %Y %H:%M:%S.%N %z"
       # ActiveSupport sometimes overrides inspect. If `ActiveSupport` is
       # defined use a custom format string that includes more time precision.
-      # @private
-      def self.format_date_time(date_time)
+      def format_date_time(date_time)
         if defined?(ActiveSupport)
           date_time.strftime(DATE_TIME_FORMAT)
         else
@@ -78,7 +112,10 @@ module RSpec
         end
       end
 
-      # @private
+      def self.format_date_time(date_time)
+        @default_instance.format_date_time(date_time)
+      end
+
       InspectableItem = Struct.new(:inspection) do
         def inspect
           inspection
@@ -89,7 +126,6 @@ module RSpec
         end
       end
 
-      # @private
       DelegatingInspector = Struct.new(:object) do
         def inspect
           if defined?(::Delegator) && ::Delegator === object

data/lib/rspec/support/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.4.1'
+      STRING = '3.5.0.beta1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0.beta1
 platform: ruby
 authors:
 - David Chelimsky
@@ -48,7 +48,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,6 @@ files:
 - lib/rspec/support/spec/with_isolated_directory.rb
 - lib/rspec/support/spec/with_isolated_stderr.rb
 - lib/rspec/support/version.rb
-- lib/rspec/support/version_checker.rb
 - lib/rspec/support/warnings.rb
 homepage: https://github.com/rspec/rspec-support
 licenses:
@@ -145,13 +144,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-support-3.4.1
+summary: rspec-support-3.5.0.beta1
 test_files: []

data/lib/rspec/support/version_checker.rb

@@ -1,53 +0,0 @@
-module RSpec
-  module Support
-    LibraryVersionTooLowError = Class.new(StandardError)
-
-    # @private
-    class VersionChecker
-      def initialize(library_name, library_version, min_patch_level)
-        @library_name, @library_version = library_name, library_version
-        @min_patch_level = min_patch_level
-
-        @major,     @minor,     @patch     = parse_version(library_version)
-        @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
-
-        @comparison_result = compare_version
-      end
-
-      def check_version!
-        raise_too_low_error if too_low?
-      end
-
-    private
-
-      def too_low?
-        @comparison_result == :too_low
-      end
-
-      def raise_too_low_error
-        raise LibraryVersionTooLowError,
-              "You are using #{@library_name} #{@library_version}. " \
-              "RSpec requires version #{version_requirement}."
-      end
-
-      def compare_version
-        case
-        when @major < @min_major then :too_low
-        when @major > @min_major then :ok
-        when @minor < @min_minor then :too_low
-        when @minor > @min_minor then :ok
-        when @patch < @min_patch then :too_low
-        else :ok
-        end
-      end
-
-      def version_requirement
-        ">= #{@min_patch_level}"
-      end
-
-      def parse_version(version)
-        version.split('.').map { |v| v.to_i }
-      end
-    end
-  end
-end