right_support 1.1.0 → 1.1.1

data/lib/right_support/crypto/signed_hash.rb

@@ -1,10 +1,10 @@
-require 'json'
+require 'yajl'
 
 module RightSupport::Crypto
   class SignedHash
     DEFAULT_OPTIONS = {
       :digest   => Digest::SHA1,
-      :encoding => JSON
+      :encoding => Yajl
     }
 
     def initialize(hash={}, options={})

data/lib/right_support/net/balancing/health_check.rb

@@ -23,7 +23,10 @@
 require 'set'
 
 module RightSupport::Net::Balancing
-  
+
+  # TODO refactor this class. We store too much unstructured data about EPs; should have a simple
+  # class representing EP state, and then perhaps move what logic remains into the HealthCheck class
+  # instead of putting it here.
   class EndpointsStack
     DEFAULT_YELLOW_STATES = 4
     DEFAULT_RESET_TIME    = 300
@@ -111,9 +114,17 @@ module RightSupport::Net::Balancing
       @counter += 1 unless endpoints.size < @last_size
       @counter = 0 if @counter == endpoints.size
       @last_size = endpoints.size
-      
-      # Returns false or true, depending on whether EP is yellow or not
-      [ endpoints[@counter][0], endpoints[@counter][1][:n_level] != 0 ]
+
+      # Hash#select returns a Hash in ruby1.9, but an Array of pairs in ruby1.8.
+      # This should really be encapsulated in EndpointsStack...
+      if RUBY_VERSION >= '1.9'
+        key = endpoints.keys[@counter]
+        next_endpoint = [ key, endpoints[key][:n_level] != 0 ]
+      else
+        next_endpoint = [ endpoints[@counter][0], endpoints[@counter][1][:n_level] != 0 ]
+      end
+
+      next_endpoint
     end
 
     def good(endpoint, t0, t1)

data/lib/right_support/net/string_encoder.rb

@@ -23,18 +23,34 @@ require 'cgi'
 require 'base64'
 require 'zlib'
 
-#
-# A tool that encodes (binary or ASCII) strings into 7-bit ASCII
-# using one or more encoding algorithms which are applied sequentially.
-# The order of algorithms is reversed on decode, naturally!
-#
-# This class is designed to be used with network protocols implemented
-# on top of HTTP, where binary data needs to be encapsulated in URL query
-# strings, request bodies or other textual payloads. Sometimes multiple
-# encodings are necessary in order to prevent unnecessary expansion of
-# the encoded text.
-#
 module RightSupport::Net
+  #
+  # A tool that encodes (binary or ASCII) strings into 7-bit ASCII
+  # using one or more encoding algorithms which are applied sequentially.
+  # The order of algorithms is reversed on decode, naturally!
+  #
+  # This class is designed to be used with network protocols implemented
+  # on top of HTTP, where binary data needs to be encapsulated in URL query
+  # strings, request bodies or other textual payloads. Sometimes multiple
+  # encodings are necessary in order to prevent unnecessary expansion of
+  # the encoded text.
+  #
+  # == Ruby 1.9 and Character Encodings
+  #
+  # === Input Strings
+  # The #encode and #decode methods accept strings with any encoding, and do not perform
+  # any conversion or coercion between encodings. Strings are passed unmodified to the
+  # underlying encoding libraries.
+  #
+  # === Output Strings
+  # The #encode method always returns strings with an encoding of US-ASCII, because the
+  # output of all encodings is guaranteed to be 7-bit ASCII.
+  #
+  # The #decode method always returns strings with an encoding of ASCII-8BIT (aka BINARY)
+  # because there is no way to determine the correct encoding. The caller of #decode
+  # should use String#force_encoding to coerce the output value to an appropriate encoding
+  # before displaying or manipulating the output.
+  #
   class StringEncoder
     ENCODINGS = [:base64, :url]
     ENCODINGS.freeze
@@ -93,7 +109,7 @@ module RightSupport::Net
         end
       end
 
-      value
+      value.force_encoding(Encoding::ASCII_8BIT)
     end
   end
 end

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '1.1.0'
-  s.date    = '2011-11-03'
+  s.version = '1.1.1'
+  s.date    = '2011-11-17'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson']
   s.email   = 'support@rightscale.com'
@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
   s.summary = %q{Reusable foundation code.}
   s.description = %q{A toolkit of useful, reusable foundation code created by RightScale.}
 
-  s.add_dependency('json', ['~> 1.4'])
+  s.add_dependency('yajl-ruby', ['~> 1.1'])
 
   basedir = File.dirname(__FILE__)
   candidates = ['right_support.gemspec', 'LICENSE', 'README.rdoc'] + Dir['lib/**/*']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Tony Spataro
@@ -17,22 +17,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 -07:00
+date: 2011-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: yajl-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 13
         segments: 
         - 1
-        - 4
-        version: "1.4"
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 description: A toolkit of useful, reusable foundation code created by RightScale.