zabbixapi 0.5.1b11 → 0.5.1b12

data/lib/zabbixapi/basic/basic_func.rb

@@ -1,20 +1,12 @@
-class Hash
-  
-  def deep_include?(sub_hash)
-    sub_hash.keys.all? do |key|
-      self.has_key?(key) && if sub_hash[key].is_a?(Hash)
-      self[key].is_a?(Hash) && self[key].deep_include?(sub_hash[key])
-      else
-        self[key] == sub_hash[key]
-      end
-    end
-  end
-
-end
-
 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

data/lib/zabbixapi/basic/basic_logic.rb

@@ -34,7 +34,11 @@ class ZabbixApi
         dump = symbolize_keys(item) if item[key].to_i == data[key.to_sym].to_i
       end
 
-      if dump.deep_include?(data)
+      puts "dump: #{dump}"
+      puts "data: #{data}"
+
+      if hash_equals?(dump, data) #dump.deep_include?(data)
+        puts "eq keys!"
         item_id
       else
         data_update = array_flag ? [data] : data

data/lib/zabbixapi/classes/triggers.rb

@@ -13,9 +13,5 @@ class ZabbixApi
       "description"
     end
 
-    def create_or_update(data)
-      raise "Don't use this shit, use get_or_create"
-    end
-
   end
 end

data/lib/zabbixapi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.1b11
+  version: 0.5.1b12
   prerelease: 5
 platform: ruby
 authors:
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2676631147213702854
+      hash: 2277446654334313109
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: