rubix 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rubix/models/host.rb

@@ -91,7 +91,7 @@ module Rubix
         hp[:status]  = (monitored ? 0 : 1) unless monitored.nil?
         
         case
-        when use_ip && (!ip.nil?) && (!ip.empty?)
+        when use_ip == true && (!ip.nil?) && (!ip.empty?)
           hp[:useip] = 1
           hp[:ip]    = ip
           hp[:port]  = port || self.class::DEFAULT_PORT

data/lib/rubix/models/model.rb

@@ -145,10 +145,10 @@ module Rubix
       response = create_request
       if response.has_data?
         @id = response.result[id_field + 's'].first.to_i
-        info("Created #{resource_name}")
+        info("Created Zabbix #{resource_name}")
         true
       else
-        error("Error creating #{resource_name}: #{response.error_message}")
+        error("Error creating Zabbix #{resource_name}: #{response.error_message}")
         return false
       end
     end
@@ -181,13 +181,13 @@ module Rubix
       response = update_request
       case
       when response.has_data? && response.result.values.first.map(&:to_i).include?(id)
-        info("Updated #{resource_name}")
+        info("Updated Zabbix #{resource_name}")
         true
       when response.has_data?
-        error("No error, but failed to update #{resource_name}")
+        error("No error, but failed to update Zabbix #{resource_name}")
         false
       else
-        error("Error updating #{resource_name}: #{response.error_message}")
+        error("Error updating Zabbix #{resource_name}: #{response.error_message}")
         false
       end
     end
@@ -229,13 +229,13 @@ module Rubix
       response = destroy_request
       case
       when response.has_data? && response.result.values.first.first.to_i == id
-        info("Destroyed #{resource_name}")
+        info("Destroyed Zabbix #{resource_name}")
         true
       when response.zabbix_error? && response.error_message =~ /does not exist/i
         # was never there
         true
       else
-        error("Could not destroy #{resource_name}: #{response.error_message}")
+        error("Could not destroy Zabbix #{resource_name}: #{response.error_message}")
         false
       end
     end
@@ -286,7 +286,7 @@ module Rubix
       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?
+        error("Error listing all Zabbix #{resource_name}s: #{response.error_message}") unless response.success?
         []
       end
     end
@@ -332,7 +332,7 @@ module Rubix
       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}")
+        error("Error finding Zabbix #{resource_name} using #{options.inspect}: #{response.error_message}")
         nil
       end
     end
@@ -357,7 +357,7 @@ module Rubix
           false
         end
       else
-        error("Error creating #{resource_name} using #{options.inspect}: #{response.error_message}")
+        error("Error creating Zabbix #{resource_name} using #{options.inspect}: #{response.error_message}")
         false
       end
     end

data/lib/rubix/models/trigger.rb

@@ -77,8 +77,8 @@ module Rubix
         :templateid   => (template_id || host_id),
         :description  => (description || 'Unknown'),
         :expression   => expression,
-        :priority     => self.class::PRIORITY_CODES[priority],
-        :status       => self.class::STATUS_CODES[status],
+        :priority     => self.class::PRIORITY_NAMES[priority],
+        :status       => self.class::STATUS_NAMES[status],
         :comments     => comments,
         :url          => url
       }

data/spec/requests/trigger_request_spec.rb

@@ -48,8 +48,9 @@ describe "Triggers" do
       @trigger = ensure_save(Rubix::Trigger.new(:expression => '{rubix_spec_template_1:rubix.spec1.count(120,1)}>1', :description => 'rubix template trigger description 1', :status => :enabled))
     end
 
-    it "can have its host, description, and status updated" do
+    it "can have its host, description, priority, and status updated" do
       @trigger.status       = :disabled
+      @trigger.priority     = :average
       @trigger.description  = 'rubix template trigger description 2'
       # @trigger.host_id      = @template_2.id
       @trigger.save.should be_true
@@ -61,6 +62,7 @@ describe "Triggers" do
       new_trigger.template.name.should == @template_1.name
       new_trigger.items.map(&:id).should include(@template_item_1.id)
       new_trigger.status.should == :disabled
+      new_trigger.priority.should == :average
     end
 
     it "can be destroyed" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 -06:00
+date: 2012-02-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency