loopiator 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be4bd53de4c331058e0fb971f6a7d477baecb6a7
-  data.tar.gz: e5029296588dafd6edca92795e71760f7e0a71b6
+  metadata.gz: a22381d3161f16684001d0698639a1d41853bc4d
+  data.tar.gz: ef2c2bd4aae92301225c9cbfecdcd92d0a809bde
 SHA512:
-  metadata.gz: 8e8cd80be4a4918de47322b4de7b8f405f981dca9f3ec46bf3ca3624338452e458ede843326f4baa73e898d373bff572c31d5d84d2082ce78f2e809459bb8bec
-  data.tar.gz: 6db744b565eb45dbb941199652cbfbf2ce3b5d0efcfec78ebc6dba0d5f632b907c02e79e1909464a6bb640819a9b2e409949620c78900692b09359f120c5fb02
+  metadata.gz: 4357a9e50c4370c21beaf1a7352a47d40727e0c24f2bed6b1357405e0996e605f71f361510df44bb1a4219096f85dd713964a17fc446fb151df076ffc7fe8523
+  data.tar.gz: 5e97236721b61dc55f6eacd418ce449389a0d607e2880777482c637e8065e6bab74839e9c552638f687f5868c197ebaabf8cd49febe35d70e707f87930193756

data/lib/loopiator.rb

@@ -10,7 +10,7 @@ require File.join(File.dirname(__FILE__), 'loopiator/credits')
 require File.join(File.dirname(__FILE__), 'loopiator/client')
 
 module Loopiator
-  VERSION     =   "0.3.0"
+  VERSION     =   "0.3.1"
   
   class << self
     attr_writer :configuration
@@ -21,11 +21,11 @@ module Loopiator
   end
   
   def self.reset
-    @configuration = Configuration.new
+    @configuration = nil
   end
   
   def self.configure
-    yield(self.configuration)
+    yield(configuration)
   end
   
 end

data/lib/loopiator/client.rb

@@ -7,14 +7,15 @@ module Loopiator
     
     include Loopiator::Logger
     
-  	def initialize(connection_options = nil)
+  	def initialize(connection_options = {})
       set_client(connection_options)
   	end
   	
-  	def set_client(connection_options = nil)
-  	  self.client           =   XMLRPC::Client.new_from_hash(generate_connection_options(connection_options))
-      self.client.instance_variable_get(:@http).instance_variable_set(:@verify_mode, OpenSSL::SSL::VERIFY_NONE)
-  	  self.client
+  	def set_client(connection_options = {})
+      connection_options  =   generate_connection_options(connection_options)
+      
+  	  self.client         =   XMLRPC::Client.new_from_hash(connection_options)
+      set_client_options(connection_options)
   	end
   	
   	def call(rpc_method, *args)
@@ -49,18 +50,35 @@ module Loopiator
   	include Loopiator::Credits
     
     private
-      def generate_connection_options(connection_options = nil)
-        connection_options    ||=   {
-          host:         Loopiator.configuration.host,
-          path:         Loopiator.configuration.path,
-          port:         Loopiator.configuration.port,
-          use_ssl:      Loopiator.configuration.use_ssl,
-          timeout:      Loopiator.configuration.timeout,
-          proxy_host:   Loopiator.configuration.proxy_host,
-          proxy_port:   Loopiator.configuration.proxy_port,
-          user:         Loopiator.configuration.proxy_user,
-          password:     Loopiator.configuration.proxy_password,
+      def generate_connection_options(connection_options = {})
+        default_options = {
+          host:             Loopiator.configuration.host,
+          path:             Loopiator.configuration.path,
+          port:             Loopiator.configuration.port,
+          
+          user:             Loopiator.configuration.auth_user,
+          password:         Loopiator.configuration.auth_password,
+          
+          use_ssl:          Loopiator.configuration.use_ssl,
+          timeout:          Loopiator.configuration.timeout,
+          
+          proxy_host:       Loopiator.configuration.proxy_host,
+          proxy_port:       Loopiator.configuration.proxy_port,
+          proxy_user:       Loopiator.configuration.proxy_user,
+          proxy_password:   Loopiator.configuration.proxy_password,
         }
+        
+        default_options.merge(connection_options)
+      end
+      
+      def set_client_options(connection_options = {})
+        self.client.instance_variable_get(:@http).instance_variable_set(:@verify_mode, OpenSSL::SSL::VERIFY_NONE)
+        
+        #Seems to be the only way to set the proxy user / password for Ruby's XMLRPC?
+        proxy_user          =   connection_options.fetch(:proxy_user, nil)
+        proxy_password      =   connection_options.fetch(:proxy_password, nil)
+        self.client.instance_variable_get(:@http).instance_variable_set(:@proxy_user, proxy_user)     if (proxy_user && !proxy_user.empty?)
+        self.client.instance_variable_get(:@http).instance_variable_set(:@proxy_pass, proxy_password) if (proxy_password && !proxy_password.empty?)
       end
       
   end

data/lib/loopiator/configuration.rb

@@ -1,6 +1,7 @@
 module Loopiator
   class Configuration
     attr_accessor :host, :port, :path
+    attr_accessor :auth_user, :auth_password
     attr_accessor :use_ssl, :timeout
     attr_accessor :username, :password
     attr_accessor :proxy_host, :proxy_port, :proxy_user, :proxy_password
@@ -10,6 +11,9 @@ module Loopiator
       self.port             =   443
       self.path             =   "/RPCSERV"
       
+      self.auth_user        =   nil
+      self.auth_password    =   nil
+      
       self.use_ssl          =   true
       self.timeout          =   180
       

data/loopiator.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
 
   s.name = 'loopiator'
-  s.version = '0.3.0'
+  s.version = '0.3.1'
 
   s.homepage      =   "https://github.com/Agiley/Loopiator"
   s.email         =   "sebastian@agiley.se"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loopiator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sebastian Johnsson