rubix 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/rubix/models.rb

@@ -8,4 +8,5 @@ module Rubix
   autoload :UserMacro,      'rubix/models/user_macro'
   autoload :Trigger,        'rubix/models/trigger'
   autoload :TimeSeries,     'rubix/models/time_series'
+  autoload :MediaType,      'rubix/models/media_type'
 end

data/lib/rubix/models/media_type.rb

@@ -0,0 +1,86 @@
+module Rubix
+  
+  class MediaType < Model
+
+    # The numeric codes corresponding to each media type.
+    #
+    # The default will be 'script'.
+    TYPE_CODES = {
+      :email      => 0,
+      :script     => 1,
+      :sms        => 2,
+      :jabber     => 3,
+      :ez_texting => 100
+    }.freeze
+    TYPE_NAMES = TYPE_CODES.invert.freeze
+
+    #
+    # == Properties & Finding ==
+    #
+
+    attr_accessor :description, :server, :helo, :email, :path, :modem, :username, :password
+    
+    attr_writer   :type
+    def type
+      @type ||= :script
+    end
+
+    def initialize properties={}
+      super(properties)
+      self.description = properties[:description]
+      self.type        = properties[:type]
+      self.server      = properties[:server]
+      self.helo        = properties[:helo]
+      self.email       = properties[:email]
+      self.path        = properties[:path]
+      self.modem       = properties[:modem]
+      self.username    = properties[:username]
+      self.password    = properties[:password]
+    end
+    
+    #
+    # == Requests ==
+    #
+
+    def create_params
+      {
+        :description => description,
+        :type        => TYPE_CODES[type]
+      }.tap do |p|
+        case type
+        when :email
+          p[:smtp_server] = server if server
+          p[:smtp_helo]   = helo   if helo
+          p[:smtp_email]  = email  if email
+        when :script
+          p[:exec_path]   = path   if path
+        when :sms
+          p[:gsm_modem]   = modem  if modem
+        when :jabber
+          p[:username]    = username if username
+          p[:passwd]      = password if password
+        end
+      end
+    end
+
+    def self.find_params options={}
+      get_params.merge(:filter => {id_field => options[:id], :description => options[:description]})
+    end
+
+    def self.build media_type
+      new({
+            :id          => media_type[id_field].to_i,
+            :type        => self::TYPE_NAMES[media_type['type'].to_i],
+            :description => media_type['description'],
+            :server      => media_type['smtp_server'],
+            :helo        => media_type['smtp_helo'],
+            :email       => media_type['smtp_email'],
+            :path        => media_type['exec_path'],
+            :modem       => media_type['gsm_modem'],
+            :username    => media_type['username'],
+            :password    => media_type['passwd']
+          })
+    end
+    
+  end
+end

data/lib/rubix/models/model.rb

@@ -190,7 +190,7 @@ module Rubix
       return false unless before_update
       response = update_request
       case
-      when response.has_data? && response.result.values.first.map(&:to_i).include?(id)
+      when response.has_data? && (response.result.values.first == true || response.result.values.first.map(&:to_i).include?(id))
         info("Updated Zabbix #{resource_name}")
         true
       when response.has_data?

data/spec/requests/media_type_request_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe "MediaTypes" do
+
+  before do
+    integration_test
+  end
+
+  after do
+    truncate_all_tables
+  end
+
+  describe "when not existing" do
+    
+    it "returns nil on find" do
+      Rubix::MediaType.find(:description => 'rubix_spec_media_type_1').should be_nil
+    end
+
+    it "can be created" do
+      mt = Rubix::MediaType.new(:description => 'rubix_spec_media_type_1', :path => 'foo')
+      mt.save.should be_true
+    end
+    
+  end
+
+  describe "when existing" do
+
+    before do
+      @mt = ensure_save(Rubix::MediaType.new(:description => 'rubix_spec_media_type_1', :path => 'foo'))
+    end
+    
+    it "can be found" do
+      Rubix::MediaType.find(:description => 'rubix_spec_media_type_1').should_not be_nil
+    end
+
+    it "can have its properties changed" do
+      @mt.description = 'rubix_spec_media_type_2'
+      @mt.type        = :sms
+      @mt.modem       = '/foo/bar'
+      @mt.save
+      Rubix::MediaType.find(:description => 'rubix_spec_media_type_1').should be_nil
+      new_mt = Rubix::MediaType.find(:description => 'rubix_spec_media_type_2')
+      new_mt.should_not be_nil
+      new_mt.type.should == :sms
+      new_mt.modem.should == '/foo/bar'
+    end
+
+    it "can be destroyed" do
+      @mt.destroy
+      Rubix::MediaType.find(:description => 'rubix_spec_media_type_1').should be_nil
+    end
+  end
+  
+end

data/spec/support/integration_helper.rb

@@ -76,7 +76,7 @@ module Rubix
       $RUBIX_INTEGRATION_TEST = api_connection
     end
 
-    RUBIX_TABLES_TO_TRUNCATE = %w[applications groups hostmacro hosts hosts_groups hosts_profiles hosts_profiles_ext hosts_templates items items_applications profiles triggers trigger_depends history sessions]
+    RUBIX_TABLES_TO_TRUNCATE = %w[applications groups hostmacro hosts hosts_groups hosts_profiles hosts_profiles_ext hosts_templates items items_applications profiles triggers trigger_depends history sessions media_type]
     
     def self.truncate_all_tables
       return unless $RUBIX_INTEGRATION_TEST

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-13 00:00:00 -06:00
+date: 2012-02-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - lib/rubix.rb
 - lib/rubix/models/template.rb
 - lib/rubix/models/trigger.rb
+- lib/rubix/models/media_type.rb
 - lib/rubix/models/user_macro.rb
 - lib/rubix/models/item.rb
 - lib/rubix/models/host.rb
@@ -144,6 +145,7 @@ files:
 - spec/rubix/sender_spec.rb
 - spec/rubix/connection_spec.rb
 - spec/requests/time_series_request_spec.rb
+- spec/requests/media_type_request_spec.rb
 - spec/requests/item_request_spec.rb
 - spec/requests/host_group_request_spec.rb
 - spec/requests/user_macro_request_spec.rb