rubix 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/rubix/models/action.rb

@@ -3,12 +3,11 @@ module Rubix
   class Action < Model
 
     # Numeric codes for the event source.  Default will be 'triggers'.
-    EVENT_SOURCE_CODES = {
+    zabbix_define :EVENT_SOURCE, {
       :triggers          => 0,
       :discovery         => 1,
       :auto_registration => 2
-    }.freeze
-    EVENT_SOURCE_NAMES = EVENT_SOURCE_CODES.invert.freeze
+    }
 
     # The default subject for messages.
     MESSAGE_SUBJECT = "{TRIGGER.NAME}: {TRIGGER.STATUS}"

data/lib/rubix/models/condition.rb

@@ -4,44 +4,42 @@ module Rubix
 
     # Numeric codes for the operator to use to join conditions for
     # this action.  Default is 'and_or'.
-    JOIN_CODES = {
+    zabbix_define :JOIN, {
       :and_or => 0,
       :and    => 1,
       :or     => 2
-    }.freeze
-    JOIN_NAMES = JOIN_CODES.invert.freeze
+    }
     
     # Numeric codes for the event source.
-    TYPE_CODES = {
-	:host_group         => 0,
-	:host               => 1,
-	:trigger            => 2,
-	:trigger_name       => 3,
-	:trigger_severity   => 4,
-	:trigger_value      => 5,
-	:time_period        => 6,
-	:dhost_ip           => 7,
-	:dservice_type      => 8,
-	:dservice_port      => 9,
-	:dstatus            => 10,
-	:duptime            => 11,
-	:dvalue             => 12,
-	:host_template      => 13,
-	:event_acknowledged => 14,
-	:application        => 15,
-	:maintenance        => 16,
-	:node               => 17,
-	:drule              => 18,
-	:dcheck             => 19,
-	:proxy              => 20,
-	:dobject            => 21,
-	:host_name          => 22
-    }.freeze
-    TYPE_NAMES = TYPE_CODES.invert.freeze
+    zabbix_define :TYPE, {
+      :host_group         => 0,
+      :host               => 1,
+      :trigger            => 2,
+      :trigger_name       => 3,
+      :trigger_severity   => 4,
+      :trigger_value      => 5,
+      :time_period        => 6,
+      :dhost_ip           => 7,
+      :dservice_type      => 8,
+      :dservice_port      => 9,
+      :dstatus            => 10,
+      :duptime            => 11,
+      :dvalue             => 12,
+      :host_template      => 13,
+      :event_acknowledged => 14,
+      :application        => 15,
+      :maintenance        => 16,
+      :node               => 17,
+      :drule              => 18,
+      :dcheck             => 19,
+      :proxy              => 20,
+      :dobject            => 21,
+      :host_name          => 22
+    }
 
     # Numeric codes for the operator used to compare a condition's
     # type to its value.
-    OPERATOR_CODES = {
+    zabbix_define :OPERATOR, {
       :equal      => 0,
       :not_equal  => 1,
       :like       => 2,
@@ -49,9 +47,8 @@ module Rubix
       :in         => 4,
       :gte        => 5,
       :lte        => 6,
-      :not_in     => 7,
-    }.freeze
-    OPERATOR_NAMES = OPERATOR_CODES.invert.freeze
+      :not_in     => 7
+    }
 
     #
     # == Properties & Finding ==

data/lib/rubix/models/host.rb

@@ -14,7 +14,7 @@ module Rubix
     DEFAULT_PORT = 10050
 
     # The numeric codes for the various status types.
-    STATUS_CODES = {
+    zabbix_define :STATUS, {
       :monitored     => 0,
       :not_monitored => 1,
       :unreachable   => 2,
@@ -22,8 +22,7 @@ module Rubix
       :deleted       => 4,
       :proxy_active  => 5,
       :proxy_passive => 6
-    }.freeze
-    STATUS_NAMES = STATUS_CODES.invert.freeze
+    }
 
     zabbix_attr :name
     zabbix_attr :ip

data/lib/rubix/models/item.rb

@@ -9,7 +9,7 @@ module Rubix
     # The numeric codes for the various item types.
     #
     # Items without a type will be set to 'zabbix'.
