rubix 0.0.8 → 0.0.9

data/spec/requests/host_request_spec.rb

@@ -1,63 +1,69 @@
 require 'spec_helper'
 
-describe "CRUD for hosts" do
+describe "Hosts" do
 
   before do
-    @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    ensure_save(@hg1)
-
-    @hg2 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_2')
-    ensure_save(@hg2)
-    
-    @t1 = Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@hg1])
-    ensure_save(@t1)
-
-    @t2 = Rubix::Template.new(:name => 'rubix_spec_template_2', :host_groups => [@hg2])
-    ensure_save(@t2)
+    integration_test
+    @host_group_1 = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
 
-    @um1 = Rubix::UserMacro.new(:name => 'rubix_spec_macro_1', :value => 'rubix_spec_value_1')
-    
   end
 
   after do
-    ensure_destroy(@um1, @t1, @t2, @hg1, @hg2)
+    truncate_all_tables
   end
-  
-  it "should be able to create, update, and destroy a host" do
-    integration_test
-    
-    Rubix::Host.find(:name => 'rubix_spec_host_1').should 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'
+
+  describe "when not existing" do
+
+    it "returns nil on find" do
+      Rubix::Host.find(:name => 'rubix_spec_host_1').should be_nil
+    end
+
+    it "can be created" do
+      host = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group_1])
+      host.save.should be_true
+    end
+  end
+
+  describe "when existing" do
+    before do
+      @host_group_2 = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_2'))
+      @host         = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1',         :host_groups => [@host_group_1]))
+      @template_1   = ensure_save(Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@host_group_2]))
+      @template_2   = ensure_save(Rubix::Template.new(:name => 'rubix_spec_template_2', :host_groups => [@host_group_2]))
+    end
+
+    it "can have its name changed" do
+      @host.name = 'rubix_spec_host_2'
+      @host.save
+
+      Rubix::Host.find(:name => 'rubix_spec_host_1').should     be_nil
+      Rubix::Host.find(:name => 'rubix_spec_host_2').should_not be_nil
+    end
+
+    it "can change its host groups" do
+      @host.host_groups = [@host_group_1, @host_group_2]
+      @host.save
       
-      h1.name = 'rubix_spec_host_2'
-      h1.host_groups = [@hg2]
-      h1.templates = [@t2]
-      h1.save.should be_true
+      new_host = Rubix::Host.find(:name => 'rubix_spec_host_1')
+      new_host.should_not be_nil
+      new_host.host_groups.size.should == 2
+      new_host.host_groups.map(&:name).should include('rubix_spec_host_group_1', 'rubix_spec_host_group_2')
+    end
+
+    it "can change its templates" do
+      @host.templates = [@template_1, @template_2]
+      @host.save
       
-      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
+      new_host = Rubix::Host.find(:name => 'rubix_spec_host_1')
+      new_host.should_not be_nil
+      new_host.templates.size.should == 2
+      new_host.templates.map(&:name).should include('rubix_spec_template_1', 'rubix_spec_template_2')
     end
-    
+
+    it "can be destroyed" do
+      @host.destroy
+      Rubix::Host.find(:name => 'rubix_spec_host_1').should be_nil
+    end
+
   end
 end

data/spec/requests/item_request_spec.rb

@@ -1,65 +1,61 @@
 require 'spec_helper'
 
-describe "CRUD for items" do
+describe "Items" do
 
   before do
-    @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    ensure_save(@hg1)
-    
-    @h1  = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@hg1])
-    ensure_save(@h1)
-
-    @h2  = Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@hg1])
-    ensure_save(@h2)
-
-    @a1 = Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @h1.id)
-    ensure_save(@a1)
-
-    @a2 = Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @h2.id)
-    ensure_save(@a2)
+    integration_test
+    @host_group = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
+    @host_1     = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group]))
+    @host_2     = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_2', :host_groups => [@host_group]))
+    @app_1      = ensure_save(Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @host_1.id))
+    @app_2      = ensure_save(Rubix::Application.new(:name => 'rubix_spec_app_1', :host_id => @host_2.id))
   end
 
   after do
-    ensure_destroy(@a1, @a2, @h1, @h2, @hg1)
+    truncate_all_tables
   end
