Fix page_class to work with Appium 1.0

Author: bootstraponline

lib/appium_lib/android/helper.rb

@@ -217,39 +217,6 @@ def find_eles_attr tag_name, attribute=nil
       mobile :find, array
     end
 
-    def get_page_class
-      r            = []
-      run_internal = lambda do |node|
-        if node.kind_of? Array
-          node.each { |node| run_internal.call node }
-          return
-        end
-
-        keys = node.keys
-        return if keys.empty?
-        r.push node['@class'] if keys.include?('@class')
-
-        run_internal.call node['node'] if keys.include?('node')
-      end
-      json         = get_source
-      run_internal.call json['hierarchy']
-
-      res = []
-      r   = r.sort
-      r.uniq.each do |ele|
-        res.push "#{r.count(ele)}x #{ele}\n"
-      end
-      count_sort = ->(one, two) { two.match(/(\d+)x/)[1].to_i <=> one.match(/(\d+)x/)[1].to_i }
-      res.sort(&count_sort).join ''
-    end
-
-    # Count all classes on screen and print to stdout.
-    # Useful for appium_console.
-    def page_class
-      puts get_page_class
-      nil
-    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.

lib/appium_lib/common/helper.rb

@@ -35,7 +35,8 @@ def wait max_wait=30, interval=0.5, &block
       max_wait = 1 if max_wait <= 0
       result   = nil
       timeout max_wait do
-        until (begin
+        until (
+        begin
           result = block.call || true
         rescue Exception
         end)
@@ -65,7 +66,8 @@ def wait_true max_wait=30, interval=0.5, &block
       max_wait = 1 if max_wait <= 0
       result   = nil
       timeout max_wait do
-        until (begin
+        until (
+        begin
           result = block.call
         rescue Exception
         end)
@@ -186,16 +188,65 @@ def last_ele tag_name
       xpath "//#{tag_name}[last()]"
     end
 
-    # Prints a JSON view of the current page
+    # Prints xml of the current page
     # @return [void]
     def source
-      ap get_source
+      doc = Nokogiri::XML(@driver.page_source) do |config|
+        config.options = Nokogiri::XML::ParseOptions::NOBLANKS | Nokogiri::XML::ParseOptions::NONET
+      end
+      puts doc.to_xml indent: 2
     end
 
-    # Returns XML for the current page
-    # @return [Nokogiri::XML]
+
+    # Returns XML string for the current page
+    # Same as driver.page_source
+    # @return [String]
     def get_source
-      Nokogiri::XML @driver.page_source
+      @driver.page_source
+    end
+
+    # http://nokogiri.org/Nokogiri/XML/SAX.html
+    class CountElements < Nokogiri::XML::SAX::Document
+      attr_reader :result
+
+      def initialize
+        reset
+      end
+
+      def reset
+        @result = Hash.new 0
+      end
+
+      # http://nokogiri.org/Nokogiri/XML/SAX/Document.html
+      def start_element name, attrs = []
+        @result[name] += 1
+      end
+
+      def formatted_result
+        message = ''
+        sorted  = @result.sort_by { |element, count| count }.reverse
+        sorted.each do |element, count|
+          message += "#{count}x #{element}\n"
+        end
+        message.strip
+      end
+    end # class CountElements
+
+    # Returns a string of class counts.
+    def get_page_class
+      parser = @count_elements_parser ||= Nokogiri::XML::SAX::Parser.new(CountElements.new)
+
+      parser.document.reset
+      parser.parse get_source
+
+      parser.document.formatted_result
+    end
+
+    # Count all classes on screen and print to stdout.
+    # Useful for appium_console.
+    def page_class
+      puts get_page_class
+      nil
     end
 
     # Returns the first element that exactly matches name

lib/appium_lib/ios/helper.rb

@@ -52,38 +52,6 @@ def ios_password length=1
       '•' * length
     end
 
-    # Returns a string of class counts.
-    def get_page_class
-      r            = []
-      run_internal = lambda do |node|
-        if node.kind_of? Array
-          node.each { |node| run_internal.call node }
-          return
-        end
-
-        keys = node.keys
-        return if keys.empty?
-        r.push node['type'] if keys.include?('type')
-
-        run_internal.call node['children'] if keys.include?('children')
-      end
-      json         = get_source
-      run_internal.call json['children']
-
-      res = []
-      r   = r.sort
-      r.uniq.each do |ele|
-        res.push "#{r.count(ele)}x #{ele}\n"
-      end
-      count_sort = ->(one, two) { two.match(/(\d+)x/)[1].to_i <=> one.match(/(\d+)x/)[1].to_i }
-      res.sort(&count_sort).join ''
-    end
-
-    def page_class
-      puts get_page_class
-      nil
-    end
-
     # Returns a string of interesting elements. iOS only.
     #
     # Defaults to inspecting the 1st windows source only.