motion-html 1.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a98f7457f2d6df6ef5b6552c790d5c2fb6a64d8b
-  data.tar.gz: 6afdc1de06f95cb62b1fa0848ba8401ac52b7ea2
+SHA256:
+  metadata.gz: e2faabbfcaa7668e24d6b087636f6f72706e269438dcea8d39147fa3377c6cf5
+  data.tar.gz: 8e21b1c802d230b06d6aa5605cdee6ce76fb4a7734bc73a4edc0cedeb88a38d2
 SHA512:
-  metadata.gz: 4a0f57cf2dd50288d8064b0983b7353f88ed273bed385635e48d28493be3da861a384930933179e611c251974a299beff4c0f2a763abed7a93824399ed0fd20c
-  data.tar.gz: 79488428c3a146561aa9c1fa15bc6a6951183d20a7170365ea7efaf6c330ddcac755a64403f1ac182cd046029a18f8b6d03eccd83407f423cdf728a47ba7f676
+  metadata.gz: 7e06dda3b1d3997a1c2063a6a90ae01a246df98a853b65d17d3821f9ac91a6143a09bae92da80b0a0547c0998f06bf78cbe4a78d0e03ffc2e3019a9734b25218
+  data.tar.gz: 301cee7bf766da1bd86fb832ea730d5dbc14e1401084a03d647de146169e6e436c16041803686db616f8dcbd96e75cca2a9c91ad55ce41224ffc4560b1adc63b

data/README.md

@@ -1,8 +1,8 @@
-# Motion::HTML
+# motion-html
 
 Parse and traverse HTML in your RubyMotion app. It's like Nokogiri for RubyMotion!
 
-Motion::HTML uses [IGHTMLQuery](https://github.com/siuying/IGHTMLQuery) under the hood.
+`motion-html` uses [HTMLKit](https://github.com/iabudiab/HTMLKit) under the hood.
 
 Currently, only iOS and OS X are supported.
 
@@ -10,7 +10,7 @@ Currently, only iOS and OS X are supported.
 
 Add this line to your application's Gemfile:
 
-    gem 'motion-html'
+    gem 'motion-html', '~> 2.0'
 
 And then execute:
 
@@ -22,23 +22,38 @@ Initialize a new document:
 ```ruby
 doc = Motion::HTML::Doc.new(html)
 # or simply:
-doc = Motion::HTML.parse(html)
+doc = HTML.parse(html)
 ```
 
-Then query using css or xpath selectors. It returns an array of nodes:
+Then query using CSS3 selectors to find one or an array of elements:
 ```ruby
-nodes = doc.query('.photos li a')
+array_of_links = doc.all('.photos li a')
+first_li = doc.first('.photos li')
+element = doc.find('#one-and-only')
 ```
 
-Iterate over the results, and use the attributes or content:
+Each item returned from a query will be an `Element` object. You can then access attributes or text content:
 ```ruby
-nodes.each do |node|
-  puts "Link text: " + node.text
-  puts "Link URL: " + node['href']
+links = doc.all('.photos li a')
+links.each do |el|
+  puts "Link tag: " + el.tag
+  puts "Link text: " + el.text
+  puts "Link URL: " + el['href']
+  puts "Link attributes: " + el.attributes.inspect
 end
 ```
 
-So far, these are the only features that I have needed. Feel free to submit a GitHub issue if you need anything else.
+With an `Element`, you can traverse to its parent, children, or next sibling:
+```ruby
+first_list_item = doc.first('.photos li')
+unordered_list = first_list_item.parent
+links = first_list_item.children
+second_list_item = first_list_item.next_sibling
+```
+
+See the [`main_spec.rb`](https://github.com/andrewhavens/motion-html/blob/master/spec/main_spec.rb) file for more examples.
+
+Feel like something is missing? Submit a GitHub issue if you need anything other features.
 
 ## Contributing
 

data/lib/motion-html.rb

@@ -10,6 +10,6 @@ lib_dir_path = File.dirname(File.expand_path(__FILE__))
 Motion::Project::App.setup do |app|
   app.files.unshift(Dir.glob(File.join(lib_dir_path, "project/**/*.rb")))
   app.pods do
-    pod "IGHTMLQuery", "~> 0.9.1"
+    pod 'HTMLKit', '~> 3.1'
   end
 end

data/lib/project/motion-html.rb

@@ -6,19 +6,70 @@ module Motion
 
     class Doc
       def initialize(html)
-        @doc = IGHTMLDocument.alloc.initWithHTMLString(html, error: nil)
+        @doc = HTMLDocument.documentWithString(html)
       end
 
-      def query(q)
-        if q =~ %r{^[//|/]}
-          node_set = @doc.queryWithXPath(q)
-        else
-          node_set = @doc.queryWithCSS(q)
+      def all(q)
+        nodes = @doc.querySelectorAll(q)
+        nodes.map {|node| Element.new(node) }
+      end
+
+      def first(q)
+        all(q).first
+      end
+
+      alias_method :find, :first
+    end
+
+    class Element
+      def initialize(element)
+        @element = element
+      end
+
+      def tag
+        @element.tagName
+      end
+
+      def text
+        @element.textContent
+      end
+
+      def attributes
+        @element.attributes
+      end
+
+      def [](key)
+        attributes[key]
+      end
+
+      def parent
+        el = @element.parentNode
+        Element.new(el) if el.is_a? HTMLElement
+      end
+
+      def children
+        elements = []
+        @element.childNodes.each do |node|
+          elements << Element.new(node) if node.is_a? HTMLElement
         end
-        nodes = []
-        node_set.enumerateNodesUsingBlock -> (node, index, stop) { nodes << node }
-        nodes
+        elements
+      end
+
+      def next_sibling
+        el = @element.nextSibling
+        el = el.nextSibling if el.is_a? HTMLText
+        Element.new(el) if el.is_a? HTMLElement
+      end
+
+      def inspect
+        to_html
+      end
+
+      def to_html
+        @element.outerHTML
       end
     end
   end
 end
+
+HTML = Motion::HTML

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-html
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Andrew Havens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -68,8 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Parse and traverse HTML in your RubyMotion app. It's like Nokogiri for RubyMotion!