osaka 0.4.4 → 0.4.5

data/lib/osaka/mailmergeflow.rb

@@ -11,6 +11,7 @@ module CommonFlows
 
     pages = Osaka::Pages.new
     pages.open(pages_file)
+    pages.set_mail_merge_document(numbers_file)
     pages.mail_merge_to_pdf(output_file)
     pages.close(:dont_save)
     pages.quit(:dont_save)

data/lib/osaka/pages.rb

@@ -1,5 +1,9 @@
 
 module Osaka
+  
+  class PagesError < RuntimeError
+  end
+  
   class PagesMailMergeDialog
     attr_accessor :control, :location
 
@@ -88,11 +92,11 @@ module Osaka
       open_dialog = do_and_wait_for_new_window {
         control.click(at.radio_button("Numbers Document:").radio_group(1).sheet(1))
       }
-      dialog = create_dialog(TypicalOpenDialog, at.window(open_dialog))
-      dialog.set_folder(File.dirname(filename))
-      dialog.select_file(File.basename(filename))
-      control.click(at.button("OK").sheet(1))
-      
+      select_file_from_open_dialog(filename, at.window(open_dialog))
+      if (control.exists?(at.sheet(1).sheet(1)))
+        raise(PagesError, "Setting Mail Merge numbers file failed")
+      end
+      control.click(at.button("OK").sheet(1))      
     end
     
     def mail_merge_field(field_name)

data/lib/osaka/preview.rb

@@ -16,10 +16,8 @@ module Osaka
     
     def open(filename)
       control.click_menu_bar(at.menu_item("Open…"), "File").wait_until_exists(at.window("Open"))
-      dialog = create_dialog(TypicalOpenDialog, at.window("Open"))
-      dialog.set_folder(File.dirname(filename))
       new_window = do_and_wait_for_new_window {
-        dialog.select_file(File.basename(filename))
+        select_file_from_open_dialog(filename, at.window("Open"))
       }
       control.set_current_window(new_window)
     end

data/lib/osaka/typicalapplication.rb

@@ -191,5 +191,11 @@ module Osaka
       dialog_class.new(control.name, location + (location.has_top_level_element? ? "" : control.base_location))
     end
     
+    def select_file_from_open_dialog(filename, dialog_location)
+      dialog = create_dialog(TypicalOpenDialog, dialog_location)
+      dialog.set_folder(File.dirname(filename))
+      dialog.select_file(File.basename(filename))
+      
+    end
   end
 end

data/lib/osaka/version.rb

@@ -1,4 +1,4 @@
 
 module Osaka
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/mailmergeflow_spec.rb

@@ -13,6 +13,7 @@ describe "Mail Merge to PDF common flow" do
     Osaka::Pages.should_receive(:new).and_return(mock_pages)
     
     mock_pages.should_receive(:open).with("/template/pages")
+    mock_pages.should_receive(:set_mail_merge_document).with("/template/numbers")
     mock_pages.should_receive(:mail_merge_to_pdf).with("/output/file.pdf")
     
     mock_pages.should_receive(:close).with(:dont_save)    

data/spec/pages_spec.rb

@@ -84,15 +84,26 @@ describe "Osaka::Pages" do
     subject.should_receive(:do_and_wait_for_new_window).and_yield.and_return("dialog")
     expect_click(at.radio_button("Numbers Document:").radio_group(1).sheet(1))
     
-    dialog_mock = mock("Open Dialog")
-    subject.should_receive(:create_dialog).with(Osaka::TypicalOpenDialog, at.window("dialog")).and_return(dialog_mock)
-    dialog_mock.should_receive(:set_folder).with("/tmp")
-    dialog_mock.should_receive(:select_file).with("filename")
+    subject.should_receive(:select_file_from_open_dialog).with("/tmp/filename", at.window("dialog"))
     expect_click(at.button("OK").sheet(1))
     
-    subject.set_mail_merge_document("/tmp/filename")    
+    expect_exists?(at.sheet(1).sheet(1)).and_return(false)
+    subject.set_mail_merge_document("/tmp/filename")
   end
   
+  it "Should be able to stop when an error happens due to mail merge. This is especially important since otherwise Pages goes nuts and crashes :)" do
+    subject.should_receive(:inspector).and_return(mock("Inspector").as_null_object)    
+    expect_wait_until_exists(at.sheet(1))
+    subject.should_receive(:do_and_wait_for_new_window)
+    subject.should_receive(:select_file_from_open_dialog)
+    
+    expect_exists?(at.sheet(1).sheet(1)).and_return(true)
+        
+    expect {subject.set_mail_merge_document("/tmp/filename") }.to raise_error(Osaka::PagesError, "Setting Mail Merge numbers file failed")
+    
+  end
+  
+  
   it "Should be able to insert a merge field" do
     expect_click_menu_bar(at.menu_item("Data").menu(1).menu_item("Merge Field"), "Insert")
     subject.mail_merge_field("Data")

data/spec/preview_spec.rb

@@ -14,14 +14,11 @@ describe "Preview application for reading PDFs" do
   end
   
   it "Can open a PDF file via the menu instead of the AppleScript 'open' as that one is buggy" do
-    open_dialog = mock("Open Dialog")
     
     expect_click_menu_bar(at.menu_item("Open…"), "File")
     expect_wait_until_exists(at.window("Open"))
     subject.stub(:do_and_wait_for_new_window).and_yield.and_return("window name")    
-    subject.should_receive(:create_dialog).with(Osaka::TypicalOpenDialog, at.window("Open")).and_return(open_dialog)
-    open_dialog.should_receive(:set_folder).with("dir")
-    open_dialog.should_receive(:select_file).with("filename")
+    subject.should_receive(:select_file_from_open_dialog).with("dir/filename", at.window("Open"))
     expect_set_current_window("window name")
 
     subject.open("dir/filename")

data/spec/typicalapplication_spec.rb

@@ -166,6 +166,15 @@ describe "Osaka::TypicalApplication" do
       subject.wait_for_save_dialog_and_save_file("/tmp/filename")
     end
     
+    it "Should be able to pick a file from an open dialog" do
+      dialog_mock = mock("Open Dialog")
+      subject.should_receive(:create_dialog).with(Osaka::TypicalOpenDialog, at.window("dialog")).and_return(dialog_mock)
+      dialog_mock.should_receive(:set_folder).with("/tmp")
+      dialog_mock.should_receive(:select_file).with("filename")
+      
+      subject.select_file_from_open_dialog("/tmp/filename", at.window("dialog"))
+    end
+    
     
     it "Should be able to duplicate and close the original document" do
       subject.stub_chain(:duplicate, :control).and_return(new_instance_control)

metadata

@@ -2,7 +2,7 @@
 name: osaka
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Bas Vodde