right_support 2.5.1 → 2.5.2

data/lib/right_support/config/feature_set.rb

@@ -82,8 +82,14 @@ module RightSupport::Config
     # (ArgumentError):: If configuration source can`t be loaded
     def load(something)
       return_value = nil
+      error_message = ''
       @configuration_source = something
-      raise ArgumentError, "Can't coerce #{something} into YAML/Hash" unless (return_value = YAMLConfig.read(something))
+      begin
+        return_value = YAMLConfig.read(something)
+      rescue Exception => e
+        error_message = "#{e}"
+      end
+      raise ArgumentError, "Can't coerce #{something.inspect} into YAML/Hash. #{error_message}" unless return_value
       return_value
     end
 

data/lib/right_support/data/hash_tools.rb

@@ -49,7 +49,7 @@ module RightSupport::Data
     # === Return
     # @return [TrueClass|FalseClass] true if clazz is hash-like, false otherwise
     def self.hash_like?(clazz)
-      clazz.public_instance_methods.include?('has_key?')
+      clazz.public_method_defined?('has_key?')
     end
 
     # Gets a value from a (deep) hash using a path given as an array of keys.

data/lib/right_support/db/cassandra_model.rb

@@ -127,8 +127,15 @@ module RightSupport::DB
         @@config
       end
 
+      def env_config
+        env = ENV['RACK_ENV']
+        raise MissingConfiguration, "CassandraModel config is missing a '#{ENV['RACK_ENV']}' section" \
+            unless !@@config.nil? && @@config.keys.include?(env) && @@config[env]
+        @@config[env]
+      end
+
       def config=(value)
-        @@config = value
+        @@config = normalize_config(value) unless value.nil?
       end
 
       def logger=(l)
@@ -194,9 +201,7 @@ module RightSupport::DB
       def conn()
         @@connections ||= {}
 
-        # TODO remove hidden dependency on ENV['RACK_ENV'] (maybe require config= to accept a sub hash?)
-        config = @@config[ENV["RACK_ENV"]]
-        raise MissingConfiguration, "CassandraModel config is missing a '#{ENV['RACK_ENV']}' section" unless config
+        config = env_config
 
         thrift_client_options = {:timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT}
         thrift_client_options.merge!({:protocol => Thrift::BinaryProtocolAccelerated})\
@@ -265,7 +270,7 @@ module RightSupport::DB
             columns.merge!(chunk)
             if chunk.size == opt[:count]
               # Assume there are more chunks, use last key as start of next get
-              opt[:start] = chunk.keys.last
+              opt[:start] = chunk.keys.sort.last
             else
               # This must be the last chunk
               break
@@ -400,7 +405,7 @@ module RightSupport::DB
           end
           if chunk.size == count
             # Assume there are more chunks, use last key as start of next get
-            start = chunk.keys.last
+            start = chunk.keys.sort.last
           else
             # This must be the last chunk
             break
@@ -493,8 +498,7 @@ module RightSupport::DB
       # === Return
       # true:: Always return true
       def reconnect
-        config = @@config[ENV["RACK_ENV"]]
-        raise MissingConfiguration, "CassandraModel config is missing a '#{ENV['RACK_ENV']}' section" unless config
+        config = env_config
 
         return false if keyspace.nil?
 
@@ -516,6 +520,33 @@ module RightSupport::DB
         conn.ring
       end
 
+      private
+
+      # Massage configuration hash into a standard form.
+      # @return the config hash, with contents normalized
+      def normalize_config(untrasted_config)
+        untrasted_config.each do |env, config|
+          raise MissingConfiguration, "CassandraModel config is broken, a '#{ENV['RACK_ENV']}' missing 'server' option" \
+ unless config.keys.include?('server')
+          server = config['server']
+
+          if server.is_a?(String)
+            # Strip surrounding brackets, in case Ops put a YAML array into an input value
+            if server.start_with?('[') && server.end_with?(']')
+              server = server[1..-2]
+            end
+
+            # Transform comma-separated host lists into an Array
+            if server =~ /,/
+              server = server.split(/\s*,\s*/)
+            end
+          end
+
+          config['server'] = server
+
+          config
+        end
+      end
     end # self
 
     attr_accessor :key, :attributes

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 = '2.5.1'
-  s.date    = '2012-09-25'
+  s.version = '2.5.2'
+  s.date    = '2012-09-28'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 5
-  - 1
-  version: 2.5.1
+  - 2
+  version: 2.5.2
 platform: ruby
 authors: 
 - Tony Spataro
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-25 00:00:00 -07:00
+date: 2012-09-28 00:00:00 -07:00
 default_executable: 
 dependencies: []