appium_lib 0.6.7 → 0.7.0

data/lib/appium_lib/android/helper.rb

@@ -307,6 +307,10 @@ module Appium::Android
     nil
   end
 
+  def lazy_load_strings
+    @strings_xml ||= mobile(:getStrings)
+  end
+
   # Android only.
   # Returns a string containing interesting elements.
   # If an element has no content desc or text, then it's not returned by this method.
@@ -325,33 +329,62 @@ module Appium::Android
         keys = node.keys
         return if keys.empty?
 
+        n_content = '@content-desc'
+        n_text = '@text'
+        n_class = '@class'
+        n_resource = '@resource-id'
+        n_node = 'node'
+
         obj = {}
-        obj.merge!( { desc: node['@content-desc'] } ) if keys.include?('@content-desc') && !node['@content-desc'].empty?
-        obj.merge!( { text: node['@text'] } ) if keys.include?('@text') && !node['@text'].empty?
-        obj.merge!( { class: node['@class'] } ) if keys.include?('@class') && !obj.empty?
+        obj.merge!( { desc: node[n_content] } ) if keys.include?(n_content) && !node[n_content].empty?
+        obj.merge!( { text: node[n_text] } ) if keys.include?(n_text) && !node[n_text].empty?
+        obj.merge!( { class: node[n_class] } ) if keys.include?(n_class) && !obj.empty?
+        obj.merge!( { resource_id: node[n_resource] } ) if keys.include?(n_resource) && !obj.empty?
 
         r.push obj if !obj.empty?
-        run_internal.call node['node'] if keys.include?('node')
+        run_internal.call node[n_node] if keys.include?(n_node)
       end
 
       run_internal.call node
       r
     end
 
+    lazy_load_strings
     json = get_source
     node = json['hierarchy']
     results = run node
 
     out = ''
     results.each { |e|
-      out += e[:class].split('.').last + "\n"
-
-      out += "  class: #{e[:class]}\n"
-      if e[:text] == e[:desc]
-        out += "  text, name: #{e[:text]}\n" unless e[:text].nil?
+      e_desc = e[:desc]
+      e_text = e[:text]
+      e_class = e[:class]
+      e_resource_id = e[:resource_id]
+      out += e_class.split('.').last + "\n"
+
+      out += "  class: #{e_class}\n"
+      if e_text == e_desc
+        out += "  text, name: #{e_text}\n" unless e_text.nil?
       else
-        out += "  text: #{e[:text]}\n" unless e[:text].nil?
-        out += "  name: #{e[:desc]}\n" unless e[:desc].nil?
+        out += "  text: #{e_text}\n" unless e_text.nil?
+        out += "  name: #{e_desc}\n" unless e_desc.nil?
+      end
+
+      out += "  resource_id: #{e_resource_id}\n" unless e_resource_id.nil?
+
+      # there may be many ids with the same value.
+      # output all exact matches.
+      id_matches = @strings_xml.select do |key, value|
+        value == e_desc || value == e_text
+      end
+
+      if id_matches && id_matches.length > 0
+        match_str = ''
+        # [0] = key, [1] = value
+        id_matches.each do |match|
+          match_str += ' ' * 6 + "#{match[0]}\n"
+        end
+        out += "  id: #{match_str.strip}\n"
       end
     }
     out
@@ -387,21 +420,24 @@ module Appium::Android
   # @param target [String] the target to search for in strings.xml values
   # @return [Array]
   def xml_keys target
-    mobile :xmlKeyContains, target
+    lazy_load_strings
+    @strings_xml.select { |key, value| key.downcase.include? target.downcase }
   end
 
   # Search strings.xml's keys for target.
   # @param target [String] the target to search for in strings.xml keys
   # @return [Array]
   def xml_values target
-    mobile :xmlValueContains, target
+    lazy_load_strings
+    @strings_xml.select { |key, value| value.downcase.include? target.downcase }
   end
 
   # Resolve id in strings.xml and return the value.
   # @param id [String] the id to resolve
   # @return [String]
   def resolve_id id
-    mobile :resolveId, id
+    lazy_load_strings
+    @strings_xml[id]
   end
 
   # Lists package, activity, and adb shell am start -n value for current app.

data/lib/appium_lib/common/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '0.6.7' unless defined? ::Appium::VERSION
+  VERSION = '0.7.0' unless defined? ::Appium::VERSION
   DATE = '2013-08-23' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -194,7 +194,7 @@ module Appium
     attr_reader :default_wait, :app_path, :app_name, :device,
                 :app_package, :app_activity, :app_wait_activity,
                 :sauce_username, :sauce_access_key, :port, :debug,
