samidare 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa6eff2457ffc6b011ac5964a02aee5808f22178
-  data.tar.gz: 2c9a55067831fad943ad9900894deaacd8f0dc71
+  metadata.gz: ec15b952226e1fe811ab80393aa6e23d078cbf0d
+  data.tar.gz: ea9f9a470b9c13b05891bc7c5672b36c1d1abf68
 SHA512:
-  metadata.gz: 4cb4b1a5ab045538a6b936e11820c53df438d356528e0ca79c4b220b7997de560e0b35cf071b7bdb3f31a18f584f0810d9d83e8ecf17a6572abf1c2e5fdefc4a
-  data.tar.gz: 622a00ae3eb3f3566d99a3415bccbfe2f67ed83d33068519d97aefe5eca591d92dc0d674748acc9716a6b4c8691328238ae09bddaf93348688cd3b97b1e2331b
+  metadata.gz: e1cb9d8ffacf52b9673ca9f6f192650c7202e8593aca20b2474687867326f9dcc6e8e417ad6733a43cd0c34a155dd26874eba9da0e48ba251fcb5aa3bee0807c
+  data.tar.gz: e4c0e30a4e533f51d0a54cb8fc41f332b16a0dbf4868470d897967fb64a39e0cf93a698fc93ad64669880cc3953e05ccff5abff6ef6131b73ba58ac01f13d9f3

data/lib/samidare/bigquery_utility.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'erb'
 require 'big_query'
 require 'unindent'
+require 'date'
 
 module Samidare
   class BigQueryUtility
@@ -35,6 +36,7 @@ module Samidare
 
     def initialize(config)
       @config = config.dup
+      @current_date = Date.today
     end
 
     def self.generate_schema(column_infos)
@@ -58,7 +60,7 @@ module Samidare
       p12_keyfile_path = @config['key']
       service_account_email = @config['service_email']
       dataset = db_info['bq_dataset']
-      table_name = table_info.name
+      table_name = actual_table_name(table_info.name, db_info['daily_snapshot'] || table_info.daily_snapshot)
       schema_path = "#{@config['schema_dir']}/#{db_name}/#{table_info.name}.json"
       path_prefix = "/var/tmp/embulk_#{db_name}_#{table_info.name}"
 
@@ -71,5 +73,10 @@ module Samidare
       bq = BigQuery::Client.new(@config)
       bq.delete_table(table_name)
     end
+
+    def actual_table_name(table_name, daily_snapshot)
+      return table_name unless daily_snapshot
+      table_name + @current_date.strftime('%Y%m%d')
+    end
   end
 end

data/lib/samidare/embulk_utility.rb

@@ -76,17 +76,6 @@ module Samidare
     end
 
     class DBInfo
-      attr_reader :name, :host, :username, :password, :database, :bq_dataset
-
-      def initialize(config)
-        @name = config['name']
-        @host = config['host']
-        @username = config['username']
-        @password = config['password']
-        @database = config['database']
-        @bq_dataset = config['bq_dataset']
-      end
-
       def self.generate_db_infos
         configs = YAML.load_file('database.yml')
         configs
@@ -109,6 +98,10 @@ module Samidare
       def name
         @config['name']
       end
+
+      def daily_snapshot
+        @config['daily_snapshot'] || false
+      end
     end
 
     class ColumnInfo

data/lib/samidare/version.rb

@@ -1,3 +1,3 @@
 module Samidare
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/samidare.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '>= 2.0'
+  spec.add_development_dependency 'timecop', '0.8.0'
 
   spec.add_dependency 'unindent', '1.0'
   spec.add_dependency 'mysql2-cs-bind', '0.0.6'

data/spec/samidare/bigquery_utility_spec.rb

@@ -1,41 +1,57 @@
 require 'spec_helper'
 require 'unindent'
+require 'timecop'
 
 describe Samidare::BigQueryUtility do
   describe '.generate_schema' do
     subject { Samidare::BigQueryUtility.generate_schema(column_infos) }
 
-    context '' do
-      let(:column_infos) { [
-        Samidare::EmbulkUtility::ColumnInfo.new('id', 'int'),
-        Samidare::EmbulkUtility::ColumnInfo.new('name', 'varchar'),
-        Samidare::EmbulkUtility::ColumnInfo.new('created_at', 'datetime')
-        ] }
-      let(:schema_json) {
-        <<-JSON.unindent
-        [
-        {"name":"id","type":"integer"},
-        {"name":"name","type":"string"},
-        {"name":"created_at","type":"timestamp"}
-        ]
-        JSON
-      }
-      it { expect(subject).to eq schema_json }
-    end
+    let(:column_infos) { [
+      Samidare::EmbulkUtility::ColumnInfo.new('id', 'int'),
+      Samidare::EmbulkUtility::ColumnInfo.new('name', 'varchar'),
+      Samidare::EmbulkUtility::ColumnInfo.new('created_at', 'datetime')
+      ] }
+    let(:schema_json) {
+      <<-JSON.unindent
+      [
+      {"name":"id","type":"integer"},
+      {"name":"name","type":"string"},
+      {"name":"created_at","type":"timestamp"}
+      ]
+      JSON
+    }
+    it { expect(subject).to eq schema_json }
   end
 
   describe '.generate_sql' do
     subject { Samidare::BigQueryUtility.generate_sql(table_name, column_infos) }
 
-    context '' do
-      let(:table_name) { 'simple' }
-      let(:column_infos) { [
-        Samidare::EmbulkUtility::ColumnInfo.new('id', 'int'),
-        Samidare::EmbulkUtility::ColumnInfo.new('name', 'varchar'),
-        Samidare::EmbulkUtility::ColumnInfo.new('created_at', 'datetime')
-        ] }
-      let(:sql) { "SELECT id,name,UNIX_TIMESTAMP(created_at) AS created_at FROM simple\n" }
-      it { expect(subject).to eq sql }
+    let(:table_name) { 'simple' }
+    let(:column_infos) { [
+      Samidare::EmbulkUtility::ColumnInfo.new('id', 'int'),
+      Samidare::EmbulkUtility::ColumnInfo.new('name', 'varchar'),
+      Samidare::EmbulkUtility::ColumnInfo.new('created_at', 'datetime')
+      ] }
+    let(:sql) { "SELECT id,name,UNIX_TIMESTAMP(created_at) AS created_at FROM simple\n" }
+    it { expect(subject).to eq sql }
+  end
+
+  describe '#actual_table_name' do
+    before { Timecop.freeze(Time.now) }
+
+    after { Timecop.return }
+
+    subject { Samidare::BigQueryUtility.new({}).actual_table_name(table_name, daily_snapshot) }
+    let(:table_name) { 'users' }
+    let(:daily_snapshot) { false }
+
+    context 'do not use daily snapshot' do
+      it { expect(subject).to eq table_name }
+    end
+
+    context 'use daily snapshot' do
+      let(:daily_snapshot) { true }
+      it { expect(subject).to eq table_name + Time.now.strftime('%Y%m%d') }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samidare
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ryoji Kobori
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: unindent
   requirement: !ruby/object:Gem::Requirement