-    TYPE_CODES = {
+    zabbix_define :TYPE, {
       :zabbix     => 0,
       :snmpv1     => 1,
       :trapper    => 2,
@@ -26,42 +26,38 @@ module Rubix
       :ssh        => 13,
       :telnet     => 14,
       :calculated => 15
-    }.freeze
-    TYPE_NAMES = TYPE_CODES.invert.freeze
+    }
 
     # The numeric codes for the value types of a Zabbix item.
     #
     # This Hash is used by ZabbixPipe#value_code_from_value to
     # dynamically set the type of a value when creating a new Zabbix
     # item.
-    VALUE_CODES = {
+    zabbix_define :VALUE, {
       :float        => 0,         # Numeric (float)
       :character    => 1,         # Character
       :log_line     => 2,         # Log
       :unsigned_int => 3,         # Numeric (unsigned)
       :text         => 4          # Text
-    }.freeze
-    VALUE_NAMES = VALUE_CODES.invert.freeze
+    }
 
     # The numeric codes for the data types of a Zabbix item.
     #
     # The default will be <tt>:decimal</tt>
-    DATA_CODES = {
+    zabbix_define :DATA, {
       :decimal     => 0,
       :octal       => 1,
       :hexadecimal => 2
-    }.freeze
-    DATA_NAMES = DATA_CODES.invert.freeze
+    }
 
     # The numeric codes for the status of a Zabbix item.
     #
     # The default will be <tt>:active</tt>
-    STATUS_CODES = {
+    zabbix_define :STATUS, {
       :active        => 0,
       :disabled      => 1,
       :not_supported => 3
-    }.freeze
-    STATUS_NAMES = STATUS_CODES.invert.freeze
+    }
 
     # Return the +value_type+ name (:float, :text, &c.) for a Zabbix
     # item's value type by examining the given +value+.

data/lib/rubix/models/media_type.rb

@@ -5,14 +5,13 @@ module Rubix
     # The numeric codes corresponding to each media type.
     #
     # The default will be 'script'.
-    TYPE_CODES = {
+    zabbix_define :TYPE, {
       :email      => 0,
       :script     => 1,
       :sms        => 2,
       :jabber     => 3,
       :ez_texting => 100
-    }.freeze
-    TYPE_NAMES = TYPE_CODES.invert.freeze
+    }
 
     #
     # == Properties & Finding ==

data/lib/rubix/models/medium.rb

@@ -8,7 +8,7 @@ module Rubix
     # and :warning triggers but rejecting :information triggers.  In
     # the interests of simplicity, we avoid exposing that degree of
     # freedom here.
-    PRIORITY_CODES = {
+    zabbix_define :PRIORITY, {
       :none           => 0,
       :not_classified => 63,
       :information    => 62,
@@ -18,8 +18,7 @@ module Rubix
       :disaster       => 32,
       :all            => 63,
       nil             => 63
-    }.freeze
-    PRIORITY_NAMES = PRIORITY_CODES.invert.freeze
+    }
 
     #
     # == Properties & Finding ==
@@ -32,7 +31,7 @@ module Rubix
 
     attr_writer :severity
     def severity
-      @severity ||= self.class::PRIORITY_CODES[priority]
+      @severity ||= self.class::PRIORITY_CODES[(priority || :all)]
     end
 
     def self.id_field
@@ -65,7 +64,7 @@ module Rubix
         :userid      => user_id,
         :sendto      => address,
         :active      => (enabled ? 0 : 1),
-        :severity    => (severity || self.class::PRIORITY_CODES[priority]),
+        :severity    => (severity || self.class::PRIORITY_CODES[(priority || :all)]),
         :period      => timeframe
       }
     end

data/lib/rubix/models/model.rb

@@ -438,6 +438,17 @@ module Rubix
         end
       end
     end
+
+    def self.zabbix_define defname, hash
+      codes = hash
+      names = hash.invert.freeze
+      codes.keys.each do |key|
+        codes[key.to_s] = codes[key]
+      end
+      codes.freeze
+      const_set "#{defname}_CODES", codes
+      const_set "#{defname}_NAMES", names
+    end
     
   end
 end

data/lib/rubix/models/operation.rb

@@ -3,7 +3,7 @@ module Rubix
   class Operation < Model
 
     # Numeric codes for the action's type.
-    TYPE_CODES = {
+    zabbix_define :TYPE, {
       :message           => 0,
       :command           => 1,
       :host_add          => 2,
@@ -14,16 +14,14 @@ module Rubix
       :template_remove   => 7,
       :host_enable       => 8,
       :host_disable      => 9
-    }.freeze
-    TYPE_NAMES = TYPE_CODES.invert.freeze
+    }
 
     # Numeric codes for the type of object that should be notified.
     # Default will be 'group'.
-    NOTIFICATION_OBJECT_CODES = {
+    zabbix_define :NOTIFICATION_OBJECT, {
       :user       => 0,
       :user_group => 1
-    }.freeze
-    NOTIFICATION_OBJECT_NAMES = NOTIFICATION_OBJECT_CODES.invert.freeze
+    }
 
     #
     # == Properties & Finding ==

data/lib/rubix/models/script.rb

@@ -6,11 +6,10 @@ module Rubix
     # a host.
     #
     # Default is 'read'.
-    ACCESS_CODES = {
+    zabbix_define :ACCESS, {
       :read  => 2,
       :write => 3
-    }.freeze
-    ACCESS_NAMES = ACCESS_CODES.invert.freeze
+    }
 
     #
     # == Properties & Finding ==

data/lib/rubix/models/trigger.rb

@@ -6,21 +6,19 @@ module Rubix
     # == Properties & Finding ==
     #
 
-    PRIORITY_NAMES = {
+    zabbix_define :PRIORITY, {
       :not_classified => 0,
       :information    => 1,
       :warning        => 2,
       :average        => 3,
       :high           => 4,
       :disaster       => 5
-    }.freeze
-    PRIORITY_CODES = PRIORITY_NAMES.invert.freeze
+    }
 
-    STATUS_NAMES = {
+    zabbix_define :STATUS, {
       :enabled  => 0,
       :disabled => 1
-    }.freeze
-    STATUS_CODES = STATUS_NAMES.invert.freeze
+    }
     
     zabbix_attr :description
     zabbix_attr :url
@@ -59,6 +57,10 @@ module Rubix
       @expression = e
     end
 
+    def resource_name
+      "#{self.class.resource_name} #{self.description || self.id}"
+    end
+
     #
     # == Associations ==
     #
@@ -76,8 +78,8 @@ module Rubix
         :templateid   => (template_id || host_id),
         :description  => (description || 'Unknown'),
         :expression   => expression,
-        :priority     => self.class::PRIORITY_NAMES[priority],
-        :status       => self.class::STATUS_NAMES[status],
+        :priority     => self.class::PRIORITY_CODES[priority],
+        :status       => self.class::STATUS_CODES[status],
         :comments     => comments,
         :url          => url
       }
@@ -110,8 +112,8 @@ module Rubix
             :expression      => trigger['expression'],
             :comments        => trigger['comments'],
             :url             => trigger['url'],
-            :status          => STATUS_CODES[trigger['status'].to_i],
-            :priority        => PRIORITY_CODES[trigger['priority'].to_i],
+            :status          => STATUS_NAMES[trigger['status'].to_i],
+            :priority        => PRIORITY_NAMES[trigger['priority'].to_i],
             :item_ids        => (trigger['items'] || []).map { |item| item['itemid'].to_i }
           }.merge(host_or_template_params_from_id(trigger['templateid'].to_i)))
     end

data/lib/rubix/models/user.rb

@@ -5,12 +5,11 @@ module Rubix
   class User < Model
 
     # Numeric codes for the various user types.
-    TYPE_CODES = {
+    zabbix_define :TYPE, {
       :normal      => 1,
       :admin       => 2,
       :super_admin => 3
-    }.freeze
-    TYPE_NAMES = TYPE_CODES.invert.freeze
+    }
 
     #
     # == Properties & Finding ==
@@ -41,9 +40,14 @@ module Rubix
       self.media          = properties[:media]
     end
 
