condition 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4a0cebdd36e6c4981bab4edb93a5d713d2bc82
-  data.tar.gz: 5062bf4d8a141fe2767c09971d638819f60cd402
+  metadata.gz: e3eb00ca6c24ba6ae12cd36c71d7e90c9dcbf1be
+  data.tar.gz: a610828831e5f8bf184fde0ced8e7ae492684b23
 SHA512:
-  metadata.gz: 1b1beb3167e03ec67a760aef3502edb55d854c75ff2ce44bcd5cc95db2844ab51f34d83370fbacba31689ace2f0c9da2120a18aeb6714d3f07866991de1e6c7b
-  data.tar.gz: 17723d890d078b0faedc501e28b9ac3c2c6d40981fe8304504b66059b0c91c9410548a1c82ac5a512dd737ad48fb41a38fae5ddb1754831c3f3bd6f10382985c
+  metadata.gz: 5b956d6a735d1768218b04442dc5a1c247c4019fbf3e817afe3cf5ea228e6d869906e13d11206f197540091168a73176bc3159376b13bce94e3cceec6ce0a29e
+  data.tar.gz: ba048d48feb07537cdb30bc3f3e351fff2827facaa012938082d49d3cc475e3713219ac05755bf49952e69312bc3f450498e4f3bf378332695bf736926292cd2

data/README.md

@@ -30,6 +30,17 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-04-17 0.0.6
+modify symbol or string
+check hash and ary
+modify check_value raise
+
+2013-04-17 0.0.5
+add pre_after exec
+
+2013-04-15 0.0.4
+add default to precondition
+
 2013-04-15 0.0.3
 add default to precondition
 

data/condition.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pg"
   spec.add_dependency "roo"
   spec.add_dependency "sequel"
+  spec.add_dependency "json"
+  spec.add_dependency "activesupport"
 end

data/lib/condition/param_item.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 require 'time'
+require 'json'
+require 'active_support/all'
 
 module Condition
   class ParamItem
@@ -69,7 +71,36 @@ module Condition
       if Time === real
         real == Time.parse(expected)
       elsif nil == real
-        expected == nil
+        expected == nil || expected == "#NULL"
+      elsif Hash === real
+        ex = expected
+        if !(Hash === expected)
+          ex = JSON.parse(expected)
+        end
+        ex = ex.symbolize_keys
+        result = true
+        ex.each_pair do |k, v|
+          res = value_match?(v, real[k])
+          result = false if !res
+        end
+        result
+      elsif Array === real
+        ex = expected
+        if !(Array === expected)
+          ex = JSON.parse(expected)
+        end
+        false if Array === ex
+        size = ex.size()
+        true if size == 0 && real.size() == 0
+        false if size != real.size()
+        index = 0
+        while true
+          break if index >= size
+          result = value_match?(ex[index], real[index])
+          return false if !result
+          index = index + 1
+        end
+        true
       else
         real.to_s == expected
       end
@@ -78,8 +109,11 @@ module Condition
     def check_value(real, value)
       targetFlag = true
       matchFlag = true
+      unmatch_info = []
+      real = real.symbolize_keys
       value.each_pair do |k, v|
-        match = value_match?(v, nil == real[k] ? real[k.to_s] : real[k])
+        match = value_match?(v, real[k])
+        unmatch_info << v.to_s + " <> " + real[k].to_s if !match
         whereKeyFlag = nil != @keys.index(k.to_s)
         matchFlag = false if !match
         targetFlag = false if whereKeyFlag && !match
@@ -89,7 +123,7 @@ module Condition
       elsif !targetFlag
         return false
       else
-        raise "#{@name} not match " + real.to_s
+        raise "#{@name} not match " + real.to_s + "\n" + unmatch_info.join("\n")
       end
     end
 

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -28,5 +28,11 @@ describe Condition do
     list = DB["SELECT * FROM t_user"].all
     param.check('list', list)
     param.check('list', [{"user_id" => 1, "user_name" => "aaax"}])
+    param.check('ary', [{name: "a", val1: {a: "b"}, val2: [{a: {c: "d"}}], val3: [], val4: nil}])
+  end
+
+  it 'unmatch' do
+    param = Condition::Param.new(FILES + '/t_user.ods', 2)
+    lambda{param.check('unmatch', [{id: 1, name: "bbb", val: 456}])}.should raise_error
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - aoyagikouhei
@@ -94,6 +94,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Condition Test
 email:
 - aoyagi.kouhei@gmail.com