rubix 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/rubix/connection.rb

@@ -10,7 +10,7 @@ module Rubix
 
     include Logs
 
-    attr_reader :uri, :server, :auth, :request_id, :username, :password
+    attr_reader :uri, :server, :auth, :request_id, :username, :password, :last_response
 
     def initialize uri_or_string, username=nil, password=nil
       self.uri    = uri_or_string
@@ -62,7 +62,7 @@ module Rubix
       when response.code.to_i >= 500
         raise ConnectionError.new("Too many consecutive failed requests (#{max_attempts}) to the Zabbix API at (#{uri}).")
       else
-        Response.new(response)
+        @last_response = Response.new(response)
       end
     end
     

data/lib/rubix/models/application.rb

@@ -16,13 +16,37 @@ module Rubix
     
     attr_accessor :name
 
-    def self.find_request options={}
-      request('application.get', 'hostids' => [options[:host_id]], 'filter' => {'name' => options[:name], 'applicationid' => options[:id]}, "output" => "extend")
+    #
+    # == Associations ==
+    #
+
+    include Associations::BelongsToHost
+
+    #
+    # == Requests == 
+    #
+    
+    def create_params
+      {:name => name, :hostid => host_id}
     end
 
+    def update_params
+      { id_field => id, :name => name, :hosts => {:hostid => host_id}}
+    end
+    
+    def self.find_params options={}
+      super().merge({
+                      :hostids => [options[:host_id]],
+                      :filter => {
+                        :name   => options[:name],
+                        id_field => options[:id]
+                      }
+                    })
+    end
+      
     def self.build app
       params = {
-        :id   => app['applicationid'].to_i,
+        :id   => app[id_field].to_i,
         :name => app['name']
       }
 
@@ -35,32 +59,5 @@ module Rubix
       new(params)
     end
     
-    def self.id_field
-      'applicationid'
-    end
-    
-    
-    #
-    # == Associations ==
-    #
-
-    include Associations::BelongsToHost
-    
-    #
-    # == CRUD ==
-    #
-    
-    def create_request
-      request('application.create', 'name' => name, 'hostid' => host_id)
-    end
-
-    def update_request
-      request('application.update', 'applicationid' => id, 'name' => name, 'hosts' => {'hostid' => host_id})
-    end
-
-    def destroy_request
-      request('application.delete', [id])
-    end
-    
   end
 end

data/lib/rubix/models/host.rb

@@ -33,26 +33,6 @@ module Rubix
       self.user_macros    = properties[:user_macros]
     end
 
-    def self.find_request options={}
-      request('host.get', 'filter' => {'host' => options[:name], 'hostid' => options[:id]}, 'select_groups' => 'refer', 'selectParentTemplates' => 'refer', 'select_profile' => 'refer', 'select_macros' => 'extend', 'output' => 'extend')
-    end
-
-    def self.build host
-      new({
-            :id             => host['hostid'].to_i,
-            :name           => host['host'],
-            :host_group_ids => host['groups'].map { |group| group['groupid'].to_i },
-            :template_ids   => host['parentTemplates'].map { |template| (template['templateid'] || template['hostid']).to_i },
-            :user_macros    => host['macros'].map { |um| UserMacro.new(:host_id => um['hostid'].to_i, :id => um['hostmacroid'], :value => um['value'], :macro => um['macro']) },
-            :profile        => host['profile'],
-            :port           => host['port']
-          })
-    end
-    
-    def self.id_field
-      'hostid'
-    end
-
     #
     # == Associations == 
     #
@@ -71,37 +51,40 @@ module Rubix
     end
     
     #
-    # == CRUD ==
+    # == Requests ==
     #
 
-    def params
-      {}.tap do |hp|
-        hp['host']    = name
-        
-        hp['profile'] = profile if profile
-        hp['status']  = status  if status
+    def create_params
+      {
+        :host      => name,
+        :groups    => host_group_params,
+        :templates => template_params,
+        :macros    => user_macro_params
+      }.tap do |hp|
+        hp[:profile] = profile if profile
+        hp[:status]  = status  if status
         
         if ip
-          hp['ip']      = ip
-          hp['useip']   = true
-          hp['port']    = port || self.class::DEFAULT_PORT
+          hp[:ip]      = ip
+          hp[:useip]   = true
+          hp[:port]    = port || self.class::DEFAULT_PORT
         else
-          hp['ip'] = self.class::BLANK_IP
+          hp[:ip] = self.class::BLANK_IP
         end
-        
       end
     end
     
-    def create_request
-      request('host.create', params.merge('groups' => host_group_params, 'templates' => template_params, 'macros' => user_macro_params))
-    end
-
-    def update_request
-      request('host.update', params.merge('hostid' => id))
+    def update_params
+      create_params.tap do |cp|
+        cp.delete(:groups)
+        cp.delete(:templates)
+        cp.delete(:macros)
+        cp[id_field] = id
+      end
     end
 
     def before_update
