condition 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0eaa8a5ffd881ac98550940bc72575e7784eeb
-  data.tar.gz: 26d1e51efde5623ba87d12ef69235b34109c1ea9
+  metadata.gz: 9b30028c08d8586bbc2846e45107fd738ef3ab07
+  data.tar.gz: 3fc8ef2b4e14594112d6ef7ea54c7a04b86b9565
 SHA512:
-  metadata.gz: b07577a3d7e099e5093b9dabca8c628f6c16e086a0c769f30d77d233d3d28d8e80bfa5a4e5e4b4be0038f9ee4cf45e055ad505672120b44b77f9b889f368eaba
-  data.tar.gz: 22e28db9c161fe74ced6ce81cf87daf96109b54bc060ee2834ea3be95e994f02094603e8e7dbfbdb77ced4b2a24abfda044fcd4cb0d7bea24725344f1ea0766b
+  metadata.gz: bad7d74c148c5567379a55ecd980f13a273c1de5cefcffb999da621e7caab942ee4a68d33eb1fda87f7ab421dac1cc0cabecf589626b207d8bd1a0c8be8f54e9
+  data.tar.gz: 2e1210d1cbc76d637b327d1191c05ab1ff690116ab6bae3bd19caef5c70a74d738a107b8116f63806fabf1cbbe95abed4925a24ae20c8971b88b9c0d96706317

data/README.md

@@ -30,6 +30,9 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-04-18 0.0.9
+deep value_match?
+
 2013-04-18 0.0.8
 add json
 

data/lib/condition/param_item.rb

@@ -100,13 +100,37 @@ module Condition
       elsif Hash === real
         if !(Hash === expected)
           false
+        elsif real == expected
+          true
+        else
+          result = true
+          expected.each_pair do |k, v|
+            res = value_match?(v, real[k])
+            result = false if !res
+          end
+          result
         end
-        expected == real
       elsif Array === real
         if !(Array === expected)
           false
+        elsif real.size() == 0 && expected.size() == 0
+          true
+        elsif real == expected
+          true
+        else
+          index = 0
+          result = true
+          while true
+            break if index >= expected.size
+            res = value_match?(expected[index], real[index])
+            if !res
+              result = false
+              break
+            end
+            index += 1
+          end
+          result
         end
-        expected == real
       else
         real.to_s == expected
       end

data/lib/condition/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Condition
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/condition_spec.rb

@@ -32,7 +32,7 @@ describe Condition do
 
   it 'ref and json' do
     param = Condition::Param.new(FILES + '/t_user.ods', 2)
-    param.check('ary', [{name: "a", val1: {a: "b"}, val2: [{a: {c: "d"}}], val3: [], val4: nil, val5: {a: [1, 2, 3]}}])
+    param.check('ary', [{name: "a", val1: {a: "b", t: true, f: false}, val2: [{a: {c: "d"}}], val3: [], val4: nil, val5: {a: [1, 2, 3]}, val6: true, val7: false}])
   end
 
   it 'unmatch' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler