data_pitcher 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8025404be932416fdf0b9bbd08d08f22cdf31469
-  data.tar.gz: 29b8bc521481415d5412bd4114f316ad3fb7d718
+  metadata.gz: a297bdeb710a6ef6c3568c0e6c82cd1e1355acf0
+  data.tar.gz: 8e0c9397fa3b7d2420edeb8d1b2bd59f8a9e5be1
 SHA512:
-  metadata.gz: 8c75433570a7a09727e2e51c9f8ee0ba535166dc108b2ba4a8a23aa098144fea6c4eceed56b74801cb8f80720a23c42bcee1e47b5f95a9ea9de6dbee2653a2ea
-  data.tar.gz: 9ee9e905e4915689e1181d6f6867758edae4693ad9160246de1f804898b2f9160727acdddc0f308800aed12f97c70c74085b24b5df462de2fcfb7c9d037d821b
+  metadata.gz: 8680385889d52db50dc7790d9a97c3ea3244965c50feaca59b0a2a2bf46c38d7a613ecd28764d16e323497b1de54ac8747005fe84f528fbbf8423eaa7393932f
+  data.tar.gz: b8d4d33a5ec419c5e81b0bef15301d2c0bedac832b2a5d7493af62bf9d8644307cdf0dc5a045385fde084e2fa518dd6b5672fda940c9221edd940ff9d7fc9989

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    data_pitcher (0.1.2)
+    data_pitcher (0.1.3)
       activerecord (>= 3.2)
       google_drive
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.3)
+      activesupport (= 5.1.3)
+    activerecord (5.1.3)
+      activemodel (= 5.1.3)
+      activesupport (= 5.1.3)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -25,7 +25,7 @@ GEM
     concurrent-ruby (1.0.5)
     declarative (0.0.9)
     declarative-option (0.1.0)
-    faraday (0.12.1)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     google-api-client (0.12.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -47,7 +47,7 @@ GEM
       os (~> 0.9)
       signet (~> 0.7)
     httpclient (2.8.3)
-    i18n (0.8.4)
+    i18n (0.8.6)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.2.2)
@@ -58,7 +58,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     nokogiri (1.8.0)
@@ -89,4 +89,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/README.md

@@ -66,6 +66,7 @@ For example:
 # config/data_pitcher.yml
 data_pitcher:
   - spreadsheet_key: 1QlOBVmsEau8EupE5Kj7AqoHLQTjInoq0GpwPkW7_WdU
+    worksheet_title: Sheet2 # Optional. Using the first worksheet if omitted
     sql_path: <%= Rails.root.join('lib', 'sqls', 'conversion_rates.sql') %>
 ```
 
@@ -82,7 +83,8 @@ $ bundle exec rake data_pitcher:export:run
 Or, you can manually execute sending data programmatically as follows:
 
 ```ruby
-DataPitcher::Spreadsheet.new('<SPREADSHEET KEY>').replace_worksheet_with_query('<SQL QUERY STRING>')
+DataPitcher::Spreadsheet.new('<SPREADSHEET KEY>').replace_worksheet_with_query('<SQL QUERY STRING>') # When using the first worksheet
+DataPitcher::Spreadsheet.new('<SPREADSHEET KEY>', '<WORKSHEET TITLE>').replace_worksheet_with_query('<SQL QUERY STRING>')
 ```
 
 ### (Optionally) Check YAML definition

data/lib/data_pitcher/batch.rb

@@ -6,17 +6,23 @@ module DataPitcher
       @yaml_path = yaml_path
     end
 
-    def commands
+    def command_hashes
       # TODO: 例外処理
       YAML.load(ERB.new(File.read(@yaml_path)).result)['data_pitcher']
     end
 
     def execute(dry_run: true)
-      commands.each.with_index(1) do |command, index|
+      command_hashes.each.with_index(1) do |command_hash, index|
         begin
           result = false
           elapsed_time = Benchmark.realtime do
-            result = DataPitcher::Command.new(command['spreadsheet_key'], command['sql_path'], dry_run: dry_run, index: index).execute
+            result = DataPitcher::Command.new(
+              spreadsheet_key: command_hash['spreadsheet_key'],
+              worksheet_title: command_hash['worksheet_title'],
+              sql_path: command_hash['sql_path'],
+              dry_run: dry_run,
+              index: index
+            ).execute
           end
           if result
             puts "##{index} command: sending completed. #{elapsed_time}s"

data/lib/data_pitcher/command.rb

@@ -1,7 +1,8 @@
 module DataPitcher
   class Command
-    def initialize(spreadsheet_key, sql_path, dry_run: true, index: 1)
+    def initialize(spreadsheet_key:, worksheet_title: nil, sql_path:, dry_run: true, index: 1)
       @spreadsheet_key = spreadsheet_key
+      @worksheet_title = worksheet_title
       @sql_path = sql_path
       @dry_run = dry_run
       @index = index
@@ -30,7 +31,7 @@ module DataPitcher
     end
 
     def spreadsheet
-      @spreadsheet ||= DataPitcher::Spreadsheet.new(@spreadsheet_key)
+      @spreadsheet ||= DataPitcher::Spreadsheet.new(@spreadsheet_key, @worksheet_title)
     end
 
     def executor
@@ -45,6 +46,7 @@ module DataPitcher
       <<-EOS
 ##{@index} command
   spreadsheet_key: #{@spreadsheet_key}
+  worksheet_title: #{@worksheet_title || '(first worksheet)'}
     valid?: #{spreadsheet.valid?}
   sql_path: #{@sql_path}
     valid?: #{executor.valid?}

data/lib/data_pitcher/spreadsheet.rb

@@ -4,8 +4,9 @@ module DataPitcher
   class Spreadsheet
     BATCH_SIZE = 1000
 
-    def initialize(spreadsheet_key)
+    def initialize(spreadsheet_key, worksheet_title = nil)
       @spreadsheet_key = spreadsheet_key
+      @worksheet_title = worksheet_title
     end
 
     def spreadsheet
@@ -13,8 +14,12 @@ module DataPitcher
     end
 
     def worksheet
-      # NOTE: DataPitcher will access first sheet only
-      @worksheet ||= spreadsheet.worksheets.first
+      @worksheet ||=
+        if @worksheet_title
+          spreadsheet.worksheet_by_title(@worksheet_title)
+        else
+          spreadsheet.worksheets.first
+        end
     end
 
     def clear_sheet

data/lib/data_pitcher/version.rb

@@ -1,3 +1,3 @@
 module DataPitcher
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_pitcher
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Masahiro Nishimi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Data Pitcher throw your pesisted data to Google Spreadsheet.