ox 1.8.3 → 1.8.4

data/README.md

@@ -34,6 +34,10 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
+### Release 1.8.4
+
+ - Applied patch by mcarpenter to fix solaris issues with build and remaining undefined @nodes.
+
 ### Release 1.8.3
 
  - Sax parser now honors encoding specification in the xml prolog correctly.

data/ext/ox/extconf.rb

@@ -31,7 +31,7 @@ dflags = {
   'NEEDS_UIO' => (RUBY_PLATFORM =~ /(win|w)32$/) ? 0 : 1,
 }
 
-if RUBY_PLATFORM =~ /(win|w)32$/
+if RUBY_PLATFORM =~ /(win|w)32$/ || RUBY_PLATFORM =~ /solaris2\.10/
   dflags['NEEDS_STPCPY'] = nil
 end
 

data/ext/ox/sax.c

@@ -77,6 +77,9 @@ typedef struct _SaxDrive {
 #endif
 } *SaxDrive;
 
+#ifdef NEEDS_STPCPY
+char *stpncpy(char *dest, const char *src, size_t n);
+#endif
 static void		sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, int convert);
 static void		sax_drive_cleanup(SaxDrive dr);
 static int		sax_drive_read(SaxDrive dr);
@@ -106,7 +109,7 @@ static int		read_from_str(SaxDrive dr);
 
 static VALUE		sax_value_class;
 
-/* This is only for CentOS 5.4 with Ruby 1.9.3-p0 and for OS X 10.6. */
+/* This is only for CentOS 5.4 with Ruby 1.9.3-p0 and for OS X 10.6 and Solaris 10. */
 #ifdef NEEDS_STPCPY
 char *stpncpy(char *dest, const char *src, size_t n) {
     size_t	cnt = strlen(src) + 1;

data/lib/ox/document.rb

@@ -18,7 +18,7 @@ module Ox
     
     # Returns the first Element in the document.
     def root()
-      unless @nodes.nil?
+      unless !instance_variable_defined?(:@nodes) || @nodes.nil?
         @nodes.each do |n|
           return n if n.is_a?(::Ox::Element)
         end

data/lib/ox/element.rb

@@ -79,7 +79,7 @@ module Ox
     # Returns the first String in the elements nodes array or nil if there is
     # no String node.
     def text()
-      @nodes.each { |n| return n if n.is_a?(String) }
+      nodes.each { |n| return n if n.is_a?(String) }
       nil
     end
 
@@ -134,7 +134,7 @@ module Ox
     def method_missing(id, *args, &block)
       ids = id.to_s
       i = args[0].to_i # will be 0 if no arg or parsing fails
-      @nodes.each do |n|
+      nodes.each do |n|
         if (n.is_a?(Element) || n.is_a?(Instruct)) && (n.value == id || n.value == ids)
           return n if 0 == i
           i -= 1

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module. 
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies: []
 description: ! "A fast XML parser and object serializer that uses only standard C
   lib.\n            \nOptimized XML (Ox), as the name implies was written to provide