condition 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3eb3d5b4acee42ce9121918d0d613ebaed8365
-  data.tar.gz: 03e56423e7cbe951ee1689a16d06fc313538bcd3
+  metadata.gz: 662e70bdaa099817376d9934c1146469274e7646
+  data.tar.gz: 34fc6074209e62d7fb346b507f04ed32ff39312b
 SHA512:
-  metadata.gz: 70b5494197bf56f1014513e8f4336fe624f3798aa9ff3d59705dbb73fe2f9840df3fb93bf5fad704aae1a59ce7dcfef70b2ee8d7a6bc721e9fa44f20a695f2ac
-  data.tar.gz: 5d6456c00c1cfca1854fb4463eb4e96c921d637c5155282b822ead45c9bfe794e9fe2529d705b93e4d890d04b905b4830c9090e2b32369fac2774affbab22c2d
+  metadata.gz: db3dac4a43ae5960261295cd69ddcaa4925cf5f55a7c52dfd4bd6facf33ad1514411e460c78a85052e300d2bf0d35d7bb8ecdd470d901b02463653dd077bb628
+  data.tar.gz: 64fc5bf5eb48e000fdb0052258ffe193a11811ca04c793deb594c4f96af8b805b4e1ba3e98ef1a4a1c6bd37a394f79851fc8a7bccd6675f2b508afad84cf256b

data/README.md

@@ -30,6 +30,10 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-12-06 0.0.16
+modify mongo key to symbol
+modify check no used line in expectations
+
 2013-12-03 0.0.15
 add present and regexp check
 

data/lib/condition/param.rb

@@ -1,10 +1,21 @@
 # coding: utf-8
-require 'roo'
-
 module Condition
   class Param
+    @@reader = nil
+
+    def self.set_reader(reader)
+      @@reader = reader
+    end
+    
+    def self.get_reader()
+      if @@reader.nil?
+        @@reader = Condition::Reader::RooReader.new
+      end
+      @@reader
+    end
+
     def initialize(path, sheet_index=0)
-      blocks = read_sheet(path, sheet_index)
+      blocks = Condition::Param.get_reader().read_sheet(path, sheet_index)
       @item_map = {}
       item_list = []
       blocks.each do |rows|
@@ -17,36 +28,6 @@ module Condition
       end
     end
 
-    def read_sheet(path, sheet_index)
-      ss =  Roo::Spreadsheet.open(path)
-      ss.default_sheet = ss.sheets[sheet_index]
-      row_index = 1
-      res = []
-      while true
-        break if nil == ss.cell(row_index, 1)
-        table = []
-        while true
-          row = read_row(ss, row_index)
-          row_index += 1
-          break if 0 == row.size
-          table << row
-        end
-        res << table
-      end
-      res
-    end
-
-    def read_row(ss, row_index)
-      column_index = 1
-      result = []
-      while true
-        value = ss.cell(row_index, column_index)
-        return result if nil == value
-        result << value
-        column_index += 1
-      end
-    end
-
     def item(name)
       @item_map[name.to_sym]
     end
@@ -75,11 +56,13 @@ module Condition
 
     def post(storage)
       @item_map.each_value do |item|
+        item.clear_used_values
         list = storage.all(item)
         list.each do |line|
           item.check_line(line)
         end
+        raise "#{item.name} not exists row" if item.is_remain_value
       end
     end
   end
-end
+end

data/lib/condition/param_item.rb

@@ -12,6 +12,7 @@ module Condition
       @keys = []
       @params = {}
       @refs = []
+      @used_values = []
       body.each do |row|
         index = 0
         key = row[0].to_sym
@@ -28,6 +29,14 @@ module Condition
       end
     end
 
+    def clear_used_values
+      @used_values = []
+    end
+
+    def is_remain_value
+      @values.size > @used_values.size
+    end
+
     def calc_item(item, index, key)
       if '#NULL' == item
         nil
@@ -147,6 +156,7 @@ module Condition
         targetFlag = false if whereKeyFlag && !match
       end
       if targetFlag && matchFlag
+        @used_values << value
         return true
       elsif !targetFlag
         return false

data/lib/condition/reader/roo_reader.rb

@@ -0,0 +1,38 @@
+# coding: utf-8
+require 'roo'
+
+module Condition
+  module Reader
+    class RooReader
+      def read_sheet(path, sheet_index)
+        ss =  Roo::Spreadsheet.open(path)
+        ss.default_sheet = ss.sheets[sheet_index]
+        row_index = 1
+        res = []
+        while true
+          break if nil == ss.cell(row_index, 1)
+          table = []
+          while true
+            row = read_row(ss, row_index)
+            row_index += 1
+            break if 0 == row.size
+            table << row
+          end
+          res << table
+        end
+        res
+      end
+  
+      def read_row(ss, row_index)
+        column_index = 1
+        result = []
+        while true
+          value = ss.cell(row_index, column_index)
+          return result if nil == value
+          result << value
+          column_index += 1
+        end
+      end
+    end
+  end
+end

data/lib/condition/storage/mongo.rb

@@ -8,7 +8,16 @@ module Condition
       end
 
       def all(param_item)
-        @db[param_item.name].find()
+        list = @db[param_item.name].find()
+        res = []
+        list.each do |row|
+          hash = {}
+          row.each do |k, v|
+            hash[k.to_sym] = v
+          end
+          res << hash
+        end
+        res
       end
 
       def delete(param_item)
@@ -29,4 +38,4 @@ module Condition
       end
     end
   end
-end
+end

data/lib/condition/version.rb

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

data/lib/condition.rb

@@ -3,3 +3,4 @@
 require "condition/version"
 require "condition/param_item"
 require "condition/param"
+require "condition/reader/roo_reader"

data/spec/condition_spec.rb

@@ -6,7 +6,7 @@ describe Condition do
     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)"
   end
-  
+
   it 'pre and post' do
     storage = Condition::Storage::Db.new(DB)
     param = Condition::Param.new(FILES + '/t_user.ods')
@@ -14,6 +14,10 @@ describe Condition do
     param.pre(storage, default)
     param = Condition::Param.new(FILES + '/t_user.ods', 1)
     param.post(storage)
+    param = Condition::Param.new(FILES + '/t_user.ods', 4)
+    expect { param.post(storage) }.to raise_error
+    param = Condition::Param.new(FILES + '/t_user.ods', 5)
+    expect { param.post(storage) }.to raise_error
   end
 
   it 'pre and params' do
@@ -60,7 +64,7 @@ describe Condition do
     param = Condition::Param.new(FILES + '/mongo.ods')
     default = Condition::Param.new(FILES + '/mongo.ods', 2)
     param.pre(storage, default)
-    param = Condition::Param.new(FILES + '/t_user.ods', 1)
+    param = Condition::Param.new(FILES + '/mongo.ods', 1)
     param.post(storage)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,7 @@ files:
 - lib/condition.rb
 - lib/condition/param.rb
 - lib/condition/param_item.rb
+- lib/condition/reader/roo_reader.rb
 - lib/condition/storage/db.rb
 - lib/condition/storage/mongo.rb
 - lib/condition/version.rb
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Condition Test