saxerator 0.5.0 → 0.7.0

data/README.md

@@ -28,7 +28,7 @@ for added clarity).
 | `within(name)`   | Elements nested anywhere within an element with the given `name`
 | `child_of(name)` | Elements that are direct children of an element with the given `name`
 | `with_attribute(name, value)` | Elements that have an attribute with a given `name` and `value`. If no `value` is given, matches any element with the specified attribute name present
-
+| `with_attributes(attrs)` | Similar to `with_attribute` except takes an Array or Hash indicating the attributes to match
 
 Examples
 --------
@@ -77,6 +77,21 @@ magazines.each do |magazine|
 end
 ```
 
+Configuration
+-------------
+
+Certain options are available at parser initialization.
+
+```ruby
+Saxerator.parse(xml) do |config|
+  # config object has accessors for various settings
+end
+```
+
+| Config Option | Default | Values        | Description
+|:--------------|:--------|---------------|------------
+| `output_type` | `:hash` | `:hash, :xml` | The type of object generated by Saxerator's parsing. `:hash` should be self-explanatory, `:xml` generates a `Nokogiri::XML::Document`
+
 Known Issues
 ------------
 * JRuby closes the file stream at the end of parsing, therefor to perform multiple operations

data/lib/saxerator/builder/array_element.rb

@@ -0,0 +1,7 @@
+module Saxerator
+  module Builder
+    class ArrayElement < Array
+      attr_accessor :name
+    end
+  end
+end

data/lib/saxerator/builder/hash_builder.rb

@@ -0,0 +1,49 @@
+module Saxerator
+  module Builder
+    class HashBuilder
+      attr_reader :name
+
+      def initialize(config, name, attributes)
+        @config = config
+        @name = name
+        @attributes = attributes
+        @children = []
+        @text = false
+      end
+
+      def add_node(node)
+        @text = true if node.is_a? String
+        @children << node
+      end
+
+      def to_s
+        StringElement.new(@children.join, @name, @attributes)
+      end
+
+      def to_hash
+        hash = HashElement.new(@name, @attributes)
+
+        @children.each do |child|
+          name = child.name
+          element = child.block_variable
+
+          if hash[name]
+            if !hash[name].is_a?(Array)
+              hash[name] = ArrayElement[hash[name]]
+              hash[name].name = name
+            end
+            hash[name] << element
+          else
+            hash[name] = element
+          end
+        end
+
+        hash
+      end
+
+      def block_variable
+        @text ? to_s : to_hash
+      end
+    end
+  end
+end

data/lib/saxerator/builder/hash_element.rb

@@ -0,0 +1,13 @@
+module Saxerator
+  module Builder
+    class HashElement < Hash
+      attr_accessor :attributes
+      attr_accessor :name
+
+      def initialize(name, attributes)
+        self.name = name
+        self.attributes = attributes
+      end
+    end
+  end
+end

data/lib/saxerator/builder/string_element.rb

@@ -0,0 +1,14 @@
+module Saxerator
+  module Builder
+    class StringElement < String
+      attr_accessor :attributes
+      attr_accessor :name
+
+      def initialize(str, name, attributes)
+        self.name = name
+        self.attributes = attributes
+        super(str)
+      end
+    end
+  end
+end

data/lib/saxerator/builder/xml_builder.rb

@@ -0,0 +1,36 @@
+module Saxerator
+  module Builder
+    class XmlBuilder
+      attr_reader :name
+
+      def initialize(config, name, attributes)
+        @config = config
+        @name = name
+        @attributes = attributes
+        @children = []
+        @text = false
+      end
+
+      def add_node(node)
+        @text = true if node.is_a? String
+        @children << node
+      end
+
+      def to_xml(builder)
+        if @text
+          builder.send("#{name}_", @attributes, @children.join)
+        else
+          builder.send("#{name}_", @attributes) do |xml|
+            @children.each { |child| child.to_xml(xml) }
+          end
+        end
+      end
+
+      def block_variable
+        builder = Nokogiri::XML::Builder.new
+        to_xml(builder)
+        builder.doc
+      end
+    end
+  end
+end

data/lib/saxerator/builder.rb

@@ -0,0 +1,19 @@
+module Saxerator
+  module Builder
+    extend self
+
+    def valid?(type)
+      Builder.const_defined? "#{camel_case(type)}Builder"
+    end
+
+    def to_class(type)
+      Builder.const_get("#{camel_case(type)}Builder")
+    end
+
+    def camel_case(str)
+      str = str.to_s
+      return str if str !~ /_/ && str =~ /[A-Z]+.*/
+      str.split('_').map{|e| e.capitalize}.join
+    end
+  end
+end

data/lib/saxerator/configuration.rb

@@ -0,0 +1,14 @@
+module Saxerator
+  class Configuration
+    attr_reader :output_type
+
+    def initialize
+      @output_type = :hash
+    end
+
+    def output_type=(val)
+      raise ArgumentError.new("Unknown output_type '#{val.inspect}'") unless Builder.valid?(val)
+      @output_type = val
+    end
+  end
+end

data/lib/saxerator/document_fragment.rb

@@ -1,6 +1,3 @@
-require 'saxerator/dsl'
-require 'nokogiri'
-
 module Saxerator
   class DocumentFragment
     include Enumerable

data/lib/saxerator/dsl.rb

@@ -5,24 +5,35 @@ module Saxerator
     end
 
     def for_tags(tags)
-      raise ArgumentError('#for_tags requires an Array argument') unless tags.is_a? Array
-      specify Parser::ForTagsLatch.new(tags.map(&:to_s))
+      raise ArgumentError.new('#for_tags requires an Array argument') unless tags.is_a? Array
+      specify Latches::ForTags.new(tags.map(&:to_s))
     end
 
     def at_depth(depth)
-      specify Parser::AtDepthLatch.new(depth.to_i)
+      specify Latches::AtDepth.new(depth.to_i)
     end
 
     def within(tag)
-      specify Parser::WithinLatch.new(tag.to_s)
+      specify Latches::Within.new(tag.to_s)
     end
 
     def child_of(tag)
-      specify Parser::ChildOfLatch.new(tag.to_s)
+      specify Latches::ChildOf.new(tag.to_s)
     end
 
     def with_attribute(name, value = nil)
-      specify Parser::WithAttributeLatch.new(name.to_s, !!value ? value.to_s : nil)
+      specify Latches::WithAttributes.new({name.to_s => !!value ? value.to_s : nil })
+    end
+
+    def with_attributes(attrs)
+      if attrs.is_a? Array
+        attrs = Hash[attrs.map { |k| [k, nil]}]
+      elsif attrs.is_a? Hash
+        attrs = Hash[attrs.map{ |k, v| [k.to_s, v ? v.to_s : v]}]
+      else
+        raise ArgumentError.new("attributes should be a Hash or Array")
+      end
+      specify Latches::WithAttributes.new(attrs)
     end
 
     private

data/lib/saxerator/full_document.rb

@@ -1,10 +1,8 @@
-require 'saxerator/dsl'
-
 module Saxerator
   class FullDocument
     include DSL
 
-    def initialize(source, config = nil)
+    def initialize(source, config)
       @source = source
       @config = config
       @latches = []

data/lib/saxerator/{parser/document_latch.rb → latches/abstract_latch.rb}

@@ -1,8 +1,6 @@
-require 'nokogiri'
-
 module Saxerator
-  module Parser
-    class DocumentLatch < Nokogiri::XML::SAX::Document
+  module Latches
+    class AbstractLatch < Nokogiri::XML::SAX::Document
       def open
         @open = true
       end

data/lib/saxerator/{parser/at_depth_latch.rb → latches/at_depth.rb}

@@ -1,6 +1,6 @@
 module Saxerator
-  module Parser
-    class AtDepthLatch < Nokogiri::XML::SAX::Document
+  module Latches
+    class AtDepth < Nokogiri::XML::SAX::Document
       def initialize(depth)
         @target_depth = depth
         @current_depth = -1

data/lib/saxerator/{parser/child_of_latch.rb → latches/child_of.rb}

@@ -1,6 +1,6 @@
 module Saxerator
-  module Parser
-    class ChildOfLatch < Nokogiri::XML::SAX::Document
+  module Latches
+    class ChildOf < Nokogiri::XML::SAX::Document
       def initialize(name)
         @name = name
         @depths = []

data/lib/saxerator/{parser/for_tags_latch.rb → latches/for_tags.rb}

@@ -1,8 +1,8 @@
-require 'saxerator/parser/document_latch'
+require 'saxerator/latches/abstract_latch'
 
 module Saxerator
-  module Parser
-    class ForTagsLatch < DocumentLatch
+  module Latches
+    class ForTags < AbstractLatch
       def initialize(names)
         @names = names
       end

data/lib/saxerator/latches/with_attributes.rb

@@ -0,0 +1,24 @@
+require 'saxerator/latches/abstract_latch'
+
+module Saxerator
+  module Latches
+    class WithAttributes < AbstractLatch
+      def initialize(attrs)
+        @attrs = attrs
+      end
+
+      def start_element _, attributes
+        attributes = Hash[attributes]
+        if @attrs.all? { |k, v| attributes[k] && (v.nil? || attributes[k] == v) }
+          open
+        else
+          close
+        end
+      end
+
+      def end_element _
+        close
+      end
+    end
+  end
+end

data/lib/saxerator/{parser/within_latch.rb → latches/within.rb}

@@ -1,6 +1,6 @@
 module Saxerator
-  module Parser
-    class WithinLatch < Nokogiri::XML::SAX::Document
+  module Latches
+    class Within < Nokogiri::XML::SAX::Document
       def initialize(name)
         @name = name
         @depth_within_element = 0

data/lib/saxerator/parser/accumulator.rb

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 module Saxerator
   module Parser
     class Accumulator < Nokogiri::XML::SAX::Document
@@ -7,10 +5,11 @@ module Saxerator
         @stack = []
         @config = config
         @block = block
+        @builder = Builder.to_class(@config.output_type)
       end
 
       def start_element(name, attrs = [])
-        @stack.push XmlNode.new(@config, name, Hash[*attrs.flatten])
+        @stack.push @builder.new(@config, name, Hash[*attrs.flatten])
       end
 
       def end_element(_)

data/lib/saxerator/parser/latched_accumulator.rb

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 module Saxerator
   module Parser
     class LatchedAccumulator < Nokogiri::XML::SAX::Document

data/lib/saxerator/version.rb

@@ -1,3 +1,3 @@
 module Saxerator
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

data/lib/saxerator.rb

@@ -1,23 +1,35 @@
 require 'saxerator/version'
 
+require 'nokogiri'
+
+require 'saxerator/dsl'
 require 'saxerator/full_document'
 require 'saxerator/document_fragment'
-require 'saxerator/string_element'
-require 'saxerator/hash_element'
-require 'saxerator/xml_node'
+require 'saxerator/configuration'
+
+require 'saxerator/builder'
+require 'saxerator/builder/string_element'
+require 'saxerator/builder/hash_element'
+require 'saxerator/builder/array_element'
+require 'saxerator/builder/hash_builder'
+require 'saxerator/builder/xml_builder'
 
 require 'saxerator/parser/accumulator'
-require 'saxerator/parser/for_tags_latch'
-require 'saxerator/parser/at_depth_latch'
-require 'saxerator/parser/within_latch'
 require 'saxerator/parser/latched_accumulator'
-require 'saxerator/parser/child_of_latch'
-require 'saxerator/parser/with_attribute_latch'
+
+require 'saxerator/latches/for_tags'
+require 'saxerator/latches/at_depth'
+require 'saxerator/latches/within'
+require 'saxerator/latches/child_of'
+require 'saxerator/latches/with_attributes'
 
 module Saxerator
   extend self
 
   def parser(xml)
-    Saxerator::FullDocument.new(xml)
+    config = Configuration.new
+    yield(config) if block_given?
+
+    Saxerator::FullDocument.new(xml, config)
   end
 end

data/spec/fixtures/nested_elements.xml

@@ -9,9 +9,9 @@
     <id>1</id>
     <published>2012-01-01T16:17:00-06:00</published>
     <updated>2012-01-01T16:17:00-06:00</updated>
-    <link type="text/html" href="https://example.com/blog/how-to-eat-an-airplane" rel="alternate"/>
+    <link href="https://example.com/blog/how-to-eat-an-airplane"/>
     <title>How to eat an airplane</title>
-    <content type="html">&lt;p&gt;Airplanes are very large &#8212; this can present difficulty in digestion.&lt;/p&gt;</content>
+    <content type="html">&lt;p&gt;Airplanes are very large &#x2014; this can present difficulty in digestion.&lt;/p&gt;</content>
     <media:thumbnail url="http://www.gravatar.com/avatar/a9eb6ba22e482b71b266daadf9c9a080?s=80"/>
     <author>
       <name><![CDATA[Soul<utter]]></name>

data/spec/lib/builder/hash_builder_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe "Saxerator (default) hash format" do
+  let(:xml) { fixture_file('nested_elements.xml') }
+  subject(:entry) { Saxerator.parser(xml).for_tag(:entry).first }
+
+  # string
+  specify { entry['title'].should == 'How to eat an airplane' }
+
+  # hash and cdata inside name
+  specify { entry['author'].should == {'name' => 'Soul<utter'} }
+
+  # array of hashes
+  specify { entry['contributor'].should == [{'name' => 'Jane Doe'}, {'name' => 'Leviticus Alabaster'}] }
+
+  # attributes on a hash
+  specify { entry['contributor'][0].attributes['type'].should == 'primary' }
+
+  # attributes on a string
+  specify { entry['content'].attributes['type'].should == 'html' }
+
+  # name on a hash
+  specify { entry.name.should == 'entry' }
+
+  # name on a string
+  specify { entry['title'].name.should == 'title' }
+
+  # name on an array
+  specify { entry['contributor'].name.should == 'contributor' }
+
+  # character entity decoding
+  specify { entry['content'].should == "<p>Airplanes are very large — this can present difficulty in digestion.</p>" }
+
+  # empty element
+  specify { entry['media:thumbnail'].should == {} }
+end

data/spec/lib/builder/xml_builder_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe "Saxerator xml format" do
+  let(:xml) { fixture_file('nested_elements.xml') }
+  subject(:entry) do
+    Saxerator.parser(xml) do |config|
+      config.output_type = :xml
+    end.for_tag(:entry).first
+  end
+
+  it { should be_a(Nokogiri::XML::Node) }
+  it "looks like the original document" do
+    expected_xml = <<-eos
+<?xml version="1.0"?>
+<entry>
+  <id>1</id>
+  <published>2012-01-01T16:17:00-06:00</published>
+  <updated>2012-01-01T16:17:00-06:00</updated>
+  <link href="https://example.com/blog/how-to-eat-an-airplane"/>
+  <title>How to eat an airplane</title>
+  <content type="html">&lt;p&gt;Airplanes are very large &#x2014; this can present difficulty in digestion.&lt;/p&gt;</content>
+  <media:thumbnail url="http://www.gravatar.com/avatar/a9eb6ba22e482b71b266daadf9c9a080?s=80"/>
+  <author>
+    <name>Soul&lt;utter</name>
+  </author>
+  <contributor type="primary">
+    <name>Jane Doe</name>
+  </contributor>
+  <contributor>
+    <name>Leviticus Alabaster</name>
+  </contributor>
+</entry>
+    eos
+    entry.to_xml.should == expected_xml
+  end
+end

data/spec/lib/dsl/for_tags_spec.rb

@@ -16,4 +16,8 @@ describe "Saxerator::DSL#for_tags" do
   it "should only select the specified tags" do
     parser.for_tags(%w(blurb1 blurb3)).inject([], :<<).should == ['one', 'three']
   end
+
+  it "raises an ArgumentError for a non-Array argument" do
+    lambda { parser.for_tags("asdf") }.should raise_error ArgumentError
+  end
 end

data/spec/lib/dsl/with_attributes_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "Saxerator::DSL#with_attributes" do
+  subject(:parser) { Saxerator.parser(xml) }
+
+  let(:xml) do
+    <<-eos
+      <book>
+        <name>How to eat an airplane</name>
+        <author>
+          <name type="primary" ridiculous="true">Leviticus Alabaster</name>
+          <name type="foreword" ridiculous="true">Eunice Diesel</name>
+          <name type="foreword">Jackson Frylock</name>
+        </author>
+      </book>
+    eos
+  end
+
+  it "matches tags with the exact specified attributes" do
+    parser.with_attributes(:type => :primary, :ridiculous => 'true').inject([], :<<).should == [
+        'Leviticus Alabaster'
+    ]
+  end
+
+  it "matches tags which have the specified attributes" do
+    parser.with_attributes(%w(type ridiculous)).inject([], :<<).should == ['Leviticus Alabaster', 'Eunice Diesel']
+  end
+
+  it "raises ArgumentError if you pass something other than a Hash or Array" do
+    lambda { parser.with_attributes('asdf') }.should raise_error ArgumentError
+  end
+end

data/spec/lib/saxerator_spec.rb

@@ -3,10 +3,6 @@
 require 'spec_helper'
 
 describe Saxerator do
-  def fixture_file(name)
-    File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', name))
-  end
-
   context "#parser" do
     subject(:parser) { Saxerator.parser(xml) }
 
@@ -41,35 +37,21 @@ describe Saxerator do
     end
   end
 
-  context "block_variable format" do
-    let(:xml) { fixture_file('nested_elements.xml') }
-    subject(:entry) { Saxerator.parser(xml).for_tag(:entry).first }
-
-    # string
-    specify { entry['title'].should == 'How to eat an airplane' }
-
-    # hash and cdata inside name
-    specify { entry['author'].should == {'name' => 'Soul<utter'} }
-
-    # array of hashes
-    specify { entry['contributor'].should == [{'name' => 'Jane Doe'}, {'name' => 'Leviticus Alabaster'}] }
-
-    # attributes on a hash
-    specify { entry['contributor'][0].attributes['type'].should == 'primary' }
-
-    # attributes on a string
-    specify { entry['content'].attributes['type'].should == 'html' }
-
-    # name on a hash
-    specify { entry.name.should == 'entry' }
+  context "output_type configuration" do
+    subject(:parser) do
+      Saxerator.parser(xml) { |config| config.output_type = output_type }
+    end
 
-    # name on a string
-    specify { entry['title'].name.should == 'title' }
+    let(:xml) { "<foo><bar>baz</bar></foo>" }
 
-    # character entity decoding
-    specify { entry['content'].should == "<p>Airplanes are very large — this can present difficulty in digestion.</p>"}
+    context "with config.output_type = :hash" do
+      let(:output_type) { :hash }
+      specify { parser.all.should == {'bar' => 'baz'} }
+    end
 
-    # empty element
-    specify { entry['media:thumbnail'].should == {} }
+    context "with an invalid config.output_type" do
+      let(:output_type) { 'lmao' }
+      specify { lambda { parser }.should raise_error(ArgumentError) }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -5,4 +5,10 @@ if ENV['COVERAGE']
   end
 end
 
+Dir['./spec/support/**/*.rb'].each { |f| require f }
+
+RSpec.configure do |config|
+  config.include FixtureFile
+end
+
 require 'saxerator'

data/spec/support/fixture_file.rb

@@ -0,0 +1,5 @@
+module FixtureFile
+  def fixture_file(name)
+    File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', name))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saxerator
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -59,33 +59,41 @@ files:
 - Rakefile
 - .gitignore
 - .travis.yml
+- lib/saxerator/builder/array_element.rb
+- lib/saxerator/builder/hash_builder.rb
+- lib/saxerator/builder/hash_element.rb
+- lib/saxerator/builder/string_element.rb
+- lib/saxerator/builder/xml_builder.rb
+- lib/saxerator/builder.rb
+- lib/saxerator/configuration.rb
 - lib/saxerator/document_fragment.rb
 - lib/saxerator/dsl.rb
 - lib/saxerator/full_document.rb
-- lib/saxerator/hash_element.rb
+- lib/saxerator/latches/abstract_latch.rb
+- lib/saxerator/latches/at_depth.rb
+- lib/saxerator/latches/child_of.rb
+- lib/saxerator/latches/for_tags.rb
+- lib/saxerator/latches/with_attributes.rb
+- lib/saxerator/latches/within.rb
 - lib/saxerator/parser/accumulator.rb
-- lib/saxerator/parser/at_depth_latch.rb
-- lib/saxerator/parser/child_of_latch.rb
-- lib/saxerator/parser/document_latch.rb
-- lib/saxerator/parser/for_tags_latch.rb
 - lib/saxerator/parser/latched_accumulator.rb
-- lib/saxerator/parser/with_attribute_latch.rb
-- lib/saxerator/parser/within_latch.rb
-- lib/saxerator/string_element.rb
 - lib/saxerator/version.rb
-- lib/saxerator/xml_node.rb
 - lib/saxerator.rb
 - spec/fixtures/flat_blurbs.xml
 - spec/fixtures/nested_elements.xml
+- spec/lib/builder/hash_builder_spec.rb
+- spec/lib/builder/xml_builder_spec.rb
 - spec/lib/dsl/all_spec.rb
 - spec/lib/dsl/at_depth_spec.rb
 - spec/lib/dsl/child_of_spec.rb
 - spec/lib/dsl/for_tag_spec.rb
 - spec/lib/dsl/for_tags_spec.rb
 - spec/lib/dsl/with_attribute_spec.rb
+- spec/lib/dsl/with_attributes_spec.rb
 - spec/lib/dsl/within_spec.rb
 - spec/lib/saxerator_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_file.rb
 - benchmark/benchmark.rb
 - benchmark/generate_sample_file.rb
 homepage: https://github.com/soulcutter/saxerator
@@ -116,12 +124,16 @@ summary: A SAX-based XML-to-hash parser for parsing large files into manageable
 test_files:
 - spec/fixtures/flat_blurbs.xml
 - spec/fixtures/nested_elements.xml
+- spec/lib/builder/hash_builder_spec.rb
+- spec/lib/builder/xml_builder_spec.rb
 - spec/lib/dsl/all_spec.rb
 - spec/lib/dsl/at_depth_spec.rb
 - spec/lib/dsl/child_of_spec.rb
 - spec/lib/dsl/for_tag_spec.rb
 - spec/lib/dsl/for_tags_spec.rb
 - spec/lib/dsl/with_attribute_spec.rb
+- spec/lib/dsl/with_attributes_spec.rb
 - spec/lib/dsl/within_spec.rb
 - spec/lib/saxerator_spec.rb
 - spec/spec_helper.rb
+- spec/support/fixture_file.rb

data/lib/saxerator/hash_element.rb

@@ -1,11 +0,0 @@
-module Saxerator
-  class HashElement < Hash
-    attr_accessor :attributes
-    attr_accessor :name
-
-    def initialize(name, attributes)
-      self.name = name
-      self.attributes = attributes
-    end
-  end
-end

data/lib/saxerator/parser/with_attribute_latch.rb

@@ -1,25 +0,0 @@
-require 'saxerator/parser/document_latch'
-
-module Saxerator
-  module Parser
-    class WithAttributeLatch < DocumentLatch
-      def initialize(name, value)
-        @attr_name = name
-        @attr_value = value
-      end
-
-      def start_element _, attributes
-        attributes = Hash[attributes]
-        if attributes[@attr_name] && (@attr_value.nil? || attributes[@attr_name] == @attr_value)
-          open
-        else
-          close
-        end
-      end
-
-      def end_element _
-        close
-      end
-    end
-  end
-end

data/lib/saxerator/string_element.rb

@@ -1,12 +0,0 @@
-module Saxerator
-  class StringElement < String
-    attr_accessor :attributes
-    attr_accessor :name
-
-    def initialize(str, name, attributes)
-      self.name = name
-      self.attributes = attributes
-      super(str)
-    end
-  end
-end

data/lib/saxerator/xml_node.rb

@@ -1,46 +0,0 @@
-module Saxerator
-  class XmlNode
-    attr_reader :name
-
-    def initialize(config, name, attributes)
-      @config = config
-      @name = name
-      @attributes = attributes
-      @children = []
-      @text = false
-    end
-
-    def add_node(node)
-      @text = true if node.is_a? String
-      @children << node
-    end
-
-    def to_s
-      StringElement.new(@children.join, @name, @attributes)
-    end
-
-    def to_hash
-      hash = HashElement.new(@name, @attributes)
-
-      @children.each do |child|
-        name = child.name
-        element = child.block_variable
-
-        if hash[name]
-          if !hash[name].is_a?(Array)
-            hash[name] = [hash[name]]
-          end
-          hash[name] << element
-        else
-          hash[name] = element
-        end
-      end
-
-      hash
-    end
-
-    def block_variable
-      @text ? to_s : to_hash
-    end
-  end
-end