+    def resource_name
+      "#{self.class.resource_name} #{self.username || self.id}"
+    end
+    
     #
     # == Validations ==
     #
+    
     def validate
       super()
       raise ValidationError.new("A new user must have a password") if new_record? && (password.nil? || password.empty?)

data/lib/rubix/models/user_group.rb

@@ -4,12 +4,11 @@ module Rubix
 
     # Numeric codes for the types of access allowed to the GUI for
     # users in the group.  Default is, well, 'default'.
-    GUI_ACCESS_CODES = {
+    zabbix_define :GUI_ACCESS, {
       :default  => 0,
       :internal => 1,
       :disabled => 2
-    }.freeze
-    GUI_ACCESS_NAMES = GUI_ACCESS_CODES.invert.freeze
+    }
 
     #
     # == Properties & Finding ==

data/spec/rubix/model_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Rubix::Model do
+
+  before do
+    @model_wrapper = Class.new(Rubix::Model)
+    @model_wrapper.zabbix_define :FOO, { :bar => 0, :booz => 1 }
+    @model_wrapper.zabbix_attr :snap
+    @model_wrapper.zabbix_attr :crackle, :default  => 'how'
+    @model_wrapper.zabbix_attr :pop,     :required => true
+  end
+
+  it "can define attributes" do
+    @model = @model_wrapper.new
+    @model.snap.should be_nil
+    @model.snap = 3
+    @model.snap.should == 3
+  end
+
+  it "can define attributes with defaults" do
+    @model_wrapper.new.crackle.should == 'how'
+  end
+
+  it "can define required attributs" do
+    lambda { @model_wrapper.new.validate }.should raise_error(Rubix::ValidationError)
+  end
+
+  it "will define a lookup hash for translating between names and integer codes" do
+    @model_wrapper::FOO_CODES[:bar].should  == 0
+    @model_wrapper::FOO_CODES[:booz].should == 1
+    @model_wrapper::FOO_NAMES[0].should     == :bar
+    @model_wrapper::FOO_NAMES[1].should     == :booz
+  end
+
+  it "will define a lookup hash that acts as a Mash when looking up names to codes" do
+    @model_wrapper::FOO_CODES[:bar].should   == 0
+    @model_wrapper::FOO_CODES['bar'].should  == 0
+  end
+
+end
+  

metadata

@@ -1,102 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubix
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 1
-  version: 0.5.1
+version: !ruby/object:Gem::Version
+  version: 0.5.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dhruv Bansal
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-17 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &21980180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mysql2
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *21980180
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &21979680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *21979680
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &21977020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <=
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: configliere
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *21977020
+- !ruby/object:Gem::Dependency
+  name: configliere
+  requirement: &21976500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.8
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: multipart-post
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *21976500
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: &21976060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-description: Rubix provides abstractions for connecting to Zabbix's API, an ORM for wrapping Zabbix resources, a set of scripts for writing data to Zabbix, and a collection of Monitor classes for building periodic monitors.
-email: 
+  prerelease: false
+  version_requirements: *21976060
+description: Rubix provides abstractions for connecting to Zabbix's API, an ORM for
+  wrapping Zabbix resources, a set of scripts for writing data to Zabbix, and a collection
+  of Monitor classes for building periodic monitors.
+email:
 - dhruv@infochimps.com
-executables: 
+executables:
 - zabbix_api
 - zabbix_pipe
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/zabbix_api
 - bin/zabbix_pipe
 - lib/rubix.rb
@@ -150,6 +130,7 @@ files:
 - lib/rubix/connection.rb
 - lib/rubix/associations.rb
 - spec/test.yml
+- spec/rubix/model_spec.rb
 - spec/rubix/auto_sender_spec.rb
 - spec/rubix/monitors/monitor_spec.rb
 - spec/rubix/monitors/chef_monitor_spec.rb
@@ -180,37 +161,28 @@ files:
 - LICENSE
 - README.rdoc
 - VERSION
-has_rdoc: true
 homepage: http://github.com/dhruvbansal/rubix
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A Ruby client for configuring and writing data to Zabbix
 test_files: []
-