condition 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3eb00ca6c24ba6ae12cd36c71d7e90c9dcbf1be
-  data.tar.gz: a610828831e5f8bf184fde0ced8e7ae492684b23
+  metadata.gz: 20018aa500c31e9d750a4ea9d905acacf9e64874
+  data.tar.gz: 7bf7c6fbe619bab599c31dcf15587346f9e22d2f
 SHA512:
-  metadata.gz: 5b956d6a735d1768218b04442dc5a1c247c4019fbf3e817afe3cf5ea228e6d869906e13d11206f197540091168a73176bc3159376b13bce94e3cceec6ce0a29e
-  data.tar.gz: ba048d48feb07537cdb30bc3f3e351fff2827facaa012938082d49d3cc475e3713219ac05755bf49952e69312bc3f450498e4f3bf378332695bf736926292cd2
+  metadata.gz: b6412b0c8180271e8d5abfd02f8a82a285c745a27cacdc1d0808ba355865bf4e09a31348a90a635eb47191a6bb71671bbccc7c11d68b27f555cafdf4ad8e30d3
+  data.tar.gz: 8e81f9192aefb66a6af4bdec4ee32ad75a1d67ea9daff558035a9b24e0561870e541fb813e42ded714648909d867c9665c999ec9539c95a22ffbc3c19efd8cf4

data/README.md

@@ -30,6 +30,10 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-04-18 0.0.7
+delete json
+add ref param_item
+
 2013-04-17 0.0.6
 modify symbol or string
 check hash and ary

data/condition.gemspec

@@ -24,6 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pg"
   spec.add_dependency "roo"
   spec.add_dependency "sequel"
-  spec.add_dependency "json"
-  spec.add_dependency "activesupport"
 end

data/lib/condition/param.rb

@@ -6,9 +6,14 @@ module Condition
     def initialize(path, sheet_index=0)
       blocks = read_sheet(path, sheet_index)
       @item_map = {}
+      item_list = []
       blocks.each do |rows|
         item = Condition::ParamItem.new(rows)
         @item_map[item.name] = item
+        item_list << item
+      end
+      item_list.reverse.each do |it|
+        it.apply_ref(self)
       end
     end
 
@@ -43,23 +48,18 @@ module Condition
     end
 
     def item(name)
-      @item_map[name]
-    end
-
-    def get(name)
-      item = @item_map[name]
-      return nil if !item
-      item.values
+      @item_map[name.to_sym]
     end
 
-    def get_one(name)
-      item = @item_map[name]
+    def get(name, index=nil)
+      item = item(name)
       return nil if !item
-      item.value
+      return item.values if !index
+      return item.values[index]
     end
 
     def check(name, data)
-      item = @item_map[name]
+      item = item(name)
       data.each do |line|
         item.check_line(line)
       end

data/lib/condition/param_item.rb

@@ -1,31 +1,53 @@
 # coding: utf-8
 require 'time'
-require 'json'
-require 'active_support/all'
 
 module Condition
   class ParamItem
     def initialize(rows)
-      @name = rows[0][0]
-      @keys = rows[0].size > 1 ? rows[0][1..rows.size - 1] : []
+      @name = rows[0][0].to_sym
+      @options = rows[0].size > 1 ? rows[0][1..rows.size - 1] : []
       body = rows[1..rows.size - 1]
       @values = []
+      @keys = []
       @params = {}
+      @refs = []
       body.each do |row|
         index = 0
-        name = row[0]
-        @params[name.to_sym] = ("$" + name).to_sym
+        key = row[0].to_sym
+        @keys = key
+        @params[key] = ("$" + key.to_s).to_sym
         items = row[1..row.size - 1]
         value = nil
         items.each do |item|
           value = @values[index] ? @values[index] : {}
-          value[name.to_sym] = '#NULL' == item ? nil : item
+          value[key] = calc_item(item, index, key)
           @values[index] = value
           index += 1
         end
       end
     end
 
+    def calc_item(item, index, key)
+      if '#NULL' == item
+        nil
+      elsif '#EMPTY' == item
+        []
+      elsif /^#REF\((.+)\)$/ =~ item
+        ary = $1.split(/,/)
+        count = ary.size > 1 ? ary[1].strip.to_i : nil
+        @refs << {index: index, key: key, name: ary[0].strip.to_sym, count: count}
+        item
+      else
+        item
+      end
+    end
+
+    def apply_ref(param)
+      @refs.each do |it|
+        @values[it[:index]][it[:key]] = param.get(it[:name], it[:count])
+      end
+    end
+
     def name
       @name
     end
@@ -62,7 +84,7 @@ module Condition
     end
 
     def exec_after(db)
-      @keys.each do |key|
+      @options.each do |key|
         db.run key
       end
     end
@@ -71,36 +93,17 @@ module Condition
       if Time === real
         real == Time.parse(expected)
       elsif nil == real
-        expected == nil || expected == "#NULL"
+        expected == nil
       elsif Hash === real
-        ex = expected
         if !(Hash === expected)
-          ex = JSON.parse(expected)
-        end
-        ex = ex.symbolize_keys
-        result = true
-        ex.each_pair do |k, v|
-          res = value_match?(v, real[k])
-          result = false if !res
+          false
         end
-        result
+        expected == real
       elsif Array === real
-        ex = expected
         if !(Array === expected)
-          ex = JSON.parse(expected)
-        end
-        false if Array === ex
-        size = ex.size()
-        true if size == 0 && real.size() == 0
-        false if size != real.size()
-        index = 0
-        while true
-          break if index >= size
-          result = value_match?(ex[index], real[index])
-          return false if !result
-          index = index + 1
+          false
         end
-        true
+        expected == real
       else
         real.to_s == expected
       end
@@ -110,11 +113,10 @@ module Condition
       targetFlag = true
       matchFlag = true
       unmatch_info = []
-      real = real.symbolize_keys
       value.each_pair do |k, v|
         match = value_match?(v, real[k])
         unmatch_info << v.to_s + " <> " + real[k].to_s if !match
-        whereKeyFlag = nil != @keys.index(k.to_s)
+        whereKeyFlag = nil != @options.index(k.to_s)
         matchFlag = false if !match
         targetFlag = false if whereKeyFlag && !match
       end

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -23,11 +23,12 @@ describe Condition do
     param = Condition::Param.new(FILES + '/t_user.ods', 2)
     item = default.item('t_user')
     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_one('ins')))
+    ds.call(item.value.merge(param.get('ins', 0)))
 
     list = DB["SELECT * FROM t_user"].all
+    #p param.get('ary')
     param.check('list', list)
-    param.check('list', [{"user_id" => 1, "user_name" => "aaax"}])
+    param.check('list', [{user_id: 1, user_name: "aaax"}])
     param.check('ary', [{name: "a", val1: {a: "b"}, val2: [{a: {c: "d"}}], val3: [], val4: nil}])
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - aoyagikouhei
@@ -94,34 +94,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Condition Test
 email:
 - aoyagi.kouhei@gmail.com