iron_core 0.1.6 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/iron_core/client.rb

@@ -1,37 +1,51 @@
-require 'rest-client'
 require 'rest'
 require 'json'
 
-require_relative 'iron_response_error'
+require_relative 'response_error'
 
 module IronCore
   class Client
-    attr_accessor :token
-    attr_accessor :project_id
+    attr_accessor :content_type
 
-    attr_accessor :scheme
-    attr_accessor :host
-    attr_accessor :port
-    attr_accessor :api_version
-    attr_accessor :user_agent
+    def initialize(company, product, options = {}, default_options = {}, extra_options_list = [])
+      @options_list = [:scheme, :host, :port, :user_agent, :http_gem] + extra_options_list
 
-    def initialize(product, options = {}, extra_options_list = [])
-      @options_list = [:token, :project_id, :scheme, :host, :port, :api_version, :user_agent] + extra_options_list
+      metaclass = class << self
+        self
+      end
+
+      @options_list.each do |option|
+        metaclass.send(:define_method, option.to_s) do
+          instance_variable_get('@' + option.to_s)
+        end
+
+        metaclass.send(:define_method, option.to_s + '=') do |value|
+          instance_variable_set('@' + option.to_s, value)
+        end
+      end
 
       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')
-      load_from_env('IRON_' + product.upcase)
-      load_from_env('IRON')
-      load_from_config(product, '~/.iron.json')
-
-      @rest = Rest::Client.new() # :gem=>:rest_client - can set specific backend if we want. Should allow user to set this too.
+      load_from_config(company, product, options[:config] || options['config'])
+      load_from_config(company, product, ENV[company.upcase + '_' + product.upcase + '_CONFIG'])
+      load_from_config(company, product, ENV[company.upcase + '_CONFIG'])
+      load_from_env(company.upcase + '_' + product.upcase)
+      load_from_env(company.upcase)
+      load_from_config(company, product, ".#{company}.json")
+      load_from_config(company, product, "#{company}.json")
+      load_from_config(company, product, "~/.#{company}.json")
+      load_from_hash('defaults', default_options)
+      load_from_hash('defaults', {:user_agent => 'iron_core_ruby-' + IronCore.version})
+
+      @content_type = 'application/json'
+
+      http_gem = @http_gem.nil? ? nil : @http_gem.to_sym
+
+      @rest = Rest::Client.new(:gem => http_gem)
     end
 
     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}"
+        IronCore::Logger.debug 'IronCore', "Setting #{name} to '#{value}' from #{source}"
 
         send(name.to_s + '=', value)
       end
@@ -51,43 +65,39 @@ module IronCore
       end
     end
 
-    def load_from_config(product, config_file)
+    def load_from_config(company, product, config_file)
       return if config_file.nil?
 
       if File.exists?(File.expand_path(config_file))
         config = JSON.load(File.read(File.expand_path(config_file)))
 
-        load_from_hash(config_file, config['iron_' + product])
-        load_from_hash(config_file, config['iron'])
+        load_from_hash(config_file, config["#{company}_#{product}"])
+        load_from_hash(config_file, config[company])
         load_from_hash(config_file, config)
       end
     end
 
-    def options
+    def options(return_strings = false)
       res = {}
 
-      @options_list.each do |o|
-        res[o.to_sym] = send(o.to_s)
+      @options_list.each do |option|
+        res[return_strings ? option.to_s : option.to_sym] = send(option.to_s)
       end
 
       res
     end
 
-    def common_headers
-      {
-        'Content-Type' => 'application/json',
-        'Authorization' => "OAuth #{@token}",
-        'User-Agent' => @user_agent
-      }
+    def headers
+      {'User-Agent' => @user_agent}
     end
 
     def url
-      "#{scheme}://#{host}:#{port}/#{api_version}/"
+      "#{scheme}://#{host}:#{port}/"
     end
 
     def get(method, params = {})
       request_hash = {}
-      request_hash[:headers] = common_headers
+      request_hash[:headers] = headers
       request_hash[:params] = params
 
       IronCore::Logger.debug 'IronCore', "GET #{url + method} with params='#{request_hash.to_s}'"
@@ -97,7 +107,7 @@ module IronCore
 
     def post(method, params = {})
       request_hash = {}
-      request_hash[:headers] = common_headers
+      request_hash[:headers] = headers.merge({'Content-Type' => @content_type})
       request_hash[:body] = params.to_json
 
       IronCore::Logger.debug 'IronCore', "POST #{url + method} with params='#{request_hash.to_s}'" 
@@ -107,7 +117,7 @@ module IronCore
 
     def put(method, params={})
       request_hash = {}
