iron_core 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/iron_core/client.rb

@@ -18,7 +18,7 @@ module IronCore
     def initialize(product, options = {}, extra_options_list = [])
       @options_list = [:token, :project_id, :scheme, :host, :port, :api_version, :user_agent] + extra_options_list
 
-      load_from_hash(options)
+      load_from_hash('params', options)
       load_from_config(product, options[:config_file] || options['config_file'])
       load_from_config(product, '.iron.json')
       load_from_config(product, 'iron.json')
@@ -29,23 +29,25 @@ module IronCore
       @rest = Rest::Client.new
     end
 
-    def set_option(name, value)
-      if send(name.to_s).nil?
+    def set_option(source, name, value)
+      if send(name.to_s).nil? && (not value.nil?)
+        IronCore::Logger.debug 'IronCore', "Setting #{name} to #{value} from #{source}"
+
         send(name.to_s + '=', value)
       end
     end
 
-    def load_from_hash(hash)
+    def load_from_hash(source, hash)
       return if hash.nil?
 
       @options_list.each do |o|
-        set_option(o, hash[o.to_sym] || hash[o.to_s])
+        set_option(source, o, hash[o.to_sym] || hash[o.to_s])
       end
     end
 
     def load_from_env(prefix)
       @options_list.each do |o|
-        set_option(o, ENV[prefix + '_' + o.to_s.upcase])
+        set_option('environment variable', o, ENV[prefix + '_' + o.to_s.upcase])
       end
     end
 
@@ -55,9 +57,9 @@ module IronCore
       if File.exists?(File.expand_path(config_file))
         config = JSON.load(File.read(File.expand_path(config_file)))
 
-        load_from_hash(config['iron_' + product])
-        load_from_hash(config['iron'])
-        load_from_hash(config)
+        load_from_hash(config_file, config['iron_' + product])
+        load_from_hash(config_file, config['iron'])
+        load_from_hash(config_file, config)
       end
     end
 
@@ -140,8 +142,13 @@ module IronCore
 
       raise IronCore::IronResponseError.new(response) if response.code != 200
 
-      return response.body unless parse_json
-      JSON.parse(response.body)
+      # response in rest_client gem is a confusing object, of class String,
+      # but with 'to_i' redefined to return response code and
+      # 'body' defined to return itself
+      body = String.new(response.body)
+
+      return body unless parse_json
+      JSON.parse(body)
     end
   end
 end

data/lib/iron_core/iron_error.rb

@@ -1,4 +1,4 @@
 module IronCore
-  class IronError < Exception
+  class IronError < StandardError
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 255864819
+      hash: 559513805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: