infoblox 0.2.4 → 0.2.5

data/README.md

@@ -17,10 +17,13 @@ Or install it yourself as:
     $ gem install infoblox
 
 # Usage
-An instance of the Infoblox::Connection class is necessary:
+
+## Connecting
+An instance of the `Infoblox::Connection` class is necessary:
 
     connection = Infoblox::Connection.new(:username => '', :password => '', :host => '')
 
+## Querying
 Once a connection is made, one can use the resource class methods to query records: 
 
     Infoblox::Network.all(connection)
@@ -29,6 +32,11 @@ Once a connection is made, one can use the resource class methods to query recor
     Infoblox::Host.find(connection, {"name~" => "demo[0-9]{1,}-web.domain"})
     # => [...]
 
+You can also search across the Infoblox cluster using the `Infoblox::Search` resource. The response will contain any number of `Infoblox::Resource` subclass instances. 
+
+    result = Infoblox::Search.new(connection, "search_string~" => "webserver-")
+
+## Creating, updating, and deleting resources
 The resource class instances support `get`, `post`, `put`, and `delete`.  For example, creating a network is pretty straightforward: 
  
     network = Infoblox::Network.new(:connection => connection)
@@ -39,6 +47,7 @@ The resource class instances support `get`, `post`, `put`, and `delete`.  For ex
     network.network = "10.20.31.0/24"
     network.put  # true
 
+
 ## Contributing
 
 1. Fork it

data/lib/infoblox.rb

@@ -7,14 +7,10 @@ require 'infoblox/version'
 require 'infoblox/connection'
 require 'infoblox/resource'
 
-require 'infoblox/resource/cname'
-require 'infoblox/resource/host'
-require 'infoblox/resource/host_ipv4addr'
-require 'infoblox/resource/arecord'
-require 'infoblox/resource/ipv4addr'
-require 'infoblox/resource/network'
-require 'infoblox/resource/network_container'
-require 'infoblox/resource/ptr'
+# Require everything in the resource directory
+Dir[File.expand_path('../infoblox/resource/*.rb', __FILE__)].each do |f|
+  require f
+end
 
 module Infoblox
   WAPI_VERSION   = '1.0'

data/lib/infoblox/resource.rb

@@ -3,7 +3,12 @@ module Infoblox
     attr_accessor :_ref, :connection
 
     def self.wapi_object(obj=nil)
-      obj.nil? ? @wapi_object : @wapi_object = obj
+      if obj.nil? 
+        @wapi_object
+      else
+        self.resource_map[obj] = self
+        @wapi_object = obj
+      end
     end
 
     ## 
@@ -87,6 +92,14 @@ module Infoblox
       BASE_PATH + self.wapi_object
     end
 
+    ##
+    # A hash that maps Infoblox WAPI object identifiers to subclasses of Resource.
+    # Used by the Search resource for mapping response objects.
+    #
+    def self.resource_map
+      @@resource_map ||= {}
+    end
+
     def initialize(attrs={})
       attrs.each do |k,v|
         self.send("#{k}=", v)

data/lib/infoblox/resource/mx.rb

@@ -0,0 +1,8 @@
+module Infoblox
+  class Mx < Resource
+    remote_attr_accessor :mail_exchanger, :name, :preference,
+                         :extensible_attributes, :view
+
+    wapi_object "record:mx"
+  end
+end

data/lib/infoblox/resource/search.rb

@@ -0,0 +1,18 @@
+module Infoblox
+  class Search < Resource
+    wapi_object "search"
+
+    # does not return objects not implemented in this library
+    def self.find(connection, params)
+      JSON.parse(connection.get(resource_uri,params).body).map do |jobj|
+        klass = resource_map[jobj["_ref"].split("/").first]
+        if klass.nil?
+          puts jobj['_ref']
+          warn "umapped resource: #{jobj["_ref"]}"
+        else
+          klass.new(jobj.merge({:connection => connection}))
+        end
+      end.compact
+    end
+  end
+end

data/lib/infoblox/version.rb

@@ -1,3 +1,3 @@
 module Infoblox
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/resource_spec.rb

@@ -61,5 +61,15 @@ describe Infoblox::Resource, "#add_ipv4addr" do
     f.post
     f._ref.should eq('abcdefg')
   end
+
+  it 'should map wapi objects to classes' do
+    @expected = {}
+    ObjectSpace.each_object(Class) do |p| 
+      if p < Infoblox::Resource
+        @expected[p.wapi_object] = p
+      end
+    end
+    Infoblox::Resource.resource_map.should eq(@expected)
+  end
 end
 

data/spec/search_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+SearchResponse = Struct.new(:body)
+
+describe Infoblox::Search, ".find" do
+  it "searches correctly" do
+    conn = double
+
+    # empty response
+    return_json = SearchResponse.new("[]")
+    uri = Infoblox::BASE_PATH + Infoblox::Search.wapi_object
+    allow(conn).to receive(:get).with(uri, {"search_string~" => "foo"}).and_return(return_json)
+    Infoblox::Search.find(conn, "search_string~" => "foo").should eq([])
+
+    # response with host
+    return_json = SearchResponse.new('[
+      {
+        "_ref": "record:host/ZG5zLmhvc3QkLl9kZWZhdWx0LmdkaS50b3BzLmRtei1tYWlsc2VuZGVycy5xYy1nb3ZpcG10YTItZXA:foo-bar-baz.inner.domain/Organization",
+        "ipv4addrs": [
+            {
+                "_ref": "record:host_ipv4addr/ZG5zLmhvc3RfYWRkcmVzcyQuX2RlZmF1bHQuZ2RpLnRvcHMuZG16LW1haWxzZW5kZXJzLnFjLWdvdmlwbXRhMi1lcC4xNzIuMjQuNC4xODQu:10.10.10.10/foo-bar-baz.inner.domain/Organization",
+                "configure_for_dhcp": false,
+                "host": "foo-bar-baz.inner.domain",
+                "ipv4addr": "10.10.10.10"
+            }
+        ],
+        "name": "foo-bar-baz.inner.domain",
+        "view": "Organization"
+      }
+    ]')
+    allow(conn).to receive(:get).with(uri, {"search_string~" => "foo"}).and_return(return_json)
+    result = Infoblox::Search.find(conn, "search_string~" => "foo")
+    result[0].should be_a(Infoblox::Host)
+    host = result[0]
+    host.name.should eq("foo-bar-baz.inner.domain")
+  end
+end
+

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: infoblox
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
+  prerelease: 
 platform: ruby
 authors:
 - Billy Reisinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -116,41 +129,52 @@ files:
 - lib/infoblox/resource/host.rb
 - lib/infoblox/resource/host_ipv4addr.rb
 - lib/infoblox/resource/ipv4addr.rb
+- lib/infoblox/resource/mx.rb
 - lib/infoblox/resource/network.rb
 - lib/infoblox/resource/network_container.rb
 - lib/infoblox/resource/ptr.rb
+- lib/infoblox/resource/search.rb
 - lib/infoblox/version.rb
 - spec/connection_spec.rb
 - spec/host_spec.rb
 - spec/resource_spec.rb
+- spec/search_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/govdelivery/infoblox
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 142878646732084018
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 142878646732084018
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+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/search_spec.rb
 - spec/spec_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWUzYzAzOGIwNGZlM2E2ZmY2N2E4MjRkMWE0MDgwNTE1MmFiZDdjNg==
-  data.tar.gz: !binary |-
-    NjJjMDM0MDBlOThhMzYzYjMyMDlhNWE2ZDZiODVkMGEyNWQ2MGIxNA==
-SHA512:
-  metadata.gz: !binary |-
-    N2VmODA3YWNlMmMwMzFkMTQ5NWZhYTM3Y2ZkNWRhMGEwYjI0ZDc2MDNhMDIx
-    MTU5MzNkYjkyYzQxYzdlODBmNDQ1NWNiZTY2NDg2OTE5MjUyMzE0NGMzNjg1
-    ZjM3MzIxZWUyMGUzYTlmZmU5ZjY4NzMzYjVlOTE5MGNmNTc3MWM=
-  data.tar.gz: !binary |-
-    MmUwYWFiN2Q0YTkxNWZkNzYyZjY5N2RmZjZjNmJjMzE1MjhiM2Y1YWQyNWY3
-    YzdlNTg5OTk1MTJjMjYyZjA2ZGExNDg5NzY1N2JjOTI2MDYzOTg5Y2FmZjU5
-    ZWNkZTFjODRmYzZjNDEzNjhhZjc1ZjM5MjAwZmRhYjQ3ZWYxNWY=