osaka 0.4.1 → 0.4.2

data/lib/osaka/location.rb

@@ -42,6 +42,10 @@ module Osaka
       create_location_with_added_name("group", name)
     end
     
+    def tab_group(name)
+      create_location_with_added_name("tab group", name)
+    end
+    
     def window(name)
       create_location_with_added_name("window", name)
     end
@@ -110,6 +114,22 @@ module Osaka
       create_location_with_added_name("outline", name)
     end
     
+    def ui_element(name)
+        create_location_with_added_name("UI element", name)
+    end
+
+    def row(name)
+        create_location_with_added_name("row", name)
+    end
+    
+    def radio_group(name)
+      create_location_with_added_name("radio group", name)
+    end
+
+    def radio_button(name)
+      create_location_with_added_name("radio button", name)
+    end
+    
     def to_location_string(name)
       return name.to_s if name.kind_of? Integer
       '"' + name.to_s + '"'

data/lib/osaka/numbers.rb

@@ -6,8 +6,24 @@ module Osaka
       super "Numbers"
     end
   
+    def new_document
+      super
+      control.set_current_window(do_and_wait_for_new_window {
+        control.keystroke(:return)
+      })
+    end
+    
+    def self.create_document(filename)
+      numbers = Osaka::Numbers.new
+      numbers.new_document
+      yield numbers
+      numbers.save_as(filename)
+      numbers.close
+    end
+    
     def fill_cell(column, row, value)
       control.tell("tell document 1; tell sheet 1; tell table 1; set value of cell #{column} of row #{row} to \"#{value}\"; end tell; end tell; end tell")
     end
+    
   end
 end

data/lib/osaka/pages.rb

@@ -30,13 +30,70 @@ module Osaka
       control.click!(at.menu_item(value).menu(1).pop_up_button(2).sheet(1))
     end    
   end
+  
+  class PagesInspector
+    attr_accessor :control
+    attr_accessor :location_symbol_map
+
+    def initialize(application_name, own_location)
+      @control = Osaka::RemoteControl.new(application_name, own_location)
+      @location_symbol_map = {}
+      @location_symbol_map[:document] = 1
+      @location_symbol_map[:layout] = 2
+      @location_symbol_map[:wrap] = 3
+      @location_symbol_map[:text] = 4
+      @location_symbol_map[:graphic] = 5
+      @location_symbol_map[:metrics] = 6
+      @location_symbol_map[:table] = 7
+      @location_symbol_map[:chart] = 8
+      @location_symbol_map[:link] = 9
+      @location_symbol_map[:quicktime] = 10
+    end    
+    
+    def get_location_from_symbol(inspector_name)
+      at.radio_button(@location_symbol_map[inspector_name]).radio_group(1)
+    end
+    
+    def select_inspector(inspector)
+      control.click(get_location_from_symbol(inspector))
+      control.wait_until_exists(at.window(inspector.to_s))
+      control.set_current_window(inspector.to_s)
+    end
+    
+    def change_mail_merge_source
+      select_inspector(:link)
+      control.click(at.button("Choose...").tab_group(1).group(1))        
+    end
+    
+  end
 
   class Pages < TypicalApplication
   
     def initialize
       super "Pages"
     end
+    
+    def type(text)
+      control.keystroke(text)
+    end
   
+    def set_mail_merge_document(filename)
+      inspector.change_mail_merge_source
+      control.wait_until_exists(at.sheet(1))
+      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))
+      
+    end
+    
+    def mail_merge_field(field_name)
+      control.click_menu_bar(at.menu_item(field_name).menu(1).menu_item("Merge Field"), "Insert")
+    end
+    
     def mail_merge
       control.click_menu_bar(at.menu_item(20), "Edit")
       control.wait_until_exists(at.button("Merge").sheet(1))
@@ -49,6 +106,18 @@ module Osaka
       print_dialog = mail_merge_dialog.merge
       print_dialog.save_as_pdf(filename)
     end
+
+    def inspector
+      if !control.exists?(at.menu_item("Show Inspector").menu(1).menu_bar_item("View").menu_bar(1))
+        control.click_menu_bar(at.menu_item("Hide Inspector"), "View")
+        control.wait_until_exists(at.menu_item("Show Inspector").menu(1).menu_bar_item("View").menu_bar(1))
+      end
+
+      window_name = do_and_wait_for_new_window {
+        control.click_menu_bar(at.menu_item("Show Inspector"), "View")
+      }
+      PagesInspector.new(control.name, at.window(window_name))
+    end
   
   end
 end

data/lib/osaka/remotecontrol.rb

@@ -190,6 +190,13 @@ module Osaka
     def get_app!(element)
       system_event!("get #{element}").strip
     end
+    
+    def attributes(location = "")
+      attributelist = get!("attributes", location)
+      attributelist.split("of application process #{name}").collect { |attribute|
+        attribute_match = attribute.match("attribute (.+?) .*")[1]
+      }
+    end
 
     def set(element, location, value)
       activate

data/lib/osaka/scriptrunner.rb

@@ -86,7 +86,7 @@ module Osaka
           exit
           return
         end
-        raise(Osaka::ScriptRunnerError, "Error received while executing: #{applescript}")
+        raise(Osaka::ScriptRunnerError, "Error received while executing: \"#{applescript}\" with message \"#{ex.message}\"")
       end
       print_debug_info_for_additional_output(output)
       output

data/lib/osaka/typicalapplication.rb

@@ -31,8 +31,10 @@ module Osaka
   
     def open (filename)
       abolutePathFileName = File.absolute_path(filename)
-      control.tell("open \"#{abolutePathFileName}\"")
-      control.set_current_window(File.basename(filename))
+      new_window = do_and_wait_for_new_window {
+        control.tell("open \"#{abolutePathFileName}\"")
+      }
+      control.set_current_window(new_window)
     end
 
     def wait_for_window_and_dialogs_to_close(option)
@@ -101,6 +103,12 @@ module Osaka
       new_instance
     end
     
+    def duplicate_and_close_original
+      new_instance = duplicate        
+      close        
+      @control = new_instance.control
+    end
+    
     def save
       control.keystroke("s", :command)
     end
@@ -109,23 +117,24 @@ module Osaka
       control.exists?(at.menu_item("Save…").menu(1).menu_bar_item("File").menu_bar(1))
     end
     
-    def save_dialog
+    def save_as(filename)
       if save_pops_up_dialog?
         save
-        control.wait_until_exists(at.sheet(1))
       else
-        control.keystroke("s", [:command, :shift]).wait_until_exists(at.sheet(1))
+        if duplicate_available?
+          duplicate_and_close_original
+          save
+        else
+          control.keystroke("s", [:command, :shift])
+        end
       end
-      create_save_dialog(at.sheet(1) + control.base_location)
+      
+      wait_for_save_dialog_and_save_file(filename)      
     end
     
-    def save_as(filename)
-      if duplicate_available?
-        new_instance = duplicate        
-        close        
-        @control = new_instance.control.clone
-      end      
-      dialog = save_dialog
+    def wait_for_save_dialog_and_save_file(filename)
+      control.wait_until_exists(at.sheet(1))
+      dialog = create_dialog(TypicalSaveDialog, at.sheet(1))
       dialog.save(filename)
       control.set_current_window(File.basename(filename))
     end
@@ -166,18 +175,14 @@ module Osaka
       control.keystroke("a", :command)
     end
     
-    def create_print_dialog(location)
-      TypicalPrintDialog.new(control.name, location)
-    end
-    
-    def create_save_dialog(location)
-      TypicalSaveDialog.new(control.name, location)
-    end
-  
     def print_dialog
       control.keystroke("p", :command).wait_until_exists(at.sheet(1))
-      create_print_dialog(at.sheet(1) + control.base_location)
+      create_dialog(TypicalPrintDialog, at.sheet(1))
     end
-  
+    
+    def create_dialog(dialog_class, location)
+      dialog_class.new(control.name, location + (location.has_top_level_element? ? "" : control.base_location))
+    end
+    
   end
 end

data/lib/osaka/typicalfinderdialog.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module Osaka
+
+  class TypicalFinderDialog
+    attr_accessor :control
+
+    def initialize(application_name, own_location)
+      @control = Osaka::RemoteControl.new(application_name, own_location)
+    end
+  
+    def set_folder(pathname)
+      return if pathname == "."
+      
+      control.keystroke("g", [ :command, :shift ]).wait_until_exists(at.sheet(1))
+      control.set("value", at.text_field(1).sheet(1), pathname)
+      control.click(at.button("Go").sheet(1)).wait_until_not_exists(at.sheet(1))
+    end
+  end
+  
+end

