infoblox 0.0.11 → 0.1.0

data/README.md

@@ -24,30 +24,31 @@ querying, adding, and removing host names from dns records:
 
 
 ## Ruby client usage
-Before you do anything, create a new client. This adds a connection to the 
-base Resource class. 
+The Client class has a few helper methods to make certain operations easier.  Creating a host record: 
   
     client = Infoblox::Client.new(:username => "foo", 
                                   :password => "bar", 
                                   :host => "https://foo-bar-dns.example.com")
 
-The client class has a few helper methods to make certain operations easier.  Creating a host record: 
 
     client.create_host("build-machine.internal", "10.10.3.3")
     client.delete_host("build-machine.internal")
     client.find_host_by_name("build-")
 
-One can also use the resource classes directly to run arbitrary query logic: 
+One can also use the resource classes directly to run arbitrary query logic.  An instance
+of the Infoblox::Connection class is necessary:
 
-    Infoblox::Network.find({"_return_fields" => "extensible_attributes"})
+    connection = Infoblox::Connection.new(:username => '', :password => '', :host => '')
+
+    Infoblox::Network.find(connection, {"_return_fields" => "extensible_attributes"})
     # => [...]
    
-    Infoblox::Host.find({"name~" => "demo[0-9]{1,}-web.domain"})
+    Infoblox::Host.find(connection, {"name~" => "demo[0-9]{1,}-web.domain"})
     # => [...]
 
 The Resource sub-classes also support `get`, `post`, `put`, and `delete`.  For example, creating a network is pretty straightforward: 
  
-    network = Infoblox::Network.new
+    network = Infoblox::Network.new(:connection => connection)
     network.network = "10.20.30.0/24"
     network.extensible_attributes = {"VLAN" => "my_vlan"}
     network.auto_create_reversezone = true

data/lib/infoblox/client.rb

@@ -5,18 +5,18 @@ module Infoblox
     # :password
     # :host (host if infoblox appliance, including protocol)
     def initialize(options={})
-      Resource.connection = Connection.new(options)
+      self.connection = Connection.new(options)
     end
 
     def all_hosts
-      Host.all
+      Host.all(connection)
     end
 
     ## 
     # Find all host records by wildcard name. 
     # 
     def find_host_by_name(name)
-      Host.find(:"name~" => name)
+      Host.find(connection, :"name~" => name)
     end
 
     ##
@@ -24,20 +24,24 @@ module Infoblox
     # ex:  find_ips('10.10.2') => [#<Infoblox::Ipv4addr>...]
     #
     def find_ips(ip_fragment)
-      Ipv4addr.find(:"ipv4addr~" => ip_fragment)
+      Ipv4addr.find(connection, :"ipv4addr~" => ip_fragment)
     end
 
     ##
+    # Create a host record for the given IP address
     # hostname : string
     # ip       : ipv4 string, i.e. "10.40.20.3"
     def create_host(hostname, ip, dns=true)
-      host = Host.new(:name => hostname, :configure_for_dns => true)
+      host = Host.new(:name => hostname, :configure_for_dns => true, :connection => connection)
       host.add_ipv4addr(ip)
       host.create
     end
 
+    ##
+    # Remove all host entries for a given host
+    #
     def delete_host(hostname)
-      if !(hosts = Host.find(:name => hostname)).empty?
+      if !(hosts = Host.find(connection, :name => hostname)).empty?
         hosts.map(&:delete)
         hosts
       else

data/lib/infoblox/resource.rb

@@ -1,6 +1,6 @@
 module Infoblox
   class Resource
-    attr_accessor :_ref
+    attr_accessor :_ref, :connection
 
     def self.wapi_object(obj=nil)
       obj.nil? ? @wapi_object : @wapi_object = obj
@@ -61,9 +61,9 @@ module Infoblox
     ##
     # Return an array of all records for this resource. 
     #
-    def self.all
+    def self.all(connection)
       JSON.parse(connection.get(resource_uri, default_params).body).map do |item|
-        new(item)
+        new(item.merge({:connection => connection}))
       end
     end
 
@@ -76,21 +76,13 @@ module Infoblox
     # Example: filter resources by name.
     #    {"name~" => "foo.*bar"}
     #
