libxml-ruby 0.9.0 → 0.9.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGES +5 -1
- data/README +1 -1
- data/{RAKEFILE → Rakefile} +2 -2
- data/ext/libxml/ruby_xml_error.c +35 -17
- data/ext/libxml/version.h +2 -2
- data/ext/vc/libxml_ruby.vcproj +1 -1
- metadata +3 -3
data/CHANGES
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
(See log/ChangeLog for more detailed changes derived directly from source control.)
|
2
2
|
|
3
|
-
== 0.9.
|
3
|
+
== 0.9.1 / 2008-11-18 Charlie Savage
|
4
4
|
|
5
5
|
* Expose LibXML's encoding support via a new Encoding object.
|
6
6
|
|
@@ -17,6 +17,10 @@
|
|
17
17
|
|
18
18
|
* A number of bug fixes and patches.
|
19
19
|
|
20
|
+
== 0.9.0 / 2008-11-18 Charlie Savage
|
21
|
+
|
22
|
+
* Version 0.9.0 was removed due to packaging errors.
|
23
|
+
|
20
24
|
|
21
25
|
== 0.8.3 / 2008-07-21 Charlie Savage
|
22
26
|
|
data/README
CHANGED
@@ -32,7 +32,7 @@ The easiest way to install libxml-ruby is via Ruby Gems. To install:
|
|
32
32
|
|
33
33
|
If you are running Windows, make sure to install the Win32 RubyGem
|
34
34
|
which includes an already built binary file. The binary is built
|
35
|
-
against libxml2 version 2.
|
35
|
+
against libxml2 version 2.7.2 and iconv version 1.11. Both of these
|
36
36
|
are also included as pre-built binaries, and should be put either in
|
37
37
|
the libxml/lib directory or on the Windows path.
|
38
38
|
|
data/{RAKEFILE → Rakefile}
RENAMED
@@ -11,7 +11,7 @@ require 'date'
|
|
11
11
|
|
12
12
|
# ------- Default Package ----------
|
13
13
|
FILES = FileList[
|
14
|
-
'
|
14
|
+
'Rakefile',
|
15
15
|
'README',
|
16
16
|
'LICENSE',
|
17
17
|
'CHANGES',
|
@@ -186,4 +186,4 @@ task :publish_rdoc do
|
|
186
186
|
# maybe -p ?
|
187
187
|
cmd = "rsync -rLvz --delete-after #{dir} #{url}"
|
188
188
|
sh cmd
|
189
|
-
end
|
189
|
+
end
|
data/ext/libxml/ruby_xml_error.c
CHANGED
@@ -17,7 +17,7 @@ static ID ERROR_HANDLER_ID;
|
|
17
17
|
*
|
18
18
|
* By default, warnings, errors and fatal errors that
|
19
19
|
* libxml generates are printed to STDERR via the
|
20
|
-
* XML::Error::VERBOSE_HANDLER proc.
|
20
|
+
* XML::Error::VERBOSE_HANDLER proc.
|
21
21
|
*
|
22
22
|
* To disable this output you can install the quiet handler:
|
23
23
|
*
|
@@ -52,11 +52,11 @@ ruby_xml_error_set_handler(VALUE self)
|
|
52
52
|
rb_raise(rb_eRuntimeError, "No block given");
|
53
53
|
|
54
54
|
block = rb_block_proc();
|
55
|
-
|
55
|
+
|
56
56
|
/* Embed the block within the Error class to avoid it to be collected.
|
57
57
|
Previous handler will be overwritten if it exists. */
|
58
|
-
rb_cvar_set(self, ERROR_HANDLER_ID, block, 0);
|
59
|
-
|
58
|
+
rb_cvar_set(self, ERROR_HANDLER_ID, block, 0);
|
59
|
+
|
60
60
|
return self;
|
61
61
|
}
|
62
62
|
|
@@ -68,7 +68,7 @@ ruby_xml_error_set_handler(VALUE self)
|
|
68
68
|
static VALUE
|
69
69
|
ruby_xml_error_reset_handler(VALUE self)
|
70
70
|
{
|
71
|
-
rb_cvar_set(self, ERROR_HANDLER_ID, Qnil, 0);
|
71
|
+
rb_cvar_set(self, ERROR_HANDLER_ID, Qnil, 0);
|
72
72
|
return self;
|
73
73
|
}
|
74
74
|
|
@@ -84,22 +84,22 @@ ruby_xml_error_wrap(xmlErrorPtr xerror) {
|
|
84
84
|
rb_iv_set(result, "@domain", INT2NUM(xerror->domain));
|
85
85
|
rb_iv_set(result, "@code", INT2NUM(xerror->code));
|
86
86
|
rb_iv_set(result, "@level", INT2NUM(xerror->level));
|
87
|
-
|
87
|
+
|
88
88
|
if (xerror->file)
|
89
89
|
rb_iv_set(result, "@file", rb_str_new2(xerror->file));
|
90
|
-
|
90
|
+
|
91
91
|
if (xerror->line)
|
92
92
|
rb_iv_set(result, "@line", INT2NUM(xerror->line));
|
93
|
-
|
93
|
+
|
94
94
|
if (xerror->str1)
|
95
95
|
rb_iv_set(result, "@str1", rb_str_new2(xerror->str1));
|
96
|
-
|
96
|
+
|
97
97
|
if (xerror->str2)
|
98
98
|
rb_iv_set(result, "@str2", rb_str_new2(xerror->str2));
|
99
|
-
|
99
|
+
|
100
100
|
if (xerror->str3)
|
101
101
|
rb_iv_set(result, "@str3", rb_str_new2(xerror->str3));
|
102
|
-
|
102
|
+
|
103
103
|
rb_iv_set(result, "@int1", INT2NUM(xerror->int1));
|
104
104
|
rb_iv_set(result, "@int2", INT2NUM(xerror->int2));
|
105
105
|
|
@@ -125,7 +125,7 @@ structuredErrorFunc(void *userData, xmlErrorPtr xerror)
|
|
125
125
|
}
|
126
126
|
}
|
127
127
|
|
128
|
-
// Rdoc needs to know
|
128
|
+
// Rdoc needs to know
|
129
129
|
#ifdef RDOC_NEVER_DEFINED
|
130
130
|
mLibXML = rb_define_module("LibXML");
|
131
131
|
mXML = rb_define_module_under(mLibXML, "XML");
|
@@ -152,7 +152,7 @@ ruby_init_xml_error() {
|
|
152
152
|
|
153
153
|
|
154
154
|
/* Ruby callback to receive errors - set it to nil by default. */
|
155
|
-
ERROR_HANDLER_ID = rb_intern("@@__error_handler_callback__");
|
155
|
+
ERROR_HANDLER_ID = rb_intern("@@__error_handler_callback__");
|
156
156
|
rb_cvar_set(eXMLError, ERROR_HANDLER_ID, Qnil, 0);
|
157
157
|
|
158
158
|
/* Error attributes */
|
@@ -203,8 +203,10 @@ ruby_init_xml_error() {
|
|
203
203
|
rb_define_const(eXMLError, "CHECK", INT2NUM(XML_FROM_CHECK));
|
204
204
|
rb_define_const(eXMLError, "WRITER", INT2NUM(XML_FROM_WRITER));
|
205
205
|
rb_define_const(eXMLError, "MODULE", INT2NUM(XML_FROM_MODULE));
|
206
|
+
#if LIBXML_VERSION >= 20632
|
206
207
|
rb_define_const(eXMLError, "I18N", INT2NUM(XML_FROM_I18N));
|
207
208
|
rb_define_const(eXMLError, "SCHEMATRONV", INT2NUM(XML_FROM_SCHEMATRONV));
|
209
|
+
#endif
|
208
210
|
|
209
211
|
/* errors */
|
210
212
|
rb_define_const(eXMLError, "OK", INT2NUM(XML_ERR_OK));
|
@@ -309,12 +311,14 @@ ruby_init_xml_error() {
|
|
309
311
|
rb_define_const(eXMLError, "XML_WAR_NS_URI", INT2NUM(XML_WAR_NS_URI));
|
310
312
|
rb_define_const(eXMLError, "XML_WAR_NS_URI_RELATIVE", INT2NUM(XML_WAR_NS_URI_RELATIVE));
|
311
313
|
rb_define_const(eXMLError, "MISSING_ENCODING", INT2NUM(XML_ERR_MISSING_ENCODING));
|
314
|
+
#if LIBXML_VERSION >= 20620
|
312
315
|
rb_define_const(eXMLError, "XML_WAR_SPACE_VALUE", INT2NUM(XML_WAR_SPACE_VALUE));
|
313
316
|
rb_define_const(eXMLError, "NOT_STANDALONE", INT2NUM(XML_ERR_NOT_STANDALONE));
|
314
317
|
rb_define_const(eXMLError, "ENTITY_PROCESSING", INT2NUM(XML_ERR_ENTITY_PROCESSING));
|
315
318
|
rb_define_const(eXMLError, "NOTATION_PROCESSING", INT2NUM(XML_ERR_NOTATION_PROCESSING));
|
316
319
|
rb_define_const(eXMLError, "WAR_NS_COLUMN", INT2NUM(XML_WAR_NS_COLUMN));
|
317
320
|
rb_define_const(eXMLError, "WAR_ENTITY_REDEFINED", INT2NUM(XML_WAR_ENTITY_REDEFINED));
|
321
|
+
#endif
|
318
322
|
rb_define_const(eXMLError, "NS_ERR_XML_NAMESPACE", INT2NUM(XML_NS_ERR_XML_NAMESPACE));
|
319
323
|
rb_define_const(eXMLError, "NS_ERR_UNDEFINED_NAMESPACE", INT2NUM(XML_NS_ERR_UNDEFINED_NAMESPACE));
|
320
324
|
rb_define_const(eXMLError, "NS_ERR_QNAME", INT2NUM(XML_NS_ERR_QNAME));
|
@@ -511,7 +515,9 @@ ruby_init_xml_error() {
|
|
511
515
|
rb_define_const(eXMLError, "TREE_INVALID_HEX", INT2NUM(XML_TREE_INVALID_HEX));
|
512
516
|
rb_define_const(eXMLError, "TREE_INVALID_DEC", INT2NUM(XML_TREE_INVALID_DEC));
|
513
517
|
rb_define_const(eXMLError, "TREE_UNTERMINATED_ENTITY", INT2NUM(XML_TREE_UNTERMINATED_ENTITY));
|
518
|
+
#if LIBXML_VERSION >= 20632
|
514
519
|
rb_define_const(eXMLError, "TREE_NOT_UTF8", INT2NUM(XML_TREE_NOT_UTF8));
|
520
|
+
#endif
|
515
521
|
rb_define_const(eXMLError, "SAVE_NOT_UTF8", INT2NUM(XML_SAVE_NOT_UTF8));
|
516
522
|
rb_define_const(eXMLError, "SAVE_CHAR_INVALID", INT2NUM(XML_SAVE_CHAR_INVALID));
|
517
523
|
rb_define_const(eXMLError, "SAVE_NO_DOCTYPE", INT2NUM(XML_SAVE_NO_DOCTYPE));
|
@@ -777,7 +783,9 @@ ruby_init_xml_error() {
|
|
777
783
|
rb_define_const(eXMLError, "SCHEMAV_CVC_TYPE_2", INT2NUM(XML_SCHEMAV_CVC_TYPE_2));
|
778
784
|
rb_define_const(eXMLError, "SCHEMAV_CVC_IDC", INT2NUM(XML_SCHEMAV_CVC_IDC));
|
779
785
|
rb_define_const(eXMLError, "SCHEMAV_CVC_WILDCARD", INT2NUM(XML_SCHEMAV_CVC_WILDCARD));
|
786
|
+
#if LIBXML_VERSION >= 20631
|
780
787
|
rb_define_const(eXMLError, "SCHEMAV_MISC", INT2NUM(XML_SCHEMAV_MISC));
|
788
|
+
#endif
|
781
789
|
rb_define_const(eXMLError, "XPTR_UNKNOWN_SCHEME", INT2NUM(XML_XPTR_UNKNOWN_SCHEME));
|
782
790
|
rb_define_const(eXMLError, "XPTR_CHILDSEQ_START", INT2NUM(XML_XPTR_CHILDSEQ_START));
|
783
791
|
rb_define_const(eXMLError, "XPTR_EVAL_FAILED", INT2NUM(XML_XPTR_EVAL_FAILED));
|
@@ -786,12 +794,16 @@ ruby_init_xml_error() {
|
|
786
794
|
rb_define_const(eXMLError, "C14N_REQUIRES_UTF8", INT2NUM(XML_C14N_REQUIRES_UTF8));
|
787
795
|
rb_define_const(eXMLError, "C14N_CREATE_STACK", INT2NUM(XML_C14N_CREATE_STACK));
|
788
796
|
rb_define_const(eXMLError, "C14N_INVALID_NODE", INT2NUM(XML_C14N_INVALID_NODE));
|
797
|
+
#if LIBXML_VERSION >= 20619
|
789
798
|
rb_define_const(eXMLError, "C14N_UNKNOW_NODE", INT2NUM(XML_C14N_UNKNOW_NODE));
|
790
799
|
rb_define_const(eXMLError, "C14N_RELATIVE_NAMESPACE", INT2NUM(XML_C14N_RELATIVE_NAMESPACE));
|
800
|
+
#endif
|
791
801
|
rb_define_const(eXMLError, "FTP_PASV_ANSWER", INT2NUM(XML_FTP_PASV_ANSWER));
|
792
802
|
rb_define_const(eXMLError, "FTP_EPSV_ANSWER", INT2NUM(XML_FTP_EPSV_ANSWER));
|
793
803
|
rb_define_const(eXMLError, "FTP_ACCNT", INT2NUM(XML_FTP_ACCNT));
|
804
|
+
#if LIBXML_VERSION >= 20618
|
794
805
|
rb_define_const(eXMLError, "FTP_URL_SYNTAX", INT2NUM(XML_FTP_URL_SYNTAX));
|
806
|
+
#endif
|
795
807
|
rb_define_const(eXMLError, "HTTP_URL_SYNTAX", INT2NUM(XML_HTTP_URL_SYNTAX));
|
796
808
|
rb_define_const(eXMLError, "HTTP_USE_IP", INT2NUM(XML_HTTP_USE_IP));
|
797
809
|
rb_define_const(eXMLError, "HTTP_UNKNOWN_HOST", INT2NUM(XML_HTTP_UNKNOWN_HOST));
|
@@ -875,20 +887,28 @@ ruby_init_xml_error() {
|
|
875
887
|
rb_define_const(eXMLError, "SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_3", INT2NUM(XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_3));
|
876
888
|
rb_define_const(eXMLError, "SCHEMAP_AU_PROPS_CORRECT_2", INT2NUM(XML_SCHEMAP_AU_PROPS_CORRECT_2));
|
877
889
|
rb_define_const(eXMLError, "SCHEMAP_A_PROPS_CORRECT_2", INT2NUM(XML_SCHEMAP_A_PROPS_CORRECT_2));
|
890
|
+
#if LIBXML_VERSION >= 20620
|
878
891
|
rb_define_const(eXMLError, "SCHEMAP_C_PROPS_CORRECT", INT2NUM(XML_SCHEMAP_C_PROPS_CORRECT));
|
892
|
+
#endif
|
893
|
+
#if LIBXML_VERSION >= 20621
|
879
894
|
rb_define_const(eXMLError, "SCHEMAP_SRC_REDEFINE", INT2NUM(XML_SCHEMAP_SRC_REDEFINE));
|
880
895
|
rb_define_const(eXMLError, "SCHEMAP_SRC_IMPORT", INT2NUM(XML_SCHEMAP_SRC_IMPORT));
|
881
896
|
rb_define_const(eXMLError, "SCHEMAP_WARN_SKIP_SCHEMA", INT2NUM(XML_SCHEMAP_WARN_SKIP_SCHEMA));
|
882
897
|
rb_define_const(eXMLError, "SCHEMAP_WARN_UNLOCATED_SCHEMA", INT2NUM(XML_SCHEMAP_WARN_UNLOCATED_SCHEMA));
|
883
898
|
rb_define_const(eXMLError, "SCHEMAP_WARN_ATTR_REDECL_PROH", INT2NUM(XML_SCHEMAP_WARN_ATTR_REDECL_PROH));
|
884
899
|
rb_define_const(eXMLError, "SCHEMAP_WARN_ATTR_POINTLESS_PROH", INT2NUM(XML_SCHEMAP_WARN_ATTR_POINTLESS_PROH));
|
900
|
+
#endif
|
901
|
+
#if LIBXML_VERSION >= 20623
|
885
902
|
rb_define_const(eXMLError, "SCHEMAP_AG_PROPS_CORRECT", INT2NUM(XML_SCHEMAP_AG_PROPS_CORRECT));
|
886
903
|
rb_define_const(eXMLError, "SCHEMAP_COS_CT_EXTENDS_1_2", INT2NUM(XML_SCHEMAP_COS_CT_EXTENDS_1_2));
|
887
904
|
rb_define_const(eXMLError, "SCHEMAP_AU_PROPS_CORRECT", INT2NUM(XML_SCHEMAP_AU_PROPS_CORRECT));
|
888
905
|
rb_define_const(eXMLError, "SCHEMAP_A_PROPS_CORRECT_3", INT2NUM(XML_SCHEMAP_A_PROPS_CORRECT_3));
|
889
906
|
rb_define_const(eXMLError, "SCHEMAP_COS_ALL_LIMITED", INT2NUM(XML_SCHEMAP_COS_ALL_LIMITED));
|
907
|
+
#endif
|
908
|
+
#if LIBXML_VERSION >= 20632
|
890
909
|
rb_define_const(eXMLError, "SCHEMATRONV_ASSERT", INT2NUM(XML_SCHEMATRONV_ASSERT));
|
891
910
|
rb_define_const(eXMLError, "SCHEMATRONV_REPORT", INT2NUM(XML_SCHEMATRONV_REPORT));
|
911
|
+
#endif
|
892
912
|
rb_define_const(eXMLError, "MODULE_OPEN", INT2NUM(XML_MODULE_OPEN));
|
893
913
|
rb_define_const(eXMLError, "MODULE_CLOSE", INT2NUM(XML_MODULE_CLOSE));
|
894
914
|
rb_define_const(eXMLError, "CHECK_FOUND_ELEMENT", INT2NUM(XML_CHECK_FOUND_ELEMENT));
|
@@ -928,14 +948,12 @@ ruby_init_xml_error() {
|
|
928
948
|
rb_define_const(eXMLError, "CHECK_NOT_NCNAME", INT2NUM(XML_CHECK_NOT_NCNAME));
|
929
949
|
rb_define_const(eXMLError, "CHECK_OUTSIDE_DICT", INT2NUM(XML_CHECK_OUTSIDE_DICT));
|
930
950
|
rb_define_const(eXMLError, "CHECK_WRONG_NAME", INT2NUM(XML_CHECK_WRONG_NAME));
|
951
|
+
#if LIBXML_VERSION >= 20621
|
931
952
|
rb_define_const(eXMLError, "CHECK_NAME_NOT_NULL", INT2NUM(XML_CHECK_NAME_NOT_NULL));
|
932
953
|
rb_define_const(eXMLError, "I18N_NO_NAME", INT2NUM(XML_I18N_NO_NAME));
|
933
954
|
rb_define_const(eXMLError, "I18N_NO_HANDLER", INT2NUM(XML_I18N_NO_HANDLER));
|
934
955
|
rb_define_const(eXMLError, "I18N_EXCESS_HANDLER", INT2NUM(XML_I18N_EXCESS_HANDLER));
|
935
956
|
rb_define_const(eXMLError, "I18N_CONV_FAILED", INT2NUM(XML_I18N_CONV_FAILED));
|
936
957
|
rb_define_const(eXMLError, "I18N_NO_OUTPUT", INT2NUM(XML_I18N_NO_OUTPUT));
|
937
|
-
|
938
|
-
rb_define_const(eXMLError, "XML_CHECK_", INT2NUM(XML_CHECK_));
|
939
|
-
rb_define_const(eXMLError, "XML_CHECK_X", INT2NUM(XML_CHECK_X));
|
940
|
-
#endif
|
958
|
+
#endif
|
941
959
|
}
|
data/ext/libxml/version.h
CHANGED
@@ -1,9 +1,9 @@
|
|
1
1
|
/* Don't nuke this block! It is used for automatically updating the
|
2
2
|
* versions below. VERSION = string formatting, VERNUM = numbered
|
3
3
|
* version for inline testing: increment both or none at all.*/
|
4
|
-
#define RUBY_LIBXML_VERSION "0.9.
|
4
|
+
#define RUBY_LIBXML_VERSION "0.9.1"
|
5
5
|
#define RUBY_LIBXML_VERNUM 0
|
6
6
|
#define RUBY_LIBXML_VER_MAJ 0
|
7
7
|
#define RUBY_LIBXML_VER_MIN 9
|
8
|
-
#define RUBY_LIBXML_VER_MIC
|
8
|
+
#define RUBY_LIBXML_VER_MIC 1
|
9
9
|
#define RUBY_LIBXML_VER_PATCH 0
|
data/ext/vc/libxml_ruby.vcproj
CHANGED
@@ -63,7 +63,7 @@
|
|
63
63
|
<Tool
|
64
64
|
Name="VCLinkerTool"
|
65
65
|
AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib"
|
66
|
-
OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.
|
66
|
+
OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.1-x86-mswin32-60\lib\$(ProjectName).so"
|
67
67
|
LinkIncremental="2"
|
68
68
|
AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
|
69
69
|
GenerateDebugInformation="true"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: libxml-ruby
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Charlie Savage
|
@@ -22,7 +22,7 @@ extensions:
|
|
22
22
|
extra_rdoc_files: []
|
23
23
|
|
24
24
|
files:
|
25
|
-
-
|
25
|
+
- Rakefile
|
26
26
|
- README
|
27
27
|
- LICENSE
|
28
28
|
- CHANGES
|
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
183
183
|
requirements: []
|
184
184
|
|
185
185
|
rubyforge_project: libxml
|
186
|
-
rubygems_version: 1.
|
186
|
+
rubygems_version: 1.3.1
|
187
187
|
signing_key:
|
188
188
|
specification_version: 2
|
189
189
|
summary: Ruby libxml bindings
|