data/lib/osaka/typicalopendialog.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+module Osaka
+  
+  class OpenDialogCantSelectFile < StandardError
+  end
+        
+  class TypicalOpenDialog < TypicalFinderDialog
+      
+    def file_list_location
+      at.outline(1).scroll_area(2).splitter_group(1).group(1)
+    end
+    
+    def text_field_location_from_row(row)
+      at.text_field(1).ui_element(1).row(row) + file_list_location
+    end
+    
+    def static_field_location_from_row(row)
+      at.static_text(1).ui_element(1).row(row) + file_list_location      
+    end
+    
+    def greyed_out?(row)
+      !control.exists?(text_field_location_from_row(row))
+    end
+    
+    def click_open
+      control.click(at.button("Open"))
+    end
+    
+    def field_location_from_row(row)
+      if (greyed_out?(row))
+        static_field_location_from_row(row)
+      else
+        text_field_location_from_row(row)
+      end
+    end
+    
+    def select_file_by_row(row)
+      raise(OpenDialogCantSelectFile, "Tried to select a file, but it either doesn't exist or is greyed out") if (greyed_out?(row))
+      control.set!("selected", at.row(1) + file_list_location, true)
+    end
+      
+    def amount_of_files_in_list
+      amount_of_rows = control.get!("rows", file_list_location)
+      amount_match_data = amount_of_rows.match(/.*row (\d) of/)
+      amount_match_data.nil? ? 0 : amount_match_data[1].to_i 
+    end
+    
+    def filename_at(row)
+      control.get!("value", field_location_from_row(row))
+    end
+      
+    def select_file(filename)
+      amount_of_files_in_list.times() { |row|
+        if filename_at(row+1) == filename
+          select_file_by_row(row+1)
+          click_open
+        end
+      }
+    end
+  end  
+
+end

data/lib/osaka/typicalsavedialog.rb

@@ -1,30 +1,19 @@
 # encoding: utf-8
 module Osaka
-  
-  class TypicalSaveDialog
-    attr_accessor :control
+      
+  class TypicalSaveDialog < TypicalFinderDialog
 
-    def initialize(application_name, own_location)
-      @control = Osaka::RemoteControl.new(application_name, own_location)
+    def click_save
+      control.click(at.button("Save")).wait_until_not_exists(control.base_location)
     end
   
     def set_filename(filename)
       control.set("value", at.text_field(1), filename)
     end
-  
-    def set_folder(pathname)
-      control.keystroke("g", [ :command, :shift ]).wait_until_exists(at.sheet(1))
-      control.set("value", at.text_field(1).sheet(1), pathname)
-      control.click(at.button("Go").sheet(1)).wait_until_not_exists(at.sheet(1))
-    end
-  
-    def click_save
-      control.click(at.button("Save")).wait_until_not_exists(control.base_location)
-    end
-  
+
     def save(filename)
+      set_folder(File.dirname(filename))
       set_filename(File.basename(filename))
-      set_folder(File.dirname(filename))  unless File.dirname(filename) == "."
       click_save
     end
 

data/lib/osaka/version.rb

@@ -1,4 +1,4 @@
 
 module Osaka
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/osaka.rb

@@ -3,6 +3,8 @@ require 'osaka/scriptrunner'
 require 'osaka/location'
 require 'osaka/remotecontrol'
 require 'osaka/typicalapplication'
+require 'osaka/typicalfinderdialog'
+require 'osaka/typicalopendialog'
 require 'osaka/typicalsavedialog'
 require 'osaka/typicalprintdialog'
 require 'osaka/pages'

data/spec/integration_pages_numbers_mail_merge_spec.rb

@@ -2,16 +2,38 @@ require 'tmpdir'
 require 'osaka'
 
 describe "Integration of mail merge flow with Pages and Numbers" do
+
+
+  before (:each) do
+    @tempdir = Dir.mktmpdir
+    @numbers_filename = File.join(@tempdir, "mail_merge_test.numbers")
+    @pages_template_filename = File.join(@tempdir, "mail_merge_template.pages")
+    @pdf_output_file = File.join(@tempdir, "output.pdf")
+  end
+  
+  after (:each) do
+    FileUtils.remove_entry_secure @tempdir
+  end
   
   it "Should mail merge the assets and generate a PDF" do
-        
-    assets_directory =  File.join(File.dirname(__FILE__), "assets")
-    numbers_data = File.join(assets_directory, "mail_merge_data.numbers")
-    pages_template = File.join(assets_directory, "mail_merge_template.pages")
-    Dir.mktmpdir { |dir|
-      pdf_output_file = File.join(dir, "output.pdf")
-      CommonFlows::number_and_pages_mail_merge(numbers_data, pages_template, pdf_output_file)
-      File.exists?(pdf_output_file).should == true
+
+    Osaka::Numbers.create_document (@numbers_filename) { |doc|
+      doc.fill_cell(2, 1, "Data")
+      doc.fill_cell(2, 2, "Hello World")
+      doc.fill_cell(2, 3, "of Data")
+      doc.fill_cell(2, 4, "in Numbers")
     }
+    
+    pages = Osaka::Pages.new
+    pages.new_document
+    pages.set_mail_merge_document(@numbers_filename)
+    
+    pages.type("Hello World! This is pages. We're going to mail merge!\r\r")    
+    pages.mail_merge_field("Data");
+    pages.save_as(@pages_template_filename)
+    pages.close
+    
+    CommonFlows::number_and_pages_mail_merge(@numbers_filename, @pages_template_filename, @pdf_output_file)
+    File.exists?(@pdf_output_file).should == true
   end
 end

data/spec/numbers_spec.rb

@@ -13,4 +13,29 @@ describe "Osaka::Numbers" do
     subject.fill_cell(1, 2, "30")
   end
   
+  it "Should be able to select blank from the template choser" do
+    expect_set_current_window("Template Choser")
+    subject.should_receive(:do_and_wait_for_new_window).and_return("Template Choser")
+    expect_set_current_window("Untitled")
+    subject.should_receive(:do_and_wait_for_new_window).and_yield.and_return("Untitled")
+    expect_keystroke(:return)
+    subject.new_document 
+  end
+  
+  it "Should be able to easily create a document, put something, save it, and close it again" do
+    
+    Osaka::Numbers.should_receive(:new).any_number_of_times.and_return(mock("Numbers"))
+    subject.should_receive(:new_document)
+    subject.should_receive(:method_call_from_code_block)
+    subject.should_receive(:save_as).with("filename")
+    subject.should_receive(:close)
+
+    Osaka::Numbers.create_document("filename") { |doc|
+      doc.method_call_from_code_block
+    }
+    
+  end
+  
+  
+  
 end

data/spec/pages_spec.rb

@@ -7,7 +7,16 @@ describe "Osaka::Pages" do
 
   subject { Osaka::Pages.new }
   
-  let (:control) { subject.control = mock("Remote Control").as_null_object}
+  let (:control) { subject.control = mock("Remote Control", :name => "ApplicationName")}
+  
+  context "Basic document operations" do
+    
+    it "Should be able to type in the file" do
+      expect_keystroke("Hello")
+      subject.type("Hello")
+    end
+    
+  end
   
   it "Should be able to do mail merge to a PDF flow" do
     
@@ -31,10 +40,95 @@ describe "Osaka::Pages" do
 
   it "Should click the merge button of the mail merge dialog" do
     expect_current_window_name.any_number_of_times.and_return("Pages.pages")
+
+    expect_click_menu_bar(at.menu_item(20), "Edit")
+    expect_wait_until_exists(at.button("Merge").sheet(1))
+
     expect_click!(at.button("Merge").sheet(1))
     expect_wait_until_exists!(at.menu_button("PDF").window("Print"))
     subject.mail_merge.merge
   end
+  
+  it "Should be able to get an inspector object" do
+    subject.should_receive(:do_and_wait_for_new_window).and_yield.and_return("Link")
+    expect_exists?(at.menu_item("Show Inspector").menu(1).menu_bar_item("View").menu_bar(1)).and_return(true)
+    expect_click_menu_bar(at.menu_item("Show Inspector"), "View")
+    
+    inspector_mock = mock("Inspector")
+    Osaka::PagesInspector.should_receive(:new).with(control.name, at.window("Link")).and_return(inspector_mock)    
+    subject.inspector.should equal(inspector_mock)
+  end
+  
+  it "Should be able to get the inspector object also when it is already visible" do
+    subject.should_receive(:do_and_wait_for_new_window).and_yield.and_return("Link")
+    expect_exists?(at.menu_item("Show Inspector").menu(1).menu_bar_item("View").menu_bar(1)).and_return(false)
+    expect_click_menu_bar(at.menu_item("Hide Inspector"), "View")
+    expect_wait_until_exists(at.menu_item("Show Inspector").menu(1).menu_bar_item("View").menu_bar(1))
+    expect_click_menu_bar(at.menu_item("Show Inspector"), "View")
+    subject.inspector
+  end
+  
+  it "Should be able to change the mail merge document source" do
+    inspector_mock = mock("Inspector")
+    subject.should_receive(:inspector).and_return(inspector_mock)
+    inspector_mock.should_receive(:change_mail_merge_source)
+    
+    expect_wait_until_exists(at.sheet(1))
+    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")
+    expect_click(at.button("OK").sheet(1))
+    
+    subject.set_mail_merge_document("/tmp/filename")    
+  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")
+  end
+  
+  
+end
+
+describe "Osaka::Pages Inspector" do
+  
+  include(*Osaka::OsakaExpectations)
+
+  subject {Osaka::PagesInspector.new("Pages", "Link")}
+  let(:control) {subject.control = mock("RemoteControl")}
+  
+  it "Can convert symbolic names to locations" do
+    # Nice... checking a map. Perhaps delete ?
+    subject.get_location_from_symbol(:document).should == at.radio_button(1).radio_group(1)
+    subject.get_location_from_symbol(:layout).should == at.radio_button(2).radio_group(1)
+    subject.get_location_from_symbol(:wrap).should == at.radio_button(3).radio_group(1)
+    subject.get_location_from_symbol(:text).should == at.radio_button(4).radio_group(1)
+    subject.get_location_from_symbol(:graphic).should == at.radio_button(5).radio_group(1)
+    subject.get_location_from_symbol(:metrics).should == at.radio_button(6).radio_group(1)
+    subject.get_location_from_symbol(:table).should == at.radio_button(7).radio_group(1)
+    subject.get_location_from_symbol(:chart).should == at.radio_button(8).radio_group(1)
+    subject.get_location_from_symbol(:link).should == at.radio_button(9).radio_group(1)
+    subject.get_location_from_symbol(:quicktime).should == at.radio_button(10).radio_group(1)
+  end
+  
+  
+  it "Should be able to select the different inspectors" do
+    expect_click(subject.get_location_from_symbol(:document))
+    expect_wait_until_exists(at.window("document"))
+    expect_set_current_window("document")
+    subject.select_inspector(:document)
+  end
+  
+  it "Change the mail merge source" do
+    subject.should_receive(:select_inspector).with(:link)
+    expect_click(at.button("Choose...").tab_group(1).group(1))
+    subject.change_mail_merge_source
+  end
+
 end
 
 describe "Osaka::Pages Mail Merge dialog" do

data/spec/remotecontrol_spec.rb

@@ -181,7 +181,7 @@ describe "Osaka::RemoteControl" do
     
     it "Should print a proper error message when it times out while waiting for something" do
       Timeout.should_receive(:timeout).with(5).and_raise(Timeout::Error.new)
-      lambda { subject.until_exists!(at.window(1)) }.should raise_error(Osaka::TimeoutError, "Timed out while waiting for: [window 1]")
+      expect { subject.until_exists!(at.window(1)) }.to raise_error(Osaka::TimeoutError, "Timed out while waiting for: [window 1]")
     end
   end
 
@@ -344,6 +344,16 @@ describe "Osaka::RemoteControl" do
       subject.window_list.should == ["one"]    
     end
     
+    it "Should be able to get the attributes of a window and parse the result" do
+      expect_get!("attributes", at.window(1)).and_return("attribute AXRole of window 1 of application process ApplicationName, attribute AXRoleDescription of window 1 of application process ApplicationName, attribute AXSubrole of window 1 of application process ApplicationName")
+      subject.attributes(at.window(1)).should == ["AXRole", "AXRoleDescription", "AXSubrole"]
+    end
+
+    it "Should be able to get the attributes of the application too" do
+    expect_get!("attributes", at.window(1)).and_return("attribute AXRole of application process ApplicationName, attribute AXRoleDescription of application process ApplicationName")
+      subject.attributes(at.window(1)).should == ["AXRole", "AXRoleDescription"]
+    end
+    
   end
 
   describe "Dealing with base locations and window lists" do

data/spec/scriptrunner_spec.rb

@@ -61,8 +61,8 @@ describe "Osaka::ScriptRunner" do
   end
   
   it "Should raise an exception witha proper error message when the applescript fails" do
-    subject.should_receive(:do_system).and_raise(Osaka::SystemCommandFailed)
-    lambda {subject.execute("Fuck off!")}.should raise_error(Osaka::ScriptRunnerError, "Error received while executing: Fuck off!")
+    subject.should_receive(:do_system).and_raise(Osaka::SystemCommandFailed.new("Message"))
+    expect {subject.execute("Fuck off!")}.to raise_error(Osaka::ScriptRunnerError, "Error received while executing: \"Fuck off!\" with message \"Message\"")
   end
   
   it "Should be able to execute an file containing applescript" do

data/spec/typicalapplication_spec.rb

@@ -7,7 +7,7 @@ describe "Osaka::TypicalApplication" do
   
   subject { Osaka::TypicalApplication.new("ApplicationName") }
   
-  let(:control) { subject.control = mock("RemoteControl", :name => "ApplicationName", :base_location => "", :mac_version => :mountain_lion) }
+  let(:control) { subject.control = mock("RemoteControl", :name => "ApplicationName", :base_location => "base", :mac_version => :mountain_lion) }
 
   before (:each) do
     Osaka::ScriptRunner.enable_debug_prints
@@ -41,20 +41,22 @@ describe "Osaka::TypicalApplication" do
       subject.control.current_window_name.should == "Original"
     end
   
+  end
+  
+  context "Opening and new document" do
+    
     it "Should pass the right open string to the application osascript" do
       filename = "filename.key"
       expect_tell("open \"#{File.absolute_path(filename)}\"")
+      subject.stub(:do_and_wait_for_new_window).and_yield.and_return(filename)
       expect_set_current_window(filename)
       subject.open(filename)    
     end
-  end
-  
-  context "Opening and new document" do
-    
+
     it "Should only get the basename of the filename when it sets the window title." do
       filename = "/root/dirname/filename.key"
-      expect_tell("open \"#{File.absolute_path(filename)}\"")
-      expect_set_current_window("filename.key")
+      subject.should_receive(:do_and_wait_for_new_window).and_return("filename")
+      expect_set_current_window("filename")
       subject.open(filename)        
     end
     
@@ -116,29 +118,50 @@ describe "Osaka::TypicalApplication" do
       expect_keystroke("s", :command)
       subject.save
     end
-  
+
     it "Should be able to save as a file without duplicate being available" do
+      subject.should_receive(:save_pops_up_dialog?).and_return(false)
       subject.should_receive(:duplicate_available?).and_return(false)
       
-      subject.should_receive(:save_dialog).and_return(save_dialog)
-      save_dialog.should_receive(:save).with("filename")
-      expect_set_current_window("filename")
+      expect_keystroke("s", [:command, :shift])
+      subject.should_receive(:wait_for_save_dialog_and_save_file).with("filename")
       
       subject.save_as("filename")
     end
 
     it "Should be able to save as a file using the duplicate..." do
+      subject.should_receive(:save_pops_up_dialog?).and_return(false)
       subject.should_receive(:duplicate_available?).and_return(true)
 
-      subject.stub_chain(:duplicate, :control, :clone).and_return(new_instance_control)
-      subject.should_receive(:close)
-      subject.stub_chain(:save_dialog, :save)
-      new_instance_control.should_receive(:set_current_window).with("filename")
-      
+      subject.should_receive(:duplicate_and_close_original)
+      subject.should_receive(:save)
+      subject.should_receive(:wait_for_save_dialog_and_save_file).with("filename")      
       subject.save_as("filename")
-      subject.control.should equal(new_instance_control)   
     end
-  
+    
+    it "Should be able to use normal Save when that pops up a dialog instead of save_as" do
+      subject.should_receive(:save_pops_up_dialog?).and_return(true)
+      subject.should_receive(:save)
+      subject.should_receive(:wait_for_save_dialog_and_save_file).with("filename")      
+      subject.save_as("filename")
+    end
+    
+    it "Should be able to wait for a save dialog and save the file" do
+      expect_wait_until_exists(at.sheet(1))
+      subject.should_receive(:create_dialog).with(Osaka::TypicalSaveDialog, at.sheet(1)).and_return(save_dialog)
+      save_dialog.should_receive(:save).with("/tmp/filename")
+      expect_set_current_window("filename")
+      subject.wait_for_save_dialog_and_save_file("/tmp/filename")
+    end
+    
+    
+    it "Should be able to duplicate and close the original document" do
+      subject.stub_chain(:duplicate, :control).and_return(new_instance_control)
+      subject.should_receive(:close)
+      subject.duplicate_and_close_original
+      subject.control.should equal(new_instance_control)
+    end
+    
     it "Should be able to check whether Duplicate is supported" do
       expect_exists?(at.menu_item("Duplicate").menu(1).menu_bar_item("File").menu_bar(1)).and_return(true)
       subject.duplicate_available?.should == true
@@ -146,7 +169,7 @@ describe "Osaka::TypicalApplication" do
   
     it "Should throw an exception when duplicate is not available"do
       subject.should_receive(:duplicate_available?).and_return(false)
-      lambda {subject.duplicate}.should raise_error(Osaka::VersioningError, "MacOS Versioning Error: Duplicate is not available on this Mac version")
+      expect {subject.duplicate}.to raise_error(Osaka::VersioningError, "MacOS Versioning Error: Duplicate is not available on this Mac version")
     end
 
     it "Should return a new keynote instance variable after duplication (Lion!)" do
@@ -177,20 +200,6 @@ describe "Osaka::TypicalApplication" do
       expect_exists?(at.menu_item("Save…").menu(1).menu_bar_item("File").menu_bar(1)).and_return(true)
       subject.save_pops_up_dialog?.should == true
     end
-
-    it "Should be able to retrieve a save dialog by using save as" do
-      subject.should_receive(:save_pops_up_dialog?).and_return(false)
-      expect_keystroke("s", [:command, :shift])
-      expect_wait_until_exists(at.sheet(1))
-      subject.save_dialog    
-    end
-
-    it "Should be able to retrieve a save dialog using duplicate and save" do
-      subject.should_receive(:save_pops_up_dialog?).and_return(true)
-      subject.should_receive(:save)
-      expect_wait_until_exists(at.sheet(1))
-      subject.save_dialog
-    end
     
   end
     
@@ -247,7 +256,7 @@ describe "Osaka::TypicalApplication" do
     end
   end
     
-  describe "Application info" do
+  context "Application info" do
     it "Should be able to retrieve an application info object and parse it" do
       expect_tell('get info for (path to application "ApplicationName")').and_return('name:ApplicationName.app, creation date:date "Sunday, December 21, 2008 PM 06:14:11"}')
       app_info = subject.get_info
@@ -255,4 +264,17 @@ describe "Osaka::TypicalApplication" do
     end
   end
   
+  context "Simple Application helpers to create objects" do
+    it "Should be able to create dialogs with a helper" do
+      Osaka::TypicalSaveDialog.should_receive(:new).with(control.name, at.sheet(1) + control.base_location)
+      subject.create_dialog(Osaka::TypicalSaveDialog, at.sheet(1))
+    end
+    
+    it "Should be able to create top level dialogs also with the helper" do
+      Osaka::TypicalSaveDialog.should_receive(:new).with(control.name, at.window("toplevel"))
+      subject.create_dialog(Osaka::TypicalSaveDialog, at.window("toplevel"))
+    end
+  end
+  
+  
 end

data/spec/typicalfinderdialog_spec.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+require 'osaka'
+
+describe "Osaka::TypicalFinderDialog" do
+  
+  include(*Osaka::OsakaExpectations)
+  subject { Osaka::TypicalFinderDialog.new("Application", at.window(1))}
+  let(:control) { subject.control = mock("RemoteControl", :base_location => at.window(1)) }
+  
+  
+  it "Should be able to set the path" do
+    expect_keystroke("g", [ :command, :shift ])
+    expect_wait_until_exists(at.sheet(1))
+    expect_set("value", at.text_field(1).sheet(1), "path")
+    expect_click(at.button("Go").sheet(1))
+    expect_wait_until_not_exists(at.sheet(1))
+    subject.set_folder("path")
+  end
+
+  it "Won't change the path when the path is the current one" do
+    control.should_not_receive(:keystroke)
+    subject.set_folder(".")
+  end
+  
+end

data/spec/typicalopendialog_spec.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+require 'osaka'
+
+describe "Osaka::TypicalOpenDialog" do
+  
+  include(*Osaka::OsakaExpectations)
+  subject { Osaka::TypicalOpenDialog.new("Application", at.window(1))}
+  let(:control) { subject.control = mock("RemoteControl", :base_location => at.window(1)) }
+  
+  
+  it "Should be do nothing when the amount of files in the directory is 0" do
+    subject.should_receive(:amount_of_files_in_list).and_return(0)
+    subject.select_file("filename")
+  end
+
+  it "Should be able to select a file from Row 1" do
+    subject.should_receive(:amount_of_files_in_list).and_return(1)
+    subject.should_receive(:filename_at).with(1).and_return("filename")
+    subject.should_receive(:select_file_by_row).with(1)
+    subject.should_receive(:click_open)
+    
+    subject.select_file("filename")
+  end
+
+  it "Should be able to select a file from Row 3" do
+    subject.should_receive(:amount_of_files_in_list).and_return(3)
+    subject.should_receive(:filename_at).and_return("filename", "filename2", "filename3")
+    subject.should_receive(:select_file_by_row).with(3)
+    subject.should_receive(:click_open)
+    
+    subject.select_file("filename3")
+  end
+  
+  it "Should be able to click open" do
+    expect_click(at.button("Open"))
+    subject.click_open
+  end
+  
+
+  it "Should be able to get the name of a file from a row" do
+    subject.should_receive(:field_location_from_row).and_return(at.window("Location"))
+    expect_get!("value", at.window("Location")).and_return("filename")
+    subject.filename_at(1).should == "filename"
+  end
+  
+  it "Should be able to select the filename (when that is possible)" do
+    subject.should_receive(:greyed_out?).and_return(false)
+    expect_set!("selected", at.row(1) + subject.file_list_location, true)
+    subject.select_file_by_row(1)
+  end
+  
+  it "Should throw an exception when the filename that we want to select is greyed out" do
+    subject.should_receive(:greyed_out?).and_return(true)
+    expect { subject.select_file_by_row(1)}.to raise_error(Osaka::OpenDialogCantSelectFile, "Tried to select a file, but it either doesn't exist or is greyed out")
+  end
+
+  it "Should be able to get the amount of files in the current file list" do
+    expect_get!("rows", subject.file_list_location).and_return("row 1 of outline 1 of scroll area 2 of splitter group 1 of group 1 of window Open of application process Pages")
+    subject.amount_of_files_in_list.should == 1
+  end
+  
+  it "Should be able to get the amount of files in the current file list with 2 files." do
+    expect_get!("rows", subject.file_list_location).and_return("row 1 of outline 1 of scroll area 2 of splitter group 1 of group 1 of window Open of application process Pages, row 2 of outline 1 of scroll area 2 of splitter group 1 of group 1 of window Open of application process Pages")
+    subject.amount_of_files_in_list.should == 2    
+  end
+  
+  it "Should be able to get the amount of files in the current file list when there are no files..." do
+    expect_get!("rows", subject.file_list_location).and_return("")
+    subject.amount_of_files_in_list.should == 0
+  end  
+    
+  it "Should be able to convert a row into a location when it is a text field" do
+    expect_exists?(subject.text_field_location_from_row(1)).and_return(true)
+    subject.field_location_from_row(1).should == subject.text_field_location_from_row(1)
+  end
+  
+  it "Should be able to convert a row into a location when it is a static field." do
+    expect_exists?(subject.text_field_location_from_row(1)).and_return(false)
+    subject.field_location_from_row(1).should == subject.static_field_location_from_row(1)    
+  end
+  
+  it "Should be able to get the location of the list" do
+    subject.file_list_location.should == at.outline(1).scroll_area(2).splitter_group(1).group(1)
+  end
+end

data/spec/typicalsavedialog_spec.rb

@@ -10,7 +10,6 @@ describe "Osaka::TypicalSaveDialog" do
   it "Should set the filename in the test field" do
     subject.should_receive(:set_filename).with("filename")
     subject.should_receive(:click_save)
-    subject.should_not_receive(:set_folder)
     subject.save("filename")
   end
   
@@ -39,13 +38,5 @@ describe "Osaka::TypicalSaveDialog" do
     subject.set_filename("filename")
   end
   
-  it "Should be able to set the path" do
-    expect_keystroke("g", [ :command, :shift ])
-    expect_wait_until_exists(at.sheet(1))
-    expect_set("value", at.text_field(1).sheet(1), "path")
-    expect_click(at.button("Go").sheet(1))
-    expect_wait_until_not_exists(at.sheet(1))
-    subject.set_folder("path")
-  end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: osaka
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Bas Vodde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-22 00:00:00 +08:00
+date: 2012-11-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,8 @@ files:
 - lib/osaka/scriptrunner.rb
 - lib/osaka/textedit.rb
 - lib/osaka/typicalapplication.rb
+- lib/osaka/typicalfinderdialog.rb
+- lib/osaka/typicalopendialog.rb
 - lib/osaka/typicalprintdialog.rb
 - lib/osaka/typicalsavedialog.rb
 - lib/osaka/version.rb
@@ -66,8 +68,6 @@ files:
 - spec/assets/01_first_slides.key
 - spec/assets/02_second_slides.key
 - spec/assets/03_third_slides.key
-- spec/assets/mail_merge_data.numbers
-- spec/assets/mail_merge_template.pages
 - spec/calculator_spec.rb
 - spec/integration_calculator_spec.rb
 - spec/integration_keynote_spec.rb
@@ -84,6 +84,8 @@ files:
 - spec/scriptrunner_spec.rb
 - spec/textedit_spec.rb
 - spec/typicalapplication_spec.rb
+- spec/typicalfinderdialog_spec.rb
+- spec/typicalopendialog_spec.rb
 - spec/typicalprintdialog_spec.rb
 - spec/typicalsavedialog_spec.rb
 has_rdoc: true