mobilize-base 1.1.04 → 1.1.05

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

@@ -153,7 +153,7 @@ module GoogleDrive
           else
             rem_v = rem_table[row_i][col_i]
             if loc_v != rem_v
-              if ['true','false'].include?(loc_v.downcase)
+              if ['true','false'].include?(loc_v.to_s.downcase)
                 #google sheet upcases true and false. ignore
               elsif loc_v.to_s.downcase.gsub("-","").gsub(" ","")==rem_v.to_s.downcase.gsub("-","").gsub(" ","")
                 #supported currency, silently converted whether it's an actual currency or not

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

@@ -3,14 +3,13 @@ module Mobilize
     def Gbook.find_all_by_path(path,gdrive_slot)
       Gdrive.books(gdrive_slot,{"title"=>path,"title-exact"=>"true"})
     end
-    def Gbook.find_or_create_by_path(path,gdrive_slot)
-      books = Gdrive.books(gdrive_slot,{"title"=>path,"title-exact"=>"true"})
+    def Gbook.find_by_path(path,gdrive_slot)
+      books = Gbook.find_all_by_path(path,gdrive_slot)
       dst = Dataset.find_or_create_by_handler_and_path('gbook',path)
-      #there should only be one book with each path, otherwise we have fail
       book = nil
       if books.length>1 and dst.http_url.to_s.length>0
-        #some idiot process created a duplicate book.
-        #Fix by renaming all but one with dst entry's key
+        #some idiot process or malicious user created a duplicate book.
+        #Fix by deleting all but the one with dst entry's key
         dkey = dst.http_url.split("key=").last
         books.each do |b|
           bkey = b.resource_id.split(":").last
@@ -23,8 +22,15 @@ module Mobilize
           end
         end
       else
+        #If it's a new dst or if there are multiple books
+        #take the first
         book = books.first
       end
+      return book
+    end
+    def Gbook.find_or_create_by_path(path,gdrive_slot)
+      book = Gbook.find_by_path(path,gdrive_slot)
+      dst = Dataset.find_or_create_by_handler_and_path('gbook',path)
       if book.nil?
         #always use owner email to make sure all books are owned by owner account
         book = Gdrive.root(Gdrive.owner_email).create_spreadsheet(path)

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

@@ -16,7 +16,7 @@ module Mobilize
 
     def Gsheet.find_by_path(path,gdrive_slot)
       book_path,sheet_name = path.split("/")
-      book = Gdrive.books(gdrive_slot,{"title"=>book_path,"title-exact"=>"true"}).first
+      book = Gbook.find_by_path(book_path,gdrive_slot)
       return book.worksheet_by_title(sheet_name) if book
     end
 

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

@@ -119,8 +119,15 @@ module Mobilize
                             :trigger => rj['trigger'])
         (1..5).to_a.each do |s_idx|
           stage_string = rj["stage#{s_idx.to_s}"]
-          break if stage_string.to_s.length==0
-          s = Stage.find_or_create_by_path("#{j.path}/stage#{s_idx.to_s}")
+          s = Stage.find_by_path("#{j.path}/stage#{s_idx.to_s}")
+          if stage_string.to_s.length==0
+            #delete this stage; user has blanked it
+            s.delete if s
+            break
+          elsif s.nil?
+            #create this stage
+            s = Stage.find_or_create_by_path("#{j.path}/stage#{s_idx.to_s}")
+          end
           #parse command string, update stage with it
           s_handler, call, param_string = [""*3]
           stage_string.split(" ").ie do |spls|

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

@@ -47,6 +47,11 @@ module Mobilize
       return s
     end
 
+    def Stage.find_by_path(path)
+      s = Stage.where(:path=>path).first
+      return s
+    end
+
     def prior
       s = self
       j = s.job

data/lib/mobilize-base/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.1.04
+  version: 1.1.05
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-04 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: -2157829484572255156
+      hash: -938171999002513852
 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: -2157829484572255156
+      hash: -938171999002513852
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24