ox 1.7.0 → 1.7.1

data/README.md

@@ -34,13 +34,11 @@ A fast XML parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.7.0
+### Release 1.7.1
 
- - Added support for BOM in the SAX parser.
+ - Pulled in sharpyfox's changes to make Ox with with Windows. (issue #24)
 
-### Release 1.6.9
-
- - Added support for BOM. They are honored for and handled correctly for UTF-8. Others cause encoding issues with Ruby or raise an error as others are not ASCII compatible.
+ - Fixed bug that ignored white space only text elements. (issue #26)
 
 ## <a name="description">Description</a>
 

data/ext/ox/extconf.rb

@@ -20,7 +20,7 @@ dflags = {
   'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION)) ? 1 : 0,
   #'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
   'HAS_TM_GMTOFF' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0]) && 
-                      !(platform.include?('solaris') || platform.include?('linux'))) ? 1 : 0,
+                      !(platform.include?('solaris') || platform.include?('linux') || RUBY_PLATFORM =~ /(win|w)32$/)) ? 1 : 0,
   'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) &&
                              (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
@@ -28,11 +28,15 @@ dflags = {
   'HAS_IVAR_HELPERS' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
+  'NEEDS_UIO' => (RUBY_PLATFORM =~ /(win|w)32$/) ? 0 : 1,
 }
 
+if RUBY_PLATFORM =~ /(win|w)32$/
+  dflags['NEEDS_STPCPY'] = nil
+end
+
 if ['i386-darwin10.0.0', 'x86_64-darwin10.8.0'].include? RUBY_PLATFORM
   dflags['NEEDS_STPCPY'] = nil
-  
   dflags['HAS_IVAR_HELPERS'] = 0 if ('ruby' == type && '1.9.1' == RUBY_VERSION)
 elsif 'x86_64-linux' == RUBY_PLATFORM && '1.9.3' == RUBY_VERSION && '2011-10-30' == RUBY_RELEASE_DATE
   begin

data/ext/ox/parse.c

@@ -377,6 +377,7 @@ read_element(PInfo pi) {
     }
     if (hasChildren) {
 	char	*start;
+	int	first = 1;
 	
 	done = 0;
 	/* read children */
@@ -388,6 +389,8 @@ read_element(PInfo pi) {
 		raise_error("invalid format, document not terminated", pi->str, pi->s);
 	    }
 	    if ('<' == c) {
+		char	*slash;
+
 		switch (*pi->s) {
 		case '!':	/* better be a comment or CDATA */
 		    pi->s++;
@@ -402,6 +405,7 @@ read_element(PInfo pi) {
 		    }
 		    break;
 		case '/':
+		    slash = pi->s;
 		    pi->s++;
 		    name = read_name_token(pi);
 		    end = pi->s;
@@ -414,12 +418,18 @@ read_element(PInfo pi) {
 		    if ('>' != c) {
 			raise_error("invalid format, element not closed", pi->str, pi->s);
 		    }
+		    if (first && start != slash - 1) {
+			/* some white space between start and here so add as text */
+			*(slash - 1) = '\0';
+			pi->pcb->add_text(pi, start, 1);
+		    }
 		    pi->s++;
 		    pi->pcb->end_element(pi, ename);
 		    return;
 		case '\0':
 		    raise_error("invalid format, document not terminated", pi->str, pi->s);
 		default:
+		    first = 0;
 		    /* a child element */
 		    read_element(pi);
 		    break;

data/ext/ox/sax.c

@@ -33,7 +33,9 @@
 #include <stdio.h>
 #include <strings.h>
 #include <sys/types.h>
-#include <sys/uio.h>
+#if NEEDS_UIO
+#include <sys/uio.h>    
+#endif
 #include <unistd.h>
 #include <time.h>
 

data/lib/ox/element.rb

@@ -161,8 +161,10 @@ module Ox
           i -= 1
         end
       end
-      return @attributes[id] if @attributes.has_key?(id)
-      return @attributes[ids] if @attributes.has_key?(ids)
+      if instance_variable_defined?(:@attributes)
+        return @attributes[id] if @attributes.has_key?(id)
+        return @attributes[ids] if @attributes.has_key?(ids)
+      end
       raise NoMethodError.new("#{name} not found", name)
     end
 
@@ -172,10 +174,12 @@ module Ox
       step = path[0]
       if step.start_with?('@') # attribute
         raise InvalidPath.new(path) unless 1 == path.size
-        step = step[1..-1]
-        sym_step = step.to_sym
-        @attributes.each do |k,v|
-          found << v if ('?' == step or k == step or k == sym_step)
+        if instance_variable_defined?(:@attributes)
+          step = step[1..-1]
+          sym_step = step.to_sym
+          @attributes.each do |k,v|
+            found << v if ('?' == step or k == step or k == sym_step)
+          end
         end
       else # element name
         if (i = step.index('[')).nil? # just name

data/lib/ox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-06 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