right_support 2.8.31 → 2.8.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54dcd26e6d8094ac8b3f8ad42dae62aaf9287a7c
-  data.tar.gz: aa1a58306c4222a41daa45cc30626723065615a1
+  metadata.gz: a2006046eff88bf5bcadd1cbae03279872cada84
+  data.tar.gz: 318dac67ca4962d08e4f990b92c6687b7bfa77c0
 SHA512:
-  metadata.gz: 97f3b74d83992e636fbc6d09926503db59a427f4907ea1679754dd916be7fee3764d88202be9aead0f484c878efe69d4bf77bfb0d580596a5009e74ad5d76e47
-  data.tar.gz: 6192c632633ef97f57ac37fc8159fe40b22a1eebe269608efb560615e138e69118c8b81702f853bfb7042819777225ffda197dfe8b93de21320e2789075532b4
+  metadata.gz: 7a1c5c26f1e59fba43adb37a272f5d1876a5a7c05704b83aa75c45cf9c5437780974d70f74546923ea32c76d661adb8044ac76a8321f180ffbbb26edf56bf21a
+  data.tar.gz: 0b03e8fa439261c5b64e62d673750d4d002fd022e179b846f51c6fcc9c2b732a2beefc7cc5de08737466a409f5dbf13d5594078fd4265aa10e38c8e4b68006e8

data/Gemfile

@@ -32,3 +32,10 @@ group :test do
   # under Ruby 1.8.
   gem 'nokogiri', '~> 1.5.0'
 end
+
+# Gems that are used for development and not for CI.
+group :development do
+  gem 'ruby-debug', :platforms => [:ruby_18]
+  gem 'pry', :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'pry-byebug', :platforms => [:ruby_19, :ruby_20, :ruby_21]
+end

data/Gemfile.lock

@@ -3,11 +3,17 @@ GEM
   specs:
     addressable (2.2.8)
     builder (3.2.2)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
+    coderay (1.1.0)
+    columnize (0.8.9)
     cucumber (1.3.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12.0)
       multi_json (~> 1.3)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     extlib (0.9.16)
     faraday (0.8.9)
@@ -40,6 +46,7 @@ GEM
       multi_json (>= 1.5)
     macaddr (1.6.5)
       systemu (~> 2.6.2)
+    method_source (0.8.2)
     mime-types (1.25.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
@@ -52,6 +59,13 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (1.3.3)
+      byebug (~> 2.7)
+      pry (~> 0.10)
     rack (1.5.2)
     rake (0.9.6)
     rdoc (4.1.1)
@@ -84,6 +98,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
     simple_uuid (0.4.0)
+    slop (3.6.0)
     systemu (2.6.3)
     trollop (2.0)
     uuid (2.3.7)
@@ -103,9 +118,12 @@ DEPENDENCIES
   mime-types (~> 1.0)
   net-ssh (~> 2.0)
   nokogiri (~> 1.5.0)
+  pry
+  pry-byebug
   rest-client (~> 1.6)
   right_develop (~> 2.1)
   rspec (~> 2.13.0)
+  ruby-debug
   simple_uuid (~> 0.2)
   uuid (~> 2.3)
   uuidtools (~> 2.0)

data/VERSION

@@ -1 +1 @@
-2.8.31
+2.8.32

data/features/serialization.feature

@@ -31,13 +31,14 @@ Feature: JSON serialization
     When I serialize a complex random data structure
     Then the serialized value should round-trip cleanly
 
-  Scenario Outline: Ruby string with non UTF-8 characters
-    When I serialize the Ruby value: <ruby>
-    Then the serialized value should be: <json>
+  Scenario: invalid UTF-8 characters
+    When I serialize the Ruby value: "\xC0\xBCscript>\xC0\xBC/script>"
+    Then the serialized value should be: "??script>??/script>"
 
-  Examples:
-    | ruby                                             | json                                             |
-    | "\xC0\xBCscript>\xC0\xBC/script>"                | "script>/script>"                                |
+  Scenario: valid UTF-8 characters
+    When I serialize the Ruby value: "onê"
+    Then the serialized value should be: "onê"
+    And the serialized value should round-trip cleanly
 
   Scenario Outline: object-escaped Symbol
     When I serialize the Ruby value: <ruby>

data/features/support/env.rb

@@ -30,6 +30,14 @@ $:.unshift(File.expand_path('../../../lib', __FILE__)) #ensure we load THIS proj
 require 'right_support'
 require 'right_support/ci'
 
+['pry', 'ruby-debug'].each do |debugger|
+  begin
+    require debugger
+  rescue LoadError
+    # ignore
+  end
+end
+
 module RandomValueHelper
   RANDOM_KEY_CLASSES   = [String, Integer, Float, TrueClass, FalseClass]
   RANDOM_VALUE_CLASSES = RANDOM_KEY_CLASSES + [Array, Hash]

data/lib/right_support/data/serializer.rb

@@ -159,10 +159,17 @@ module RightSupport::Data
       # @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 => '')
+        if dirty.encoding == Encoding::UTF_8 && dirty.valid_encoding?
+          # Nothing to do
+          dirty
+        else
+          # Some other encoding, or string has invalid characters. Scrub, and possibly lose
+          # data in the process
+          dirty.dup.encode(Encoding::UTF_8,
+                           :invalid => :replace,
+                           :undef => :replace,
+                           :replace => '?')
+        end
       end
     else
       warn "Cannot deal with invalid UTF-8 codepoints; install iconv or upgrade to Ruby > 1.8"

data/right_support.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_support 2.8.31 ruby lib
+# stub: right_support 2.8.32 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.8.31"
+  s.version = "2.8.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = "2014-09-25"
+  s.date = "2014-09-30"
   s.description = "A toolkit of useful, reusable foundation code created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
@@ -145,5 +145,23 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.rubygems_version = "2.2.0"
   s.summary = "Reusable foundation code."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<pry-byebug>, [">= 0"])
+    else
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<pry-byebug>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<pry-byebug>, [">= 0"])
+  end
 end
 

data/spec/spec_helper.rb

@@ -26,6 +26,14 @@ require 'flexmock'
 $:.unshift(File.expand_path('../../../lib', __FILE__)) #ensure we load THIS project's code, not an installed gem
 require 'right_support'
 
+['pry', 'ruby-debug'].each do |debugger|
+  begin
+    require debugger
+  rescue LoadError
+    # ignore
+  end
+end
+
 RSpec.configure do |config|
   config.mock_with :flexmock
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_support
 version: !ruby/object:Gem::Version
-  version: 2.8.31
+  version: 2.8.32
 platform: ruby
 authors:
 - Tony Spataro
@@ -13,8 +13,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
-dependencies: []
+date: 2014-09-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A toolkit of useful, reusable foundation code created by RightScale.
 email: support@rightscale.com
 executables: []