mobilize-base 1.25 → 1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce15c1af069e5c285df26cf613ce6cf378489f1f
-  data.tar.gz: 5a4098bb5d320d6580ab5dbe695348015edd0949
+  metadata.gz: 589b56572a43097c84f63317ef02d681f7add21d
+  data.tar.gz: 660181a7039188861db41215c185fc1ec76244ba
 SHA512:
-  metadata.gz: cca5b69d992e93bac4b7a738199993c81802534366f52bf12f2c6171ab88fe15c3f18735402c102d77d01e2224bedd93a97226ee996959a05cd77df5c2433d16
-  data.tar.gz: d6d7de9e7516102527baeccb3d0198fc03d5aaccb47f1a702160ba4d4e25b0fea3e0232bacc4b22465dd360581c3560f75b53d69441cd7a21b97c61ba80473de
+  metadata.gz: eafc31651c0737c1b9788f109a6a34f7afdc3af235028892d98173b03d6279e6e867a85498b08b0f4700d24320ebc3ebe43d561f1809bf94a901ae8942c53b8d
+  data.tar.gz: 19508e09afba3af8aea6091a26c8481a9382b905ef07ba9af8288bdcb8829e296fb684b0800206ff89d7a99b25766b76ecd827a9325ec4c75b0d156a8119a925

data/lib/mobilize-base/extensions/google_drive/worksheet.rb

@@ -1,6 +1,6 @@
 module GoogleDrive
   class Worksheet
-    def to_tsv
+    def to_tsv(gsub_line_breaks="\n")
       sheet = self
       rows = sheet.rows
       header = rows.first
@@ -8,7 +8,12 @@ module GoogleDrive
       #look for blank cols to indicate end of row
       col_last_i = (header.index("") || header.length)-1
       #ignore user-entered line breaks for purposes of tsv reads
-      out_tsv = rows.map{|r| r[0..col_last_i].join("\t").gsub("\n","")+"\n"}.join + "\n"
+      out_tsv = rows.map do |r|
+                             row = r[0..col_last_i].join("\t")
+                             row.gsub!("\n",gsub_line_breaks)
+                             row = row + "\n"
+                             row
+                         end.join + "\n"
       out_tsv.tsv_convert_dates(Mobilize::Gsheet.config['sheet_date_format'],
                                 Mobilize::Gsheet.config['read_date_format'])
     end

data/lib/mobilize-base/handlers/gfile.rb

@@ -1,6 +1,6 @@
 module Mobilize
   module Gfile
-    def Gfile.path_to_dst(path,stage_path)
+    def Gfile.path_to_dst(path,stage_path,gdrive_slot)
       #don't need the ://
       path = path.split("://").last if path.index("://")
       if Gfile.find_by_path(path)

data/lib/mobilize-base/handlers/gsheet.rb

@@ -10,12 +10,10 @@ module Mobilize
     end
 
     # converts a source path or target path to a dst in the context of handler and stage
-    def Gsheet.path_to_dst(path,stage_path)
+    def Gsheet.path_to_dst(path,stage_path,gdrive_slot)
       s = Stage.where(:path=>stage_path).first
       params = s.params
       target_path = params['target']
-      #take random slot if one is not available
-      gdrive_slot = Gdrive.slot_worker_by_path(stage_path) || Gdrive.worker_emails.sort_by{rand}.first
       #if this is the target, it doesn't have to exist already
       is_target = true if path == target_path
       #don't need the ://
@@ -46,9 +44,7 @@ module Mobilize
 
     def Gsheet.read_by_dataset_path(dst_path,user_name,*args)
       #expects gdrive slot as first arg, otherwise chooses random
-      gdrive_slot = args
-      worker_emails = Gdrive.worker_emails.sort_by{rand}
-      gdrive_slot = worker_emails.first unless worker_emails.include?(gdrive_slot)
+      gdrive_slot = args.to_a.first
       sheet = Gsheet.find_by_path(dst_path,gdrive_slot)
       sheet.read(user_name) if sheet
     end
@@ -56,8 +52,6 @@ module Mobilize
     def Gsheet.write_by_dataset_path(dst_path,tsv,user_name,*args)
       #expects gdrive slot as first arg, otherwise chooses random
       gdrive_slot,crop = args
-      worker_emails = Gdrive.worker_emails.sort_by{rand}
-      gdrive_slot = worker_emails.first unless worker_emails.include?(gdrive_slot)
       crop ||= true
       Gsheet.write_target(dst_path,tsv,user_name,gdrive_slot,crop)
     end
@@ -134,7 +128,7 @@ module Mobilize
       crop = s.params['crop'] || true
       begin
         #get tsv to write from stage
-        source = s.sources.first
+        source = s.sources(gdrive_slot).first
         raise "Need source for gsheet write" unless source
         tsv = source.read(u.name,gdrive_slot)
         raise "No data source found for #{source.url}" unless tsv

data/lib/mobilize-base/models/runner.rb

@@ -101,7 +101,8 @@ module Mobilize
 
     def read_gsheet(gdrive_slot)
       r = self
-      gsheet_tsv = r.gsheet(gdrive_slot).read(Gdrive.owner_name)
+      #argument converts line breaks in cells to spaces
+      gsheet_tsv = r.gsheet(gdrive_slot).to_tsv(" ")
       #turn it into a hash array
       gsheet_jobs = gsheet_tsv.tsv_to_hash_array
       #go through each job, update relevant job with its params

data/lib/mobilize-base/models/stage.rb

@@ -212,14 +212,15 @@ module Mobilize
         raise "incompatible target handler #{handler} for #{s.handler} stage"
       else
         begin
-          return "Mobilize::#{s.handler.downcase.capitalize}".constantize.path_to_dst(target_path,s.path)
+          #nil gdrive_slot for targets since there is no verification
+          return "Mobilize::#{s.handler.downcase.capitalize}".constantize.path_to_dst(target_path,s.path,nil)
         rescue => exc
           raise "Could not get #{target_path} with error: #{exc.to_s}"
         end
       end
     end
 
-    def sources
+    def sources(gdrive_slot)
       #returns an array of Datasets corresponding to
       #items listed as sources in the stage params
       s = self
@@ -248,7 +249,7 @@ module Mobilize
                     end
           begin
             stage_path = s.path
-            dsts << "Mobilize::#{handler.downcase.capitalize}".constantize.path_to_dst(source_path,stage_path)
+            dsts << "Mobilize::#{handler.downcase.capitalize}".constantize.path_to_dst(source_path,stage_path,gdrive_slot)
           rescue => exc
             raise "Could not get #{source_path} with error: #{exc.to_s}"
           end

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.25"
+    VERSION = "1.26"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.25'
+  version: '1.26'
 platform: ruby
 authors:
 - Cassio Paes-Leme
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake