infoblox 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58900d8b11339ba296f175de86b4160b6bc6300c
-  data.tar.gz: f2b1740ca897c5c07f1d42cf8912ec085eeab45f
+  metadata.gz: 7b7222b3b91069125571ec18d52d5a270bde96ca
+  data.tar.gz: 1420c6a63bb641f8159bd3a38bdc89a2821fcd0e
 SHA512:
-  metadata.gz: 6eec1b32abae5f6829b9ef27dc29ee09b5c6cfff98251e52191225626439f954ba25a93f84af460d2376ba01b9d5e552e968f1afaa47bb87d35d54af716f4a26
-  data.tar.gz: 14e7bef6cd7c2c5ddb3f1a5c447ed6fa052bbf7b5969ea58a86433f309addcd843c808dcff5a764528f2d23a952f80c8cfbe43537191a04f3908a8ba663cebd1
+  metadata.gz: 022760f2578972ca11583adc646a2df274b8108fca7cfcd53346998d558d7d277ded594db735d336c79ec46e38af63f008a7331a94d49617aeca132f1c9be069
+  data.tar.gz: ffe884aa4559ab98749037baa18f8bd73e89fd140e191533d101a58027f36a743c626108174f936348f86301d8df442cd33fac2bbf92cc7e37c36b501417d5e1

data/README.md

@@ -184,9 +184,11 @@ Extensible attributes are supported in this client.  It should be noted that in
 
 ## Infoblox Version Compatibility
 
-This gem is known to be compatible with Infoblox versions 1.0 through 2.0.  While Infoblox claims that their API is backwards-compatible, one caveat remains with the Extensible Attributes (see elsewhere in this document).  Some features are only available in newer versions (such as FixedAddress and AAAARecord).  To set your version, use the `WAPI_VERSION` environment variable.  For example: 
+This gem is known to be compatible with Infoblox versions 1.0 through 2.0.  While Infoblox claims that their API is backwards-compatible, one caveat remains with the Extensible Attributes (see elsewhere in this document).  Some features are only available in newer versions (such as FixedAddress and AAAARecord).  For best results, set the version using the `WAPI_VERSION` environment variable.  For example: 
 
-    WAPI_VERSION=2.0 ruby my_script.rb
+    WAPI_VERSION=1.2 ruby my_script.rb
+
+The default version is 2.0. 
 
 ## Ruby Version Compatibility
 

data/RELEASES.md

@@ -1,3 +1,6 @@
+## 2.0.0 - September 2 2016
+Make WAPI version 2.0 the default version. 
+
 ## 1.0.1 - September 2 2016
 A point release containing a bugfix and new field on a recod.
 

data/lib/infoblox.rb

@@ -7,16 +7,11 @@ require 'infoblox/version'
 require 'infoblox/connection'
 require 'infoblox/resource'
 
-# Require everything in the resource directory
-Dir[File.expand_path('../infoblox/resource/*.rb', __FILE__)].each do |f|
-  require f
-end
-
 module Infoblox
   DEBUG        = ENV['DEBUG']
   
   def wapi_version
-    @wapi_version ||= (ENV['WAPI_VERSION'] || '1.0')
+    @wapi_version ||= (ENV['WAPI_VERSION'] || '2.0')
   end
   module_function :wapi_version
 
@@ -30,3 +25,8 @@ module Infoblox
   end
   module_function :base_path
 end
+
+# Require everything in the resource directory
+Dir[File.expand_path('../infoblox/resource/*.rb', __FILE__)].each do |f|
+  require f
+end

data/lib/infoblox/version.rb

@@ -1,3 +1,3 @@
 module Infoblox
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/spec/connection_spec.rb

@@ -19,7 +19,7 @@ describe Infoblox::Connection do
     end
   end
 
-  it "should raise Infobloxon invalid response" do
+  it "should raise on invalid response" do
     host        = 'localhost'
     conn_params = {
       :username => "billy",

data/spec/resource_spec.rb

@@ -44,15 +44,27 @@ describe Infoblox::Resource, "#add_ipv4addr" do
 
   it "should find with default attributes" do
     conn = double
-    uri = Infoblox.base_path + "foo:animal"
-    allow(conn).to receive(:get).with(uri, {:_return_fields => "name,junction,extensible_attributes,readonly_thing"}).and_return(FooResponse.new("[]"))
-    expect(FooResource.all(conn)).to eq([])
+    each_version do
+      uri = Infoblox.base_path + "foo:animal"
+      if(Infoblox.wapi_version >= '1.2')
+        allow(conn).to receive(:get).with(uri, {:_return_fields => "name,junction,extattrs,readonly_thing"}).and_return(FooResponse.new("[]"))
+      else 
+        allow(conn).to receive(:get).with(uri, {:_return_fields => "name,junction,extensible_attributes,readonly_thing"}).and_return(FooResponse.new("[]"))
+      end
+      expect(FooResource.all(conn)).to eq([])
+    end
   end
 
   it "should allow .all with return fields or max results" do
     conn = double
     uri = Infoblox.base_path + "foo:animal"
-    allow(conn).to receive(:get).with(uri, {:_return_fields => "name,junction,extensible_attributes,readonly_thing", :_max_results => -70}).and_return(FooResponse.new("[]"))
+    each_version do
+      if Infoblox.wapi_version >= '1.2'
+        allow(conn).to receive(:get).with(uri, {:_return_fields => "name,junction,extattrs,readonly_thing", :_max_results => -70}).and_return(FooResponse.new("[]"))
+      else
+        allow(conn).to receive(:get).with(uri, {:_return_fields => "name,junction,extensible_attributes,readonly_thing", :_max_results => -70}).and_return(FooResponse.new("[]"))
+      end
+    end
     expect(FooResource.all(conn, :_max_results => -70)).to eq([])
   end
 

data/spec/spec_helper.rb

@@ -17,16 +17,16 @@ module Helper
       yield
     end
   ensure
-    Infoblox.wapi_version = '1.0'
+    Infoblox.wapi_version = '2.0'
   end
 
   def connection
     Infoblox::Connection.new(
       :username => $username,
       :password => $password,
-      :host =>     $host,
+      :host     => $host,
       :ssl_opts => {:verify => false}
-      # :logger => Logger.new(STDOUT)
+      # :logger   => Logger.new(STDOUT)
     )
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infoblox
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Billy Reisinger