infoblox 0.2.1 → 0.2.2

data/lib/infoblox/connection.rb

@@ -1,6 +1,13 @@
 module Infoblox
   class Connection
-    attr_accessor :username, :password, :host, :connection, :logger, :ssl_opts
+    attr_accessor :adapter, 
+                  :adapter_block,
+                  :connection, 
+                  :host, 
+                  :logger, 
+                  :password, 
+                  :ssl_opts, 
+                  :username
 
     def get(href, params={})
       wrap do
@@ -43,11 +50,25 @@ module Infoblox
     def connection
       @connection ||= Faraday.new(:url => self.host, :ssl => {:verify => false}) do |faraday|
         faraday.use Faraday::Response::Logger, logger if logger
-
         faraday.request :json
         faraday.basic_auth(self.username, self.password)
-        faraday.adapter :net_http
+        faraday.adapter(self.adapter, &self.adapter_block)
+      end
+    end
+
+    ##
+    # The host variable is expected to be a protocol with a host name. 
+    # If the host has no protocol, https:// is added before it. 
+    #
+    def host=(new_host)
+      unless new_host =~ /^http(s)?:\/\//
+        new_host = "https://#{new_host}"
       end
+      @host = new_host
+    end
+
+    def adapter
+      @adapter ||= :net_http
     end
 
     private

data/lib/infoblox/version.rb

@@ -1,3 +1,3 @@
 module Infoblox
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/connection_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+describe Infoblox::Connection do
+
+  ["localhost", "127.0.0.1", "http://localhost:3000", "https://localhost", "http://localhost:3000/"].each do |host|
+    it "should build URL without failure" do
+      conn_params = {
+        username: "billy", 
+        password: "boi",
+        host:     host
+      }
+      uri = "/wapi/v1.0/record:host"
+
+      ic = Infoblox::Connection.new(conn_params)
+      ic.adapter       = :test
+      ic.adapter_block = stub_get(uri)
+
+      # execute the request. There should be no "URI::BadURIError: both URI are relative" error
+      ic.get(uri)
+    end
+  end
+
+  def stub_get(uri)
+    Proc.new do |stub|
+      stub.get(uri) { [ 200, {}, 'Yay!'] } 
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infoblox
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -132,6 +132,7 @@ files:
 - lib/infoblox/resource/network_container.rb
 - lib/infoblox/resource/ptr.rb
 - lib/infoblox/version.rb
+- spec/connection_spec.rb
 - spec/host_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
@@ -148,12 +149,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4416688330478250235
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4416688330478250235
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -162,7 +169,7 @@ specification_version: 3
 summary: This gem is a Ruby interface to the Infoblox WAPI.  Resources supported for
   REST operations include CNAME, Host, HostIpv4addr, Ipv4addr, Network, and NewtorkContainer.
 test_files:
+- spec/connection_spec.rb
 - spec/host_spec.rb
 - spec/resource_spec.rb
 - spec/spec_helper.rb
-has_rdoc: