ox 1.0.0 → 1.0.1

data/{README → README.rdoc}

@@ -2,6 +2,8 @@
 
 *GitHub* *repo*: https://github.com/ohler55/ox
 
+*RubyGems* *repo*: https://rubygems.org/gems/ox
+
 === Description:
 
 Optimized XML (Ox), as the name implies was written to provide speed optimized

data/ext/ox/dump.c

@@ -702,8 +702,8 @@ dump_hash(VALUE key, VALUE value, Out out) {
 
 static void
 dump_gen_doc(VALUE obj, unsigned int depth, Out out) {
-    VALUE       attrs = rb_ivar_get(obj, attributes_id);
-    VALUE       nodes = rb_ivar_get(obj, nodes_id);
+    VALUE       attrs = rb_attr_get(obj, attributes_id);
+    VALUE       nodes = rb_attr_get(obj, nodes_id);
 
     dump_value(out, "<?xml", 5);
     if (Qnil != attrs) {
@@ -717,9 +717,9 @@ dump_gen_doc(VALUE obj, unsigned int depth, Out out) {
 
 static void
 dump_gen_element(VALUE obj, unsigned int depth, Out out) {
-    VALUE       rname = rb_ivar_get(obj, value_id);
-    VALUE       attrs = rb_ivar_get(obj, attributes_id);
-    VALUE       nodes = rb_ivar_get(obj, nodes_id);
+    VALUE       rname = rb_attr_get(obj, value_id);
+    VALUE       attrs = rb_attr_get(obj, attributes_id);
+    VALUE       nodes = rb_attr_get(obj, nodes_id);
     const char  *name = StringValuePtr(rname);
     long        nlen = RSTRING_LEN(rname);
     size_t      size;
@@ -817,7 +817,7 @@ static void
 dump_gen_val_node(VALUE obj, unsigned int depth,
                   const char *pre, size_t plen,
                   const char *suf, size_t slen, Out out) {
-    VALUE       v = rb_ivar_get(obj, value_id);
+    VALUE       v = rb_attr_get(obj, value_id);
     const char  *val;
     size_t      vlen;
     size_t      size;

data/ext/ox/ox.c

@@ -228,7 +228,6 @@ load_str(int argc, VALUE *argv, VALUE self) {
  * or Object depending on the options.  Raises an exception if the XML is
  * malformed or the classes specified are not valid.
  * [file_path] file path to read the XML document from
- * [xml]       XML String
  * [options] load options
  *           [:mode]        format expected
  *                          [:object]  object format

data/lib/ox/element.rb

@@ -1,6 +1,6 @@
 
 module Ox
-  # An Element represents a element of an EML document. It has a name,
+  # An Element represents a element of an XML document. It has a name,
   # attributes, and sub-nodes.
   class Element < Node
     
@@ -17,28 +17,28 @@ module Ox
     # Returns the Element's nodes array. These are the sub-elements of this
     # Element.
     def nodes
-      @nodes = [] if @nodes.nil?
+      @nodes = [] if !instance_variable_defined?(:@nodes) or @nodes.nil?
       @nodes
     end
 
     # Appends a Node to the Element's nodes array.
     # [node] Node to append to the nodes array
     def <<(node)
-      @nodes = [] if @nodes.nil?
+      @nodes = [] if !instance_variable_defined?(:@nodes) or @nodes.nil?
       raise "argument to << must be a String or Ox::Node." unless node.is_a?(String) or node.is_a?(Node)
       @nodes << node
     end
 
     # Returns all the attributes of the Element as a Hash.
     def attributes
-      @attributes = { } if @attributes.nil?
+      @attributes = { } if !instance_variable_defined?(:@attributes) or @attributes.nil?
       @attributes
     end
     
     # Returns the value of an attribute.
     # [attr]  attribute name or key to return the value for
     def [](attr)
-      return nil unless @attributes.is_a?(Hash)
+      return nil unless instance_variable_defined?(:@attributes) and @attributes.is_a?(Hash)
       @attributes[attr] or (attr.is_a?(String) ? @attributes[attr.to_sym] : @attributes[attr.to_s])
     end
 
@@ -47,7 +47,7 @@ module Ox
     # [value] value for the attribute
     def []=(attr, value)
       raise "argument to [] must be a Symbol or a String." unless attr.is_a?(Symbol) or attr.is_a?(String)
-      @attributes = { } if @attributes.nil?
+      @attributes = { } if !instance_variable_defined?(:@attributes) or @attributes.nil?
       @attributes[attr] = value.to_s
     end
 

metadata

@@ -2,7 +2,7 @@
 name: ox
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Peter Ohler
@@ -20,7 +20,7 @@ executables: []
 extensions: 
 - ext/ox/extconf.rb
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - lib/ox/cdata.rb
 - lib/ox/comment.rb
@@ -72,14 +72,14 @@ files:
 - test/test.rb
 - test/Sample.graffle
 - LICENSE
-- README
+- README.rdoc
 homepage: http://www.ohler.com/ox
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 - ext