zabbixapi 0.5.1b12 → 0.5.1b13

data/lib/zabbixapi/basic/basic_alias.rb

@@ -13,5 +13,9 @@ class ZabbixApi
       delete(data)
     end
 
+    def method_name
+      
+    end
+
   end
 end

data/lib/zabbixapi/basic/basic_func.rb

@@ -1,22 +1,39 @@
 class ZabbixApi
   class Basic
 
-    def hash_equals?(a, b)
-      hash1 = a.merge(b)
-      hash2 = b.merge(a)
-      hash1 == hash2
-    end
-
     def log(message)
       puts "#{message}" if @client.options[:debug]
     end
 
+    def hash_equals?(a, b)
+      a_new = normalize_hash(a)
+      b_new = normalize_hash(b)
+      hash1 = a_new.merge(b_new)
+      hash2 = b_new.merge(a_new)
+      log("hash1 == #{hash1}")
+      log("hash2 == #{hash2}")
+      hash1 == hash2
+    end
+
     def symbolize_keys(obj)
       return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  symbolize_keys(v); memo} if obj.is_a? Hash
       return obj.inject([]){|memo,v    | memo           << symbolize_keys(v); memo} if obj.is_a? Array
       obj
     end
 
+    def normalize_hash(hash)
+      result = hash.dup
+      result.each do |key, value|
+        case value
+          when Hash
+            result[key] = value.to_s
+          when Array
+            result.delete(key)
+        end
+      end
+      result
+    end
+
     def parse_keys(data)
       case data
       when Hash

data/lib/zabbixapi/basic/basic_logic.rb

@@ -26,6 +26,7 @@ class ZabbixApi
     end
 
     def update(data)
+      
       log "[DEBUG] Call update with parametrs: #{data.inspect}"
       
       dump = {}
@@ -34,11 +35,8 @@ class ZabbixApi
         dump = symbolize_keys(item) if item[key].to_i == data[key.to_sym].to_i
       end
 
-      puts "dump: #{dump}"
-      puts "data: #{data}"
-
       if hash_equals?(dump, data) #dump.deep_include?(data)
-        puts "eq keys!"
+        log "equal keys #{dump} and #{data}, skip update"
         item_id
       else
         data_update = array_flag ? [data] : data

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.1b12"
+  VERSION = "0.5.1b13"
 end

data/spec/localhost.rb

@@ -1,5 +1,5 @@
 #encoding: utf-8
-
+require 'rspec'
 require 'zabbixapi'
 
 # settings
@@ -13,7 +13,7 @@ zbx = ZabbixApi.connect(
   :url => api_url,
   :user => api_login,
   :password => api_password,
-  :debug => false
+  :debug => true
 )
 
 hostgroup = "hostgroup______1"
@@ -21,7 +21,7 @@ template  = "template______1"
 application = "application_____1"
 item = "item_____1"
 host = "hostname____1"
-trigger = "trigger____1"
+trigger = "trigger____1" #TODO !saDSASDAS
 user = "user____1"
 user2 = "user____2"
 usergroup = "SomeUserGroup"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.1b12
+  version: 0.5.1b13
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2277446654334313109
+      hash: 2834936151065301027
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: