loopiator 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0139c4834170b91b736915fd3b5cfb333eaacd77
-  data.tar.gz: a1a963f7309f4e4b598d5ce5243f84afa397ec81
+  metadata.gz: c0052de38f588c5ec092a39c1db7c864cca70cce
+  data.tar.gz: 0481091a1d6a62b3f1f60a623d6e15e789abef5a
 SHA512:
-  metadata.gz: 569d16bc8cb703c96b966f9a9f9fd05cabf4525145e55e6972873e4c3a5c9738dd9140f7063194815f668a1a1c6e7d3f817b663310f20804eed1a314300c6037
-  data.tar.gz: 89396769939432c3c8779145aabccdf558ce94bb2bbe303bf56152bc839fd69038a5c0a8ce9e8e6951d10a157904ba8c51a74c65612e6ca8b5ee651475341402
+  metadata.gz: 66b943cfe25acd2ae8fed98f0e735e45419f9146ef08de839407a98724d6924d5f3a2a51729d28a2095ae40bf2ad27ce23546edd4849969a54798ab2b4dc0f0c
+  data.tar.gz: 14f432effad1d2f2fcf0190f1e2c931d125804e7a651147bbcf9f5068200b5c12e120c265d609602822a75f2394b109a303a742bb933b677c6fb9ac34e74f9f2

data/lib/loopiator/client.rb

@@ -7,15 +7,14 @@ module Loopiator
     
     include Loopiator::Logger
     
-  	def initialize(connection_options = {}, debug = false)
-      set_client(connection_options, debug: debug)
+  	def initialize(connection_options = {})
+      connection_options.symbolize_keys!
+      set_client(connection_options)
   	end
   	
-  	def set_client(connection_options = {}, debug = false)
-      connection_options  =   generate_connection_options(connection_options)
-      
-  	  self.client         =   XMLRPC::Client.new_from_hash(connection_options)
-      enable_debugging if debug
+  	def set_client(connection_options = {})
+  	  self.client         =   XMLRPC::Client.new_from_hash(generate_connection_options(connection_options))
+      enable_debugging if Loopiator.configuration.debug
       set_client_options(connection_options)
   	end
   	
@@ -53,7 +52,7 @@ module Loopiator
     private
       def generate_connection_options(connection_options = {})
         default_options = {
-          host:             Loopiator.configuration.host,
+          host:             determine_host(connection_options),
           path:             Loopiator.configuration.path,
           port:             Loopiator.configuration.port,
           
@@ -72,6 +71,11 @@ module Loopiator
         default_options.merge(connection_options)
       end
       
+      def determine_host(connection_options = {})
+        env   =   (connection_options && !connection_options.empty?) ? connection_options.fetch(:environment, Loopiator.configuration.environment) : Loopiator.configuration.environment
+        Loopiator.configuration.hosts[env.to_sym]
+      end
+      
       def enable_debugging
         self.client.instance_variable_get(:@http).set_debug_output($stderr)
       end

data/lib/loopiator/configuration.rb

@@ -1,13 +1,21 @@
 module Loopiator
   class Configuration
-    attr_accessor :host, :port, :path
+    attr_accessor :environment
+    attr_accessor :hosts, :port, :path
     attr_accessor :auth_user, :auth_password
     attr_accessor :use_ssl, :timeout
+    attr_accessor :debug
     attr_accessor :username, :password
     attr_accessor :proxy_host, :proxy_port, :proxy_user, :proxy_password
     
     def initialize
-      self.host             =   "api.loopia.se"
+      self.environment      =   :production
+      
+      self.hosts            =   {
+        production: "api.loopia.se",
+        test:       "test-api.loopia.se"
+      }
+      
       self.port             =   443
       self.path             =   "/RPCSERV"
       
@@ -17,6 +25,8 @@ module Loopiator
       self.use_ssl          =   true
       self.timeout          =   180
       
+      self.debug            =   false
+      
       self.username         =   nil
       self.password         =   nil
       

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.5"
+  VERSION     =   "0.3.6"
   
   class << self
     attr_writer :configuration

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.5'
+  s.version = '0.3.6'
 
   s.homepage      =   "https://github.com/Agiley/Loopiator"
   s.email         =   "sebastian@agiley.se"

data/spec/loopiator/configuration_spec.rb

@@ -12,10 +12,6 @@ describe "Loopiator Configuration"  do
         expect(Loopiator.configuration.password).to be == nil
       end
       
-      it "should have a default host set" do
-        expect(Loopiator.configuration.host).to be == "api.loopia.se"
-      end
-      
       it "should have a default port set" do
         expect(Loopiator.configuration.port).to be == 443
       end
@@ -64,10 +60,6 @@ describe "Loopiator Configuration"  do
         expect(Loopiator.configuration.proxy_port).to be == 8080
       end
       
-      it "should have a default host set" do
-        expect(Loopiator.configuration.host).to be == "api.loopia.se"
-      end
-      
       it "should have a default port set" do
         expect(Loopiator.configuration.port).to be == 443
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loopiator
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Sebastian Johnsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn