multisax 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faccd217b395949d18f4b29ac75f185a7f1976bb
-  data.tar.gz: 24ecac5d9f3042ac03326efcb378886410d37edb
+  metadata.gz: 93782bad9e30774f1d5d05b206804d6ec7a981be
+  data.tar.gz: 1734d46e0312e9849fd6897aab0826c7225c8ff5
 SHA512:
-  metadata.gz: 1e091e45e62d7c0f41015949dd97a196f37b604cc700e5a1d039a07d8e73b9e710f39c42342d3171f7f89edd150069312b6e3da021964212ffe65b0c48ff79aa
-  data.tar.gz: 4cbbdb6fd438fbcfb5ddf62216d5b1269798835e1f8cd0ec75e5d7902290285934ec668177c35f0fa564922bb2de19c21241e8b8ec4e45b74fd89c3225156e69
+  metadata.gz: 3c4696780f1da115c91ca765f07c9a47d73221ef86e157f4aad2b3635b7a561d0fa3a1614da0a6118ab9fca99eb70444b835db970b0ea079d25c3cbe722fce21
+  data.tar.gz: 40df1e1c34be650f6526cc561e1535c35bc3fc2f5116b96fb8d046f68162ad2c143dd31bcc370a0b6d27f4fd550d8e35c88494dbbb80e5bda958149f5fbee6e0

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 = ChangeLog
 
+== 0.0.3 (2013 Nov 14)
+- Fixed namespace handling.
+- Now you can also select :oxhtml to parse HTML.
+- Added shortcut :XML and :HTML.
+- sax_tag_start()'s attrs is assured to be a Hash.
+- Refined spec.
+
 == 0.0.2 (2013 Nov 13)
 - Now you can create an instance of MultiSAX::SAX.
   - Please note that passed class to MultiSAX is still modified directly.
@@ -7,6 +14,7 @@
   - MultiSAX::Sax is now an instance of MultiSAX::SAX (this is backward-compatible).
 - You can specify :nokogirihtml explicitly to parse HTML.
 - Fixed attrs with Ox (now String is passed, not Symbol)
+- Moved to Bundler rather than Jeweler.
 
 == 0.0.1 (2013 Jul 8)
 - Added ChangeLog.

data/Gemfile

@@ -11,6 +11,6 @@ group :optional do
 end
 
 group :development do
-  gem "rspec"
-  gem "bundler"
+  gem 'rspec'
+  gem 'bundler', '>= 1.0'
 end

data/lib/multisax.rb

@@ -8,7 +8,7 @@
 
 module MultiSAX
 	# VERSION string
-	VERSION='0.0.2'
+	VERSION='0.0.3'
 
 	# The class to handle XML libraries.
 	class SAX
@@ -16,16 +16,19 @@ module MultiSAX
 		@saxmodule=nil
 		# Library loader.
 		# Arguments are list (or Array) of libraries.
-		#  Currently the following are supported (order by speed):
+		#  if list is empty or :XML, the following are searched (order by speed):
 		#  :ox, :libxml, :nokogiri, :rexmlstream, :rexmlsax2
+		#  if list is :HTML, the following are searched (order by speed):
+		#  :oxhtml, :nokogirihtml
+		#  You can also specify libraries individually.
 		#  If multiple selected, MultiSAX will try the libraries one by one and use the first usable one.
-		#  For HTML, you can specify :nokogirihtml explicitly.
 		def open(*list)
 			return @parser if @parser
-			list=[:ox,:libxml,:nokogiri,:rexmlstream,:rexmlsax2] if list.size==0
+			list=[:ox,:libxml,:nokogiri,:rexmlstream,:rexmlsax2] if list.size==0||list==[:XML]
+			list=[:oxhtml,:nokogirihtml] if list==[:HTML]
 			list.each{|e_module|
 				case e_module
-					when :ox
+					when :ox,:oxhtml
 						#next if RUBY_VERSION<'1.9'
 						begin
 							require 'ox'
@@ -92,17 +95,22 @@ module MultiSAX
 		def method_mapping(listener)
 			#raise "MultiSAX::Sax open first" if !@parser
 			case @parser
-				when :ox
+				when :ox,:oxhtml
 					saxmodule=@saxmodule
 					listener.instance_eval{
 						extend saxmodule
 						@saxwrapper_tag=nil
 						@saxwrapper_attr={}
 						def start_element(tag)
-							# I hope provided Listener's sax_tag_start will NOT be used elsewhere.
-							#alias :attrs_done :attrs_done_normal
-							@saxwrapper_tag=tag
-							@saxwrapper_attr={}
+							if @after_error
+								sax_tag_start(tag.to_s,{})
+								@after_error=false
+							else
+								# I hope provided Listener's sax_tag_start will NOT be used elsewhere.
+								#alias :attrs_done :attrs_done_normal
+								@saxwrapper_tag=tag
+								@saxwrapper_attr={}
+							end
 						end
 						# These "instance methods" are actually injected to listener class using instance_eval.
 						# i.e. not APIs. You cannot call these methods from outside.
@@ -122,6 +130,7 @@ module MultiSAX
 						def attrs_done
 							@saxwrapper_tag ? attrs_done_normal : attrs_done_xmldecl
 						end
+						def error(s,i,j) @after_error=true if s.end_with?('closed but not opened') end
 						def end_element(tag) sax_tag_end(tag.to_s) end
 						alias :cdata :sax_cdata
 						alias :text :sax_text
@@ -133,8 +142,10 @@ module MultiSAX
 				when :libxml
 					listener.instance_eval{
 						extend LibXML::XML::SaxParser::Callbacks
-						alias :on_start_element :sax_tag_start
-						alias :on_end_element :sax_tag_end
+						alias :on_start_element_ns :sax_start_element_namespace_libxml
+						#alias :on_start_element :sax_tag_start
+						alias :on_end_element_ns :sax_end_element_namespace
+						#alias :on_end_element :sax_tag_end
 						alias :on_cdata_block :sax_cdata
 						alias :on_characters :sax_text
 						alias :on_comment :sax_comment
@@ -144,8 +155,8 @@ module MultiSAX
 					saxmodule=@saxmodule
 					listener.instance_eval{
 						extend saxmodule
-						alias :start_element_namespace :sax_start_element_namespace
-						alias :start_element :sax_tag_start
+						alias :start_element_namespace :sax_start_element_namespace_nokogiri
+						def start_element(tag,attrs) sax_tag_start(tag,attrs.is_a?(Array) ? Hash[*attrs.flatten(1)] : attrs) end
 						alias :end_element_namespace :sax_end_element_namespace
 						alias :end_element :sax_tag_end
 						alias :cdata_block :sax_cdata
@@ -166,8 +177,8 @@ module MultiSAX
 				when :rexmlsax2
 					listener.instance_eval{
 						extend REXML::SAX2Listener
-						def start_element(uri,tag,qname,attrs) sax_tag_start(tag,attrs) end
-						def end_element(uri,tag,qname) sax_tag_end(tag) end
+						def start_element(uri,tag,qname,attrs) sax_tag_start(qname,attrs) end
+						def end_element(uri,tag,qname) sax_tag_end(qname) end
 						alias :cdata :sax_cdata
 						alias :characters :sax_text
 						alias :comment :sax_comment
@@ -192,6 +203,7 @@ module MultiSAX
 			if source.is_a?(String)
 				case @parser
 					when :ox           then Ox.sax_parse(@listener,StringIO.new(source),:convert_special=>true)
+					when :oxhtml       then Ox.sax_parse(@listener,StringIO.new(source),:convert_special=>true,:smart=>true)
 					when :libxml       then parser=LibXML::XML::SaxParser.string(source);parser.callbacks=@listener;parser.parse
 					when :nokogiri     then parser=Nokogiri::XML::SAX::Parser.new(@listener);parser.parse(source)
 					when :nokogirihtml then parser=Nokogiri::HTML::SAX::Parser.new(@listener);parser.parse(source)
@@ -201,9 +213,10 @@ module MultiSAX
 			else
 				case @parser
 					when :ox           then Ox.sax_parse(@listener,source,:convert_special=>true)
+					when :oxhtml       then Ox.sax_parse(@listener,source,:convert_special=>true,:smart=>true)
 					when :libxml       then parser=LibXML::XML::SaxParser.io(source);parser.callbacks=@listener;parser.parse
 					when :nokogiri     then parser=Nokogiri::XML::SAX::Parser.new(@listener);parser.parse(source)
-					when :nokogirihtml then parser=Nokogiri::HTML::SAX::Parser.new(@listener);parser.parse(source)
+					when :nokogirihtml then parser=Nokogiri::HTML::SAX::Parser.new(@listener);parser.parse(source.read) # fixme
 					when :rexmlstream  then REXML::Parsers::StreamParser.new(source,@listener).parse
 					when :rexmlsax2    then parser=REXML::Parsers::SAX2Parser.new(source);parser.listen(@listener);parser.parse
 				end
@@ -245,7 +258,7 @@ module MultiSAX
 	module Callbacks
 		# Cited from Nokogiri to convert Nokogiri::XML::SAX::Document into module.
 		#  https://github.com/sparklemotion/nokogiri/blob/master/lib/nokogiri/xml/sax/document.rb
-		def sax_start_element_namespace name, attrs = [], prefix = nil, uri = nil, ns = []
+		def sax_start_element_namespace_nokogiri name, attrs = [], prefix = nil, uri = nil, ns = []
 			# Deal with SAX v1 interface
 			name = [prefix, name].compact.join(':')
 			# modified in 0.0.2
@@ -257,6 +270,20 @@ module MultiSAX
 				attributes[[attr.prefix, attr.localname].compact.join(':')]=attr.value
 			}
 			sax_tag_start name, attributes
+        end
+		# libxml namespace handler
+		def sax_start_element_namespace_libxml name, attrs, prefix = nil, uri = nil, ns = []
+			# Deal with SAX v1 interface
+			name = [prefix, name].compact.join(':')
+			# modified in 0.0.2
+			attributes = {}
+			ns.each{|ns_prefix,ns_uri|
+				attributes[['xmlns', ns_prefix].compact.join(':')]=ns_uri
+			}
+			attrs.each{|k,v|
+				attributes[k]=v
+			}
+			sax_tag_start name, attributes
         end
 		# Cited from Nokogiri
 		def sax_end_element_namespace name, prefix = nil, uri = nil

data/multisax.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   ]
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "bundler", ">= 1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/spec/multisax_spec.rb

@@ -8,7 +8,7 @@ class MultiSAXTester
 	end
 	def sax_tag_start(tag,attrs)
 		@result<<tag
-		@attrib=attrs['foo'] if tag=='sax'
+		@attrib=attrs['class'] if tag=='span'
 	end
 	def sax_tag_end(tag)
 		@result<<tag
@@ -22,13 +22,16 @@ class MultiSAXTester
 	end
 	attr_reader :result,:attrib,:xmlencoding
 end
+
 input_xml=<<"EOM"
 <?xml version="1.0" encoding="UTF-8"?>
-<hello><sax foo="bar">world</sax></hello>
+<ns xmlns:zzz="http://example.com/">
+<zzz:hello><span class="foo">world</span></zzz:hello>
+</ns>
 EOM
-answer=['hello','sax','world','sax','hello']
+xml_answer=['ns','zzz:hello','span','world','span','zzz:hello','ns']
 
-describe "MultiSAX::Sax.parse (String)" do
+describe "[XML] MultiSAX::Sax.parse(String)" do
 	it "fails on :unknown" do
 		MultiSAX::Sax.reset
 		MultiSAX::Sax.open(:unknown).should be_false
@@ -38,8 +41,8 @@ describe "MultiSAX::Sax.parse (String)" do
 		MultiSAX::Sax.open(:rexmlstream)
 		MultiSAX::Sax.parser.should eq :rexmlstream
 		listener=MultiSAX::Sax.parse(input_xml,MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :rexmlsax2" do
@@ -47,8 +50,8 @@ describe "MultiSAX::Sax.parse (String)" do
 		MultiSAX::Sax.open(:rexmlsax2)
 		MultiSAX::Sax.parser.should eq :rexmlsax2
 		listener=MultiSAX::Sax.parse(input_xml,MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :ox" do
@@ -56,8 +59,8 @@ describe "MultiSAX::Sax.parse (String)" do
 		MultiSAX::Sax.open(:ox)
 		MultiSAX::Sax.parser.should eq :ox
 		listener=MultiSAX::Sax.parse(input_xml,MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :libxml" do
@@ -65,8 +68,8 @@ describe "MultiSAX::Sax.parse (String)" do
 		MultiSAX::Sax.open(:libxml)
 		MultiSAX::Sax.parser.should eq :libxml
 		listener=MultiSAX::Sax.parse(input_xml,MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		#listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :nokogiri" do
@@ -74,20 +77,20 @@ describe "MultiSAX::Sax.parse (String)" do
 		MultiSAX::Sax.open(:nokogiri)
 		MultiSAX::Sax.parser.should eq :nokogiri
 		listener=MultiSAX::Sax.parse(input_xml,MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 end
 
-describe "MultiSAX::Sax.parse (IO)" do
+describe "[XML] MultiSAX::Sax.parse(IO)" do
 	it "uses :rexmlstream" do
 		MultiSAX::Sax.reset
 		MultiSAX::Sax.open(:rexmlstream)
 		MultiSAX::Sax.parser.should eq :rexmlstream
 		listener=MultiSAX::Sax.parse(StringIO.new(input_xml),MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :rexmlsax2" do
@@ -95,8 +98,8 @@ describe "MultiSAX::Sax.parse (IO)" do
 		MultiSAX::Sax.open(:rexmlsax2)
 		MultiSAX::Sax.parser.should eq :rexmlsax2
 		listener=MultiSAX::Sax.parse(StringIO.new(input_xml),MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :ox" do
@@ -104,8 +107,8 @@ describe "MultiSAX::Sax.parse (IO)" do
 		MultiSAX::Sax.open(:ox)
 		MultiSAX::Sax.parser.should eq :ox
 		listener=MultiSAX::Sax.parse(StringIO.new(input_xml),MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :libxml" do
@@ -113,8 +116,8 @@ describe "MultiSAX::Sax.parse (IO)" do
 		MultiSAX::Sax.open(:libxml)
 		MultiSAX::Sax.parser.should eq :libxml
 		listener=MultiSAX::Sax.parse(StringIO.new(input_xml),MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		#listener.xmlencoding.should eq 'UTF-8'
 	end
 	it "uses :nokogiri" do
@@ -122,8 +125,56 @@ describe "MultiSAX::Sax.parse (IO)" do
 		MultiSAX::Sax.open(:nokogiri)
 		MultiSAX::Sax.parser.should eq :nokogiri
 		listener=MultiSAX::Sax.parse(StringIO.new(input_xml),MultiSAXTester.new)
-		listener.result.should eq answer
-		listener.attrib.should eq 'bar'
+		listener.result.should eq xml_answer
+		listener.attrib.should eq 'foo'
 		listener.xmlencoding.should eq 'UTF-8'
 	end
 end
+
+# broken intentionally
+input_html=<<"EOM"
+<html>
+<body>
+<span class="foo">hello
+</body>
+</html>
+EOM
+html_answer=['html','body','span','hello','span','body','html']
+
+describe "[HTML] MultiSAX::Sax.parse(String)" do
+	it "uses :oxhtml" do
+		MultiSAX::Sax.reset
+		MultiSAX::Sax.open(:oxhtml)
+		MultiSAX::Sax.parser.should eq :oxhtml
+		listener=MultiSAX::Sax.parse(input_html,MultiSAXTester.new)
+		listener.result.should eq html_answer
+		listener.attrib.should eq 'foo'
+	end
+	it "uses :nokogirihtml" do
+		MultiSAX::Sax.reset
+		MultiSAX::Sax.open(:nokogirihtml)
+		MultiSAX::Sax.parser.should eq :nokogirihtml
+		listener=MultiSAX::Sax.parse(input_html,MultiSAXTester.new)
+		listener.result.should eq html_answer
+		listener.attrib.should eq 'foo'
+	end
+end
+
+describe "[HTML] MultiSAX::Sax.parse(IO)" do
+	it "uses :oxhtml" do
+		MultiSAX::Sax.reset
+		MultiSAX::Sax.open(:oxhtml)
+		MultiSAX::Sax.parser.should eq :oxhtml
+		listener=MultiSAX::Sax.parse(StringIO.new(input_html),MultiSAXTester.new)
+		listener.result.should eq html_answer
+		listener.attrib.should eq 'foo'
+	end
+	it "uses :nokogirihtml" do
+		MultiSAX::Sax.reset
+		MultiSAX::Sax.open(:nokogirihtml)
+		MultiSAX::Sax.parser.should eq :nokogirihtml
+		listener=MultiSAX::Sax.parse(StringIO.new(input_html),MultiSAXTester.new)
+		listener.result.should eq html_answer
+		listener.attrib.should eq 'foo'
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multisax
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - cielavenir
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement