condition 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51e98f4bbd8529a11baa22fe47f06f2496d45d38
-  data.tar.gz: 3266cdf958fd1ca38025ef74df922d3be1167d69
+  metadata.gz: 050b71f7bdf86ef89f20b29f0224d357ffacb789
+  data.tar.gz: 9375d2c0dc2a57025ef3591ba9a9139135038832
 SHA512:
-  metadata.gz: 48a46b7f0adf7009f6529404ebea19c59750e93c7c739405199969a20633c4a614198f09b56da37ef6ba3388a14d3380946472db52f83336af5cfa8fde3b3787
-  data.tar.gz: 6a2d78da0d52a248fb04bdd4c98c4c222eb25d431579a86455cfd61f04e84d4f9f1c2bfc8f9b41772d7024ec1c52cbd61d79a900318163501abaf2a55f1e0190
+  metadata.gz: 624c722b84ef2d2c6c145d3b6fb3474f650d43fb340b0d6ad5619a39c485fb642b3d578e1903764f78b1e1ac942fcf5ad3e7be8cefa0f1c583e194951b7e7617
+  data.tar.gz: 9902d2e5e09f98854e2c99eb45ee7d47bbbd5744461cd1edb10a66ff2f5f11b2c21f61bb75c983031e5dc82d277ac1c3cf818961c83a5708879d948831d70641

data/README.md

@@ -30,6 +30,11 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2014-01-30 0.0.27
+check param.check name not found
+view expected <> real
+view post condition column name in error
+
 2014-01-23 0.0.26
 modify bug array size check
 view unmatch hash key

data/lib/condition/param.rb

@@ -50,6 +50,7 @@ module Condition
 
     def check(name, data)
       item = item(name)
+      raise "#{name} not found in param" if item.nil?
       item.clear_used_values
       data.each do |line|
         item.check_line(line)

data/lib/condition/param_item.rb

@@ -164,7 +164,7 @@ module Condition
       @unmatch_info = []
       value.each_pair do |k, v|
         match = value_match?(v, real[k])
-        @unmatch_info << v.to_s + " <> " + real[k].to_s if !match
+        @unmatch_info << "key=#{k.to_s} " + v.to_s + " <> " + real[k].to_s if !match
         whereKeyFlag = nil != @options.index(k.to_s)
         matchFlag = false if !match
         targetFlag = false if whereKeyFlag && !match
@@ -175,7 +175,7 @@ module Condition
       elsif !targetFlag
         return false
       else
-        raise "#{@name} not match " + real.to_s + "\n" + @unmatch_info.join("\n")
+        raise "#{@name} not match " + real.to_s + "\nexpected <> real\n" + @unmatch_info.join("\n")
       end
     end
 

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -25,6 +25,8 @@ describe Condition do
     expect { param.post(storage) }.to raise_error
     param = Condition::Param.new(FILES + '/t_user.ods', 5)
     expect { param.post(storage) }.to raise_error
+    param = Condition::Param.new(FILES + '/t_user.ods', 6)
+    expect { param.post(storage) }.to raise_error
   end
 
   it 'pre and params' do
@@ -163,4 +165,9 @@ describe Condition do
     expect(REDIS.get("files2_param2_params")).to be_nil
   end
 
+  it 'name not found' do
+    param = Condition::Param.new(FILES + '/t_user.ods', 2)
+    expect { param.check('notexistsname', [{}]) }.to raise_error("notexistsname not found in param")
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler