lumberg 1.0.3 → 1.0.6

data/lib/lumberg.rb

@@ -1,9 +1,9 @@
 $:.unshift(File.dirname(__FILE__))
 
 # External Libs
+require 'openssl'
 require 'json'
 require 'uri'
-require 'excon'
 require 'faraday'
 require 'faraday_middleware'
 require 'logger'
@@ -17,15 +17,15 @@ require 'lumberg/whm/args'
 require 'lumberg/whm'
 
 module Lumberg
-    
+
   extend self
-  
+
   attr_accessor :configuration
-  
+
   def base_path
     File.dirname(__FILE__)
   end
-  
+
   self.configuration ||= Lumberg::Config.new
 
    # Specificy the config via block
@@ -43,6 +43,6 @@ module Lumberg
      yield self.configuration if block_given?
      self.configuration.options
    end
-   
+
 end
 

data/lib/lumberg/version.rb

@@ -1,3 +1,3 @@
 module Lumberg
-  VERSION = '1.0.3'
+  VERSION = '1.0.6'
 end

data/lib/lumberg/whm/server.rb

@@ -174,13 +174,17 @@ module Lumberg
 
       def do_request(uri, function, params)
         @response = Faraday.new(:url => uri, :ssl => ssl_options) do |c|
-          c.basic_auth @user, @hash
+          if basic_auth
+            c.basic_auth @user, @hash
+          else
+            c.headers['Authorization'] = "WHM #{@user}:#{@hash}"
+          end
           c.params = params
           c.request :url_encoded
           c.response :format_whm, @force_response_type, @key, @boolean_params
           c.response :logger, create_logger_instance
           c.response :json
-          c.adapter :excon
+          c.adapter :net_http
         end.get(function).body
         @force_response_type = nil
         @response

data/lumberg.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "lumberg"
 
-  s.add_dependency 'json', '~> 1.7.3'
-  s.add_dependency 'excon' , '~> 0.14.0'
+  s.add_runtime_dependency 'json', '~> 1.7.3'
   s.add_runtime_dependency 'faraday', '~> 0.8.1'
   s.add_runtime_dependency 'faraday_middleware', '~> 0.8.4'
   s.add_runtime_dependency('jruby-openssl', '~> 0.7.3') if RUBY_PLATFORM == 'java'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumberg
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.3
-- !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 954596705739906551
+      hash: 2770939314296025523
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 954596705739906551
+      hash: 2770939314296025523
 requirements: []
 rubyforge_project: lumberg
 rubygems_version: 1.8.23