mobilize-base 1.1.03 → 1.1.04

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

@@ -47,7 +47,7 @@ module Mobilize
 
     #email management - used to make sure not too many emails get used at the same time
     def Gdrive.slot_worker_by_path(path)
-      working_slots = Mobilize::Resque.jobs('working').map{|j| j['gdrive_slot'] if j['gdrive_slot']}.compact
+      working_slots = Mobilize::Resque.jobs('working').map{|j| j['gdrive_slot'] if (j and j['gdrive_slot'])}.compact
       Gdrive.workers.sort_by{rand}.each do |w|
         unless working_slots.include?([w['name'],Gdrive.domain].join("@"))
           Mobilize::Resque.set_worker_args_by_path(path,{'gdrive_slot'=>[w['name'],Gdrive.domain].join("@")})

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

@@ -65,7 +65,7 @@ module Mobilize
         #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.spreadsheet.update_acl(user.email,"writer") unless target_sheet.spreadsheet.acl_entry(user.email).ie{|e| e and e.role=="owner"}
         target_sheet.delete_sheet1
       end
       target_sheet.merge(temp_sheet,user.name)

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

@@ -56,7 +56,7 @@ module Mobilize
 
     #Resque workers and methods to find
     def Resque.find_worker_by_path(path)
-      Resque.workers('working').select{|w| w.job and w.job['payload'] and w.job['payload']['args'].first == path}.first
+      Resque.workers('working').select{|w| w.job.ie{|j| j and j['payload'] and j['payload']['args'].first == path}}.first
     end
 
     def Resque.set_worker_args_by_path(path,args)

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

@@ -91,7 +91,7 @@ module Mobilize
         #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"
+        unless jobs_sheet.spreadsheet.acl_entry(r.user.email).ie{|e| e and e.role=="owner"}
           jobs_sheet.spreadsheet.update_acl(r.user.email,"writer")
         end
       end

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.1.03"
+    VERSION = "1.1.04"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.1.03
+  version: 1.1.04
   prerelease: 
 platform: ruby
 authors:
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2026723308315737953
+      hash: -2157829484572255156
 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: 2026723308315737953
+      hash: -2157829484572255156
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24