-      response = request('host.massUpdate', { 'groups' => host_group_params, 'templates' => template_params, 'macros' => user_macro_params, 'hosts' => [{'hostid' => id}]})
+      response = request('host.massUpdate', { :groups => host_group_params, :templates => template_params, :macros => user_macro_params, :hosts => [{id_field => id}]})
       if response.has_data?
         true
       else
@@ -110,8 +93,33 @@ module Rubix
       end
     end
     
-    def destroy_request
-      request('host.delete', [{'hostid' => id}])
+    def destroy_params
+      [{id_field => id}]
+    end
+
+    def before_destroy
+      return true if user_macros.nil? || user_macros.empty?
+      user_macros.map { |um| um.destroy }.all?
+    end
+
+    def self.build host
+      new({
+            :id             => host[id_field].to_i,
+            :name           => host['host'],
+            :host_group_ids => host['groups'].map { |group| group['groupid'].to_i },
+            :template_ids   => host['parentTemplates'].map { |template| (template['templateid'] || template[id_field]).to_i },
+            :user_macros    => host['macros'].map { |um| UserMacro.new(:host_id => um[id_field].to_i, :id => um['hostmacroid'], :value => um['value'], :macro => um['macro']) },
+            :profile        => host['profile'],
+            :port           => host['port']
+          })
+    end
+    
+    def self.get_params
+      super().merge({:select_groups => :refer, :selectParentTemplates => :refer, :select_profile => :refer, :select_macros => :extend})
+    end
+
+    def self.find_params options={}
+      get_params.merge(:filter => {:host => options[:name], id_field => options[:id]})
     end
     
   end

data/lib/rubix/models/host_group.rb

@@ -16,17 +16,6 @@ module Rubix
     
     attr_accessor :name
 
-    def self.find_request options={}
-      request('hostgroup.get', 'filter' => {'groupid' => options[:id], 'name' => options[:name]}, 'select_hosts' => 'refer', 'output' => 'extend')
-    end
-
-    def self.build host_group
-      new({
-            :id       => host_group['groupid'].to_i,
-            :name     => host_group['name'],
-            :host_ids => host_group['hosts'].map { |host_info| host_info['hostid'].to_i }
-          })
-    end
     
     def self.id_field
       'groupid'
@@ -39,20 +28,32 @@ module Rubix
     include Associations::HasManyHosts
 
     #
-    # == CRUD ==
+    # == Requests ==
     #
-    
-    def create_request
-      request('hostgroup.create', [{'name' => name}])
+
+    def create_params
+      {:name => name}
     end
 
-    def update_request
-      request('hostgroup.update', [{'groupid' => id, 'name' => name}])
+    def destroy_params
+      [{id_field => id}]
     end
 
-    def destroy_request
-      request('hostgroup.delete', [{'groupid' => id}])
+    def self.get_params
+      super().merge(:select_hosts => :refer)
     end
 
+    def self.find_params options={}
+      get_params.merge(:filter => {id_field => options[:id], :name => options[:name]})
+    end
+
+    def self.build host_group
+      new({
+            :id       => host_group[id_field].to_i,
+            :name     => host_group['name'],
+            :host_ids => host_group['hosts'].map { |host_info| host_info['hostid'].to_i }
+          })
+    end
+    
   end
 end

data/lib/rubix/models/item.rb

@@ -66,25 +66,6 @@ module Rubix
     def resource_name
       "#{self.class.resource_name} #{self.key || self.id}"
     end
-    
-    def self.find_request options={}
-      request('item.get', 'hostids' => [options[:host_id]], 'filter' => {'key_' => options[:key], 'id' => options[:id]}, "select_applications" => "refer", "output" => "extend")
-    end
-
-    def self.build item
-      new({
-            :id              => item['itemid'].to_i,
-            :host_id         => item['hostid'].to_i,
-            :description     => item['description'],
-            :value_type      => item['value_type'] ? self::VALUE_NAMES[item['value_type'].to_i] : :character,
-            :application_ids => (item['applications'] || []).map { |app| app['applicationid'].to_i },
-            :key             => item['key_']
-          })
-    end
-    
-    def self.id_field
-      'itemid'
-    end
 
     def value_type= vt
       if vt.nil? || vt.to_s.empty? || !self.class::VALUE_CODES.include?(vt.to_sym)
@@ -102,10 +83,10 @@ module Rubix
     include Associations::HasManyApplications
 
     #
-    # == CRUD == 
+    # == Requests == 
     #
     
