opal · Feb 2, 2014 · Feb 2, 2014 · Feb 2, 2014 · Feb 2, 2014 · Feb 2, 2014
Showing with 68 additions and 74 deletions.

+1 −3 opal/browser/dom.rb

+1 −8 opal/browser/dom/builder.rb

+1 −2 opal/browser/dom/element.rb

+2 −2 opal/browser/dom/node.rb

+19 −59 opal/browser/dom/node_set.rb

+44 −0 spec/dom/node_set_spec.rb
diff --git a/opal/browser/dom.rb b/opal/browser/dom.rb
@@ -39,9 +39,7 @@ def XML(what)
   def DOM(*args, &block)
     if block
       document = args.shift || $document
-      element  = args.shift
-
-      roots = Browser::DOM::Builder.new(document, element, &block).to_a
+      roots    = Browser::DOM::Builder.new(document, &block).to_a
 
       if roots.length == 1
         roots.first

diff --git a/opal/browser/dom/builder.rb b/opal/browser/dom/builder.rb
@@ -36,17 +36,10 @@ def self.build(builder, item)
 
   attr_reader :document, :element
 
-  def initialize(document, element = nil, &block)
+  def initialize(document, &block)
     @document = document
-    @element  = element
     @builder  = Paggio::HTML.new(&block)
     @roots    = @builder.each.map { |e| Builder.build(self, e) }
-
-    if @element
-      @roots.each {|root|
-        @element << root
-      }
-    end
   end
 
   def to_a

diff --git a/opal/browser/dom/element.rb b/opal/browser/dom/element.rb
@@ -232,9 +232,8 @@ def inner_dom(&block)
 
     # FIXME: when block passing is fixed
     doc = document
-    Builder.new(doc, self, &block)
 
-    self
+    self << Builder.new(doc, self, &block).to_a
   end
 
   def inner_dom=(node)

diff --git a/opal/browser/dom/node.rb b/opal/browser/dom/node.rb
@@ -149,7 +149,7 @@ def remove
 
   # Remove all the children of the node.
   def clear
-    children.each(&:remove)
+    children.remove
   end
 
   # @!attribute content
@@ -321,7 +321,7 @@ def parent
   end
 
   def parent=(node)
-    `#@native.parentNode = #{Native.try_convert(node)}`
+    `#@native.parentNode = #{Native.convert(node)}`
   end
 
   def parse(text, options = {})

diff --git a/opal/browser/dom/node_set.rb b/opal/browser/dom/node_set.rb
@@ -2,30 +2,31 @@ module Browser; module DOM
 
 # Allows manipulation of a set of {Node}s.
 class NodeSet
+  # Create a new {NodeSet} from the given nodes.
+  #
+  # Note that the nodes are flattened and converted with DOM automatically,
+  # this means you can pass {NodeSet}s and {Native::Array}s as well.
   def self.[](*nodes)
-    new(nodes.flatten.map { |x| DOM(Native.convert(x)) })
+    new(nodes.flatten.map { |x| DOM(Native.convert(x)) }.uniq)
   end
 
-  def initialize(array)
-    @array = array
-  end
-
-  def respond_to_missing?(name)
-    @array.respond_to?(name)
+  def initialize(literal)
+    @literal = literal
   end
 
+  # Any other method will be called on every node in the set.
   def method_missing(name, *args, &block)
-    unless @array.respond_to? name
+    unless @literal.respond_to? name
       each {|el|
         el.__send__(name, *args, &block)
       }
 
       return self
     end
 
-    result = @array.__send__ name, *args, &block
+    result = @literal.__send__ name, *args, &block
 
-    if `result === #@array`
+    if `result === #@literal`
       self
     elsif Array === result
       NodeSet.new(result)
@@ -34,61 +35,20 @@ def method_missing(name, *args, &block)
     end
   end
 
-  def dup
-    NodeSet.new(@array.dup)
-  end
-
+  # Create another {NodeSet} with all the nodes that match the given
+  # expression.
+  #
+  # @param expression [String] a CSS selector
+  #
+  # @return [NodeSet] the new {NodeSet} with the matching nodes
   def filter(expression)
-    NodeSet.new(@array.select { |node| node =~ expression })
-  end
-
-  def after(node)
-    last.after node
-  end
-
-  def at(path)
-    raise NotImplementedError
-  end
-
-  def at_css(*rules)
-    raise NotImplementedError
-  end
-
-  def at_xpath(*paths)
-    raise NotImplementedError
-  end
-
-  def before
-    first.before
-  end
-
-  def children
-    result = NodeSet.new([])
-
-    each { |n| result.concat(n.children) }
-
-    result
-  end
-
-  def css(*paths)
-    raise NotImplementedError
+    @literal.select { |node| node =~ expression }
   end
 
+  # Search for multiple selectors
   def search(*what)
     map { |n| n.search(*what) }.flatten.uniq
   end
-
-  def to_a
-    @array.dup
-  end
-
-  def to_ary
-    self
-  end
-
-  def inspect
-    "#<DOM::NodeSet: #{@array.inspect[1 .. -2]}"
-  end
 end
 
 end; end
diff --git a/spec/dom/node_set_spec.rb b/spec/dom/node_set_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe Browser::DOM::NodeSet do
+  NodeSet = Browser::DOM::NodeSet
+
+  html <<-HTML
+    <div id="lol">
+      <div class="a">
+        <div class="a-a"></div>
+      </div>
+
+      <div class="b"></div>
+      <div class="c"></div>
+
+      <div class="d">
+        <div class="d-a"></div>
+      </div>
+    </div>
+  HTML
+
+  describe '.[]' do
+    it 'flattens the nodes' do
+      set = NodeSet[[[$document["#lol .a"]]], [[$document["#lol .c"]]]]
+
+      expect(set[0]).to eq($document["#lol .a"])
+      expect(set[1]).to eq($document["#lol .c"])
+    end
+
+    it 'converts the items to DOM' do
+      set = NodeSet[`document.getElementById("lol")`]
+
+      expect(set[0]).to eq($document["#lol"])
+    end
+  end
+
+  describe '#filter' do
+    it 'filters the set with the given expression' do
+      set = $document["lol"].children.filter('.a, .c')
+
+      expect(set[0]).to eq($document["#lol .a"])
+      expect(set[1]).to eq($document["#lol .c"])
+    end
+  end
+end