condition 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 662e70bdaa099817376d9934c1146469274e7646
-  data.tar.gz: 34fc6074209e62d7fb346b507f04ed32ff39312b
+  metadata.gz: c660ebf970ed4d07d0cb2c17f663c26d957f5e3c
+  data.tar.gz: 80508516454670dc5eb73a1e5c9db3f945519226
 SHA512:
-  metadata.gz: db3dac4a43ae5960261295cd69ddcaa4925cf5f55a7c52dfd4bd6facf33ad1514411e460c78a85052e300d2bf0d35d7bb8ecdd470d901b02463653dd077bb628
-  data.tar.gz: 64fc5bf5eb48e000fdb0052258ffe193a11811ca04c793deb594c4f96af8b805b4e1ba3e98ef1a4a1c6bd37a394f79851fc8a7bccd6675f2b508afad84cf256b
+  metadata.gz: 038592f544ab29b35d7edba60c2e22fce16d18e78cf2474f13a5b637707b5f5467b612a84b2492b3847c02b48f84a0bab8c98efd2eeae537c1b0c6c260f6ecd8
+  data.tar.gz: 8f3cbbb7c9b4e66203b81a5fbdddf232ebe2a072cc91ba3381cec166f1071804ec26344554d6a18badce332107dd620d35a1e37828937f815092d78123b00c33

data/README.md

@@ -30,6 +30,9 @@ TODO: Write usage instructions here
 
 ## Changes
 
+2013-12-11 0.0.17
+add redis reader
+
 2013-12-06 0.0.16
 modify mongo key to symbol
 modify check no used line in expectations

data/condition.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sequel"
   spec.add_development_dependency "mongo"
   spec.add_development_dependency "bson_ext"
+  spec.add_development_dependency "redis"
   spec.add_dependency "roo"
   spec.add_dependency "json"
 end

data/lib/condition/param.rb

@@ -14,8 +14,17 @@ module Condition
       @@reader
     end
 
-    def initialize(path, sheet_index=0)
-      blocks = Condition::Param.get_reader().read_sheet(path, sheet_index)
+    def initialize(path, sheet_index=0, blks: nil, reader: nil)
+      if blks.nil?
+        rd = reader.nil? ? Condition::Param.get_reader() : reader
+        blocks = rd.read_sheet(path, sheet_index)
+        set_blocks(blocks)
+      else
+        set_blocks(blks)
+      end
+    end
+
+    def set_blocks(blocks)
       @item_map = {}
       item_list = []
       blocks.each do |rows|

data/lib/condition/reader/convert_sheet.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+require 'json'
+
+module Condition
+  module Reader
+    class ConvertSheet
+      def initialize(redis)
+        @redis = redis
+        @reader = Condition::Reader::RooReader.new
+      end
+
+      def convert(path, sheet_index, name)
+        @redis.set(name, JSON.generate(@reader.read_sheet(path, sheet_index)))
+      end
+    end
+  end
+end

data/lib/condition/reader/redis_reader.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+require 'json'
+
+module Condition
+  module Reader
+    class RedisReader
+      def initialize(redis)
+        @redis = redis 
+      end
+
+      def read_sheet(path, sheet_index)
+        JSON.parse(@redis.get(path), {:symbolize_names => true})
+      end
+    end
+  end
+end

data/lib/condition/version.rb

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

data/spec/condition_spec.rb

@@ -5,6 +5,14 @@ describe Condition do
     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)"
+
+    converter = Condition::Reader::ConvertSheet.new(REDIS)
+    converter.convert(FILES + '/t_user.ods', 0, 'pre_condition')
+    converter.convert(FILES + '/t_user.ods', 1, 'post_condition1')
+    converter.convert(FILES + '/t_user.ods', 2, 'params')
+    converter.convert(FILES + '/t_user.ods', 3, 'default')
+    converter.convert(FILES + '/t_user.ods', 4, 'post_condition2')
+    converter.convert(FILES + '/t_user.ods', 5, 'post_condition3')
   end
 
   it 'pre and post' do
@@ -67,4 +75,38 @@ describe Condition do
     param = Condition::Param.new(FILES + '/mongo.ods', 1)
     param.post(storage)
   end
+
+  it 'redis with set_reader' do
+    reader = Condition::Reader::RedisReader.new(REDIS)
+    Condition::Param.set_reader(reader)
+    storage = Condition::Storage::Db.new(DB)
+    param = Condition::Param.new('pre_condition')
+    default = Condition::Param.new('default')
+    param.pre(storage, default)
+    param = Condition::Param.new('post_condition1')
+    param.post(storage)
+    param = Condition::Param.new('post_condition2')
+    expect { param.post(storage) }.to raise_error
+    param = Condition::Param.new('post_condition3')
+    expect { param.post(storage) }.to raise_error
+  end
+
+  it 'redis with reader parameter' do
+    reader = Condition::Reader::RedisReader.new(REDIS)
+    Condition::Param.set_reader(nil)
+
+    storage = Condition::Storage::Db.new(DB)
+    param = Condition::Param.new('pre_condition', reader: reader)
+    default = Condition::Param.new('default', reader: reader)
+    param.pre(storage, default)
+    param = Condition::Param.new('post_condition1', reader: reader)
+    param.post(storage)
+    param = Condition::Param.new('post_condition2', reader: reader)
+    expect { param.post(storage) }.to raise_error
+    param = Condition::Param.new('post_condition3', reader: reader)
+    expect { param.post(storage) }.to raise_error
+
+    param = Condition::Param.new(FILES + '/t_user.ods', 5)
+    expect { param.post(storage) }.to raise_error
+  end
 end

data/spec/spec_helper.rb

@@ -7,10 +7,14 @@ require 'pg'
 require 'mongo'
 require 'condition/storage/db'
 require 'condition/storage/mongo'
+require 'redis'
+require 'condition/reader/redis_reader'
+require 'condition/reader/convert_sheet'
 
 FILES = File.dirname(__FILE__) + "/files"
 DB = Sequel.connect('postgres://localhost:5432/test?user=aoyagikouhei')
 MONGO = Mongo::MongoClient.new('localhost', 27017)['test']
+REDIS = Redis.new
 
 RSpec.configure do |config|
   # some (optional) config here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condition
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - aoyagikouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,8 @@ files:
 - lib/condition.rb
 - lib/condition/param.rb
 - lib/condition/param_item.rb
+- lib/condition/reader/convert_sheet.rb
+- lib/condition/reader/redis_reader.rb
 - lib/condition/reader/roo_reader.rb
 - lib/condition/storage/db.rb
 - lib/condition/storage/mongo.rb