osaka 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98f479a2e3a76f17e9727eacb616a4668126f06
-  data.tar.gz: 2cc8d297e7bc54fa57120ba557988582ffc27874
+  metadata.gz: f35e5efb876b09d8cb875ab2a27f0e6b6f1a0fca
+  data.tar.gz: 9048faf743ba238257751678a6592acf4c49b2ea
 SHA512:
-  metadata.gz: f269e4e1d5fbf49387ffe48a7adfec8881f221e13b73800d550b9da99809af18bbc1e401f281ede9b9462588e97f21407acd2b0a4c81318e8815e0e9f27380be
-  data.tar.gz: f8ad1bf37387d5b294c7d86e39cd7aaf2e7fc104743abb1eb6c994d5a76d245a25228cfdabe4744b8c11f4436187161b67baa2f052da5e1a5750a4e6b513c641
+  metadata.gz: 9e7bd9f36d4bdc7492965cbdcb742fcac627fd7e091d6f614e1458ceae25ac3a14ced4a0a460b702a86808dca4d017811f269950d1a84d827f41ff98b4bf055f
+  data.tar.gz: ed0e9e6ee4310cd7ff794047d917cc2ddc307fb3e1140d35a76d15c7ed63ba5117b8a87a5682c550b225b7d469a85c07e134ddd2f4442ddaea35991dc2b0e710

data/lib/osaka/osakaexpectations.rb

@@ -132,5 +132,9 @@ module Osaka
     def expect_until_not_exists!(element)
       expect(control).to receive(:until_not_exists!).with(element).and_yield
     end
+
+    def expect_mac_version_before(version_name)
+      expect(control).to receive(:mac_version_before).with(version_name)
+    end
   end
 end

data/lib/osaka/preview.rb

@@ -1,19 +1,23 @@
 # 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))
+      if control.mac_version_before(:el_capitain)
+        control.get!("value", at.static_text(1).scroll_area(1).splitter_group(1))
+      else
+        control.get!("value", at.static_text(1).group(1).scroll_area(1).splitter_group(1))
+      end
     end
-    
+
     def open(filename)
       control.click_menu_bar(at.menu_item("Open…"), "File").wait_until_exists(at.window("Open"))
       new_window = do_and_wait_for_new_window {
@@ -21,6 +25,6 @@ module Osaka
       }
       control.set_current_window(new_window)
     end
-    
+
   end
 end

data/lib/osaka/remotecontrol.rb

@@ -245,9 +245,8 @@ module Osaka
       @base_location.to_s.empty? || window_list.index(current_window_name).nil?
     end
 
-    def mac_version
-      @mac_version_string ||= Osaka::ScriptRunner.execute("system version of (system info)").strip
-      @mac_version ||= case @mac_version_string
+    def mac_version_string_to_name(mac_version_string)
+      case mac_version_string
         when /^10.6.*/
           :snow_leopard
         when /^10.7.*/
@@ -256,15 +255,43 @@ module Osaka
           :mountain_lion
         when /^10.10.*/
           :yosemite
+        when /^10.11.*/
+          :el_capitain
         else
           :other
-        end
+      end
+    end
+
+    def mac_version_name_to_number(mac_version_name)
+      case mac_version_name
+        when :snow_leopard
+          10.6
+        when :lion
+          10.7
+        when :mountain_lion
+          10.8
+        when :yosemite
+          10.10
+        when :el_capitain
+          10.11
+        else
+          :other
+      end
+    end
+
+    def mac_version
+      mac_version_string_to_name(mac_version_string)
+    end
 
+    def mac_version_before(mac_version_name)
+      current_mac_version_string = Osaka::ScriptRunner.execute("system version of (system info)").strip
+      current_mac_version_number = mac_version_name_to_number(mac_version_string_to_name(current_mac_version_string))
+      before_mac_version_number = mac_version_name_to_number(mac_version_name)
+      current_mac_version_number < before_mac_version_number
     end
 
     def mac_version_string
-      mac_version
-      @mac_version_string
+      Osaka::ScriptRunner.execute("system version of (system info)").strip
     end
 
 

data/lib/osaka/version.rb

@@ -1,4 +1,4 @@
 
 module Osaka
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

data/spec/defaultssystem_spec.rb

@@ -2,9 +2,9 @@
 require 'osaka'
 
 describe "Wrapper around the defaults app which can be used for storing and retrieving preferences" do
-  
+
   before (:each) do
-    @worldclock_widget = <<-END_OF_DUMP  
+    @worldclock_widget = <<-END_OF_DUMP
 {
     "0000000000000002-city" = 44;
     "0000000000000002-continent" = 1;
@@ -13,18 +13,18 @@ describe "Wrapper around the defaults app which can be used for storing and retr
 }
 END_OF_DUMP
   end
-  
+
   it "Can retrieve the settings from a domain (A domain is usually an application)" do
     expect(Osaka::CommandRunner).to receive(:run).with("defaults read widget-com.apple.widget.worldclock").and_return(@worldclock_widget)
     settings = DefaultsSystem.new("widget-com.apple.widget.worldclock")
     expect(settings["city"]).to eq "44"
   end
-  
+
   it "Can set settings on a domain" do
     expect(Osaka::CommandRunner).to receive(:run).with("defaults read com.osaka").and_return(@worldclock_widget)
-    expect(Osaka::CommandRunner).to receive(:run).with("defaults write com.osaka key value").and_return(@worldclock_widget)    
+    expect(Osaka::CommandRunner).to receive(:run).with("defaults write com.osaka key value").and_return(@worldclock_widget)
     settings = DefaultsSystem.new("com.osaka")
     settings["key"] = "value"
   end
-  
+
 end

data/spec/integration_preview_spec.rb

@@ -7,9 +7,10 @@ describe "Integration tests for Preview", :integration => true do
   end
 
   it "Should be able to open a file and check if there is a certain text" do
+    Osaka::ScriptRunner::enable_debug_prints
     preview = Osaka::Preview.new
     preview.open(File.join(@assets_directory, "document.pdf"))
-    expect(preview.pdf_content).to include("Jamaica")
+    expect(preview.pdf_content).to include("Hungary")
     preview.close
     preview.quit
   end

data/spec/preview_spec.rb

@@ -2,26 +2,32 @@
 require 'osaka'
 
 describe "Preview application for reading PDFs" do
-  
+
   include(*Osaka::OsakaExpectations)
 
   subject { Osaka::Preview.new }
   let(:control) { subject.control = double("RemoteControl", :mac_version => :mountain_lion)}
 
-  it "Can get the text context of a PDF document" do
+  it "Can get the text context of a PDF document (pre el capitain)" do
+    expect_mac_version_before(:el_capitain).and_return(true)
     expect_get!("value", at.static_text(1).scroll_area(1).splitter_group(1)).and_return("Blah")
     expect(subject.pdf_content).to eq "Blah"
   end
-  
+
+  it "Can get the text context of a PDF document (post el capitain)" do
+    expect_mac_version_before(:el_capitain).and_return(false)
+    expect_get!("value", at.static_text(1).group(1).scroll_area(1).splitter_group(1)).and_return("Blah")
+    expect(subject.pdf_content).to eq "Blah"
+  end
+
   it "Can open a PDF file via the menu instead of the AppleScript 'open' as that one is buggy" do
-    
     expect_click_menu_bar(at.menu_item("Open…"), "File")
     expect_wait_until_exists(at.window("Open"))
-    expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("window name")    
+    expect(subject).to receive(:do_and_wait_for_new_window).and_yield.and_return("window name")
     expect(subject).to receive(:select_file_from_open_dialog).with("dir/filename", at.window("Open"))
     expect_set_current_window("window name")
 
     subject.open("dir/filename")
   end
-  
+
 end

data/spec/remotecontrol_spec.rb

@@ -38,6 +38,10 @@ describe "Osaka::RemoteControl" do
     it "Can get the OS version (lion)" do
       expect_execute_osascript("system version of (system info)").and_return("10.7.4\n")
       expect(subject.mac_version).to eq :lion
+    end
+
+    it "Can get the OS version (lion) string" do
+      expect_execute_osascript("system version of (system info)").and_return("10.7.4\n")
       expect(subject.mac_version_string).to eq "10.7.4"
     end
 
@@ -51,10 +55,25 @@ describe "Osaka::RemoteControl" do
       expect(subject.mac_version).to eq :snow_leopard
     end
 
-    it "Can get the OS version (snow leopard)" do
+    it "Can get the OS version (el capitain)" do
+      expect_execute_osascript("system version of (system info)").and_return("10.11\n")
+      expect(subject.mac_version).to eq :el_capitain
+    end
+
+    it "Can get the OS version (other)" do
       expect_execute_osascript("system version of (system info)").and_return("1\n")
       expect(subject.mac_version).to eq :other
     end
+
+    it "OSVersion in before a certain version" do
+      expect_execute_osascript("system version of (system info)").and_return("10.10\n")
+      expect(subject.mac_version_before(:el_capitain)).to eq true
+    end
+
+    it "OSVersion in before a certain version" do
+      expect_execute_osascript("system version of (system info)").and_return("10.11\n")
+      expect(subject.mac_version_before(:el_capitain)).to eq false
+    end
   end
 
   context "Able to compare different remote controls" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osaka
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Bas Vodde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake