rspec-support 3.9.1 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8cd61c982e4ac70aa43e70803e06e76018107daa69d666eb489734ccf78e91
-  data.tar.gz: 68f0a5ab651d9adfb6c53708bbf0b694eb40fe2781da413afd795a375dabbb5f
+  metadata.gz: '0608e9d9e32db7972f9ed9edf1acc660be6e859589a5bb40118979f32e3e3093'
+  data.tar.gz: df94499781e6a3f6460990392a90bcea42c4c1aaa028357139787ab1b92716df
 SHA512:
-  metadata.gz: 57f69f0570273c83d2eca2570a40e203afa78bc259591770e97b330b8ebac66884db77f906244916becfbcd5e13bbd1365db05833c1336b520f6d21c07345162
-  data.tar.gz: 76eb5e023bdce42de00e3194491530bb7c32819aae9975b95536734c064af676890f30d3618fb04a4d000e6934e3644af577593fd5708496c61ac9ae647bdac9
+  metadata.gz: 7598c046151adc5322cddd117f5809c3b3f9b1271c5db74496d6961e0799c1fbf3a47d2b48f1195be96b3c2ce0baab7c11d2f19709d478fc44848523034b9514
+  data.tar.gz: f548fa1b506985c64d9d612463cb4ffb8b41233a86af16ee26449e936570dbe0d4c2f2d9ad5c7fe3cd1a1b57d3156fba368b2f44627634053c2f1db51f64fc6d

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-�y�>k�k�ce�;�m���(#�h�n����Գ�G{{-�������(:��N3���D�'j��/:/�ί�4W�}2��a����%%�&�o�:l���k�!�P|�^	F,��΀nz�̉�W���uة1",��/�����_U�� ��ݽ�Z�3T�,,['(�7o��P��yt�/
-�`
-.���(>k�8�o��!�ڷQ�+����qH����<P���I�������g�_6�SG@�R�XR��5�]�
60�qs�ž�,֤�6���N�@�;�E����3�Nآ	-�ٴB}65����&�F%i�epO�M&C�Î�O�;PҘF�n��Et�V�ZG�	���������>�t�4�'`���9��]VE��q�P�j���a7����џ�^c2]&�B-�?����_�,�a���/�\����+��[9�M~<륦�k-q��Ȅ��!C<�e�^8��,y�b��%�#�{�O���0��e�t�ok�yw-�����'�
+�i|?��R
�.�����m!�~��L�29�[�&�x=
+��f��l��䦆��;	��O��t[�j���wr�bE�&W�[�p
+^S�:�$zXPL�o��

data/Changelog.md

@@ -1,4 +1,12 @@
+### 3.9.2 / 2019-12-30
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.9.1...v3.9.2)
+
+Bug Fixes:
+
+* Remove unneeded eval. (Matijs van Zuijlen, #394)
+
 ### 3.9.1 / 2019-12-28
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.9.0...v3.9.1)
 
 Bug Fixes:
 
@@ -6,12 +14,14 @@ Bug Fixes:
   (Jon Rowe, #392)
 
 ### 3.9.0 / 2019-10-07
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.3...v3.9.0)
 
 *NO CHANGES*
 
 Version 3.9.0 was released to allow other RSpec gems to release 3.9.0.
 
 ### 3.8.3 / 2019-10-02
+[Full Changelog](http://github.com/rspec/rspec-support/compare/v3.8.2...v3.8.3)
 
 Bug Fixes:
 

data/lib/rspec/support/encoded_string.rb

@@ -5,31 +5,11 @@ module RSpec
       # Reduce allocations by storing constants.
       UTF_8    = "UTF-8"
       US_ASCII = "US-ASCII"
-      #
-      # In MRI 2.1 'invalid: :replace' changed to also replace an invalid byte sequence
-      # see https://github.com/ruby/ruby/blob/v2_1_0/NEWS#L176
-      # https://www.ruby-forum.com/topic/6861247
-      # https://twitter.com/nalsh/status/553413844685438976
-      #
-      # For example, given:
-      #   "\x80".force_encoding("Emacs-Mule").encode(:invalid => :replace).bytes.to_a
-      #
-      # On MRI 2.1 or above: 63  # '?'
-      # else               : 128 # "\x80"
-      #
+
       # Ruby's default replacement string is:
       #   U+FFFD ("\xEF\xBF\xBD"), for Unicode encoding forms, else
       #   ?      ("\x3F")
       REPLACE = "?"
-      ENCODE_UNCONVERTABLE_BYTES =  {
-        :invalid => :replace,
-        :undef   => :replace,
-        :replace => REPLACE
-      }
-      ENCODE_NO_CONVERTER = {
-        :invalid => :replace,
-        :replace => REPLACE
-      }
 
       def initialize(string, encoding=nil)
         @encoding = encoding
@@ -112,40 +92,27 @@ module RSpec
           string = remove_invalid_bytes(string)
           string.encode(@encoding)
         rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-          encode_unconvertable_bytes(string)
+          # Originally defined as a constant to avoid uneeded allocations, this hash must
+          # be defined inline (without {}) to avoid warnings on Ruby 2.7
+          #
+          # In MRI 2.1 'invalid: :replace' changed to also replace an invalid byte sequence
+          # see https://github.com/ruby/ruby/blob/v2_1_0/NEWS#L176
+          # https://www.ruby-forum.com/topic/6861247
+          # https://twitter.com/nalsh/status/553413844685438976
+          #
+          # For example, given:
+          #   "\x80".force_encoding("Emacs-Mule").encode(:invalid => :replace).bytes.to_a
+          #
+          # On MRI 2.1 or above: 63  # '?'
+          # else               : 128 # "\x80"
+          #
+          string.encode(@encoding, :invalid => :replace, :undef => :replace, :replace => REPLACE)
         rescue Encoding::ConverterNotFoundError
-          encode_no_converter(string.dup.force_encoding(@encoding))
+          # Originally defined as a constant to avoid uneeded allocations, this hash must
+          # be defined inline (without {}) to avoid warnings on Ruby 2.7
+          string.dup.force_encoding(@encoding).encode(:invalid => :replace, :replace => REPLACE)
         end
 
-        private
-
-        # On Ruby 2.7.0 keyword arguments mixed with conventional cause a warning to
-        # be issued requiring us to be explicit by using a ** to pass the hash as
-        # keyword arguments. Any keyword argument supporting Ruby supports this.
-        if RubyFeatures.kw_args_supported?
-          # Note on non keyword supporting Ruby ** causes a syntax error hence
-          # we must use eval. To be removed in RSpec 4.
-          binding.eval(<<-CODE, __FILE__, __LINE__)
-          def encode_unconvertable_bytes(string)
-            string.encode(@encoding, **ENCODE_UNCONVERTABLE_BYTES)
-          end
-
-          def encode_no_converter(string)
-            string.encode(**ENCODE_NO_CONVERTER)
-          end
-          CODE
-        else
-          def encode_unconvertable_bytes(string)
-            string.encode(@encoding, ENCODE_UNCONVERTABLE_BYTES)
-          end
-
-          def encode_no_converter(string)
-            string.encode(ENCODE_NO_CONVERTER)
-          end
-        end
-
-        public
-
         # Prevents raising ArgumentError
         if String.method_defined?(:scrub)
           # https://github.com/ruby/ruby/blob/eeb05e8c11/doc/NEWS-2.1.0#L120-L123

data/lib/rspec/support/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Support
     module Version
-      STRING = '3.9.1'
+      STRING = '3.9.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.9.2
 platform: ruby
 authors:
 - David Chelimsky
@@ -48,7 +48,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,7 +123,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-support/issues
-  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.9.1/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.9.2/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-support
@@ -146,5 +146,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rspec-support-3.9.1
+summary: rspec-support-3.9.2
 test_files: []