-    def params
+    def create_params
       {
         :hostid       => host_id,
         :description  => (description || 'Unknown'),
@@ -116,17 +97,30 @@ module Rubix
         p[:applications] = application_ids if application_ids
       end
     end
-    
-    def create_request
-      request('item.create', params)
-    end
 
-    def update_request
-      request('item.update', params.merge('itemid' => id))
+    def self.get_params
+      super().merge(:select_applications => :refer)
+    end
+    
+    def self.find_params options={}
+      super().merge({
+                      :hostids => [options[:host_id]],
+                      :filter => {
+                        :key_ => options[:key],
+                        :id   => options[:id]
+                      }
+                    })
     end
 
-    def destroy_request
-      request('item.delete', [id])
+    def self.build item
+      new({
+            :id              => item[id_field].to_i,
+            :host_id         => item['hostid'].to_i,
+            :description     => item['description'],
+            :value_type      => item['value_type'] ? self::VALUE_NAMES[item['value_type'].to_i] : :character,
+            :application_ids => (item['applications'] || []).map { |app| app['applicationid'].to_i },
+            :key             => item['key_']
+          })
     end
     
   end

data/lib/rubix/models/model.rb

@@ -9,22 +9,46 @@ module Rubix
     extend Logs
     include Logs
 
+    #
+    # == Identifiers == 
+    #
+
+    # This is the name of the resource as used inside Rubix -- Host,
+    # HostGroup, UserMacro, &c.
     def self.resource_name
       self.to_s.split('::').last
     end
 
+    # This is the name of *this* resource instance, using this
+    # object's 'name' property if possible.
     def resource_name
       "#{self.class.resource_name} #{respond_to?(:name) ? self.name : self.id}"
     end
+    
+    # This is the name of the resource as used by Zabbix -- host,
+    # hostgroup, usermacro, &c.
+    def self.zabbix_name
+      resource_name.downcase
+    end
+
+    # This is the name of the id field returned in Zabbix responses --
+    # hostid, groupid, hostmacroid, &c.
+    def self.id_field
+      "#{zabbix_name}id"
+    end
+
+    def id_field
+      self.class.id_field
+    end
+
+    #
+    # == Initialization ==
+    #
 
     def initialize properties={}
       @properties = properties
       @id         = properties[:id]
     end
-    
-    def new_record?
-      @id.nil?
-    end
 
     def request method, params
       self.class.request(method, params)
@@ -34,77 +58,84 @@ module Rubix
       Rubix.connection && Rubix.connection.request(method, params)
     end
 
-    def self.find options={}
-      response = find_request(options)
-      case
-      when response.has_data?
-        build(response.result.first)
-      when response.success?
-        # a successful but empty response means it wasn't found
-      else
-        error("Error finding #{resource_name} using #{options.inspect}: #{response.error_message}")
-        nil
-      end
+    #
+    # == CRUD == 
+    #
+    
+    def new_record?
+      @id.nil?
     end
 
-    def self.find_or_create options={}
-      response = find_request(options)
-      case
-      when response.has_data?
-        build(response.result.first)
-      when response.success?
-        # doesn't exist
-        obj = new(options)
-        if obj.save
-          obj
-        else
-          false
-        end
-      else
-        error("Error creating #{resource_name} using #{options.inspect}: #{response.error_message}")
-        false
-      end
+    def save
+      new_record? ? create : update
     end
-
+    
     def validate
       true
     end
-    
+
+    def create_params
+      {}
+    end
+
+    def create_request
+      request("#{self.class.zabbix_name}.create", create_params)
+    end
+
     def create
       return false unless validate
       response = create_request
       if response.has_data?
-        @id = response.result[self.class.id_field + 's'].first.to_i
+        @id = response.result[id_field + 's'].first.to_i
         info("Created #{resource_name}")
+        true
       else
         error("Error creating #{resource_name}: #{response.error_message}")
         return false
       end
     end
 
+    def update_params
+      create_params.merge({id_field => id})
+    end
+
+    def update_request
+      request("#{self.class.zabbix_name}.update", update_params)
+    end
+
     def update
       return false unless validate
       return create if new_record?
       return false unless before_update
       response = update_request
-      if response.has_data?
+      case
+      when response.has_data? && response.result.values.first.map(&:to_i).include?(id)
         info("Updated #{resource_name}")
+        true
+      when response.has_data?
+        error("No error, but failed to update #{resource_name}")
+        false
       else
         error("Error updating #{resource_name}: #{response.error_message}")
-        return false
+        false
       end
     end
 
     def before_update
       true
     end
-    
-    def save
-      new_record? ? create : update
+
+    def destroy_params
+      [id]
     end
 
+    def destroy_request
+      request("#{self.class.zabbix_name}.delete", destroy_params)
+    end
+    
     def destroy
-      return false if new_record?
+      return true if new_record?
+      return false unless before_destroy
       response = destroy_request
       case
       when response.has_data? && response.result.values.first.first.to_i == id
@@ -119,5 +150,83 @@ module Rubix
       end
     end
 
+    def before_destroy
+      true
+    end
+    
+    #
+    # == Index == 
+    #
+
+    def self.get_params
+      { :output => :extend }
+    end
+
+    def self.all_params options={}
+      get_params.merge(options)
+    end
+
+    def self.all_request options={}
+      request("#{zabbix_name}.get", all_params(options))
+    end
+
+    def self.all options={} 
+      response = all_request(options)
+      if response.has_data?
+        response.result.map { |obj_data| build(obj_data) }
+      else
+        error("Error listing all #{resource_name}s: #{response.error_message}") unless response.success?
+        []
+      end
+    end
+
+    def self.each &block
+      all.each(&block)
+    end
+
+    #
+    # == Show == 
+    #
+
+    def self.find_params options={}
+      get_params.merge(options)
+    end
+
+    def self.find_request options={}
+      request("#{zabbix_name}.get", find_params(options))
+    end
+
+    def self.find options={}
+      response = find_request(options)
+      case
+      when response.has_data?
+        build(response.result.first)
+      when response.success?
+        # a successful but empty response means it wasn't found
+      else
+        error("Error finding #{resource_name} using #{options.inspect}: #{response.error_message}")
+        nil
+      end
+    end
+
+    def self.find_or_create options={}
+      response = find_request(options)
+      case
+      when response.has_data?
+        build(response.result.first)
+      when response.success?
+        # doesn't exist
+        obj = new(options)
+        if obj.save
+          obj
+        else
+          false
+        end
+      else
+        error("Error creating #{resource_name} using #{options.inspect}: #{response.error_message}")
+        false
+      end
+    end
+
   end
 end

data/lib/rubix/models/template.rb

@@ -19,30 +19,6 @@ module Rubix
       self.host_groups    = properties[:host_groups]
     end
 
-    def self.find_request options={}
-      params = {'select_groups' => 'refer', 'select_hosts' => 'refer', 'output' => 'extend'}
-      case
-      when options[:id]
-        params['templateids'] = [options[:id]]
-      when options[:name]
-        params['filter'] = { 'host' => options[:name] }
-      end
-      request('template.get', params)
-    end
-
-    def self.build template
-      new({
-            :id       => (template['templateid'] || template['hostid']).to_i,
-            :name     => template['host'],
-            :host_ids => template['hosts'].map { |host_info| host_info['hostid'].to_i },
-            :host_group_ids => template['groups'].map { |group| group['groupid'].to_i }
-          })
-    end
-
-    def self.id_field
-      'templateid'
-    end
-
     #
     # == Validation ==
     #
@@ -63,16 +39,33 @@ module Rubix
     # == CRUD ==
     #
     
-    def create_request
-      request('template.create', {'host' => name, 'groups' => host_group_params})
+    def create_params
+      {:host => name, :groups => host_group_params}
     end
     
-    def update_request
-      request('template.update', [{'host' => name, 'templateid' => id, 'groups' => host_group_params}])
+    def update_params
+      [create_params.merge(id_field => id)]
     end
 
-    def destroy_request
-      request('template.delete', [{'templateid' => id}])
+    def destroy_params
+      [{id_field => id}]
+    end
+
+    def self.get_params
+      super().merge(:select_groups => :refer, :select_hosts => :refer)
+    end
+
+    def self.find_params options={}
+      get_params.merge(:filter => {:host => options[:name], :hostid => options[:id]})
+    end
+
+    def self.build template
+      new({
+            :id       => (template[id_field] || template['hostid']).to_i,
+            :name     => template['host'],
+            :host_ids => template['hosts'].map { |host_info| host_info['hostid'].to_i },
+            :host_group_ids => template['groups'].map { |group| group['groupid'].to_i }
+          })
     end
     
   end

data/lib/rubix/models/user_macro.rb

@@ -6,30 +6,24 @@ module Rubix
     # == Properties & Finding ==
     #
     
-    attr_accessor :name, :value
-
+    attr_accessor :value
+    
     def initialize properties={}
       super(properties)
-      @name  = properties[:name] || self.class.unmacro_name(properties[:macro])
+      self.name  = properties[:name] || self.class.unmacro_name(properties[:macro])
       @value = properties[:value]
 
       self.host    = properties[:host]
       self.host_id = properties[:host_id]
     end
 
-    def self.find_request options={}
-      request('usermacro.get', 'hostids' => [options[:host_id]], 'filter' => {'macro' => macro_name(options[:name])}, "output" => "extend")
+    attr_reader :name
+    def name= n
+      return if n.nil? || n.empty?
+      raise ValidationError.new("Cannot change the name of a UserMacro once it's created.") if @name && (!new_record?)
+      @name = n
     end
 
-    def self.build macro
-      new({
-            :id      => macro['hostmacroid'].to_i,
-            :name    => unmacro_name(macro['macro']),
-            :value   => macro['value'],
-            :host_id => macro['hostid']
-          })
-    end
-    
     def self.unmacro_name name
       (name || '').gsub(/^\{\$/, '').gsub(/\}$/, '').upcase
     end
@@ -46,6 +40,10 @@ module Rubix
       'hostmacroid'
     end
 
+    def resource_name
+      "#{self.class.resource_name} #{self.name || self.id}"
+    end
+
     #
     # == Associations ==
     #
@@ -55,25 +53,48 @@ module Rubix
     #
     # == Validation ==
     #
+    
     def validate
       raise ValidationError.new("A user macro must have both a 'name' and a 'value'") if name.nil? || name.strip.empty? || value.nil? || value.strip.empty?
       true
     end
     
     #
-    # == CRUD ==
+    # == Requests ==
     #
+
+    def mass_add_params
+      { :macros => [{:macro => macro_name, :value => value}], :hosts => [{:hostid => host_id}] }
+    end
     
     def create_request
-      request('usermacro.massAdd', 'macros' => [{'macro' => macro_name, 'value' => value}], 'hosts' => [{'hostid' => host_id}])
+      request('usermacro.massAdd', mass_add_params)
     end
     
     def update_request
-      request('usermacro.massUpdate', 'macros' => [{'macro' => macro_name, 'value' => value}], 'hosts' => [{'hostid' => host_id}])
+      request('usermacro.massUpdate', mass_add_params)
     end
 
     def destroy_request
-      request('usermacro.massRemove', 'hostids' => [host_id], 'macros' => [macro_name])
+      request('usermacro.massRemove', :hostids => [host_id], :macros => [macro_name])
+    end
+
+    def self.find_params options={}
+      super().merge({
+                      :hostids => [options[:host_id]],
+                      :filter => {
+                        :macro => macro_name(options[:name])
+                      }
+                    })
+    end
+
+    def self.build macro
+      new({
+            :id      => macro[id_field].to_i,
+            :name    => unmacro_name(macro['macro']),
+            :value   => macro['value'],
+            :host_id => macro['hostid']
+          })
     end
     
   end

data/spec/requests/application_request_spec.rb

@@ -4,19 +4,17 @@ describe "CRUD for hosts" do
 
   before do
     @hg = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    @hg.save
+    ensure_save(@hg)
     
     @h1  = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@hg])
-    @h1.save
+    ensure_save(@h1)
 
     @h2  = Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@hg])
-    @h2.save
+    ensure_save(@h2)
   end
 
   after do
-    @h1.destroy
-    @h2.destroy
-    @hg.destroy
+    ensure_destroy(@h1, @h2, @hg)
   end
   
   it "should be able to create, update, and destroy a host" do
@@ -24,22 +22,28 @@ describe "CRUD for hosts" do
     
     Rubix::Application.find(:name => 'rubix_spec_app_1', :host_id => @h1.id).should be_nil
     
-    app = Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @h1.id)
-    app.save
-    new_a = Rubix::Application.find(:name => 'rubix_spec_app_1', :host_id => @h1.id)
-    new_a.should_not be_nil
-    new_a.id.should == app.id
-    new_a.host_id.should == @h1.id
-    id = app.id
+    app1 = Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @h1.id)
+    app1.save.should be_true
+    id = app1.id
     id.should_not be_nil
-
-    app.name = 'rubix_spec_app_2'
-    app.update
-    new_a = Rubix::Application.find(:id => id, :name => 'rubix_spec_app_2', :host_id => @h1.id)
-    new_a.should_not be_nil
-    new_a.name.should == 'rubix_spec_app_2'
     
-    app.destroy
-    Rubix::Application.find(:id => id, :host_id => @h1.id).should be_nil
+    ensure_destroy(app1) do
+      
+      app2 = Rubix::Application.find(:name => 'rubix_spec_app_1', :host_id => @h1.id)
+      app2.should_not be_nil
+      app2.id.should == app1.id
+      app2.host_id.should == @h1.id
+      
+      app1.name = 'rubix_spec_app_2'
+      app1.save.should be_true
+      
+      app2 = Rubix::Application.find(:id => id, :name => 'rubix_spec_app_2', :host_id => @h1.id)
+      app2.should_not be_nil
+      app2.name.should == 'rubix_spec_app_2'
+      
+      app1.destroy.should be_true
+      Rubix::Application.find(:id => id, :host_id => @h1.id).should be_nil
+      Rubix::Application.find(:id => id, :host_id => @h2.id).should be_nil
+    end
   end
 end

data/spec/requests/host_group_request_spec.rb

@@ -7,17 +7,25 @@ describe "CRUD for host groups" do
     
     Rubix::HostGroup.find(:name => 'rubix_spec_host_group_1').should be_nil
     
-    hg = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    hg.save
-    Rubix::HostGroup.find(:name => 'rubix_spec_host_group_1').should_not be_nil
-    id = hg.id
+    hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
+    hg1.save.should be_true
+    id = hg1.id
     id.should_not be_nil
 
-    hg.name = 'rubix_spec_host_group_2'
-    hg.update
-    Rubix::HostGroup.find(:id => id).name.should == 'rubix_spec_host_group_2'
-    
-    hg.destroy
-    Rubix::HostGroup.find(:id => id).should be_nil
+    ensure_destroy(hg1) do
+      hg2 = Rubix::HostGroup.find(:name => 'rubix_spec_host_group_1')
+      hg2.should_not be_nil
+      hg2.name.should == 'rubix_spec_host_group_1'
+      
+      hg1.name = 'rubix_spec_host_group_2'
+      hg1.save.should be_true
+
+      hg2 = Rubix::HostGroup.find(:name => 'rubix_spec_host_group_2')
+      hg2.should_not be_nil
+      hg2.name.should == 'rubix_spec_host_group_2'
+
+      hg1.destroy
+      Rubix::HostGroup.find(:id => id).should be_nil
+    end
   end
 end

data/spec/requests/host_request_spec.rb

@@ -4,27 +4,23 @@ describe "CRUD for hosts" do
 
   before do
     @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    @hg1.save
+    ensure_save(@hg1)
 
     @hg2 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_2')
-    @hg2.save
+    ensure_save(@hg2)
     
     @t1 = Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@hg1])
-    @t1.save
+    ensure_save(@t1)
 
     @t2 = Rubix::Template.new(:name => 'rubix_spec_template_2', :host_groups => [@hg2])
-    @t2.save
+    ensure_save(@t2)
 
     @um1 = Rubix::UserMacro.new(:name => 'rubix_spec_macro_1', :value => 'rubix_spec_value_1')
-    @um2 = Rubix::UserMacro.new(:name => 'rubix_spec_macro_2', :value => 'rubix_spec_value_2')
     
   end
 
   after do
-    @t1.destroy
-    @t2.destroy
-    @hg1.destroy
-    @hg2.destroy
+    ensure_destroy(@um1, @t1, @t2, @hg1, @hg2)
   end
   
   it "should be able to create, update, and destroy a host" do
@@ -32,39 +28,36 @@ describe "CRUD for hosts" do
     
     Rubix::Host.find(:name => 'rubix_spec_host_1').should be_nil
     
-    h = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@hg1], :templates => [@t1], :user_macros => [@um1])
-    h.save
-    begin
-      new_h = Rubix::Host.find(:name => 'rubix_spec_host_1')
-      new_h.should_not be_nil
-      new_h.template_ids.should include(@t1.id)
-      new_h.host_group_ids.should include(@hg1.id)
-      new_h.user_macros.size.should == 1
-      new_h.user_macros.first.name.should  == 'RUBIX_SPEC_MACRO_1'
-      new_h.user_macros.first.value.should == 'rubix_spec_value_1'
-      
-      id = h.id
-      id.should_not be_nil
+    h1 = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@hg1], :templates => [@t1], :user_macros => [@um1])
+    h1.save.should be_true
+    id = h1.id
+    id.should_not be_nil
+    
+    ensure_destroy(h1) do
+      h2 = Rubix::Host.find(:name => 'rubix_spec_host_1')
+      h2.should_not be_nil
+      h2.template_ids.should include(@t1.id)
+      h2.host_group_ids.should include(@hg1.id)
+      h2.user_macros.size.should == 1
+      h2.user_macros.first.name.should  == 'RUBIX_SPEC_MACRO_1'
+      h2.user_macros.first.value.should == 'rubix_spec_value_1'
       
-      h.name = 'rubix_spec_host_2'
-      h.host_groups = [@hg2]
-      h.templates = [@t2]
-      h.user_macros = [@um2]
-      h.update
+      h1.name = 'rubix_spec_host_2'
+      h1.host_groups = [@hg2]
+      h1.templates = [@t2]
+      h1.save.should be_true
       
-      new_h = Rubix::Host.find(:name => 'rubix_spec_host_2')
-      new_h.should_not be_nil
-      new_h.template_ids.should include(@t2.id)
-      new_h.host_group_ids.should include(@hg2.id)
-      new_h.user_macros.size.should == 1
-      new_h.user_macros.first.name.should  == 'RUBIX_SPEC_MACRO_2'
-      new_h.user_macros.first.value.should == 'rubix_spec_value_2'
-    rescue => e
-      puts "#{e.class} -- #{e.message}"
-      puts e.backtrace
-    ensure
-      h.destroy
+      h2 = Rubix::Host.find(:name => 'rubix_spec_host_2')
+      h2.should_not be_nil
+      h2.template_ids.should include(@t2.id)
+      h2.host_group_ids.should include(@hg2.id)
+      h2.user_macros.size.should == 1
+      h2.user_macros.first.name.should  == 'RUBIX_SPEC_MACRO_1'
+      h2.user_macros.first.value.should == 'rubix_spec_value_1'
+
+      h1.destroy
+      Rubix::Host.find(:id => id).should be_nil
     end
-    Rubix::Host.find(:id => id).should be_nil
+    
   end
 end

data/spec/requests/item_request_spec.rb

@@ -4,28 +4,23 @@ describe "CRUD for items" do
 
   before do
     @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    @hg1.save
+    ensure_save(@hg1)
     
     @h1  = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@hg1])
-    @h1.save
+    ensure_save(@h1)
 
     @h2  = Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@hg1])
-    @h2.save
+    ensure_save(@h2)
 
     @a1 = Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @h1.id)
-    @a1.save
+    ensure_save(@a1)
 
     @a2 = Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @h2.id)
-    @a2.save
-    
+    ensure_save(@a2)
   end
 
   after do
-    @a1.destroy
-    @a2.destroy
-    @h1.destroy
-    @h2.destroy
-    @hg1.destroy
+    ensure_destroy(@a1, @a2, @h1, @h2, @hg1)
   end
   
   it "should be able to create, update, and destroy an item" do
@@ -33,36 +28,38 @@ describe "CRUD for items" do
     
     Rubix::Item.find(:key => 'rubix.spec1', :host_id => @h1.id).should be_nil
     
-    item = Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @h1.id, :value_type => :character, :applications => [@a1])
-    item.save
-    
-    new_i = Rubix::Item.find(:key => 'rubix.spec1', :host_id => @h1.id)
-    new_i.should_not be_nil
-    new_i.host.name.should == @h1.name
-    new_i.key.should == 'rubix.spec1'
-    new_i.description.should == 'rubix item description 1'
-    new_i.value_type.should == :character
-    new_i.application_ids.should include(@a1.id)
-    
-    id = item.id
+    item1 = Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @h1.id, :value_type => :character, :applications => [@a1])
+    item1.save.should be_true
+    id = item1.id
     id.should_not be_nil
-
-    item.key = 'rubix.spec2'
-    item.description = 'rubix item description 2'
-    item.value_type = :unsigned_int
-    item.host_id = @h2.id
-    item.applications = [@a2]
-    item.update
-
-    new_i = Rubix::Item.find(:key => 'rubix.spec2', :host_id => @h2.id)
-    new_i.should_not be_nil
-    new_i.host.name.should == @h2.name
-    new_i.key.should == 'rubix.spec2'
-    new_i.description.should == 'rubix item description 2'
-    new_i.value_type.should == :unsigned_int
-    new_i.application_ids.should include(@a2.id)
     
-    item.destroy
-    Rubix::Item.find(:id => id, :host_id => @h1.id).should be_nil
+    ensure_destroy(item1) do
+      item2 = Rubix::Item.find(:key => 'rubix.spec1', :host_id => @h1.id)
+      item2.should_not be_nil
+      item2.host.name.should == @h1.name
+      item2.key.should == 'rubix.spec1'
+      item2.description.should == 'rubix item description 1'
+      item2.value_type.should == :character
+      item2.application_ids.should include(@a1.id)
+      
+      item1.key = 'rubix.spec2'
+      item1.description = 'rubix item description 2'
+      item1.value_type = :unsigned_int
+      item1.host_id = @h2.id
+      item1.applications = [@a2]
+      item1.save.should be_true
+      
+      item2 = Rubix::Item.find(:key => 'rubix.spec2', :host_id => @h2.id)
+      item2.should_not be_nil
+      item2.host.name.should == @h2.name
+      item2.key.should == 'rubix.spec2'
+      item2.description.should == 'rubix item description 2'
+      item2.value_type.should == :unsigned_int
+      item2.application_ids.should include(@a2.id)
+      
+      item1.destroy
+      Rubix::Item.find(:id => id, :host_id => @h1.id).should be_nil
+      Rubix::Item.find(:id => id, :host_id => @h2.id).should be_nil
+    end
   end
 end

data/spec/requests/template_request_spec.rb

@@ -4,16 +4,14 @@ describe "CRUD for templates" do
 
   before do
     @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    @hg1.save
+    ensure_save(@hg1)
 
     @hg2 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_2')
-    @hg2.save
-    
+    ensure_save(@hg2)
   end
 
   after do
-    @hg1.destroy
-    @hg2.destroy
+    ensure_destroy(@hg1, @hg2)
   end
 
   it "should be able to create, update, and destroy a template" do
@@ -21,27 +19,29 @@ describe "CRUD for templates" do
     
     Rubix::Template.find(:name => 'rubix_spec_template_1').should be_nil
     
-    t = Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@hg1])
-    t.save
-    
-    new_t = Rubix::Template.find(:name => 'rubix_spec_template_1')
-    new_t.should_not be_nil
-    new_t.id.should == t.id
-    new_t.host_group_ids.should include(@hg1.id)
-    id = t.id
+    t1 = Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@hg1])
+    t1.save.should be_true
+    id = t1.id
     id.should_not be_nil
 
-    t.name = 'rubix_spec_template_2'
-    t.host_groups = [@hg2]
-    t.update
-
-    new_t = Rubix::Template.find(:id => id)
-    new_t.name.should == 'rubix_spec_template_2'
-    new_t.host_group_ids.should_not include(@hg1.id)
-    new_t.host_group_ids.should     include(@hg2.id)
-    
-    t.destroy
-    Rubix::Template.find(:id => id).should be_nil
+    ensure_destroy(t1) do
+      t2 = Rubix::Template.find(:name => 'rubix_spec_template_1')
+      t2.should_not be_nil
+      t2.id.should == id
+      t2.host_group_ids.should include(@hg1.id)
+      
+      t1.name = 'rubix_spec_template_2'
+      t1.host_groups = [@hg2]
+      t1.save.should be_true
+
+      t2 = Rubix::Template.find(:id => id)
+      t2.name.should == 'rubix_spec_template_2'
+      t2.host_group_ids.should_not include(@hg1.id)
+      t2.host_group_ids.should     include(@hg2.id)
+      
+      t1.destroy
+      Rubix::Template.find(:id => id).should be_nil
+    end
   end
 
   it "should be able to import and export a template" do

data/spec/requests/user_macro_request_spec.rb

@@ -4,15 +4,14 @@ describe "CRUD for user macros" do
 
   before do
     @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    @hg1.save
+    ensure_save(@hg1)
     
     @h1  = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@hg1])
-    @h1.save
+    ensure_save(@h1)
   end
 
   after do
-    @h1.destroy
-    @hg1.destroy
+    ensure_destroy(@h1, @hg1)
   end
   
   it "should be able to create, update, and destroy a host" do
@@ -20,17 +19,25 @@ describe "CRUD for user macros" do
     
     Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id).should be_nil
     
-    um = Rubix::UserMacro.new(:name => 'rubix_spec_macro_1', :value => 'rubix_spec_value_1', :host_id => @h1.id)
-    um.save
-    Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id).should_not be_nil
-    id = um.id
+    um1 = Rubix::UserMacro.new(:name => 'rubix_spec_macro_1', :value => 'rubix_spec_value_1', :host_id => @h1.id)
+    um1.save.should be_true
+
+    id = um1.id
     id.should_not be_nil
 
-    um.value = 'rubix_spec_value_2'
-    um.update
-    Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id).value.should == 'rubix_spec_value_2'
+    ensure_destroy(um1) do
+      um2 = Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id)
+      um2.should_not be_nil
+
+      um1.value = 'rubix_spec_value_2'
+      um1.save.should be_true
+
+      um2 = Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id)
+      um2.should_not be_nil
+      um2.value.should == 'rubix_spec_value_2'
 
-    um.destroy
-    Rubix::UserMacro.find(:name => 'rubix_spec_macro_2', :host_id => @h1.id).should be_nil
+      um1.destroy
+      Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id).should be_nil
+    end
   end
 end

data/spec/support/integration_helper.rb

@@ -4,6 +4,43 @@ module Rubix
     def integration_test
       pending("A live Zabbix API to test against") unless $RUBIX_INTEGRATION_TEST
     end
+
+    def ensure_save(obj)
+      begin
+        raise Rubix::Error.new(Rubix.connection.last_response.error_message) unless obj.save
+      rescue => e
+        puts "#{e.class} -- #{e.message}"
+        puts e.backtrace
+        raise e
+      end
+    end
+
+    def ensure_destroy *objs, &block
+      begin
+        if block_given?
+          yield
+        else
+          errors = []
+          objs.each do |obj|
+            errors << Rubix.connection.last_response.error_message unless obj.destroy
+          end
+          raise Rubix::Error.new(errors.join("\n")) if errors.size > 0
+        end
+      rescue => e
+        puts "#{e.class} -- #{e.message}"
+        puts e.backtrace
+        objs.each do |obj|
+          begin
+            puts "COULD NOT DESTROY #{obj.resource_name}" unless obj.destroy
+          rescue => f
+            puts "COULD NOT DESTROY #{obj.resource_name}"
+            puts "#{e.class} -- #{e.message}"
+            puts e.backtrace
+          end
+        end
+        raise e
+      end
+    end
     
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubix
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Dhruv Bansal