-    def self.find(params)
+    def self.find(connection, params)
       params = default_params.merge(params)
       JSON.parse(connection.get(resource_uri, params).body).map do |item|
-        new(item)
+        new(item.merge({:connection => connection}))
       end
     end
 
-    def self.connection
-      @@connection
-    end
-
-    def self.connection=(con)
-      @@connection = con
-    end
-
     def self.resource_uri
       BASE_PATH + self.wapi_object
     end
@@ -102,7 +94,7 @@ module Infoblox
     end
 
     def post
-      self._ref = connection.post(resource_uri, remote_attribute_hash(write = true, post = true)).body
+      self._ref = unquote(connection.post(resource_uri, remote_attribute_hash(write = true, post = true)).body)
       true
     end
     alias_method :create, :post
@@ -116,7 +108,8 @@ module Infoblox
     end
 
     def put
-      connection.put(resource_uri, remote_attribute_hash(write = true))
+      self._ref = unquote(connection.put(resource_uri, remote_attribute_hash(write = true)).body)
+      true
     end
 
     def resource_uri
@@ -138,10 +131,9 @@ module Infoblox
     end
 
   private
-
-    def connection
-      self.class.connection
+    def unquote(str)
+      str.gsub(/\A['"]+|['"]+\Z/, "")
     end
-
   end
+
 end

data/lib/infoblox/version.rb

@@ -1,3 +1,3 @@
 module Infoblox
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

data/spec/host_spec.rb

@@ -17,13 +17,13 @@ describe Infoblox::Host, "#add_ipv4addr" do
       :ipv4addrs => [{:ipv4addr => "10.10.10.10"}],
       :name => "test-server.test.ing",
       :configure_for_dns => nil,
-      :extensible_attributes => nil}).and_return(HostResponse.new("hey"))
+      :extensible_attributes => nil}).and_return(HostResponse.new("\"hey\""))
 
-    Infoblox::Host.connection = conn
-    h = Infoblox::Host.new
+    h = Infoblox::Host.new(:connection => conn)
     h.add_ipv4addr("10.10.10.10")
     h.name = "test-server.test.ing"
     h.post
+    h._ref.should eq("hey")
   end
 end
 

data/spec/resource_spec.rb

@@ -32,30 +32,28 @@ describe Infoblox::Resource, "#add_ipv4addr" do
     conn = double
     uri = Infoblox::BASE_PATH + "foo:animal"
     allow(conn).to receive(:get).with(uri, {:_return_fields => "name,junction"}).and_return(FooResponse.new("[]"))
-    FooResource.connection = conn
-    FooResource.all.should eq([])
+    FooResource.all(conn).should eq([])
   end
 
   it "should put with the right attributes" do
     conn = double
     uri = Infoblox::BASE_PATH + "abcd"
-    allow(conn).to receive(:put).with(uri, {:name => "jerry", :junction => "32", :do_it => false}).and_return(FooResponse.new("[]"))
-    FooResource.connection = conn
-    f = FooResource.new
+    allow(conn).to receive(:put).with(uri, {:name => "jerry", :junction => "32", :do_it => false}).and_return(FooResponse.new("\"foobar\""))
+    f = FooResource.new(:connection => conn)
     f._ref = "abcd" 
     f.do_it = false
     f.junction = "32"
     f.name = "jerry"
     f.sect = :fulburns
     f.put
+    f._ref.should eq("foobar")
   end
 
   it "should post with the right attributes" do
     conn = double
     uri = Infoblox::BASE_PATH + "foo:animal"
-    allow(conn).to receive(:post).with(uri, {:name => "jerry", :junction => "32", :do_it => false, :sect => :fulburns}).and_return(FooResponse.new("abcdefg"))
-    FooResource.connection = conn
-    f = FooResource.new
+    allow(conn).to receive(:post).with(uri, {:name => "jerry", :junction => "32", :do_it => false, :sect => :fulburns}).and_return(FooResponse.new("\"abcdefg\""))
+    f = FooResource.new(:connection => conn)
     f.do_it = false
     f.junction = "32"
     f.name = "jerry"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday