nokogiri 1.4.5-x86-mswin32-60 → 1.4.6-x86-mswin32-60

data/CHANGELOG.ja.rdoc

@@ -1,4 +1,11 @@
-=== 1.4.5 / 未リリース
+=== 1.4.6 / 2011年6月19日
+
+* ノート
+
+  * このバージョンは、1.4.5と機能的に同じです
+  * Rubyの1.8.6のサポートが復元されている
+
+=== 1.4.5 / 2011年6月15日
 
 * 新機能
 

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 1.4.6 / 2011-06-19
+
+* Notes
+
+  * This version is functionally identical to 1.4.5.
+  * Ruby 1.8.6 support has been restored.
+
 === 1.4.5 / 2011-06-15
 
 * New Features

data/Rakefile

@@ -67,7 +67,7 @@ unless java
 
     ext.config_options << ENV['EXTOPTS']
     ext.cross_compile   = true
-    ext.cross_platform = ["x86-mingw32", "x86-mswin32-60"]
+    ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
     ext.cross_config_options <<
       "--with-xml2-include=#{File.join(CROSS_DIR, 'include', 'libxml2')}"
     ext.cross_config_options <<

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.4.5'
+  VERSION = '1.4.6'
 
   # More complete version information about libxml
   VERSION_INFO = {}
@@ -9,7 +9,7 @@ module Nokogiri
   VERSION_INFO['ruby']                  = {}
   VERSION_INFO['ruby']['version']       = ::RUBY_VERSION
   VERSION_INFO['ruby']['platform']      = ::RUBY_PLATFORM
-  VERSION_INFO['ruby']['description']   = ::RUBY_DESCRIPTION
+  VERSION_INFO['ruby']['description']   = ::RUBY_DESCRIPTION if defined? ::RUBY_DESCRIPTION
   VERSION_INFO['ruby']['engine']        = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'mri'
   VERSION_INFO['ruby']['jruby']         = ::JRUBY_VERSION if RUBY_PLATFORM == "java"
   if defined?(LIBXML_VERSION)

data/lib/nokogiri/xml/reader.rb

@@ -87,9 +87,9 @@ module Nokogiri
       ###
       # Get a list of attributes for the current node.
       def attributes
-        Hash[attribute_nodes.map { |node|
+        Hash[*attribute_nodes.map { |node|
           [node.name, node.to_s]
-        }].merge(namespaces || {})
+        }.flatten].merge(namespaces || {})
       end
 
       ###

data/test/html/test_document_fragment.rb

@@ -246,7 +246,7 @@ module Nokogiri
         context_node = doc.at_css "div"
         frag = Nokogiri::HTML::DocumentFragment.new doc, "<hello>oh, hello there.</hello>", context_node
         assert frag.errors.any?{|err| err.to_s =~ /Tag hello invalid/}, "errors should be on the context node's document"
-        assert frag.errors.none?{|err| err.to_s =~ /jimmy/}, "errors should not include pre-existing document errors"
+        assert ! frag.errors.any?{|err| err.to_s =~ /jimmy/}, "errors should not include pre-existing document errors"
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: x86-mswin32-60
 authors: 
 - Aaron Patterson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -04:00
+date: 2011-06-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency