aruba 0.10.0.pre → 0.10.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28f6c27992873436132f1a1026bf1fefca105da
-  data.tar.gz: a84562c8730d436682f1e297e9a1f93e5875cc54
+  metadata.gz: 8629fdb3cc71266ccb714b5423728671ef1216b9
+  data.tar.gz: 5451d0a593fcb71b59275a3b83f7ecdbacc79d8d
 SHA512:
-  metadata.gz: 3cef82f178232a44414a87e5e4b8f1b7582974b4e1e1517defd7154343a5c21a59778951ef71116dae59ea76870924f9945d35f2e69894c637c4f36448a6a424
-  data.tar.gz: 8cdd376cb0f7f4d2d70e508135e6b679ec288a5cbd55c55ebbe7d58972da4261a9ccec084017ee1fe5f1cc736f9cc434f2357169fdabd7c2f212ed04a5a31646
+  metadata.gz: b61b360369dd57186dc7a4de4c0e2c5c367fa3109a0ed4d63205f704787344392e9b677216fc00b2d5eb33a19ed0c66b8c087d3d08492260911033d2655d813b
+  data.tar.gz: 3e69d2bdc444786404a5e09edef498afb4c5f6a041858d950ff90528c87d01971eb550977b8ed65e8c9a3fe9729d02eecba9ec03ce4ae84f51d7fe0349e695d7

data/.travis.yml

@@ -19,9 +19,9 @@ rvm:
 matrix:
   allow_failures:
   - rvm: rbx
-  - rvm: jrbuby-9.0.0.0
-  - rvm: jrbuby-9.0.0.0-20mode
-  - rvm: jrbuby-9.0.0.0-21mode
+  - rvm: jruby-9.0.0.0
+  - rvm: jruby-9.0.0.0-20mode
+  - rvm: jruby-9.0.0.0-21mode
 notifications:
   email:
   - cukes-devs@googlegroups.com

data/History.md

@@ -1,5 +1,12 @@
 # Latest Release
 
+## [v0.10.0.pre2](https://github.com/cucumber/aruba/compare/v0.10.0.pre...v0.10.0.pre2)
+
+* Take over code from `RSpec::Support::ObjectFormatter` since `rspec-support`
+  is not intended for public use.
+
+# Old releases
+
 ## [v0.10.0.pre](https://github.com/cucumber/aruba/compare/v0.9.0...v0.10.0)
 
 * Add some new steps to make writing documentation easier using "cucumber",
@@ -14,7 +21,6 @@
 * Added work around because of method name conflict between Capybara and RSpec
   (https://github.com/cucumber/aruba/commit/1939c4049d5195ffdd967485f50119bdd86e98a0)
 
-# Old releases
 
 ## [v0.9.0](https://github.com/cucumber/aruba/compare/v0.9.0.pre2...v0.9.0)
 

data/lib/aruba/matchers/base/base_matcher.rb

@@ -1,4 +1,4 @@
-require 'rspec/support/object_formatter'
+require 'aruba/matchers/base/object_formatter'
 
 module Aruba
   module Matchers
@@ -87,7 +87,7 @@ module Aruba
       # a `description` method, returns the description; otherwise
       # returns `object.inspect`.
       def description_of(object)
-        RSpec::Support::ObjectFormatter.format(object)
+        Aruba::Matchers::ObjectFormatter.format(object)
       end
     end
   end

data/lib/aruba/matchers/base/object_formatter.rb

@@ -0,0 +1,110 @@
+module Aruba
+  module Matchers
+    # Provide additional output details beyond what `inspect` provides when
+    # printing Time, DateTime, or BigDecimal
+    module ObjectFormatter
+      # @api private
+      def self.format(object)
+        prepare_for_inspection(object).inspect
+      end
+
+      # rubocop:disable MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity
+
+      # @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.
+      #
+      # This allows us to apply the desired formatting to hash/array data structures
+      # at any level of nesting, simply by walking that structure and replacing items
+      # 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)
+        case object
+        when Array
+          return object.map { |o| prepare_for_inspection(o) }
+        when Hash
+          return prepare_hash(object)
+        when Time
+          inspection = format_time(object)
+        else
+          if defined?(DateTime) && DateTime === object
+            inspection = format_date_time(object)
+          elsif defined?(BigDecimal) && BigDecimal === object
+            inspection = "#{object.to_s 'F'} (#{object.inspect})"
+          elsif RSpec::Support.is_a_matcher?(object) && object.respond_to?(:description)
+            inspection = object.description
+          else
+            return DelegatingInspector.new(object)
+          end
+        end
+
+        InspectableItem.new(inspection)
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable MethodLength
+
+      # @private
+      def self.prepare_hash(input)
+        input.each_with_object({}) do |(k, v), hash|
+          hash[prepare_for_inspection(k)] = prepare_for_inspection(v)
+        end
+      end
+
+      TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+
+      if Time.method_defined?(:nsec)
+        # @private
+        def self.format_time(time)
+          time.strftime("#{TIME_FORMAT}.#{format('%09d', time.nsec)} %z")
+        end
+      else # for 1.8.7
+        # @private
+        def self.format_time(time)
+          time.strftime("#{TIME_FORMAT}.#{format('%06d', time.usec)} %z")
+        end
+      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)
+        if defined?(ActiveSupport)
+          date_time.strftime(DATE_TIME_FORMAT)
+        else
+          date_time.inspect
+        end
+      end
+
+      # @private
+      InspectableItem = Struct.new(:inspection) do
+        def inspect
+          inspection
+        end
+
+        def pretty_print(pp)
+          pp.text inspection
+        end
+      end
+
+      # @private
+      DelegatingInspector = Struct.new(:object) do
+        def inspect
+          if defined?(::Delegator) && ::Delegator === object
+            "#<#{object.class}(#{ObjectFormatter.format(object.__getobj__)})>"
+          else
+            object.inspect
+          end
+        end
+
+        def pretty_print(pp)
+          pp.text inspect
+        end
+      end
+    end
+  end
+end

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.10.0.pre'
+  VERSION = '0.10.0.pre2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.10.0.pre
+  version: 0.10.0.pre2
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -292,6 +292,7 @@ files:
 - lib/aruba/initializer.rb
 - lib/aruba/jruby.rb
 - lib/aruba/matchers/base/base_matcher.rb
+- lib/aruba/matchers/base/object_formatter.rb
 - lib/aruba/matchers/collection.rb
 - lib/aruba/matchers/collection/all.rb
 - lib/aruba/matchers/collection/include_an_object.rb
@@ -431,7 +432,7 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: aruba-0.10.0.pre
+summary: aruba-0.10.0.pre2
 test_files:
 - features/announce.feature
 - features/api/command/run.feature