-  
-  it "should be able to create, update, and destroy an item" do
-    integration_test
-    
-    Rubix::Item.find(:key => 'rubix.spec1', :host_id => @h1.id).should be_nil
-    
-    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
+
+  describe "when not existing" do
+
+    it "returns nil on find" do
+      Rubix::Item.find(:key => 'rubix.spec1', :host_id => @host_1.id).should be_nil
+    end
+
+    it "can be created" do
+      item = Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @host_1.id, :value_type => :character, :applications => [@app_1])
+      item.save.should be_true
+      item.host.name.should == @host_1.name
+      item.applications.map(&:name).should include(@app_1.name)
+    end
     
-    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
+
+  describe "when existing" do
+
+    before do
+      @item = ensure_save(Rubix::Item.new(:key => 'rubix.spec1', :description => 'rubix item description 1', :host_id => @host_1.id, :value_type => :character, :applications => [@app_1]))
+    end
+
+    it "can have its host, application, and properties updated" do
+      @item.key          = 'rubix.spec2'
+      @item.description  = 'rubix item description 2'
+      @item.value_type   = :unsigned_int
+      @item.host_id      = @host_2.id
+      @item.applications = [@app_2]
+      @item.save.should be_true
+
+      Rubix::Item.find(:key => 'rubix.spec1', :host_id => @host_1.id).should be_nil
+
+      new_item = Rubix::Item.find(:key => 'rubix.spec2', :host_id => @host_2.id)
+      new_item.should_not be_nil
+      new_item.host.name.should == @host_2.name
+      new_item.applications.map(&:name).should include(@app_2.name)
+    end
+
+    it "can be destroyed" do
+      @item.destroy
+      Rubix::Item.find(:key => 'rubix.spec1', :host_id => @host_1.id).should be_nil
     end
   end
 end
+    

data/spec/requests/template_request_spec.rb

@@ -1,51 +1,51 @@
 require 'spec_helper'
 
-describe "CRUD for templates" do
+describe "Templates" do
 
   before do
-    @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    ensure_save(@hg1)
-
-    @hg2 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_2')
-    ensure_save(@hg2)
+    integration_test
+    @host_group_1 = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
+    @host_group_2 = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_2'))
   end
 
   after do
-    ensure_destroy(@hg1, @hg2)
+    truncate_all_tables
   end
 
-  it "should be able to create, update, and destroy a template" do
-    integration_test
-    
-    Rubix::Template.find(:name => 'rubix_spec_template_1').should be_nil
+  describe "when not existing" do
+
+    it "returns nil on find" do
+      Rubix::Template.find(:name => 'rubix_spec_template_1').should be_nil
+    end
+
+    it "can be created" do
+      template = Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@host_group_1])
+      template.save.should be_true
+    end
     
-    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
-
-    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
+
+  describe "when existing" do
+
+    before do
+      @template = ensure_save(Rubix::Template.new(:name => 'rubix_spec_template_1', :host_groups => [@host_group_1]))
+    end
+
+    it "can have its name changed" do
+      @template.name = 'rubix_spec_template_2'
+      @template.save
+      Rubix::Template.find(:name => 'rubix_spec_template_1').should     be_nil
+      Rubix::Template.find(:name => 'rubix_spec_template_2').should_not be_nil
     end
+
+    it "can be destroyed" do
+      @template.destroy
+      Rubix::Template.find(:name => 'rubix_spec_template_1').should be_nil
+    end
+    
   end
 
   it "should be able to import and export a template" do
-    integration_test
     pending "Learning how to import/export XML via the API"
   end
   

data/spec/requests/user_macro_request_spec.rb

@@ -1,43 +1,49 @@
 require 'spec_helper'
 
-describe "CRUD for user macros" do
+describe "User Macros" do
 
   before do
-    @hg1 = Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1')
-    ensure_save(@hg1)
-    
-    @h1  = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@hg1])
-    ensure_save(@h1)
+    integration_test
+    @host_group = ensure_save(Rubix::HostGroup.new(:name => 'rubix_spec_host_group_1'))
+    @host       = ensure_save(Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group]))
   end
 
   after do
-    ensure_destroy(@h1, @hg1)
+    truncate_all_tables
   end
-  
-  it "should be able to create, update, and destroy a host" do
-    integration_test
-    
-    Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id).should be_nil
-    
-    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
+  describe "when not existing" do
 
-    ensure_destroy(um1) do
-      um2 = Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id)
-      um2.should_not be_nil
+    it "returns nil on find" do
+      Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @host.id).should be_nil      
+    end
 
-      um1.value = 'rubix_spec_value_2'
-      um1.save.should be_true
+    it "can be created" do
+      um = Rubix::UserMacro.new(:name => 'rubix_spec_macro_1', :value => 'rubix_spec_value_1', :host_id => @host.id)
+      um.save.should be_true
+    end
 
-      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'
+  end
 
-      um1.destroy
-      Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @h1.id).should be_nil
+  describe "when existing" do
+
+    before do
+      @macro = ensure_save(Rubix::UserMacro.new(:name => 'rubix_spec_macro_1', :value => 'rubix_spec_value_1', :host_id => @host.id))
+    end
+
+    it "can have its value changed" do
+      @macro.value = 'rubix_spec_value_2'
+      @macro.save
+
+      new_macro = Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @host.id)
+      new_macro.should_not be_nil
+      new_macro.value.should == 'rubix_spec_value_2'
     end
+
+    it "can be destroyed" do
+      @macro.destroy
+      Rubix::UserMacro.find(:name => 'rubix_spec_macro_1', :host_id => @host.id).should be_nil
+    end
+    
   end
 end

data/spec/spec_helper.rb

@@ -15,17 +15,5 @@ RSpec.configure do |config|
   config.include Rubix::IntegrationHelper
   config.include Rubix::ConfigliereHelper
 
-  test_yml_path = File.expand_path('../test.yml', __FILE__)
-  if File.exist?(test_yml_path)
-    require 'yaml'
-    test_data = YAML.load(open(test_yml_path))
-    if test_data['disable_integration_tests']
-      $RUBIX_INTEGRATION_TEST = false
-    else
-      Rubix.connect(test_data['url'], test_data['username'], test_data['password'])
-      $RUBIX_INTEGRATION_TEST = true
-    end
-  else
-    $RUBIX_INTEGRATION_TEST = false
-  end
+  Rubix::IntegrationHelper.setup_integration_tests(File.expand_path('../test.yml', __FILE__))
 end

data/spec/support/integration_helper.rb

@@ -1,6 +1,6 @@
 module Rubix
   module IntegrationHelper
-
+    
     def integration_test
       pending("A live Zabbix API to test against") unless $RUBIX_INTEGRATION_TEST
     end
@@ -8,6 +8,7 @@ module Rubix
     def ensure_save(obj)
       begin
         raise Rubix::Error.new(Rubix.connection.last_response.error_message) unless obj.save
+        obj
       rescue => e
         puts "#{e.class} -- #{e.message}"
         puts e.backtrace
@@ -41,6 +42,38 @@ module Rubix
         raise e
       end
     end
+
+    def self.setup_integration_tests test_yml_path
+      return unless File.exist?(test_yml_path)
+      
+      require 'yaml'
+      test_data = YAML.load(open(test_yml_path))
+      return if test_data['disable_integration_tests']
+      
+      api_connection = test_data['api']
+      mysql_connection = test_data['mysql']
+      return unless api_connection && mysql_connection
+
+      Rubix.connect(api_connection['url'], api_connection['username'], api_connection['password'])
+      
+      require 'mysql2'
+      $RUBIX_MYSQL_CLIENT = Mysql2::Client.new(:host => mysql_connection['host'], :username => mysql_connection['username'], :password => mysql_connection['password'], :database => mysql_connection['database'])
+
+      truncate_all_tables
+
+      $RUBIX_INTEGRATION_TEST = true
+    end
+
+    RUBIX_TABLES_TO_TRUNCATE = %w[applications groups hostmacro hosts hosts_groups hosts_profiles hosts_profiles_ext hosts_templates items items_applications profiles triggers]
+    
+    def self.truncate_all_tables
+      return unless $RUBIX_INTEGRATION_TEST
+      RUBIX_TABLES_TO_TRUNCATE.each { |table| $RUBIX_MYSQL_CLIENT.query("TRUNCATE TABLE #{table}") }
+    end
+
+    def truncate_all_tables
+      IntegrationHelper.truncate_all_tables
+    end
     
   end
 end