-                :export_session, :device_cap
+                :export_session, :device_cap, :compress_xml
 
     # The amount to sleep in seconds before every webdriver http call.
     attr_accessor :global_webdriver_http_sleep
@@ -234,6 +234,8 @@ module Appium
       # convert to downcased symbols
       opts.each_pair { |k,v| opts[k.to_s.downcase.strip.intern] = v }
 
+      @compress_xml = opts[:compress_xml] ? true : false
+
       @export_session = opts.fetch :export_session, false
 
       @default_wait = opts.fetch :wait, 30
@@ -345,7 +347,7 @@ module Appium
     # https://github.com/jlipps/appium/blob/master/app/android.js
     def android_capabilities
       {
-        browserName: 'Android',
+        compressXml: @compress_xml,
         platform: 'LINUX',
         version: '4.2',
         device: @device == :android ? 'Android' : 'selendroid',
@@ -360,9 +362,8 @@ module Appium
     # WebDriver capabilities. Must be valid for Sauce to work.
     def ios_capabilities
       {
-        browserName: 'iOS 6.0',
         platform: 'Mac 10.8',
-        version: '6.0',
+        version: '6.1',
         device: @device_cap || 'iPhone Simulator',
         name: @app_name || 'Ruby Console iOS Appium'
       }

data/lib/appium_lib/ios/helper.rb

@@ -83,11 +83,19 @@ module Appium::Ios
     nil
   end
 
+  def lazy_load_strings
+    @strings_xml ||= mobile(:getStrings)
+  end
+
   # Returns a string of interesting elements. iOS only.
   #
+  # Defaults to inspecting the 1st windows source only.
+  # use get_page(get_source) for all window sources
+  #
   # @param element [Object] the element to search. omit to search everything
   # @return [String]
-  def get_page element=get_source
+  def get_page element=source_window(0)
+    lazy_load_strings
 
     # @private
     def empty ele
@@ -123,6 +131,21 @@ module Appium::Ios
         puts "  label: #{label}" if label
         puts "  value: #{value}" if value
       end
+
+      # there may be many ids with the same value.
+      # output all exact matches.
+      id_matches = @strings_xml.select do |key, val|
+        val == name || val == label || val == value
+      end
+
+      if id_matches && id_matches.length > 0
+        match_str = ''
+        # [0] = key, [1] = value
+        id_matches.each do |match|
+          match_str += ' ' * 7 + "#{match[0]}\n"
+        end
+        puts "   id: #{match_str.strip}\n"
+      end
     end
 
     children = element['children']

data/readme.md

@@ -4,7 +4,7 @@
 - [Documentation for appium_lib](http://www.rubydoc.info/github/appium/ruby_lib/master/frames)
 - [Appium Ruby Console](https://github.com/appium/ruby_console)
 
-Helper methods for writing cross platform (iPad, iPhone, Android) tests in Ruby using Appium. Note that user waits should not exceed 120 seconds if they're going to run on Sauce Labs.
+Helper methods for writing cross platform (iOS, Android) tests in Ruby using Appium. Note that user waits should not exceed 120 seconds if they're going to run on Sauce Labs.
 
 Make sure you're using Ruby 1.9.3+ with upgraded rubygems and bundler.
 

data/release_notes.md

@@ -1,3 +1,13 @@
+#### v0.6.7 2013-08-23
+
+- [a1f5942](https://github.com/appium/ruby_lib/commit/a1f5942e907339f1c3968c5af03feb5bde6b1b7c) Release 0.6.7
+- [4a08dd6](https://github.com/appium/ruby_lib/commit/4a08dd63add2fd11e7cbb7aadaa086f6fb014ed2) Enable bundleid in app device cap
+- [caff218](https://github.com/appium/ruby_lib/commit/caff2187c378e619ee5b4e0524734df372354b69) Improve docs
+- [b579ca7](https://github.com/appium/ruby_lib/commit/b579ca7fd83c6673be1f04d745b9d6cbdaeb6504) Add iOS Jenkins Xcode note
+- [4fbf0fb](https://github.com/appium/ruby_lib/commit/4fbf0fbdea07120ebf4d270bfee2cf251ba312fb) Add landscape and portrait rotate examples
+- [c6d4353](https://github.com/appium/ruby_lib/commit/c6d43537c759342b1ceed72cf8a81573c5070c65) Allow setting device cap
+
+
 #### v0.6.6 2013-08-19
 
 - [5b84a0b](https://github.com/appium/ruby_lib/commit/5b84a0bd9d9273c704414bdb9a9857b503439b90) Release 0.6.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - code@bootstraponline.com
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.33.0
+        version: 2.35.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.33.0
+        version: 2.35.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement