osaka 0.4.2 → 0.4.4

data/lib/osaka.rb

@@ -7,12 +7,19 @@ require 'osaka/typicalfinderdialog'
 require 'osaka/typicalopendialog'
 require 'osaka/typicalsavedialog'
 require 'osaka/typicalprintdialog'
+
+#Specific application
 require 'osaka/pages'
 require 'osaka/numbers'
 require 'osaka/keynote'
 require 'osaka/calculator'
 require 'osaka/textedit'
+require 'osaka/preview'
+
+# Automation flots
 require 'osaka/mailmergeflow'
 require 'osaka/keynoteflow'
+
+# RSpec helpers
 require 'osaka/osakaexpectations'
 

data/lib/osaka/mailmergeflow.rb

@@ -2,21 +2,17 @@
 module CommonFlows
   
   def self.number_and_pages_mail_merge(numbers_file, pages_file, output_file)
-    numbers = Osaka::Numbers.new
-    pages = Osaka::Pages.new
-    
-    numbers.open(numbers_file)
-    yield numbers if block_given?
-    numbers.save
     
+    if block_given?
+      Osaka::Numbers.create_document(numbers_file) { |numbers|
+        yield numbers         
+      }      
+    end
+
+    pages = Osaka::Pages.new
     pages.open(pages_file)
     pages.mail_merge_to_pdf(output_file)
-    
-    numbers.close(:dont_save)
     pages.close(:dont_save)
-
-    numbers.quit(:dont_save)
     pages.quit(:dont_save)
-    
   end
 end

data/lib/osaka/numbers.rb

@@ -1,5 +1,16 @@
 
 module Osaka
+  
+  class Location
+    def cell(name)
+      create_location_with_added_name("cell", name)
+    end
+
+    def table(name)
+      create_location_with_added_name("table", name)
+    end
+  end
+  
   class Numbers < TypicalApplication
   
     def initialize
@@ -13,17 +24,25 @@ module Osaka
       })
     end
     
-    def self.create_document(filename)
+    def self.create_document(filename, &block)
       numbers = Osaka::Numbers.new
-      numbers.new_document
-      yield numbers
-      numbers.save_as(filename)
-      numbers.close
+      numbers.create_document(filename, &block)
     end
     
     def fill_cell(column, row, value)
+      if (column > column_count)
+        set_column_count(column)
+      end
       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
     
+    def column_count
+      control.tell("tell document 1; tell sheet 1; tell table 1; get column count; end tell; end tell; end tell").to_i
+    end
+    
+    def set_column_count(amount)
+      control.tell("tell document 1; tell sheet 1; tell table 1; set column count to #{amount}; end tell; end tell; end tell")
+    end
+    
   end
 end

data/lib/osaka/pages.rb

@@ -77,6 +77,11 @@ module Osaka
       control.keystroke(text)
     end
   
+    def self.create_document(filename, &block)
+      numbers = Osaka::Pages.new
+      numbers.create_document(filename, &block)
+    end
+  
     def set_mail_merge_document(filename)
       inspector.change_mail_merge_source
       control.wait_until_exists(at.sheet(1))

data/lib/osaka/preview.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+module Osaka
+  
+  class Preview < TypicalApplication
+    
+    attr_accessor :control
+    
+    def initialize
+      super "Preview"
+    end
+    
+    def pdf_content
+      control.get!("value", at.static_text(1).scroll_area(1).splitter_group(1))
+    end
+    
+    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))
+      }
+      control.set_current_window(new_window)
+    end
+    
+  end
+end

data/lib/osaka/typicalapplication.rb

@@ -83,6 +83,13 @@ module Osaka
       control.focus
     end
     
+    def create_document(filename)
+      new_document
+      yield self
+      save_as(filename)
+      close
+    end
+    
     def duplicate_available?
       control.exists?(at.menu_item("Duplicate").menu(1).menu_bar_item("File").menu_bar(1))
     end

data/lib/osaka/typicalfinderdialog.rb

@@ -10,9 +10,9 @@ module Osaka
   
     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)
+      sleep(1) # Seems this must be here due to the sucking Apple UI. Not found something else to wait for!
       control.click(at.button("Go").sheet(1)).wait_until_not_exists(at.sheet(1))
     end
   end

data/lib/osaka/typicalopendialog.rb

@@ -36,7 +36,7 @@ module Osaka
     
     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)
+      control.set!("selected", at.row(row) + file_list_location, true)
     end
       
     def amount_of_files_in_list
