lebowski 0.3.3.pre.0 → 0.4.0

data/History.md

@@ -1,3 +1,11 @@
+# lebowski 0.4.0 August 16, 2011
+
+* Updated all foundation SC proxies to work with SC 1.5 and 1.6
+* Changed the gem build process. Now using the lebowski.gemspec file. No longer use Jeweler
+* Removed Selenium 1 dependency. Now uses Selenium 2
+* Fixed the user-extensions.js file to allow Lebowski to work with SC 1.5 and SC 1.6
+* Updated various spec files in the examples folder
+
 # lebowski 0.3.3.pre.0 March 13, 2011
 
 * Initial Fixes to allow Lebowski to work with IE 7/8. Updates made to user-extensions.js file

data/bin/lebowski-spec

@@ -14,7 +14,7 @@ if ARGV.length == 0
   exit
 end
 
-gem 'rspec', "~> 2.1.0"
+gem 'rspec', ">= 2.1.0"
 require 'rspec'
 
 gem 'lebowski'

data/bin/lebowski-start-server

@@ -4,21 +4,199 @@
 # Executable to start the selenium server that will automically include
 # the required extension file
 #
+# To get help use the -h or --help option:
+#
+#   lebowski-start-server -h
+#
+
+# TODO: Put this together quickly. Needs to be refactored at some point.
+
+require 'open-uri'
+require 'optparse'
 
+SELENIUM_NAME = 'Selenium'
+SELENIUM_VERSION = '2.3.0'
+SELENIUM_JAR = "selenium-server-standalone-#{SELENIUM_VERSION}.jar"
+SELENIUM_DOMAIN = 'http://selenium.googlecode.com'
+SELENIUM_JAR_URL = "#{SELENIUM_DOMAIN}/files/#{SELENIUM_JAR}"
+LEBOWSKI_PATH = File.join(Dir.home, ".lebowski")
+SELENIUM_JAR_PATH = File.join(LEBOWSKI_PATH, SELENIUM_JAR)
+ERROR_MSG_PREFIX = "Unable to run lebowski-server. "
 DEFAULT_SELENIUM_SERVER_PORT = 4444
+USER_EXTENTIONS_FILE = 'user-extensions.js'
+RESOURCES_DIR_PATH = File.expand_path(File.join(File.dirname(__FILE__), %w[.. resources]))
+USER_EXTENTIONS_PATH = File.join(RESOURCES_DIR_PATH, USER_EXTENTIONS_FILE)
+
+$selenium_args = []
+$verbose = false
+$help = false
+$selenium_server_help = false
+$selenium_jar = nil
+$port = DEFAULT_SELENIUM_SERVER_PORT
+
+$optparser = OptionParser.new do |o|
+  o.banner = <<BANNER
+Usage: lebowski-start-server [options]
+
+  To pass options on to the selenium server, prefix each option with --S. If an
+  option requires an argument then use = to specify the argument.
+  Example: lebowski-start-server --Sinteractive --Stimeout=1000 
 
-port = DEFAULT_SELENIUM_SERVER_PORT
+BANNER
 
-ARGV.each_with_index do |arg, index|
-  port = ARGV[index + 1] if arg == '-port' and (index + 1) < ARGV.count 
+  o.on('-p ARG', '--port=ARG', "Specify the server port. Default is #{DEFAULT_SELENIUM_SERVER_PORT}", Integer) do |val|
+    $port = val
+  end
+    
+  o.on('-s ARG', '--selenium-jar=ARG', "Specify a path to the Selenium JAR") do |val| 
+    $selenium_jar = File.expand_path val
+  end
+    
+  o.on('-v', '--verbose', "Turn on verbose mode") do |val|
+    $verbose = true
+  end
+  
+  o.on(nil, '--selenium-help', "Show Selenium server help") do |val|
+    $selenium_server_help = true
+  end
+    
+  o.on('-h', '--help', "Show help") do |val| 
+    $help = true
+  end
+
+end
+
+def verbose(msg, newline=true)
+  return if not $verbose
+  
+  if newline
+    puts msg
+  else
+    print msg
+  end   
 end
 
-puts "Running Selenium Server for Lebowski"
-puts "Starting server on http://localhost:#{port}"
-puts "To quit server, press Control-C"
+def error(msg)
+  puts "#{ERROR_MSG_PREFIX} #{msg}"
+end
+
+def setup_selenium
+  
+  if not $selenium_jar.nil? 
+    if File.directory? $selenium_jar
+      error "-s requires path to file"
+      return false
+    elsif File.file? $selenium_jar
+      verbose "Detected Selenium server at #{$selenium_jar}"
+      return true
+    else
+      error "Could not detect Selenium server at #{$selenium_jar}"
+      return false
+    end
+  end
+  
+  if File.file? SELENIUM_JAR_PATH
+    verbose "Detected Selenium."
+    $selenium_jar = SELENIUM_JAR_PATH
+    return true
+  end
+  
+  puts "Could not detect Selenium server. Required by Lebowski to function."
+  puts "Continue by downloading Selenium server? Enter 'yes' to download."
+  print "> "
+  result = STDIN.gets
+
+  if result.chomp != 'yes'
+    puts "Selenium server can be download from #{SELENIUM_DOMAIN}" 
+    return false
+  end
+  
+  verbose "Checking if #{LEBOWSKI_PATH} exists... ", false
+  if not Dir.exists? LEBOWSKI_PATH
+    verbose "Does not exist. Creating."
+    Dir.mkdir LEBOWSKI_PATH
+  else 
+    verbose "Exists."
+  end
+  
+  puts "Downloading Selenium server v#{SELENIUM_VERSION} from #{SELENIUM_DOMAIN}..."
 
-resources_dir = File.expand_path(File.join(File.dirname(__FILE__), %w[.. resources]))
-selenium_server =  File.join(resources_dir, 'selenium-server.jar')
-user_extensions =  File.join(resources_dir, 'user-extensions.js')
+  stream = nil
+  begin
+    stream = open(SELENIUM_JAR_URL)
+    puts "Selenium server download successfully."
+  rescue Exception
+    error "Error trying to download Selenium server"
+    return false
+  end
+  
+  begin
+    selenium = File.new(SELENIUM_JAR_PATH, 'wb')
+    selenium.write stream.read
+    selenium.flush
+    selenium.close
+  rescue Exception
+    error "Error trying to create Selenium server"
+    return false
+  end
+  
+  $selenium_jar = SELENIUM_JAR_PATH
+  
+  return true
+  
+end
+
+def process_options
+  
+  args = []
+  
+  # Pre-process command arguments
+  ARGV.each do |arg|
+    matches = arg.match(/--S(.+)($|=(.+))/)
+    if not matches.nil?
+      $selenium_args << "-" + matches[1]
+      if not matches[3].nil? 
+        $selenium_args << matches[3]
+      end
+    else
+      args << arg
+    end
+  end
+
+  begin
+    $optparser.parse args
+  rescue Exception => e
+    error e.to_s
+    return false
+  end
+  
+  return true
+  
+end
+
+def run_selenium_server
+  $selenium_args << '-port'
+  $selenium_args << $port.to_s
+  $selenium_args << '-help' if $selenium_server_help
+
+  puts "Running Selenium Server v#{SELENIUM_VERSION} for Lebowski"
+  puts "Starting server on http://localhost:#{$port}"
+  puts "To quit server, press Control-C"
+
+  exec 'java', '-jar', $selenium_jar, '-userExtensions', USER_EXTENTIONS_PATH, *$selenium_args
+end
+
+def main
+
+  return if not process_options
+  
+  if $help
+    puts $optparser.to_s
+    return
+  end
+
+  run_selenium_server if setup_selenium
+  
+end
 
-exec 'java', '-jar', selenium_server, '-userExtensions', user_extensions, *ARGV
+main

data/lib/lebowski/foundation/application.rb

@@ -57,6 +57,10 @@ module Lebowski
         return self['$SC.RootResponder.responder.keyPane', expected_type]
       end
       
+      def menu_pane(expected_type=nil)
+        return self['$SC.RootResponder.responder.menuPane', expected_type]
+      end
+      
       def responding_panes()
         if @responding_panes.nil?
           @responding_panes = ObjectArray.new self, '$SC.RootResponder.responder.panes'
@@ -236,6 +240,9 @@ module Lebowski
       SAFARI = '*safari'
       FIREFOX = '*firefox'
       CHROME = '*chrome'
+      IEXPLORER = '*iexplore'
+      IEHTA = '*iehta'
+      GOOGLECHROME = '*googlechrome'
       
       DEFAULT_BROWSER = FIREFOX
       DEFAULT_SELENIUM_SERVER_HOST = 'localhost'
@@ -424,7 +431,9 @@ module Lebowski
       def get_application_base_url(params)
         client = get_selenium_client(params) 
         return client.browser_url if (not client.nil?)
-        return "http://#{get_app_server_host(params)}:#{get_app_server_port(params)}"
+        host = get_app_server_host(params)
+        host = "http://#{host}" if not host =~ /^http(|s):\/\//
+        return "#{host}:#{get_app_server_port(params)}"
       end
       
       def get_session_id(params)
@@ -448,6 +457,12 @@ module Lebowski
           return SAFARI
         when :chrome
           return CHROME
+        when :iexplorer
+          return IEXPLORER
+        when :iehta
+          return IEHTA
+        when :googlechrome
+          return GOOGLECHROME
         else
           return DEFAULT_BROWSER
         end

data/lib/lebowski/foundation/mixins/list_item_view_support.rb

@@ -35,7 +35,7 @@ module Lebowski
             :mouse_offset_x => :center, 
             :mouse_offset_y => :center
           }
-          source.drag_to self, (self.width / 2).floor, row_height - 2, params
+          source.drag_to self, (self.width / 2).floor, row_height, params
         end
         
         def row_height()

data/lib/lebowski/foundation/mixins/stall_support.rb

@@ -16,13 +16,9 @@ module Lebowski
       #
       module StallSupport
     
-        DEFAULT_STALL = 0.2
+        DEFAULT_STALL = 0
     
-        DEFAULT_KEY_STALLS = {
-          :click => 0.2,
-          :double_click => 0.5,
-          :select => 0.5
-        }
+        DEFAULT_KEY_STALLS = {}
       
         @@adjusted_default_stall = DEFAULT_STALL
       

data/lib/lebowski/foundation/mixins/user_actions.rb

@@ -232,23 +232,26 @@ module Lebowski
           @driver.sc_disable_all_autoscrolling
           
           mouse_down_at mouse_offset_x, mouse_offset_y
+          
+          # Need to incoporate an intentional sleep so sproutcore
+          # has enough time to do its thing
+          sleep 0.2
+          
           mouse_move_at mouse_offset_x, mouse_offset_y
-                    
+     
           # Make sure the element we are dragging relative to is visible
           relative_to.scroll_to_visible if relative_to.kind_of? PositionedElement
           
           rel_pos = relative_position(x, y, relative_to)
           mouse_move_at rel_pos.x, rel_pos.y
-          
+
           rel_pos = relative_position(x, y, relative_to)
           mouse_up_at rel_pos.x, rel_pos.y
-          
+
           # Enable autoscrolling and mouse move events since we have completed the 
           # drag and drop operation
           @driver.sc_enable_all_autoscrolling
           @driver.sc_enable_mouse_move_event
-          
-          stall :drag 
         end
         
         def drag_to(source, offset_x=nil, offset_y=nil, *params)

data/lib/lebowski/foundation/panes/alert.rb

@@ -6,10 +6,6 @@
 module Lebowski
   module Foundation
     
-    SC_BUTTON1_STATUS = 'button1'
-    SC_BUTTON2_STATUS = 'button2'
-    SC_BUTTON3_STATUS = 'button3'
-    
     module Panes
       
       #
@@ -35,9 +31,9 @@ module Lebowski
         
         ALERT_PROPERTY_TYPE = 'icon'
         
-        BUTTON_ONE = 'buttonOne'
-        BUTTON_TWO = 'buttonTwo'
-        BUTTON_THREE = 'buttonThree'
+        BUTTON_ONE = 'button1'
+        BUTTON_TWO = 'button2'
+        BUTTON_THREE = 'button3'
         
         BUTTONS = [BUTTON_ONE, BUTTON_TWO, BUTTON_THREE]
         

data/lib/lebowski/foundation/panes/menu.rb

@@ -19,6 +19,10 @@ module Lebowski
           return @menu_items
         end
         
+        def click_item(title)
+          menu_items.click title
+        end
+        
       protected
       
         def create_menu_item_array()
@@ -33,15 +37,16 @@ module Lebowski
           include Lebowski
           
           def initialize(parent, *params)
-            super(parent, 'menuItemViews', 'length', *params)
+            super(parent, 'items', 'length', *params)
+            @itemTitleKey = @parent['itemTitleKey']
           end
           
           def click(title)
             menu_item = nil
             if title.kind_of? String
-              menu_item = find_first({ :title => /^#{title}$/i })
+              menu_item = find_first({ @itemTitleKey => /^#{title}$/i })
             elsif title.kind_of? Regexp
-              menu_item = find_first({ :title => title })
+              menu_item = find_first({ @itemTitleKey => title })
             else
               raise ArgumentInvalidTypeError.new "title", title, String, Regexp
             end
@@ -50,45 +55,9 @@ module Lebowski
           
         protected
         
-          def find_indexes_process_filter(filter)
-            processed_filter = {}
-
-            @title_flag = :no_flag
-
-            filter.each do |key, value|
-              case key
-              when :title
-                @title_flag = value
-              else
-                processed_filter[key] = value
-              end
-            end
-
-            return processed_filter
-          end
-
-          def find_indexes_process_indexes(indexes)
-            processed_indexes = []
-
-            indexes.each do |index|
-              if @title_flag != :no_flag
-                next if (not menu_item_has_title?(index, @title_flag))
-              end
-
-              processed_indexes << index
-            end
-
-            return processed_indexes
-          end
-          
-        private
-        
-          def menu_item_has_title?(index, title)
-            menu_item = self[index]
-            @valueKey = @parent['itemTitleKey']  if @valueKey.nil?
-            value = menu_item["content.#{@valueKey}"]
-            return (value =~ title).kind_of?(Integer) if title.kind_of?(Regexp)
-            return (value == title)
+          def create_object(index, expected_type=nil)
+            rel_path = "_menuView.childViews.#{index}"
+            return @parent[rel_path, expected_type]
           end
           
         end

data/lib/lebowski/foundation/views/checkbox.rb

@@ -16,19 +16,7 @@ module Lebowski
         
         # A value the view's isSelected property can return other than a boolean value
         MIXED_STATE = '__MIXED__'
-        
-        #
-        # @override
-        #
-        # Need to perform a basic click so that the view will respond correctly
-        #
-        def click()
-          mouse_down
-          mouse_up
-          basic_click
-          stall :click
-        end
-        
+                
         def deselect()
           if in_mixed_state?
             click

data/lib/lebowski/foundation/views/label.rb

@@ -21,6 +21,10 @@ module Lebowski
           double_click
           edit_inline_text_field value
           click
+          
+          # Need to incoporate an intentional sleep so sproutcore
+          # has enough time to do its thing
+          sleep 0.2
         end
     
       end

data/lib/lebowski/foundation/views/menu_item.rb

@@ -18,6 +18,10 @@ module Lebowski
           mouse_move
           mouse_down
           mouse_up
+          
+          # Need to incoporate an intentional sleep so sproutcore
+          # has enough time to do its thing
+          sleep 0.2
         end
         
       end

data/lib/lebowski/foundation/views/radio.rb

@@ -20,13 +20,38 @@ module Lebowski
         end
         
         def buttons()
-          if @items.nil?
-            @items = Support::SimpleItemArray.new self, '.sc-radio-button'
-          end
+          @items = create_simple_item_array if @items.nil?
           return @items
         end
         
+      protected
+      
+        def create_simple_item_array()
+          return Support::RadioViewItemArray.new self
+        end
+        
       end
+      
+      module Support
+      
+        class RadioViewItemArray < SimpleItemArray
+          
+          SELECTOR = '.sc-radio-button'
+          
+          def click_with_index(value)
+            cq = @parent.core_query(SELECTOR)
+            cq[value].mouse_down
+            cq.done
+            
+            cq = @parent.core_query(SELECTOR)
+            cq[value].mouse_up
+            cq.done
+          end
+          
+        end
+        
+      end
+      
     end
   end
 end

data/lib/lebowski/foundation/views/segmented.rb

@@ -30,7 +30,7 @@ module Lebowski
       protected
       
         def create_simple_item_array()
-          return Support::SegmentItemArray.new self, '.sc-segment'
+          return Support::SegmentItemArray.new self
         end
         
       end
@@ -81,6 +81,11 @@ module Lebowski
             item = self[index]
             item.deselect
           end
+          
+          def click_with_index(value)
+            segment = @parent["childViews.#{value}", View]
+            segment.click if (not segment.nil?)
+          end
         
         protected
         

data/lib/lebowski/foundation/views/select_button.rb

@@ -16,19 +16,19 @@ module Lebowski
         representing_sc_class 'SC.SelectButtonView'
         
         def display_menu
-          self.mouse_down if !menu_displayed?
+          click if !has_menu_displayed?
         end
         
         def hide_menu
-          menu.click_off if menu_displayed?
+          menu.click_off if has_menu_displayed?
         end
 
-        def menu_displayed?
+        def has_menu_displayed?
           return (not menu.nil?)
         end
 
         def menu
-          @menu = get_root_application_object.responding_panes.find_first(MenuPane)
+          @menu = self['pane.rootResponder.menuPane']
           if not @menu.nil?
             @menu = @menu.represent_as(SelectButtonMenu) 
             @menu.select_button = self

data/lib/lebowski/foundation/views/select_field.rb

@@ -99,7 +99,8 @@ module Lebowski
         # @see #select
         #
         def select_with_value(val)
-          option_locator = "value=regexi:^(nu|st|sc)#{val}$"
+          guid = @driver.get_sc_guid(val)
+          option_locator = "value=regexi:^#{guid}$"
           @driver.sc_select(:view, option_locator, self.abs_path)
           stall :select
         end

data/lib/lebowski/foundation/views/support/simple_item_array.rb

@@ -40,22 +40,17 @@ module Lebowski
           include Lebowski::Foundation
           include Lebowski::Foundation::Views
           
-          def initialize(parent, item_selector, value_rel_path=nil, items_rel_path=nil, item_title_key=nil, item_value_key=nil)
+          def initialize(parent)
             if not parent.kind_of? View
               raise ArgumentInvalidTypeError.new "parent", parent, View
             end
-    
-            if not item_selector.kind_of? String
-              raise ArgumentInvalidTypeError.new "item_selector", item_selector, String
-            end
             
             @parent = parent
             @driver = parent.driver
-            @item_selector = item_selector
-            @value_rel_path = value_rel_path.nil? ? 'value' : value_rel_path
-            @items_rel_path = items_rel_path.nil? ? 'items' : items_rel_path
-            @item_title_key = item_title_key.nil? ? parent['itemTitleKey'] : parent[item_title_key]
-            @item_value_key = item_value_key.nil? ? parent['itemValueKey'] : parent[item_value_key]
+            @value_rel_path = 'value'
+            @items_rel_path = 'items'
+            @item_title_key = parent['itemTitleKey']
+            @item_value_key = parent['itemValueKey']
           end
           
           def selected?(value)
@@ -170,15 +165,9 @@ module Lebowski
             end
           end
           
+          # Must be implemented by a subclass
           def click_with_index(value)
-            cq = @parent.core_query(@item_selector)
-            cq[value].mouse_down
-            cq[value].basic_click # Required for slightly older versions of SC (pre 1.0)
-            cq.done
-            
-            cq = @parent.core_query(@item_selector)
-            cq[value].mouse_up
-            cq.done
+            # NO-OP
           end
             
           def click_with_title(value)

data/lib/lebowski/runtime/sprout_core_extensions.rb

@@ -33,8 +33,9 @@ module Lebowski
       
       # SC Object Foundation Selenium Calls
       
-      def get_sc_guid(scpath)
-        return __string_command("getScGuid", [scpath])
+      def get_sc_guid(val)
+        encoded_params = ObjectEncoder.encode_hash({ :val => val })
+        return __string_command("getScGuid", [encoded_params])
       end
       
       def get_sc_object_class_name(scpath)
@@ -246,13 +247,13 @@ module Lebowski
       end
       
       def sc_key_down(type, key, *params)
-        if key == :meta_key
+        if key == :meta_key or key == :meta
           meta_key_down
-        elsif key == :alt_key
+        elsif key == :alt_key or key == :alt
           alt_key_down
-        elsif key == :ctrl_key
+        elsif key == :ctrl_key or key == :ctrl
           control_key_down
-        elsif key == :shift_key
+        elsif key == :shift_key or key == :shift
           shift_key_down
         elsif key.kind_of? Symbol
           __remote_control_command("scFunctionKeyDown", [__locator(type, *params), key.to_s])
@@ -263,13 +264,13 @@ module Lebowski
       end
       
       def sc_key_up(type, key, *params)
-        if key == :meta_key
+        if key == :meta_key or key == :meta
           meta_key_up
-        elsif key == :alt_key
+        elsif key == :alt_key or key == :alt
           alt_key_up
-        elsif key == :ctrl_key
+        elsif key == :ctrl_key or key == :ctrl
           control_key_up
-        elsif key == :shift_key
+        elsif key == :shift_key or key == :shift
           shift_key_up
         elsif key.kind_of? Symbol
           __remote_control_command("scFunctionKeyUp", [__locator(type, *params), key.to_s])

data/lib/lebowski/version.rb

@@ -6,8 +6,8 @@
 module Lebowski
   module Version
     MAJOR = 0
-    MINOR = 3
-    PATCH = "3.pre.0"
+    MINOR = 4
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/resources/user-extensions.js

@@ -38,18 +38,41 @@ var $App = null;
 */
 var ScExt = {};
 
+/**
+  Use this method instead of SC's typeOf method to check a value's type.
+  
+  This method handles both SC 1.6 and 1.5. Unfortunately SC.typeOf for 
+  SC 1.5 can return an incorrect result that will end up prevent the
+  rest of Lebowski from working. This method will correct the result.
+*/
+ScExt.typeOf = function(value) {
+  var type = $SC.typeOf(value);
+
+  if (type === $SC.T_ERROR && $SC.VERSION.match(/^1.5/)) {
+    if ($SC.Error && value instanceof $SC.Error) {
+      type = $SC.T_ERROR;
+    } else if (value instanceof $SC.Object) {
+      type = $SC.T_OBJECT;
+    } else {
+      type = $SC.T_HASH;
+    }
+  }
+  
+  return type;
+};
+
 /**
   Checks if the given value is indeed an SC.Object
 */
 ScExt.isScObject = function(obj) {
-  return $SC.typeOf(obj) === $SC.T_OBJECT;
+  return ScExt.typeOf(obj) === $SC.T_OBJECT;
 };
 
 /**
   Checks if the given value is either an instance of SC.Object or a JS hash object
 */
 ScExt.isObject = function(obj) {
-  var type = $SC.typeOf(obj);
+  var type = ScExt.typeOf(obj);
   return type === $SC.T_OBJECT || type === $SC.T_HASH;
 };
 
@@ -279,7 +302,7 @@ ScExt.PathParser = {
     
     for (var i = 1; i < parts.length; i++) {
       if (this._isArrayIndex(parts[i])) {
-        if ($SC.typeOf(objPathChain[i - 1]) === $SC.T_FUNCTION) {
+        if (ScExt.typeOf(objPathChain[i - 1]) === $SC.T_FUNCTION) {
           // Last part is a function, therefore invoke the function with the index
           var target = objPathChain[i - 2];
           var func = objPathChain[i - 1];
@@ -290,10 +313,12 @@ ScExt.PathParser = {
           current_obj = this._getObjectFromArray(array, parts[i]);
         }
       } else {
-        if ($SC.typeOf(current_obj.getPath) === $SC.T_FUNCTION) {
-          // Object is a SC object. Use the get method
+        if (ScExt.typeOf(current_obj.getPath) === $SC.T_FUNCTION && current_obj !== $SC) {
+          // Object is a SC object. Use the get method. Need to be mindful of the SC
+          // root object since it also has getPath but doesn't behave the same way as
+          // getPath on regular SC objects.
           current_obj = current_obj.getPath(parts[i]);
-        } else if ($SC.typeOf(current_obj.get) === $SC.T_FUNCTION) {
+        } else if (ScExt.typeOf(current_obj.get) === $SC.T_FUNCTION) {
           current_obj = current_obj.get(parts[i]);
         } else {
           // Object is just a plain old JS object
@@ -353,7 +378,7 @@ ScExt.MouseEventSimulation = {
   
   simulateEvent: function(mouseEvent, locator, x, y, button) {
     var element = selenium.browserbot.findElement(locator),
-        coord = element ? $SC.viewportOffset(element) : { x: 0, y: 0 },
+        coord = element ? $SC.offset(element) : { x: 0, y: 0 },
         width = element ? element.clientWidth : 0,
         height = element ? element.clientHeight : 0,
         which = 1;
@@ -377,7 +402,7 @@ ScExt.MouseEventSimulation = {
       }
     } 
     
-    var coords = element ? $SC.viewportOffset(element) : { x: 0, y: 0 },
+    var coords = element ? $SC.offset(element) : { x: 0, y: 0 },
         clientX = coords.x + x,
         clientY = coords.y + y;
         
@@ -1587,7 +1612,7 @@ Selenium.prototype.doScEnableMouseMoveEvent = function() {
 */
 Selenium.prototype.getScTypeOf = function(path) {
   var value = $ScPath.getPath(path);
-  return $SC.typeOf(value);
+  return ScExt.typeOf(value); 
 };
 
 /**
@@ -1605,9 +1630,13 @@ Selenium.prototype.getScTypeOfArrayContent = function(path) {
 /**
   Returns a SproutCore object's GUID
 */
-Selenium.prototype.getScGuid = function(path) {
-  var value = $ScPath.getPath(path, 'SC.Object');
-  var guid = $SC.guidFor(value);
+Selenium.prototype.getScGuid = function(params) {
+  params = ScExt.ObjectDecoder.decodeHash(params);
+  var value = params.val;
+  if ($SC.typeOf(value) === $SC.T_STRING) {
+    value = $ScPath.getPath(value, 'SC.Object');
+  }
+  var guid = $SC.guidFor(!!value ? value : params.val);
   return guid;
 };
 
@@ -1689,7 +1718,7 @@ Selenium.prototype.getScViewFrame = function(path) {
 Selenium.prototype.getScElementWindowPosition = function(path) {
   var element = this.browserbot.findElement(path);
   if (!element) return null;
-  var coords = $SC.viewportOffset(element);
+  var coords = $SC.offset(element);
   if (!coords) return null;
   return [coords.x, coords.y];
 };
@@ -2019,4 +2048,4 @@ PageBot.prototype.locateElementByScCoreQuery = function(text) {
 PageBot.prototype.evaluateCssSelectorCount = function(css, document) {
   var elements = eval_css(css, document);
   return elements.length;
-};
+};

metadata

@@ -1,185 +1,63 @@
 --- !ruby/object:Gem::Specification 
 name: lebowski
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 3
-  - 3
-  - pre
-  - 0
-  version: 0.3.3.pre.0
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Michael Cohen
+- Apple Inc. and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -08:00
+date: 2011-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: selenium-client
+  name: rspec
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 18
-        version: 1.2.18
+        version: 2.5.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: selenium-client
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 18
         version: 1.2.18
   type: :runtime
-  prerelease: false
-  version_requirements: *id006
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+        version: 2.5.0
   type: :development
-  prerelease: false
-  version_requirements: *id008
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *id011
+  version_requirements: *id004
 description: "  \n  Lebowski is a test automation framework designed for full feature, integration, and \n  regression testing of SproutCore applications.\n  \n"
 email: michael.lee.cohen@gmail.com
 executables: 
@@ -189,19 +67,10 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.md
-files: 
-- Gemfile
 - History.md
-- License.txt
 - README.md
-- Rakefile
-- bin/lebowski
-- bin/lebowski-spec
-- bin/lebowski-start-server
-- lib/lebowski.rb
+files: 
 - lib/lebowski/core.rb
-- lib/lebowski/foundation.rb
 - lib/lebowski/foundation/application.rb
 - lib/lebowski/foundation/core.rb
 - lib/lebowski/foundation/core_query.rb
@@ -251,7 +120,7 @@ files:
 - lib/lebowski/foundation/views/text_field.rb
 - lib/lebowski/foundation/views/view.rb
 - lib/lebowski/foundation/views/web.rb
-- lib/lebowski/rspec.rb
+- lib/lebowski/foundation.rb
 - lib/lebowski/rspec/core.rb
 - lib/lebowski/rspec/matchers/be.rb
 - lib/lebowski/rspec/matchers/has.rb
@@ -263,7 +132,7 @@ files:
 - lib/lebowski/rspec/operators/operator.rb
 - lib/lebowski/rspec/operators/that.rb
 - lib/lebowski/rspec/util.rb
-- lib/lebowski/runtime.rb
+- lib/lebowski/rspec.rb
 - lib/lebowski/runtime/errors/remote_control_command_execution_error.rb
 - lib/lebowski/runtime/errors/remote_control_command_timeout_error.rb
 - lib/lebowski/runtime/errors/remote_control_error.rb
@@ -271,7 +140,7 @@ files:
 - lib/lebowski/runtime/object_encoder.rb
 - lib/lebowski/runtime/sprout_core_driver.rb
 - lib/lebowski/runtime/sprout_core_extensions.rb
-- lib/lebowski/scui.rb
+- lib/lebowski/runtime.rb
 - lib/lebowski/scui/mixins/link_support.rb
 - lib/lebowski/scui/mixins/node_item_view_support.rb
 - lib/lebowski/scui/mixins/terminal_view_support.rb
@@ -281,11 +150,15 @@ files:
 - lib/lebowski/scui/views/date_picker.rb
 - lib/lebowski/scui/views/linkit.rb
 - lib/lebowski/scui/views/select_field_tab.rb
+- lib/lebowski/scui.rb
 - lib/lebowski/version.rb
-- resources/README
-- resources/selenium-server.jar
+- lib/lebowski.rb
+- History.md
+- README.md
 - resources/user-extensions.js
-- spec/spec_helper.rb
+- bin/lebowski
+- bin/lebowski-spec
+- bin/lebowski-start-server
 has_rdoc: true
 homepage: http://github.com/FrozenCanuck/Lebowski
 licenses: 
@@ -293,7 +166,7 @@ licenses:
 post_install_message: |
   **************************************************
   
-    Thank you for installing lebowski-0.3.3.pre.0
+    Thank you for installing lebowski-0.4.0
   
     Please be sure to read the README.md and History.md
     for useful information on how to use this framework 
@@ -311,31 +184,25 @@ rdoc_options: []
 
 require_paths: 
 - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1632185460177014276
-      segments: 
-      - 0
-      version: "0"
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A test automation framework for SproutCore
+summary: Lebowski is a test integration automation framework for SproutCore
 test_files: []
 

data/Gemfile

@@ -1,12 +0,0 @@
-source "http://rubygems.org"
-
-gem "selenium-client", "~> 1.2.18"
-gem "rspec", "~> 2.1.0"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-end

data/License.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2010, 2011 Michael Cohen <http://frozencanuck.wordpress.com>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,58 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-
-require 'jeweler'
-require './lib/lebowski/version.rb'
-
-Jeweler::Tasks.new do |gem|
-  gem.name = 'lebowski'
-  gem.version = Lebowski::Version::STRING
-  gem.homepage = 'http://github.com/FrozenCanuck/Lebowski'
-  gem.license = 'MIT'
-  gem.summary = 'A test automation framework for SproutCore'
-  gem.description = <<-DESCRIPTION
-  
-  Lebowski is a test automation framework designed for full feature, integration, and 
-  regression testing of SproutCore applications.
-  
-DESCRIPTION
-  gem.email = 'michael.lee.cohen@gmail.com'
-  gem.authors = ['Michael Cohen']
-  gem.add_dependency 'selenium-client', '~> 1.2.18'
-  gem.add_dependency 'rspec', '~> 2.1.0'
-  gem.add_development_dependency 'rspec', '~> 2.1.0'
-  gem.add_development_dependency 'bundler', '~> 1.0.0'
-  gem.add_development_dependency 'jeweler', '~> 1.5.1'
-  gem.add_development_dependency 'rcov', '>= 0'
-  gem.executables = ['lebowski', 'lebowski-spec', 'lebowski-start-server']
-  gem.files.exclude 'examples'
-  gem.test_files = []
-  gem.post_install_message = <<-POST_INSTALL_MESSAGE
-#{'*'*50}
-
-  Thank you for installing lebowski-#{Lebowski::Version::STRING}
-
-  Please be sure to read the README.md and History.md
-  for useful information on how to use this framework 
-  and about this release.
-  
-  For more information go to the following web sites:
-  
-    http://github.com/FrozenCanuck/Lebowski
-    http://frozencanuck.wordpress.com
-    http://www.sproutcore.com
-
-#{'*'*50}
-POST_INSTALL_MESSAGE
-end
-Jeweler::RubygemsDotOrgTasks.new

data/resources/README

@@ -1 +0,0 @@
-The selenium-server.jar is part of the Selenium Framework (http://seleniumhq.org)

data/spec/spec_helper.rb

@@ -1 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../lib/lebowski')