condition 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc74fd455a5c5272d28fdf6ed278b6b3f2790dd
-  data.tar.gz: 8a7cffd879fd0c3cab7c0f77490896e0f1645edf
+  metadata.gz: 56f8176e26996112edd1da8178bdbdc10ea723e5
+  data.tar.gz: 87d8a3b31df12240ecbb2d6155d311e7629e175e
 SHA512:
-  metadata.gz: b01d271d559b2d76f8f5ef336e8a63f86c396ab3b5e945079f82ea96e8133ce01e3cbdb0cbc149bf3200d562b5c26d39ed5fd1dd0af75d57cf6e7140e37baa61
-  data.tar.gz: eadf6a040442e6ad2be58c69a6064a6c0a5d0830b90f292938e94cf24ed219dc7adfe615937a54f2da208a812bd56a24d10935396483c7da9ebb16d895973e36
+  metadata.gz: 4c58d2270aa657f59be34cab672c0edf05a8d7399116b969c87d0f2abcff24f8e5ff2c349c6b3686e5272cb9fc183df72233180ac2d105158f7da0d1ca3180b7
+  data.tar.gz: f5e00fe61661aeace89ab6dc7ac4ef9ec655b782dc86c812afa2be8f13f53708e8e048f860cb721bf99612de1a3f4d8c9e19caa1e5507b595952c52726ae11d7

data/README.md

@@ -30,6 +30,9 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-04-15 0.0.3
+add default to precondition
+
 2013-04-11 0.0.2
 add param, param_item
 delete pre, post, reader, table

data/lib/condition/param.rb

@@ -42,12 +42,20 @@ module Condition
       end
     end
 
+    def item(name)
+      @item_map[name]
+    end
+
     def get(name)
-      @item_map[name].values
+      item = @item_map[name]
+      return nil if !item
+      item.values
     end
 
     def get_one(name)
-      @item_map[name].value
+      item = @item_map[name]
+      return nil if !item
+      item.value
     end
 
     def check(name, data)
@@ -57,10 +65,10 @@ module Condition
       end
     end
 
-    def pre(db)
+    def pre(db, default=nil)
       @item_map.each_value do |item|
         item.delete(db)
-        item.insert(db)
+        item.insert(db, default)
       end
     end
 

data/lib/condition/param_item.rb

@@ -36,6 +36,10 @@ module Condition
       @values
     end
 
+    def params
+      @params
+    end
+
     def all(db)
       db["SELECT * FROM #{@name}"].all
     end
@@ -44,10 +48,14 @@ module Condition
       db["DELETE FROM #{@name}"].delete
     end
 
-    def insert(db)
-      ds = db[@name.to_sym].prepare(:insert, :insert_with_name, @params)
+    def insert(db, default)
+      item = default.item(@name) if default
+      ds = db[@name.to_sym].prepare(
+        :insert, 
+        :insert_with_name, 
+        item ? item.params.merge(@params) : @params)
       @values.each do |it|
-        ds.call(it)
+        ds.call(item ? item.value.merge(it) : it)
       end
     end
 

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -1,24 +1,29 @@
 require 'spec_helper'
 describe Condition do
   before(:all) do
-    DB << "CREATE TABLE IF NOT EXISTS t_user(user_id BIGINT, user_name TEXT)"
-    DB << "CREATE TABLE IF NOT EXISTS t_test(id BIGINT, name TEXT, flag BOOLEAN, ts TIMESTAMPTZ, iary BIGINT[], tary TEXT[])"
+    DB << "DROP TABLE IF EXISTS t_user"
+    DB << "DROP TABLE IF EXISTS t_test"
+    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
     param = Condition::Param.new(FILES + '/t_user.ods')
-    param.pre(DB)
+    default = Condition::Param.new(FILES + '/t_user.ods', 3)
+    param.pre(DB, default)
     param = Condition::Param.new(FILES + '/t_user.ods', 1)
     param.post(DB)
   end
 
   it 'pre and params' do
     param = Condition::Param.new(FILES + '/t_user.ods')
-    param.pre(DB)
+    default = Condition::Param.new(FILES + '/t_user.ods', 3)
+    param.pre(DB, default)
 
     param = Condition::Param.new(FILES + '/t_user.ods', 2)
-    ds = DB[:t_user].prepare(:insert, :insert_with_name, {user_id: :$user_id, user_name: :$user_name})
-    ds.call(param.get_one('ins'))
+    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')))
 
     list = DB["SELECT * FROM t_user"].all
     param.check('list', list)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler