appium_lib 2.1.0 → 3.0.0

data/lib/appium_lib/common/patch.rb

@@ -94,7 +94,7 @@ def patch_webdriver_bridge
         # For complex_find, we pass a whole array
         if command_hash.kind_of? Array
           print_command[:args]   = [command_hash.clone]
-          print_command[:script] = 'mobile: find' if command == :complex_find
+          print_command[:script] = 'complex_find' if command == :complex_find
         else
           print_command = command_hash.clone
         end

data/lib/appium_lib/common/version.rb

@@ -1,5 +1,5 @@
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '2.1.0' unless defined? ::Appium::VERSION
-  DATE    = '2014-05-21' unless defined? ::Appium::DATE
+  VERSION = '3.0.0' unless defined? ::Appium::VERSION
+  DATE    = '2014-05-30' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/device/device.rb

@@ -163,18 +163,25 @@ module Appium
 
         add_endpoint_method(:complex_find, 'session/:session_id/appium/app/complex_find') do
           def complex_find(opts)
-            mode      = opts.fetch :mode, false
+            # allow: complex_find([[[3, 'app']]])
+            opts      = { selectors: opts } if opts.is_a?(Array)
+            mode      = opts.fetch :mode, false # mode can be 'all' or 'scroll'
             selectors = opts.fetch :selectors, false
             raise 'Complex find must have selectors' unless selectors
-            selectors.insert(0, mode) if mode
+            selectors = selectors.dup.insert(0, mode) if mode # must dupe before insert
 
             ids = execute :complex_find, {}, selectors
+            ids = [ids] unless ids.is_a? Array # wrap single result in an array
 
-            if mode == 'all' && ids.length > 1
-              return ids.map { |id| Selenium::WebDriver::Element.new self, element_id_from(id) }
-            else
-              return Selenium::WebDriver::Element.new self, element_id_from(ids)
+            # mode can be set directly in the selectors
+            find_all = mode == 'all' || selectors.first == 'all'
+
+            result = ids.map do |id|
+              resolved_id = element_id_from(id)
+              Selenium::WebDriver::Element.new self, resolved_id
             end
+            # when not finding all, don't return an array
+            return find_all ? result : result.first
           end
         end
 

data/release_notes.md

@@ -1,3 +1,12 @@
+#### v3.0.0 2014-05-30
+
+- [77d64af](https://github.com/appium/ruby_lib/commit/77d64af57b0e6a828c5d61008c444518e6597e4b) Release 3.0.0
+- [86f1655](https://github.com/appium/ruby_lib/commit/86f1655d51ee74ec32e720ff285c30175283d4fd) Rename mobile find to complex_find
+- [109139b](https://github.com/appium/ruby_lib/commit/109139bd6ff664e020609a5828ab755c9f6dbf2e) Merge pull request #207 from appium/no_xpath
+- [682797d](https://github.com/appium/ruby_lib/commit/682797d252a040ffcc225a43491842c3e0d6e2ad) Use uiselector instead of xpath
+- [0c51bca](https://github.com/appium/ruby_lib/commit/0c51bcab548826d125b9f90418079fc8af72071a) Update complex find constants
+
+
 #### v2.1.0 2014-05-21
 
 - [f0db091](https://github.com/appium/ruby_lib/commit/f0db0910ea077e04329d3e0cafb434f829760abb) Release 2.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver