mobilize-base 1.1.01 → 1.1.02

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

@@ -60,6 +60,11 @@ module GoogleDrive
         elsif entry.role != role and ['reader','writer','owner'].include?(role)
           entry.role=role
           f.acl.update_role(entry,entry.role)
+          if entry.role != role
+            #for whatever reason
+            f.acl.delete(entry)
+            f.acl.push({:scope_type=>"user",:scope=>email,:role=>role})
+          end
         elsif !['reader','writer','owner'].include?(role)
           raise "Invalid role #{role}"
         end

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

@@ -49,9 +49,9 @@ module GoogleDrive
       #with the contents of merge_sheet
       sheet = self
       sheet.reload
-      entry = merge_sheet.spreadsheet.acl_entry("#{user}@#{Mobilize::Gdrive.domain}")
+      entry = sheet.spreadsheet.acl_entry("#{user}@#{Mobilize::Gdrive.domain}")
       unless entry and ['writer','owner'].include?(entry.role)
-        raise "User #{user} is not allowed to write to #{merge_sheet.spreadsheet.title}"
+        raise "User #{user} is not allowed to write to #{sheet.spreadsheet.title}"
       end
       merge_sheet.reload
       curr_rows = sheet.num_rows

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

@@ -50,18 +50,25 @@ module Mobilize
       #return blank response if there are no slots available
       return nil unless gdrive_slot
       s = Stage.where(:path=>stage_path).first
-      user = s.job.runner.user.name
+      user = s.job.runner.user
       target_path = s.params['target']
       target_path = "#{s.job.runner.title}/#{target_path}" unless target_path.index("/")
       source_dst = s.source_dsts(gdrive_slot).first
-      tsv = source_dst.read(user)
+      tsv = source_dst.read(user.name)
       sheet_name = target_path.split("/").last
       temp_path = [stage_path.gridsafe,sheet_name].join("/")
       temp_sheet = Gsheet.find_or_create_by_path(temp_path,gdrive_slot)
       temp_sheet.write(tsv,Gdrive.owner_name)
       temp_sheet.check_and_fix(tsv)
-      target_sheet = Gsheet.find_or_create_by_path(target_path,gdrive_slot)
-      target_sheet.merge(temp_sheet,user)
+      target_sheet = Gsheet.find_by_path(target_path,gdrive_slot)
+      unless target_sheet
+        #only give the user edit permissions if they're the ones
+        #creating it
+        target_sheet = Gsheet.find_or_create_by_path(target_path,gdrive_slot)
+        target_sheet.spreadsheet.update_acl(user.email,"writer") unless target_sheet.spreadsheet.acl_entry(user.email).role=="owner"
+        target_sheet.delete_sheet1
+      end
+      target_sheet.merge(temp_sheet,user.name)
       #delete the temp sheet's book
       temp_sheet.spreadsheet.delete
       status = "Write successful for #{target_path}"

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

@@ -85,7 +85,16 @@ module Mobilize
 
     def gsheet(gdrive_slot)
       r = self
-      jobs_sheet = Gsheet.find_or_create_by_path(r.path,gdrive_slot)
+      jobs_sheet = Gsheet.find_by_path(r.path,gdrive_slot)
+      #make sure the user has a runner with a jobs sheet and has write privileges on the spreadsheet
+      unless (jobs_sheet and jobs_sheet.spreadsheet.acl_entry(r.user.email).ie{|e| e and e.role=="writer"})
+        #only give the user edit permissions if they're the ones
+        #creating it
+        jobs_sheet = Gsheet.find_or_create_by_path(r.path,gdrive_slot)
+        unless jobs_sheet.spreadsheet.acl_entry(r.user.email).role=="owner"
+          jobs_sheet.spreadsheet.update_acl(r.user.email,"writer")
+        end
+      end
       jobs_sheet.add_headers(r.headers)
       begin;jobs_sheet.delete_sheet1;rescue;end #don't care if sheet1 deletion fails
       return jobs_sheet

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.1.01"
+    VERSION = "1.1.02"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.1.01
+  version: 1.1.02
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3362582751526690476
+      hash: 1719370628244377798
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3362582751526690476
+      hash: 1719370628244377798
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24