right_support 2.8.10 → 2.8.11

data/Gemfile

@@ -11,7 +11,7 @@ group :optional do
   gem "simple_uuid", "~> 0.2", :require => nil
   gem "uuid", "~> 2.3", :require => nil
   gem "yajl-ruby", "~> 1.1"
-  gem "iconv"
+  gem "iconv", :platforms => :ruby_18
 end
 
 # Gems used during test and development of RightSupport.

data/VERSION

@@ -1 +1 @@
-2.8.10
+2.8.11

data/lib/right_support/data/serializer.rb

@@ -22,7 +22,6 @@
 
 require 'time'
 require 'date'
-require 'iconv'
 
 module RightSupport::Data
   # Utility class that implements true, lossless Ruby-to-JSON serialization.
@@ -142,14 +141,47 @@ module RightSupport::Data
 
     protected
 
+    if RUBY_VERSION =~ /^1\.8/ && require_succeeds?('iconv')
+      # Given a String, replace invalid UTF-8 character sequences and return a string with valid
+      # UTF-8 encoding. This requires the iconv gem to be present if running under Ruby 1.8.
+      #
+      # @param [String] dirty the string to be scrubbed
+      # @return [String]
+      def scrub_string(dirty)
+        iconv = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+        iconv.iconv(dirty)
+      end
+    elsif RUBY_VERSION !~ /^1\.8/
+      # Given a String, replace invalid UTF-8 character sequences and return a string with valid
+      # UTF-8 encoding. This requires the iconv gem to be present if running under Ruby 1.8.
+      #
+      # @param [String] dirty the string to be scrubbed
+      # @return [String]
+      def scrub_string(dirty)
+        dirty.dup.force_encoding(Encoding::BINARY).encode(Encoding::UTF_8,
+                                                          :invalid => :replace,
+                                                          :undef => :replace,
+                                                          :replace => '')
+      end
+    else
+      warn "Cannot deal with invalid UTF-8 codepoints; install iconv or upgrade to Ruby > 1.8"
+      # Given a String, replace invalid UTF-8 character sequences and return a string with valid
+      # UTF-8 encoding. This requires the iconv gem to be present if running under Ruby 1.8.
+      #
+      # @param [String] dirty the string to be scrubbed
+      # @return [String]
+      def scrub_string(dirty)
+        dirty
+      end
+    end
+
     # Given an Object, transform it into a JSONish Ruby structure.
     # @param [Object] object any Ruby object
     # @return [Object] JSONish representation of input object
     def object_to_jsonish(object)
-      iconv = Iconv.new('UTF-8//IGNORE', 'UTF-8')
       case object
       when String
-        object = iconv.iconv(object)
+        object = scrub_string(object)
         if (object =~ /^:/ ) || (object =~ TIME_PATTERN)
           # Strings that look like a Symbol or Time must be object-escaped.
           {@marker => String.name,

data/right_support.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.8.10"
+  s.version = "2.8.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 2
   - 8
-  - 10
-  version: 2.8.10
+  - 11
+  version: 2.8.11
 platform: ruby
 authors: 
 - Tony Spataro