condition 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9912e8fdea45ff07344c66c7a7b9968c2e5528f0
-  data.tar.gz: cb3c7b60487f3a1f79d21d3d9cd32d3302b14fbe
+  metadata.gz: fb3eb3d5b4acee42ce9121918d0d613ebaed8365
+  data.tar.gz: 03e56423e7cbe951ee1689a16d06fc313538bcd3
 SHA512:
-  metadata.gz: e535a51008d8386707d41546ab02030ae237ee293b642c3f1c4d8d953da8177c64b28b65e66dd082a0ce01ddacc977277f23e7154488c89951a0141bb588bde0
-  data.tar.gz: 888b72eb5e372602e7bc67411c7735cffc67a15b5db33484dada9df457aebbccb95b6e264905899a6c8be0e16ef3a935de2c0d01aedb835ea58b8d7662da1d5d
+  metadata.gz: 70b5494197bf56f1014513e8f4336fe624f3798aa9ff3d59705dbb73fe2f9840df3fb93bf5fad704aae1a59ce7dcfef70b2ee8d7a6bc721e9fa44f20a695f2ac
+  data.tar.gz: 5d6456c00c1cfca1854fb4463eb4e96c921d637c5155282b822ead45c9bfe794e9fe2529d705b93e4d890d04b905b4830c9090e2b32369fac2774affbab22c2d

data/README.md

@@ -30,6 +30,9 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-12-03 0.0.15
+add present and regexp check
+
 2013-05-22 0.0.14
 modify view not match
 
@@ -75,4 +78,4 @@ add param, param_item
 delete pre, post, reader, table
 
 2013-04-10 0.0.1
-first release
+first release

data/lib/condition/param_item.rb

@@ -48,6 +48,8 @@ module Condition
         Time.parse($1)
       elsif /^#INT\((.+)\)$/ =~ item
         $1.to_i
+      elsif /^#REGEXP\((.+)\)$/ =~ item
+        Regexp.new($1)
       else
         item
       end
@@ -80,8 +82,12 @@ module Condition
     end
 
     def value_match?(expected, real)
-      if expected == nil && real != nil || expected != nil && real == nil
+      if "#PRESENT" == expected
+        (!real.nil?) && ("" != real.to_s)
+      elsif expected == nil && real != nil || expected != nil && real == nil
         false
+      elsif Regexp === expected
+        expected =~ real.to_s
       elsif Time === real
         real == Time.parse(expected)
       elsif nil == real
@@ -157,4 +163,4 @@ module Condition
     end
 
   end
-end
+end

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -42,6 +42,19 @@ describe Condition do
     lambda{param.check('unmatch', [{id: 1, name: "bbb", val: 456}])}.should raise_error
   end
 
+  it 'present' do
+    param = Condition::Param.new(FILES + '/t_user.ods', 2)
+    param.check('present', [{val1: "a"}])
+    lambda{param.check('present', [{val1: ""}])}.should raise_error
+    lambda{param.check('present', [{val1: nil}])}.should raise_error
+  end
+
+  it 'regex' do
+    param = Condition::Param.new(FILES + '/t_user.ods', 2)
+    param.check('regex', [{val1: "abbbbbc"}])
+    lambda{param.check('regex', [{val1: "ac"}])}.should raise_error
+  end
+
   it 'mongo' do
     storage = Condition::Storage::Mongo.new(MONGO)
     param = Condition::Param.new(FILES + '/mongo.ods')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Condition Test