nokogiri-streaming-reader 0.0.4 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eb4862727aea104efe91c018f0a9e2a0028cb14
-  data.tar.gz: fd0873746033091ef29e77e69010ef6fe79c96be
+  metadata.gz: 37fc22b99e9fd94795e988f57082726da98ef508
+  data.tar.gz: e3bb119767f3a94f69f6f9bad22c5a77c515d58d
 SHA512:
-  metadata.gz: c339ad735fc8f065a6f73ed3eba1e9e5aadf32cf2fe07bc348c308d8945d98cfa72abd48bef9f7f5ba574446b98fc4032dbe19acd35cc30e93f9b0b126888b6c
-  data.tar.gz: e9ab7271bfaf71a817d4fff7da753b793c197332ea74fe1a9d43405c872c5f7f1f3aa7f9518d08b7ccb1eb4665787abce484cb2669bb06d15618f6799aafbe83
+  metadata.gz: bb074d9be0e846dd89a034f026ba01c38224426a94f7cbba99dfd623d1a33dd804b53c52ff3a5300c2150ddbd4cc23c7b7e58f56dec73dfabb168841800fbb92
+  data.tar.gz: 79d289710b6dc9869e59639bfafb33806299021f0ec8fa42429cb7d7c01600b962ba9bc0682aad1950936a0ac5438c5005acab61521e7c695f1543fbc4f0e54a

data/lib/nokogiri/streaming/reader.rb

@@ -34,7 +34,8 @@ module Nokogiri
         @source = IOWrapper.new(source)
         @parser = Nokogiri::XML::SAX::Parser.new(self)
         @stack = []
-        @triggers = {}
+        @end_triggers = {}
+        @start_triggers = {}
       end
 
       def run
@@ -42,7 +43,11 @@ module Nokogiri
       end
 
       def on(path, &block)
-        (@triggers[path] ||= []).push(block)
+        (@end_triggers[path] ||= []).push(block)
+      end
+
+      def on_start(path, &block)
+        (@start_triggers[path] ||= []).push(block)
       end
 
       def current_path
@@ -70,19 +75,27 @@ module Nokogiri
       def start_element(name, attrs = [])
         if @current
           element = @current.document.create_element(name)
-          attrs.each do |name, value|
-            element[name] = value
+          attrs.each do |attrname, value|
+            element[attrname] = value
           end
           @current.add_child(element)
           @current = element
-        elsif @triggers[current_path + '/' + name]
+        elsif @end_triggers.include?(current_path + '/' + name)
           fragment = Nokogiri::XML::DocumentFragment.new(Nokogiri::XML::Document.new)
-
           element = fragment.document.create_element(name)
-          attrs.each do |name, value|
-            element[name] = value
+          attrs.each do |attrname, value|
+            element[attrname] = value
           end
           @current = element
+        elsif (triggers = @start_triggers[current_path + '/' + name])
+          fragment = Nokogiri::XML::DocumentFragment.new(Nokogiri::XML::Document.new)
+          element = fragment.document.create_element(name)
+          attrs.each do |attrname, value|
+            element[attrname] = value
+          end
+          triggers.each do |proc|
+            proc.call(element)
+          end
         end
         @stack.push(name)
       end
@@ -97,8 +110,7 @@ module Nokogiri
           @current = @current.parent
         end
 
-        triggers = @triggers[path]
-        if triggers
+        if (triggers = @end_triggers[path])
           triggers.each do |proc|
             proc.call(element)
           end

data/lib/nokogiri/streaming/version.rb

@@ -1,5 +1,5 @@
 module Nokogiri
   module Streaming
-    VERSION = '0.0.4'
+    VERSION = '1.1'
   end
 end

data/spec/reader_spec.rb

@@ -6,62 +6,86 @@ describe Nokogiri::Streaming::Reader do
     Nokogiri::Streaming::Reader
   end
 
-  it 'parses registered paths' do
-    doc = %{
-      <root>
-        <fruit/>
-        <fruit/>
-        <vegetable id='1'><seed/></vegetable>
-        <meat><type>beef</type></meat>
-      </root>
-    }
+  describe "#on" do
+    it 'parses registered paths' do
+      doc = StringIO.new %{
+        <root>
+          <fruit/>
+          <fruit/>
+          <vegetable id='1'><seed/></vegetable>
+          <meat><type>beef</type></meat>
+        </root>
+      }
 
-    fruits = []
-    vegetables = []
-    meats = []
+      fruits = []
+      vegetables = []
+      meats = []
 
-    reader = subject.new(doc)
-    reader.on('/root/fruit') do |e|
-      fruits.push(e.to_xml(indent: 0))
-    end
-    reader.on('/root/vegetable') do |e|
-      vegetables.push(e.to_xml(indent: 0))
-    end
-    reader.on('/root/meat/type') do |e|
-      meats.push(e.to_xml(indent: 0))
+      reader = subject.new(doc)
+      reader.on('/root/fruit') do |e|
+        fruits.push(e.to_xml(indent: 0))
+      end
+      reader.on('/root/vegetable') do |e|
+        vegetables.push(e.to_xml(indent: 0))
+      end
+      reader.on('/root/meat/type') do |e|
+        meats.push(e.to_xml(indent: 0))
+      end
+      reader.run
+
+      expect(fruits).to eq ['<fruit/>', '<fruit/>']
+      expect(vegetables).to eq ["<vegetable id=\"1\">\n<seed/>\n</vegetable>"]
+      expect(meats).to eq ["<type>beef</type>"]
     end
-    reader.run
 
-    expect(fruits).to eq ['<fruit/>', '<fruit/>']
-    expect(vegetables).to eq ["<vegetable id=\"1\">\n<seed/>\n</vegetable>"]
-    expect(meats).to eq ["<type>beef</type>"]
-  end
+    it 'preserves CDATA nodes' do
+      doc = StringIO.new %{
+        <root><![CDATA[banana]]></root>
+      }
+
+      reader = subject.new(doc)
+      reader.on('/root') do |e|
+        expect(e.children.length).to eq 1
+        expect(e.children.first.cdata?).to be true
+      end
+      reader.run
+    end
 
-  it 'preserves CDATA nodes' do
-    doc = %{
-      <root><![CDATA[banana]]></root>
-    }
+    it 'preserves text nodes' do
+      doc = StringIO.new %{
+        <root>banana</root>
+      }
 
-    reader = subject.new(doc)
-    reader.on('/root') do |e|
-      expect(e.children.length).to eq 1
-      expect(e.children.first.cdata?).to be true
+      reader = subject.new(doc)
+      reader.on('/root') do |e|
+        expect(e.children.length).to eq 1
+        expect(e.children.first.text?).to be true
+        expect(e.children.first.cdata?).to be false
+      end
+      reader.run
     end
-    reader.run
   end
 
-  it 'preserves text nodes' do
-    doc = %{
-      <root>banana</root>
-    }
+  describe "#on_start" do
+    it 'parses registered paths' do
+      doc = StringIO.new %{
+        <root>
+          <fruit name="apple"/>
+          <fruit/>
+          <fruit>something</fruit>
+          <vegetable id='1'><seed/></vegetable>
+          <meat><type>beef</type></meat>
+        </root>
+      }
+      fruits = []
+      reader = subject.new(doc)
+      reader.on_start('/root/fruit') do |e|
+        fruits.push(e.to_xml(indent: 0))
+      end
+      reader.run
 
-    reader = subject.new(doc)
-    reader.on('/root') do |e|
-      expect(e.children.length).to eq 1
-      expect(e.children.first.text?).to be true
-      expect(e.children.first.cdata?).to be false
+      expect(fruits).to eq ['<fruit name="apple"/>', '<fruit/>', '<fruit/>']
     end
-    reader.run
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri-streaming-reader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: '1.1'
 platform: ruby
 authors:
 - Alexander Staubo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -103,11 +103,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple streaming reader for Nokogiri.
 test_files:
 - spec/reader_spec.rb
 - spec/spec_helper.rb
-has_rdoc: