hyper_navigator 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f83d77d20b8bbb093c8a1cc3e32a49e1079ebcb
-  data.tar.gz: cae40da73f186e5ce41d4a9f07dd9551bcce4695
+  metadata.gz: 1a75b9f286ad4f15c47234f38bc78ec3fb0ed862
+  data.tar.gz: bcefe082de297582f6f239c40e80fc2e393d0ecf
 SHA512:
-  metadata.gz: 42fb7fc920df883e1965f6c316086812a2f0daafbcaab385091d163cbc801bcd8bfdebcd115a80f4dd6f5dbabbd01d3b87b17dff598ea07324e6933868a7c62f
-  data.tar.gz: c44fe57cf3cf77c4c769e6222d0d6c5b6d666cc90512ab9e1c163584aa549c3202abaf44b8e2bae38177802c9ae508fe0beb3dd5567ecc3d13cb077e8126c24a
+  metadata.gz: 3c7be6769655618746cb083c1f23137652a2150b77aeac7ecdd16dcdad54c5c003ded2c8649bb5395463603b71fded8f8fc5599c7a2855142ed58426200d226b
+  data.tar.gz: 50097470c15c94e5de2995c8823fa7862ea841285bd9fca25990b847c62f97afd8c1643bc1ef3ceb07d0ff30b273be2a8d5a8046938e36dd79b5ef08ba04b73b

data/examples/surf.rb

@@ -45,6 +45,12 @@ end
 
 result = HyperNavigator.surf(options.url, options.pattern, options.headers, { :verbose => options.verbose })
 
-result.map do |n|
-  pp JSON.parse(n.response.body) rescue nil
-end
+print_tree = lambda do |node|
+  padding = '  ' * node.depth
+  puts "#{padding}#{node.rel} : #{node.href}"
+  node.descendants.each do |d|
+    print_tree.call(d)
+  end
+end
+
+print_tree.call(result)

data/lib/hyper_navigator.rb

@@ -4,7 +4,7 @@ require "hyper_navigator/node"
 module HyperNavigator
 
   def self.surf(root_url, exp, headers={}, options={})
-    PatternMatcher.new(headers, options).match(root_url, exp).flatten_branch
+    PatternMatcher.new(headers, options).match(root_url, exp)
   end
 
 end

data/lib/hyper_navigator/node.rb

@@ -38,44 +38,44 @@ module HyperNavigator
 
     def match_here(exp, node)
       if exp == nil
-        return node
+        return nil
       elsif exp[1] == :star
         match_star(exp[0], exp.drop(2), node)
         return node
       elsif exp[0] == :any
-        match_here_descendants(exp, node)
+        node.descendants = match_here_descendants(exp.drop(1), node)
         return node
       elsif exp[0] == node.rel
-        match_here_descendants(exp, node)
+        node.descendants = match_here_descendants(exp.drop(1), node)
         return node
       end
-      return NullNode.new
+      return nil
     end
 
     def match_here_descendants(exp, node)
-      links = node.links.map {|link| make_node(link, node.depth + 1)}
-      descendants = links.map {|n| match_here(exp.drop(1), n) }
-      node.descendants = descendants.select {|d| d.class == Node }
+      return [] if exp == nil
+      nodes = node.links.map {|link| make_node(link, node.depth + 1)}
+      matched_nodes = nodes.map {|n| match_here(exp, n) }
+      return matched_nodes.compact
     end
 
     def match_star(exp_star, exp, node)
-      # in case of zero matches, exp can match here
-      node_here = match_here(exp, node)
-
-      if node_here.is_a? NullNode
-        match_star_descendants(exp_star, exp, node)
-      end
-    end
-
-    def match_star_descendants(exp_star, exp, node)
-      if exp_star == :any
-        links = node.links
+      # exp can match here, ending the descent
+      exp_node_here = match_here(exp, node)
+      if exp_node_here
+        # finish the star match
       else
-        links = node.links.select { |link| link["rel"] == exp_star }
+        nodes = match_here_descendants([exp_star], node)
+
+        # continue the star matching for each descendant
+        nodes.each {|n| match_star(exp_star, exp, n) }
+        if exp.empty?
+          node.descendants = nodes
+        else
+          # removing nodes that are not in the path to the next exp
+          node.descendants = nodes.reject {|n| n.descendants.empty? && n.rel != exp[0] }
+        end
       end
-
-      node.descendants = links.map { |link| make_node(link, node.depth + 1) }
-      node.descendants.map {|desc| match_star(exp_star, exp, desc) }
     end
 
     def make_node(link, depth=nil)
@@ -90,7 +90,7 @@ module HyperNavigator
 
     IGNORE_REFS = ["self", "up", "next", "prev"]
 
-    attr_reader :rel, :href, :headers, :response
+    attr_reader :rel, :href, :response
     attr_accessor :descendants, :depth
 
     def initialize(rel, href, headers={}, depth=nil)
@@ -121,9 +121,4 @@ module HyperNavigator
 
   end
 
-  class NullNode < Node
-    def initialize()
-      super(nil, nil)
-    end
-  end
 end

data/lib/hyper_navigator/version.rb

@@ -1,3 +1,3 @@
 module HyperNavigator
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper_navigator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Carl Douglas