nokogiri 1.5.7.rc2 → 1.5.7.rc3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of nokogiri might be problematic. Click here for more details.

@@ -1,8 +1,15 @@
1
+
1
2
  == 1.5.x
2
3
 
3
4
  === 1.5.7 / unreleased
4
5
 
6
+ * Features
7
+
8
+ * Windows support for Ruby 2.0.
9
+
10
+
5
11
  * Bugfixes
12
+
6
13
  * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
7
14
  * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
8
15
  * (JRuby) Nokogiri::XML::Reader broken (as a pull parser) on jruby - reads the whole XML document. #831
@@ -32,6 +39,7 @@
32
39
 
33
40
 
34
41
  * Bugfixes
42
+
35
43
  * Nokogiri はこのバージョンからXSLT変換のエラーを検出するようになった。#731 (ありがとう、Justin Fitzsimmons!)
36
44
  * Don't throw an Error when trying to replace top-level text node in DocumentFragment. #775
37
45
  * SAXパーザに不正なエンコーディングに渡された場合はArgumentErrorを投げるようにした。#756 (ありがとう、Bradley Schaefer!)
@@ -2,7 +2,13 @@
2
2
 
3
3
  === 1.5.7 / unreleased
4
4
 
5
+ * Features
6
+
7
+ * Windows support for Ruby 2.0.
8
+
9
+
5
10
  * Bugfixes
11
+
6
12
  * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
7
13
  * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
8
14
  * (JRuby) Nokogiri::XML::Reader broken (as a pull parser) on jruby - reads the whole XML document. #831
@@ -32,6 +38,7 @@
32
38
 
33
39
 
34
40
  * Bugfixes
41
+
35
42
  * Nokogiri now detects XSLT transform errors. #731 (Thanks, Justin Fitzsimmons!)
36
43
  * Don't throw an Error when trying to replace top-level text node in DocumentFragment. #775
37
44
  * Raise an ArgumentError if an invalid encoding is passed to the SAX parser. #756 (Thanks, Bradley Schaefer!)
data/Rakefile CHANGED
@@ -7,7 +7,7 @@ Hoe.plugin :debugging
7
7
  Hoe.plugin :git
8
8
  Hoe.plugin :gemspec
9
9
  Hoe.plugin :bundler
10
- Hoe.add_include_dirs '.' # for ruby 1.9.2
10
+ Hoe.add_include_dirs '.'
11
11
 
12
12
  GENERATED_PARSER = "lib/nokogiri/css/parser.rb"
13
13
  GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
@@ -35,7 +35,7 @@ HOE = Hoe.spec 'nokogiri' do
35
35
  self.clean_globs += [
36
36
  'nokogiri.gemspec',
37
37
  'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
38
- 'lib/nokogiri/1.{8,9}',
38
+ 'lib/nokogiri/{1.8,1.9,2.0}',
39
39
  # GENERATED_PARSER,
40
40
  # GENERATED_TOKENIZER
41
41
  ]
@@ -48,7 +48,7 @@ HOE = Hoe.spec 'nokogiri' do
48
48
  ["mini_portile", ">= 0.2.2"],
49
49
  ["minitest", "~> 2.2.2"],
50
50
  ["rake", ">= 0.9"],
51
- ["rake-compiler", "= 0.8.0"],
51
+ ["rake-compiler", "~> 0.8.0"],
52
52
  ["racc", ">= 1.4.6"],
53
53
  ["rexical", ">= 1.0.5"]
54
54
  ]
@@ -194,7 +194,7 @@ end
194
194
 
195
195
  desc "build a windows gem without all the ceremony."
196
196
  task "gem:windows" => "gem" do
197
- cross_rubies = ["1.8.7-p358", "1.9.3-p194"]
197
+ cross_rubies = ["1.8.7-p358", "1.9.3-p194", "2.0.0-p0"]
198
198
  ruby_cc_version = cross_rubies.collect { |_| _.split("-").first }.join(":") # e.g., "1.8.7:1.9.2"
199
199
  rake_compiler_config_path = "#{ENV['HOME']}/.rake-compiler/config.yml"
200
200
 
@@ -215,9 +215,12 @@ task "gem:windows" => "gem" do
215
215
  end
216
216
 
217
217
  # verify that --export-all is in the 1.9 rbconfig. see #279,#374,#375.
218
- rbconfig_19 = rake_compiler_config["rbconfig-1.9.2"]
218
+ rbconfig_19 = rake_compiler_config["rbconfig-1.9.3"]
219
219
  raise "rbconfig #{rbconfig_19} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_19).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
220
220
 
221
+ rbconfig_20 = rake_compiler_config["rbconfig-2.0.0"]
222
+ raise "rbconfig #{rbconfig_20} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_20).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
223
+
221
224
  pkg_config_path = %w[libxslt libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
222
225
  sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross native gem") || raise("build failed!")
223
226
  end
data/build_all CHANGED
@@ -82,6 +82,9 @@ fi
82
82
  if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
83
83
  bundle exec rake-compiler cross-ruby VERSION=1.9.3-p194
84
84
  fi
85
+ if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-2.0.0-p0/lib/ruby/2.0.0/x86_64-linux/rbconfig.rb ]] ; then
86
+ bundle exec rake-compiler cross-ruby VERSION=2.0.0-p0
87
+ fi
85
88
  bundle exec rake cross
86
89
  bundle exec rake gem:windows
87
90
  cp -v pkg/nokogiri*x86-{mingw32,mswin32}*.gem gems
@@ -8,6 +8,7 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
8
8
 
9
9
  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
10
10
  LIBDIR = RbConfig::CONFIG['libdir']
11
+ @libdir_basename = "lib" # shrug, ruby 2.0 won't work for me.
11
12
  INCLUDEDIR = RbConfig::CONFIG['includedir']
12
13
 
13
14
  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
@@ -1,6 +1,6 @@
1
1
  module Nokogiri
2
2
  # The version of Nokogiri you are using
3
- VERSION = '1.5.7.rc2'
3
+ VERSION = '1.5.7.rc3'
4
4
 
5
5
  class VersionInfo # :nodoc:
6
6
  def jruby?
@@ -48,7 +48,7 @@ namespace :cross do
48
48
  end
49
49
  end
50
50
 
51
- checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
51
+ checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
52
52
  unless File.exist?(checkpoint)
53
53
  recipe.cook
54
54
  touch checkpoint
@@ -69,7 +69,7 @@ namespace :cross do
69
69
  "LDFLAGS=-mno-cygwin"
70
70
  ]
71
71
 
72
- checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
72
+ checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
73
73
  unless File.exist?(checkpoint)
74
74
  recipe.cook
75
75
  touch checkpoint
@@ -100,7 +100,7 @@ namespace :cross do
100
100
  end
101
101
  end
102
102
 
103
- checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
103
+ checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
104
104
  unless File.exist?(checkpoint)
105
105
  recipe.cook
106
106
  touch checkpoint
@@ -130,7 +130,7 @@ namespace :cross do
130
130
  end
131
131
  end
132
132
 
133
- checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
133
+ checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
134
134
  unless File.exist?(checkpoint)
135
135
  recipe.cook
136
136
  touch checkpoint
@@ -140,7 +140,7 @@ namespace :cross do
140
140
 
141
141
  task :file_list do
142
142
  HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
143
- HOE.spec.files += Dir["lib/nokogiri/1.{8,9}/nokogiri.so"]
143
+ HOE.spec.files += Dir["lib/nokogiri/{1.8,1.9,2.0}/nokogiri.so"]
144
144
  end
145
145
  end
146
146
 
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nokogiri
3
3
  version: !ruby/object:Gem::Version
4
- hash: -474228265
4
+ hash: -704395179
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 1
8
8
  - 5
9
9
  - 7
10
10
  - rc
11
- - 2
12
- version: 1.5.7.rc2
11
+ - 3
12
+ version: 1.5.7.rc3
13
13
  platform: ruby
14
14
  authors:
15
15
  - Aaron Patterson
@@ -20,7 +20,7 @@ autorequire:
20
20
  bindir: bin
21
21
  cert_chain: []
22
22
 
23
- date: 2013-03-11 00:00:00 Z
23
+ date: 2013-03-14 00:00:00 Z
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency
26
26
  prerelease: false
@@ -136,7 +136,7 @@ dependencies:
136
136
  version_requirements: &id008 !ruby/object:Gem::Requirement
137
137
  none: false
138
138
  requirements:
139
- - - "="
139
+ - - ~>
140
140
  - !ruby/object:Gem::Version
141
141
  hash: 63
142
142
  segments: