condition 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050b71f7bdf86ef89f20b29f0224d357ffacb789
-  data.tar.gz: 9375d2c0dc2a57025ef3591ba9a9139135038832
+  metadata.gz: 5a71ca9f6eeadb13b4693a1225abb81daf9aac06
+  data.tar.gz: 5c5bc5b440e4df1144986b9ed14a86a12c66e9fd
 SHA512:
-  metadata.gz: 624c722b84ef2d2c6c145d3b6fb3474f650d43fb340b0d6ad5619a39c485fb642b3d578e1903764f78b1e1ac942fcf5ad3e7be8cefa0f1c583e194951b7e7617
-  data.tar.gz: 9902d2e5e09f98854e2c99eb45ee7d47bbbd5744461cd1edb10a66ff2f5f11b2c21f61bb75c983031e5dc82d277ac1c3cf818961c83a5708879d948831d70641
+  metadata.gz: f034d5dae5c0b284d232fb5d28c54e8b5e5a192401f36f796f96570c8bda4db2390e24438cf5930803f7d9324292b4557a7c1715440bd75c95f3ac7bace0e591
+  data.tar.gz: c8b61d6e3da820a82aa467607ba15f8f78fc50126d0c5e5b0e2b4df07b5d00a51ca30336dc8d4dbb889db6011bbbdb555ce72d633ed7fe24ed24537792eba0fc

data/README.md

@@ -30,6 +30,9 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2014-02-19 0.0.28
+modify bug order check in no options
+
 2014-01-30 0.0.27
 check param.check name not found
 view expected <> real

data/lib/condition/param.rb

@@ -52,8 +52,10 @@ module Condition
       item = item(name)
       raise "#{name} not found in param" if item.nil?
       item.clear_used_values
+      index = 0
       data.each do |line|
-        item.check_line(line)
+        item.check_line(line, index)
+        index += 1
       end
       raise "#{item.name} not exists row" if item.is_remain_value
     end
@@ -70,8 +72,10 @@ module Condition
       @item_map.each_value do |item|
         item.clear_used_values
         list = storage.all(item)
+        index = 0
         list.each do |line|
-          item.check_line(line)
+          item.check_line(line, index)
+          index += 1
         end
         raise "#{item.name} not exists row" if item.is_remain_value
       end

data/lib/condition/param_item.rb

@@ -158,8 +158,7 @@ module Condition
       end
     end
 
-    def check_value(real, value)
-      targetFlag = true
+    def check_value(real, value, targetFlag)
       matchFlag = true
       @unmatch_info = []
       value.each_pair do |k, v|
@@ -179,9 +178,12 @@ module Condition
       end
     end
 
-    def check_line(real)
+    def check_line(real, index)
+      value_index = 0
       @values.each do |value|
-        return if check_value(real, value)
+        targetFlag = @options.empty? ? value_index == index : true
+        return if check_value(real, value, targetFlag)
+        value_index += 1
       end
       raise "#{@name} not found " + real.to_s
     end

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 describe Condition do
   before(:all) do
-    DB << "DROP TABLE IF EXISTS t_user"
-    DB << "DROP TABLE IF EXISTS t_test"
+    DB << "DROP TABLE IF EXISTS t_user CASCADE"
+    DB << "DROP TABLE IF EXISTS t_test CASCADE"
     DB << "CREATE TABLE t_user(user_id BIGINT, user_name TEXT, login_ts TIMESTAMPTZ NOT NULL)"
     DB << "CREATE TABLE t_test(id BIGINT, name TEXT, flag BOOLEAN, ts TIMESTAMPTZ, iary BIGINT[], tary TEXT[], test_name TEXT NOT NULL)"
     DB << "CREATE SCHEMA IF NOT EXISTS history"
-    DB << "DROP TABLE IF EXISTS history.t_user"
+    DB << "DROP TABLE IF EXISTS history.t_user CASCADE"
     DB << "CREATE TABLE history.t_user(user_id BIGINT, user_name TEXT, login_ts TIMESTAMPTZ NOT NULL)"
 
     converter = Condition::Reader::ConvertSheet.new(REDIS)
@@ -170,4 +170,30 @@ describe Condition do
     expect { param.check('notexistsname', [{}]) }.to raise_error("notexistsname not found in param")
   end
 
+  it 'many options' do
+    param = Condition::Param.new(FILES + '/t_user.ods', 2)
+    param.check('output_options', [
+      {val1: "2", val2: "2", val3: "z"},
+      {val1: "1", val2: "1", val3: "w"},
+      {val1: "1", val2: "2", val3: "x"},
+      {val1: "2", val2: "1", val3: "y"},
+    ]) 
+    param.check('output_options2', [
+      {val1: "1", val2: "2", val3: "z"},
+      {val1: "1", val2: "2", val3: "w"},
+      {val1: "1", val2: "2", val3: "x"},
+      {val1: "1", val2: "2", val3: "y"},
+    ])
+  end
+
+  it 'output order' do
+    param = Condition::Param.new(FILES + '/t_user.ods', 2)
+    param.check('output_order', [
+      {val1: "1", val2: "4"},
+      {val1: "1", val2: "3"},
+      {val1: "1", val2: "2"},
+      {val1: "1", val2: "1"},
+    ]) 
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Condition Test