@@ -49,11 +49,12 @@ module Osaka
       control.get!("value", field_location_from_row(row))
     end
       
-    def select_file(filename)
+    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
+          return
         end
       }
     end

data/lib/osaka/version.rb

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

data/spec/integration_numbers_spec.rb

@@ -0,0 +1,17 @@
+require 'tmpdir'
+require 'osaka'
+
+describe "Integration tests for Numbers" do
+  
+  it "Should be able to fill in large index cells" do
+    
+    Dir.mktmpdir { |dir|
+      
+      Osaka::Numbers.create_document(File.join(dir, "temp.numbers")) { |doc|
+        doc.fill_cell(12, 1, "Data")
+      }
+    }
+    
+  end
+  
+end

data/spec/integration_pages_numbers_mail_merge_spec.rb

@@ -17,23 +17,26 @@ describe "Integration of mail merge flow with Pages and Numbers" do
   
   it "Should mail merge the assets and generate a PDF" do
 
-    Osaka::Numbers.create_document (@numbers_filename) { |doc|
+    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
-    
+    Osaka::Pages.create_document(@pages_template_filename) { |doc|
+      doc.set_mail_merge_document(@numbers_filename)
+      doc.type("Hello World! This is pages. We're going to mail merge!\r\r")    
+      doc.mail_merge_field("Data");
+    }
+        
     CommonFlows::number_and_pages_mail_merge(@numbers_filename, @pages_template_filename, @pdf_output_file)
     File.exists?(@pdf_output_file).should == true
+    
+    preview = Osaka::Preview.new
+    preview.open(@pdf_output_file)
+    preview.pdf_content.should include("Hello World")
+    preview.close
+    preview.quit
   end
 end

data/spec/mailmergeflow_spec.rb

@@ -7,19 +7,15 @@ describe "Mail Merge to PDF common flow" do
   let(:mock_pages) { mock("Pages") }
 
   it "Should do a good mail merge with Pages and Keynote flow" do
-    Osaka::Numbers.should_receive(:new).and_return(mock_numbers)
+    
+    Osaka::Numbers.should_receive(:create_document).with("/template/numbers").and_yield(mock_numbers)
+    
     Osaka::Pages.should_receive(:new).and_return(mock_pages)
     
-    mock_numbers.should_receive(:open).with("/template/numbers")    
-    mock_numbers.should_receive(:save)
-
     mock_pages.should_receive(:open).with("/template/pages")
     mock_pages.should_receive(:mail_merge_to_pdf).with("/output/file.pdf")
-
-    mock_numbers.should_receive(:close).with(:dont_save)
-    mock_pages.should_receive(:close).with(:dont_save)
     
-    mock_numbers.should_receive(:quit).with(:dont_save)
+    mock_pages.should_receive(:close).with(:dont_save)    
     mock_pages.should_receive(:quit).with(:dont_save)
     
     CommonFlows.number_and_pages_mail_merge("/template/numbers", "/template/pages", "/output/file.pdf") {}
@@ -28,7 +24,7 @@ describe "Mail Merge to PDF common flow" do
   it "Should yield for filling in the numbers fields" do
     mock_numbers.as_null_object
     mock_pages.as_null_object
-    Osaka::Numbers.should_receive(:new).and_return(mock_numbers)
+    Osaka::Numbers.should_receive(:create_document).and_yield(mock_numbers)
     Osaka::Pages.should_receive(:new).and_return(mock_pages)
 
     retrieved_numbers = nil

data/spec/numbers_spec.rb

@@ -8,11 +8,30 @@ describe "Osaka::Numbers" do
   subject { Osaka::Numbers.new }  
   let(:control) { subject.control = mock("RemoteControl").as_null_object}
   
-  it "Should be able to fill in data in cells" do
+  it "Should be able to get the column count" do
+    expect_tell('tell document 1; tell sheet 1; tell table 1; get column count; end tell; end tell; end tell').and_return("10")
+    subject.column_count.should == 10
+  end
+  
+  it "Should be able to set the column count to a certain value" do
+    expect_tell('tell document 1; tell sheet 1; tell table 1; set column count to 10; end tell; end tell; end tell')
+    subject.set_column_count(10)
+  end
+  
+  it "Should be able to fill in data in cells" do 
+    subject.should_receive(:column_count).and_return(10)
     expect_tell('tell document 1; tell sheet 1; tell table 1; set value of cell 1 of row 2 to "30"; end tell; end tell; end tell')
     subject.fill_cell(1, 2, "30")
   end
   
+  it "Will change the column count when the cell is outside of the range of the current column count" do
+    subject.should_receive(:column_count).and_return(5)
+    subject.should_receive(:set_column_count).with(6)
+    expect_tell('tell document 1; tell sheet 1; tell table 1; set value of cell 6 of row 2 to "30"; end tell; end tell; end tell')
+    subject.fill_cell(6, 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")
@@ -22,20 +41,12 @@ describe "Osaka::Numbers" do
     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)
+  it "Should be able to use a class method for creating documents quickly" do
+      Osaka::Numbers.should_receive(:new).any_number_of_times.and_return(mock("App"))
+      subject.should_receive(:create_document)
 
-    Osaka::Numbers.create_document("filename") { |doc|
-      doc.method_call_from_code_block
-    }
-    
+      Osaka::Numbers.create_document("filename") { |doc|
+      }    
   end
-  
-  
-  
+    
 end

data/spec/pages_spec.rb

@@ -14,10 +14,17 @@ describe "Osaka::Pages" do
     it "Should be able to type in the file" do
       expect_keystroke("Hello")
       subject.type("Hello")
-    end
-    
+    end  
   end
   
+  it "Should be able to use a class method for creating documents quickly" do
+      Osaka::Pages.should_receive(:new).any_number_of_times.and_return(mock("App"))
+      subject.should_receive(:create_document)
+
+      Osaka::Pages.create_document("filename") { |doc|
+      }    
+  end
+    
   it "Should be able to do mail merge to a PDF flow" do
     
     mail_merge_dialog = mock("Pages Mail Merge Dialog")

data/spec/preview_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'osaka'
+
+describe "Preview application for reading PDFs" do
+  
+  include(*Osaka::OsakaExpectations)
+
+  subject { Osaka::Preview.new }
+  let(:control) { subject.control = mock("RemoteControl", :mac_version => :mountain_lion)}
+
+  it "Can get the text context of a PDF document" do
+    expect_get!("value", at.static_text(1).scroll_area(1).splitter_group(1)).and_return("Blah")
+    subject.pdf_content.should == "Blah"
+  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")
+    expect_set_current_window("window name")
+
+    subject.open("dir/filename")
+  end
+  
+end

data/spec/typicalapplication_spec.rb

@@ -68,6 +68,18 @@ describe "Osaka::TypicalApplication" do
       subject.new_document
     end
     
+    it "Should be able to easily create a document, put something, save it, and close it again" do
+
+      subject.should_receive(:new_document)
+      subject.should_receive(:method_call_from_code_block)
+      subject.should_receive(:save_as).with("filename")
+      subject.should_receive(:close)
+
+      subject.create_document("filename") { |doc|
+        doc.method_call_from_code_block
+      }
+    end
+    
   end
   
   context "Quiting and closing and checking whether the app is still running" do

data/spec/typicalopendialog_spec.rb

@@ -23,7 +23,7 @@ describe "Osaka::TypicalOpenDialog" do
   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(:amount_of_files_in_list).and_return(10)
     subject.should_receive(:filename_at).and_return("filename", "filename2", "filename3")
     subject.should_receive(:select_file_by_row).with(3)
     subject.should_receive(:click_open)

metadata

@@ -2,7 +2,7 @@
 name: osaka
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors: 
 - Bas Vodde
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-17 00:00:00 +08:00
+date: 2012-12-05 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/osaka/numbers.rb
 - lib/osaka/osakaexpectations.rb
 - lib/osaka/pages.rb
+- lib/osaka/preview.rb
 - lib/osaka/remotecontrol.rb
 - lib/osaka/scriptrunner.rb
 - lib/osaka/textedit.rb
@@ -71,6 +72,7 @@ files:
 - spec/calculator_spec.rb
 - spec/integration_calculator_spec.rb
 - spec/integration_keynote_spec.rb
+- spec/integration_numbers_spec.rb
 - spec/integration_pages_numbers_mail_merge_spec.rb
 - spec/integration_textedit_spec.rb
 - spec/keynote_flows_spec.rb
@@ -80,6 +82,7 @@ files:
 - spec/numbers_spec.rb
 - spec/osakaexpectations_spec.rb
 - spec/pages_spec.rb
+- spec/preview_spec.rb
 - spec/remotecontrol_spec.rb
 - spec/scriptrunner_spec.rb
 - spec/textedit_spec.rb