mobilize-base 1.293 → 1.294

data/README.md

@@ -220,9 +220,8 @@ production:
 
 gsheet.yml needs:
 * max_cells, which is the number of cells a sheet is allowed to have
-  written to it at one time. Default is 400k cells, which is the max per
-  book. Google Drive will throw its own exception if
-  you try to write more than that.
+  written to it at one time. Default is 50k cells, which is about how
+much you can write before things start breaking.
 * Because Google Docs ties date formatting to the Locale for the
   spreadsheet, there are 2 date format parameters:
   * read_date_format, which is the format that should be read FROM google

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

@@ -13,7 +13,7 @@ module GoogleDrive
       f = self
       #admin includes workers
       return true if f.has_admin_acl?
-      accounts = (Mobilize::Gdrive.admin_emails + Mobilize::Gdrive.worker_emails)
+      accounts = (Mobilize::Gdrive.admin_emails + Mobilize::Gdrive.worker_emails).uniq
       accounts.each do |email|
         f.update_acl(email)
       end
@@ -21,9 +21,9 @@ module GoogleDrive
 
     def has_admin_acl?
       f = self
-      curr_emails = f.acls.map{|a| a.scope}.sort
-      admin_emails = (Mobilize::Gdrive.admin_emails + Mobilize::Gdrive.worker_emails)
-      if (curr_emails & admin_emails) == admin_emails
+      curr_emails = f.acls.map{|a| a.scope}.compact.sort
+      admin_emails = (Mobilize::Gdrive.admin_emails + Mobilize::Gdrive.worker_emails).uniq
+      if curr_emails == admin_emails or (curr_emails & admin_emails) == admin_emails
         return true
       else
         return false
@@ -32,9 +32,9 @@ module GoogleDrive
 
     def has_worker_acl?
       f = self
-      curr_emails = f.acls.map{|a| a.scope}.sort
+      curr_emails = f.acls.map{|a| a.scope}.compact.sort
       worker_emails = Mobilize::Gdrive.worker_emails.sort
-      if (curr_emails & worker_emails) == worker_emails
+      if curr_emails == worker_emails or (curr_emails & worker_emails) == worker_emails
         return true
       else
         return false
@@ -84,7 +84,7 @@ module GoogleDrive
     end
     def acl_entry(email)
       f = self
-      f.acls.select{|a| ['group','user'].include?(a.scope_type) and a.scope == email}.first
+      f.acls.select{|a| ['group','user'].include?(a.scope_type) and a.scope and a.scope == email}.first
     end
     def entry_hash
       f = self

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

@@ -132,9 +132,14 @@ module Mobilize
         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
-        stdout = if tsv.to_s.length == 0
+        tsv_row_count = tsv.to_s.split("\n").length
+        tsv_col_count = tsv.to_s.split("\n").first.to_s.split("\t").length
+        tsv_cell_count = tsv_row_count * tsv_col_count
+        stdout = if tsv_row_count == 0
                    #soft error; no data to write. Stage will complete.
                    "Write skipped for #{s.target.url}"
+                 elsif tsv_cell_count > Gsheet.max_cells
+                   raise "Too many datapoints; you have #{tsv_cell_count.to_s}, max is #{Gsheet.max_cells.to_s}"
                  else
                    Dataset.write_by_url(s.target.url,tsv,u.name,gdrive_slot,crop)
                    #update status

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.293"
+    VERSION = "1.294"
   end
 end

data/lib/samples/gsheet.yml

@@ -1,17 +1,17 @@
 ---
 development:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets
 test:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets
 staging:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets
 production:
-  max_cells: 400000 #current google limit is 400k cells per book
+  max_cells: 50000 #current google limit is 400k cells per book but fails earlier
   read_date_format: "%Y-%m-%d" #format to record when reading sheets
   sheet_date_format: "%m/%d/%Y" #format to use to parse sheets

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.293'
+  version: '1.294'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3027972477721057312
+      hash: 1508381292879500596
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3027972477721057312
+      hash: 1508381292879500596
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.25