condition 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1600a1f079b5dda433b728ebcefd9f31e9341074
-  data.tar.gz: baead12e5cb94c49937c7fb63ba0203bf4885c55
+  metadata.gz: a35a3befff8b198904309c0b89f9aefd3e7882f4
+  data.tar.gz: 4464c12614d73dd49721c9feb5db1ac28efd1f02
 SHA512:
-  metadata.gz: 94272e37d660028c6799028690d59c9f19ee6bad37e6cba832a654453f23415a24cd3130f8a5b7f895cc46e86b4790d0bf2ffeba25ee807bac851ff6f3d3f4a1
-  data.tar.gz: fda4ea6d4f5e3d5af1f8a76cc437f25cf36c13ec507325887569a31cc71f1969f25b4821679bb5345a888309d9fbdb48f5dc6993e42be154e42dc5916a4e45da
+  metadata.gz: 2a6c22a9ec01f890b6b1b987a2990064cee78700963088bdf44c6b3e79f03ba14607b6382f1fa213bc7b72572b8ce30c72da6c602cfcf2858a821e5ee6c6a171
+  data.tar.gz: cf32216dd84543a2ed579050a222ac3d30bf0b7f48fef5e6abee7d97c081e272892bd95e1e06dc0471b034edf1defe1b96a8f0d7be4834bcaf0e731ba8629aad

data/README.md

@@ -30,6 +30,10 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-12-13 0.0.21
+bugfix options array
+bugfix check_line over or lack
+
 2013-12-13 0.0.20
 check redis key not found
 

data/lib/condition/param.rb

@@ -50,9 +50,11 @@ module Condition
 
     def check(name, data)
       item = item(name)
+      item.clear_used_values
       data.each do |line|
         item.check_line(line)
       end
+      raise "#{item.name} not exists row" if item.is_remain_value
     end
 
     def pre(storage, default=nil)

data/lib/condition/param_item.rb

@@ -6,7 +6,7 @@ module Condition
   class ParamItem
     def initialize(rows)
       @name = rows[0][0].to_sym
-      @options = rows[0].size > 1 ? rows[0][1..rows.size - 1] : []
+      @options = rows[0].size > 1 ? rows[0][1..rows[0].size - 1] : []
       body = rows[1..rows.size - 1]
       @values = []
       @keys = []

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -35,9 +35,14 @@ describe Condition do
     ds = DB[:t_user].prepare(:insert, :insert_with_name, item.params.merge({user_id: :$user_id, user_name: :$user_name}))
     ds.call(item.value.merge(param.get('ins', 0)))
 
-    list = DB["SELECT * FROM t_user"].all
+    list = DB["SELECT * FROM t_user order by user_id"].all
     param.check('list', list)
-    param.check('list', [{user_id: 1, user_name: "aaax"}])
+    param.check('list', [
+      {user_id: 1, user_name: "aaax"},
+      {user_id: 2, user_name: "bbbx"},
+      {user_id: 3, user_name: "cccx"},
+      {user_id: 4, user_name: "ddd"},
+    ])
   end
 
   it 'ref and json' do
@@ -117,4 +122,24 @@ describe Condition do
     Condition::Param.set_reader(nil)
     expect { Condition::Param.new('files_aaa', reader: reader) }.to raise_error("redis key name files_aaa not found")
   end
+
+  it 'output count' do
+    reader = Condition::Reader::RedisReader.new(REDIS)
+    Condition::Param.set_reader(nil)
+    param = Condition::Param.new('files_t_user_params', reader: reader)
+
+    param.check('output_count', [{l: [{id: "1"}, {id: "2"}, {id: "3"}]}])
+    expect { param.check('output_count', [{id: "1"}, {id: "2"}]) }.to raise_error
+    expect { param.check('output_count', [{id: "1"}, {id: "2"}, {id: "3"}, {id: "4"}]) }.to raise_error
+  end
+
+  it 'options count' do
+    reader = Condition::Reader::RedisReader.new(REDIS)
+    Condition::Param.set_reader(nil)
+    param = Condition::Param.new('files_t_user_params', reader: reader)
+
+    item = param.item('options')
+    expect(item.options.length).to eq(4)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler