rubix 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rubix/associations/belongs_to_item.rb

@@ -16,7 +16,6 @@ module Rubix
       end
 
       def item_id= iid
-        puts "I AM TRYING TO SET ITEM_ID=#{iid}"
         return unless iid
         @item_id = iid
       end

data/lib/rubix/models/host.rb

@@ -12,8 +12,21 @@ module Rubix
 
     # The default port.
     DEFAULT_PORT = 10050
+
+    # The numeric codes for the various status types.
+    STATUS_CODES = {
+      :monitored     => 0,
+      :not_monitored => 1,
+      :unreachable   => 2,
+      :template      => 3,
+      :deleted       => 4,
+      :proxy_active  => 5,
+      :proxy_passive => 6
+    }.freeze
+    STATUS_NAMES = STATUS_CODES.invert.freeze
     
-    attr_accessor :name, :ip, :port, :profile, :status
+    attr_accessor :name, :ip, :port, :profile, :dns, :status
+    attr_writer   :use_ip, :monitored
     
     def initialize properties={}
       super(properties)
@@ -21,6 +34,9 @@ module Rubix
       @ip          = properties[:ip]
       @port        = properties[:port]
       @profile     = properties[:profile]
+      @monitored   = properties[:monitored]
+      @dns         = properties[:dns]
+      @use_ip      = properties[:use_ip]
       @status      = properties[:status]
 
       self.host_group_ids = properties[:host_group_ids]
@@ -33,6 +49,16 @@ module Rubix
       self.user_macros    = properties[:user_macros]
     end
 
+    def use_ip
+      return @use_ip if (!@use_ip.nil?)
+      @use_ip = true
+    end
+
+    def monitored
+      return @monitored if (!@monitored.nil?)
+      @monitored = true
+    end
+    
     #
     # == Associations == 
     #
@@ -62,12 +88,17 @@ module Rubix
         :macros    => user_macro_params
       }.tap do |hp|
         hp[:profile] = profile if profile
-        hp[:status]  = status  if status
+        hp[:status]  = (monitored ? 0 : 1) unless monitored.nil?
         
-        if ip
-          hp[:ip]      = ip
-          hp[:useip]   = true
-          hp[:port]    = port || self.class::DEFAULT_PORT
+        case
+        when use_ip && (!ip.nil?) && (!ip.empty?)
+          hp[:useip] = 1
+          hp[:ip]    = ip
+          hp[:port]  = port || self.class::DEFAULT_PORT
+        when (!dns.nil?) && (!dns.empty?)
+          hp[:useip] = 0
+          hp[:dns]   = dns
+          hp[:port]  = port || self.class::DEFAULT_PORT
         else
           hp[:ip] = self.class::BLANK_IP
         end
@@ -110,7 +141,16 @@ module Rubix
             :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']
+            :port           => host['port'],
+            :ip             => host['ip'],
+            :dns            => host['dns'],
+            :use_ip         => (host['useip'].to_i  == '1'),
+
+            # If the status is '1' then this is an unmonitored host.
+            # Otherwise it's either '0' for monitored and ok or
+            # something else for monitored and *not* ok.
+            :monitored      => (host['status'].to_i == 1 ? false : true),
+            :status         => self::STATUS_NAMES[host['status'].to_i]
           })
     end
     

data/lib/rubix/models/time_series.rb

@@ -16,7 +16,6 @@ module Rubix
       
       self.item    = properties[:item]
       self.item_id = properties[:item_id]
-      puts "MY ITEM ID IS #{self.item_id}"
     end
 
     def self.zabbix_name

data/spec/requests/host_request_spec.rb

@@ -21,6 +21,8 @@ describe "Hosts" do
     it "can be created" do
       host = Rubix::Host.new(:name => 'rubix_spec_host_1', :host_groups => [@host_group_1])
       host.save.should be_true
+      host.monitored.should be_true
+      host.use_ip.should be_true
     end
   end
 
@@ -50,6 +52,16 @@ describe "Hosts" do
       new_host.host_groups.map(&:name).should include('rubix_spec_host_group_1', 'rubix_spec_host_group_2')
     end
 
+    it "can change its monitoring status" do
+      @host.monitored = false
+      @host.save
+      
+      new_host = Rubix::Host.find(:name => 'rubix_spec_host_1')
+      new_host.should_not be_nil
+      new_host.monitored.should be_false
+      new_host.status.should == :not_monitored
+    end
+    
     it "can change its templates" do
       @host.templates = [@template_1, @template_2]
       @host.save

metadata

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