condition 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b30028c08d8586bbc2846e45107fd738ef3ab07
-  data.tar.gz: 3fc8ef2b4e14594112d6ef7ea54c7a04b86b9565
+  metadata.gz: b9ac4108f5c2b04fafdc90724e8f8b52c7b90c2d
+  data.tar.gz: f40b96478445f6dabd7e5b7816f566428de235a2
 SHA512:
-  metadata.gz: bad7d74c148c5567379a55ecd980f13a273c1de5cefcffb999da621e7caab942ee4a68d33eb1fda87f7ab421dac1cc0cabecf589626b207d8bd1a0c8be8f54e9
-  data.tar.gz: 2e1210d1cbc76d637b327d1191c05ab1ff690116ab6bae3bd19caef5c70a74d738a107b8116f63806fabf1cbbe95abed4925a24ae20c8971b88b9c0d96706317
+  metadata.gz: 10869fa4ba4ccb3b0cf550120e2d8c1d61e27c417dc268cfb892e29e241da1aea54d464986899d8daba6718a3dda9274c32a8a06ee337456ddedfd9548703426
+  data.tar.gz: 618c9f8738a6e655fb29be2087adc7d47a0228c7d8e93302301f02503a890852e72a65ed821bc3cd01197a6c424df69939904320f5711cf872e4bb33974f83dd

data/README.md

@@ -30,6 +30,9 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-04-23 0.0.10
+separate storage, param_item
+
 2013-04-18 0.0.9
 deep value_match?
 

data/condition.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pg"
+  spec.add_development_dependency "sequel"
   spec.add_dependency "roo"
-  spec.add_dependency "sequel"
   spec.add_dependency "json"
 end

data/lib/condition/param.rb

@@ -65,17 +65,17 @@ module Condition
       end
     end
 
-    def pre(db, default=nil)
+    def pre(storage, default=nil)
       @item_map.each_value do |item|
-        item.delete(db)
-        item.insert(db, default)
-        item.exec_after(db)
+        storage.delete(item)
+        storage.insert(item, default)
+        storage.exec_after(item)
       end
     end
 
-    def post(db)
+    def post(storage)
       @item_map.each_value do |item|
-        list = item.all(db)
+        list = storage.all(item)
         list.each do |line|
           item.check_line(line)
         end

data/lib/condition/param_item.rb

@@ -67,29 +67,8 @@ module Condition
       @params
     end
 
-    def all(db)
-      db["SELECT * FROM #{@name}"].all
-    end
-
-    def delete(db)
-      db["DELETE FROM #{@name}"].delete
-    end
-
-    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(item ? item.value.merge(it) : it)
-      end
-    end
-
-    def exec_after(db)
-      @options.each do |key|
-        db.run key
-      end
+    def options
+      @options
     end
 
     def value_match?(expected, real)

data/lib/condition/storage/db.rb

@@ -0,0 +1,36 @@
+# coding: utf-8
+
+module Condition
+  module Storage
+    class Db
+      def initialize(db)
+        @db = db
+      end
+
+      def all(param_item)
+        @db["SELECT * FROM #{param_item.name}"].all
+      end
+
+      def delete(param_item)
+        @db["DELETE FROM #{param_item.name}"].delete
+      end
+
+      def insert(param_item, default)
+        default_item = default.item(param_item.name) if default
+        ds = @db[param_item.name.to_sym].prepare(
+          :insert, 
+          :insert_with_name, 
+          default_item ? default_item.params.merge(param_item.params) : param_item.params)
+        param_item.values.each do |it|
+          ds.call(default_item ? default_item.value.merge(it) : it)
+        end
+      end
+
+      def exec_after(param_item)
+        param_item.options.each do |key|
+          @db.run key
+        end
+      end
+    end
+  end
+end

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -8,17 +8,19 @@ describe Condition do
   end
   
   it 'pre and post' do
+    storage = Condition::Storage::Db.new(DB)
     param = Condition::Param.new(FILES + '/t_user.ods')
     default = Condition::Param.new(FILES + '/t_user.ods', 3)
-    param.pre(DB, default)
+    param.pre(storage, default)
     param = Condition::Param.new(FILES + '/t_user.ods', 1)
-    param.post(DB)
+    param.post(storage)
   end
 
   it 'pre and params' do
+    storage = Condition::Storage::Db.new(DB)
     param = Condition::Param.new(FILES + '/t_user.ods')
     default = Condition::Param.new(FILES + '/t_user.ods', 3)
-    param.pre(DB, default)
+    param.pre(storage, default)
 
     param = Condition::Param.new(FILES + '/t_user.ods', 2)
     item = default.item('t_user')

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@
 require 'bundler/setup'
 require 'condition'
 require 'sequel'
+require 'pg'
+require 'condition/storage/db'
 
 FILES = File.dirname(__FILE__) + "/files"
 DB = Sequel.connect('postgres://localhost:5432/test?user=aoyagikouhei')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: roo
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -124,6 +124,7 @@ files:
 - lib/condition.rb
 - lib/condition/param.rb
 - lib/condition/param_item.rb
+- lib/condition/storage/db.rb
 - lib/condition/version.rb
 - spec/condition_spec.rb
 - spec/files/t_user.ods