-      request_hash[:headers] = common_headers
+      request_hash[:headers] = headers.merge({'Content-Type' => @content_type})
       request_hash[:body] = params.to_json
 
       IronCore::Logger.debug 'IronCore', "PUT #{url + method} with params='#{request_hash.to_s}'"
@@ -117,7 +127,7 @@ module IronCore
 
     def delete(method, params = {})
       request_hash = {}
-      request_hash[:headers] = common_headers
+      request_hash[:headers] = headers
       request_hash[:params] = params
 
       IronCore::Logger.debug 'IronCore', "DELETE #{url + method} with params='#{request_hash.to_s}'"
@@ -125,34 +135,32 @@ module IronCore
       @rest.delete(url + method, request_hash)
     end
 
-    # FIXME: retries support
-    # FIXME: user agent support
-    def post_file(method, file, params = {})
+    def post_file(method, file_field, file, params_field, params = {})
       request_hash = {}
-      request_hash[:data] = params.to_json
-      request_hash[:file] = file
+      request_hash[:headers] = headers
+      request_hash[:body] = {params_field => params.to_json, file_field => file}
 
-      IronCore::Logger.debug 'IronCore', "POST #{url + method + "?oauth=" + @token} with params='#{request_hash.to_s}'"
+      IronCore::Logger.debug 'IronCore', "POST #{url + method} with params='#{request_hash.to_s}'"
 
-      begin
-        RestClient.post(url + method + "?oauth=#{@token}", request_hash)
-      rescue RestClient::Unauthorized => e
-        raise IronCore::IronResponseError.new(e.response)
-      end
+      @rest.post_file(url + method, request_hash)
     end
 
     def parse_response(response, parse_json = true)
       IronCore::Logger.debug 'IronCore', "GOT #{response.code} with params='#{response.body}'"
 
-      raise IronCore::IronResponseError.new(response) if response.code != 200
+      raise IronCore::ResponseError.new(response) if response.code != 200
 
-      # 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
+
+    def check_id(id, name = 'id', length = 24)
+      if (not id.is_a?(String)) || id.length != length
+        IronCore::Logger.error 'IronCore', "Expecting #{length} symbol #{name} string", IronCore::Error
+      end
+    end
   end
 end

data/lib/iron_core/error.rb

@@ -0,0 +1,4 @@
+module IronCore
+  class Error < StandardError
+  end
+end

data/lib/iron_core/logger.rb

@@ -15,24 +15,40 @@ module IronCore
       @logger = logger
     end
 
-    def self.fatal(product, msg)
+    def self.fatal(product, msg, exception_class = nil)
       self.logger.fatal(product) { msg }
+
+      self.raise_exception(msg, exception_class)
     end
 
-    def self.error(product, msg)
+    def self.error(product, msg, exception_class = nil)
       self.logger.error(product) { msg }
+
+      self.raise_exception(msg, exception_class)
     end
 
-    def self.warn(product, msg)
+    def self.warn(product, msg, exception_class = nil)
       self.logger.warn(product) { msg }
+
+      self.raise_exception(msg, exception_class)
     end
 
-    def self.info(product, msg)
+    def self.info(product, msg, exception_class = nil)
       self.logger.info(product) { msg }
+
+      self.raise_exception(msg, exception_class)
     end
 
-    def self.debug(product, msg)
+    def self.debug(product, msg, exception_class = nil)
       self.logger.debug(product) { msg }
+
+      self.raise_exception(msg, exception_class)
+    end
+
+    def self.raise_exception(msg, exception_class)
+      unless exception_class.nil?
+        raise exception_class.new(msg)
+      end
     end
   end
 end

data/lib/iron_core/{iron_response_error.rb → response_error.rb}

@@ -1,7 +1,7 @@
-require_relative 'iron_error'
+require_relative 'error'
 
 module IronCore
-  class IronResponseError < IronCore::IronError
+  class ResponseError < IronCore::Error
     def initialize(response)
       super(response.body)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_core
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,16 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,16 +27,16 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: rest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,22 +44,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler2
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +71,9 @@ files:
 - VERSION
 - lib/iron_core.rb
 - lib/iron_core/client.rb
-- lib/iron_core/iron_error.rb
-- lib/iron_core/iron_response_error.rb
+- lib/iron_core/error.rb
 - lib/iron_core/logger.rb
+- lib/iron_core/response_error.rb
 - lib/iron_core/version.rb
 homepage: https://github.com/iron-io/iron_core_ruby
 licenses: []
@@ -105,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1936258264107303313
+      hash: -839868627
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/iron_core/iron_error.rb

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