saxaphone 0.2.0 → 0.2.1

data/lib/saxaphone/document.rb

@@ -4,12 +4,14 @@ module Saxaphone
   class Document < Nokogiri::XML::SAX::Document
     class << self
       def parse(io, root_element_class)
-        parser = Nokogiri::XML::SAX::Parser.new(new(root_element_class))
+        document = new(root_element_class)
+        parser = Nokogiri::XML::SAX::Parser.new(document)
         parser.parse(io)
+        document.root_element
       end
     end
 
-    attr_accessor :element_stack, :root_element_class
+    attr_accessor :element_stack, :root_element_class, :root_element
     def initialize(root_element_class)
       @element_stack = []
       @root_element_class = root_element_class
@@ -22,7 +24,9 @@ module Saxaphone
 
     def end_element(name)
       ending_element = element_stack.pop
-      unless element_stack.empty?
+      if element_stack.empty?
+        self.root_element = ending_element
+      else
         element_stack.last.add_element(ending_element)
       end
     end

data/test/element_test.rb

@@ -5,30 +5,22 @@ class Saxaphone::ElementTest < MiniTest::Spec
     attr_accessor :special
   end
 
-  class TestElement < Saxaphone::Element
-    attr_accessor :setup_attr
-    attr_accessor :child_special
-    setup do
-      self.setup_attr = 'hola'
-    end
-
-    element_attributes %w(foo bar)
-    element_attribute 'faz', as: 'baz'
-
-    has_element 'omg', 'Saxaphone::ElementTest::TestChildElement' do |element|
-      self.child_special = element.special
+  def test_setup
+    element = define_element do
+      attr_accessor :setup_attr
+      setup do
+        self.setup_attr = 'hola'
+      end
     end
 
-    has_element 'wtf', 'Saxaphone::ElementTest::TestChildElement'
-  end
-
-  def test_setup
-    element = TestElement.new
     assert_equal 'hola', element.setup_attr
   end
 
   def test_element_attributes
-    element = TestElement.new
+    element = define_element do
+      element_attributes %w(foo bar)
+    end
+
     element.add_element(Saxaphone::Element.new('foo', 'value1'))
     element.add_element(Saxaphone::Element.new('bar', 'value2'))
     element.add_element(Saxaphone::Element.new('invalid', 'value3'))
@@ -37,14 +29,24 @@ class Saxaphone::ElementTest < MiniTest::Spec
   end
 
   def test_element_attribute
-    element = TestElement.new
+    element = define_element do
+      element_attribute 'faz', as: 'baz'
+    end
+
     element.add_element(Saxaphone::Element.new('faz', 'value'))
 
     assert_equal({'baz' => 'value'}, element.attributes)
   end
 
   def test_has_element_with_block
-    element = TestElement.new
+    element = define_element do
+      attr_accessor :child_special
+
+      has_element 'omg', 'Saxaphone::ElementTest::TestChildElement' do |element|
+        self.child_special = element.special
+      end
+    end
+
     child_element = element.new_element('omg')
     
     assert_kind_of TestChildElement, child_element
@@ -55,11 +57,19 @@ class Saxaphone::ElementTest < MiniTest::Spec
   end
   
   def test_has_element_without_block
-    element = TestElement.new
-    child_element = element.new_element('omg')
+    element = define_element do
+      has_element 'wtf', 'Saxaphone::ElementTest::TestChildElement'
+    end
+
+    child_element = element.new_element('wtf')
     
     assert_kind_of TestChildElement, child_element
     element.add_element(child_element)
     # silence?
   end
+  
+  private
+    def define_element(&block)
+      Class.new(Saxaphone::Element, &block).new
+    end
 end

metadata

@@ -1,38 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: saxaphone
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 -07:00
+date: 2011-07-15 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157419940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2157419940
 description: Use objects
 email: developer@matthewhiggins.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -46,30 +43,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/matthuhiggins/saxaphone
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Object Oriented SAX Parsing
 test_files: []
-