saxaphone 0.5.1 → 0.5.2

data/lib/saxaphone/document.rb

@@ -26,6 +26,7 @@ module Saxaphone
     def end_element(name)
       ending_element = element_stack.pop
       if element_stack.empty?
+        p "root"
         self.root_element = ending_element
       else
         element_stack.last.add_element(ending_element)

data/lib/saxaphone/element.rb

@@ -7,7 +7,18 @@ module Saxaphone
     class ElementHandler < Struct.new(:class_name, :proc)
     end
 
+    @element_handlers = {}
+    @stored_attributes = Set.new
+
     class << self
+      attr_accessor :element_handlers
+      attr_accessor :stored_attributes
+
+      def inherited(base)
+        base.element_handlers = element_handlers.dup
+        base.stored_attributes = stored_attributes.dup
+      end
+
       # A block can be passed to <tt>setup</tt>,
       # which is called after the element is initialized.
       # 
@@ -144,25 +155,16 @@ module Saxaphone
       # Notice that the "price" attribute is not stored.
       # 
       def store_attributes(*attribute_names)
-        @stored_attributes = attribute_names.flatten.to_set
+        self.stored_attributes += attribute_names.flatten.to_set
       end
 
       def handler_for(element_name)
         element_handlers[element_name] || element_handlers['*']
       end
       
-      def stored_attributes
-        @stored_attributes ||= Set.new
-      end
-
       def parse(xml)
         Saxaphone::Document.parse(xml, self)
       end
-
-      private
-        def element_handlers
-          @element_handlers ||= {}
-        end
     end
 
     attr_accessor :name, :content, :attributes

data/test/element_test.rb

@@ -121,7 +121,25 @@ class Saxaphone::ElementTest < MiniTest::Spec
     element.add_element(child_element)
     # silence?
   end
-  
+
+  def test_attributes_inherited
+    parent = Class.new(Saxaphone::Element) do
+      has_element 'foo'
+      store_attributes 'faz'
+    end
+
+    child = Class.new(parent) do
+      has_element 'bar'
+      store_attributes 'baz'
+    end
+
+    assert_equal ['foo'].to_set, parent.element_handlers.keys.to_set
+    assert_equal ['faz'].to_set, parent.stored_attributes
+
+    assert_equal ['foo', 'bar'].to_set, child.element_handlers.keys.to_set
+    assert_equal ['faz', 'baz'].to_set, child.stored_attributes
+  end
+
   private
     def define_element(&block)
       Class.new(Saxaphone::Element, &block).new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saxaphone
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70243549160060 !ruby/object:Gem::Requirement
+  requirement: &70257440543260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243549160060
+  version_requirements: *70257440543260
 description: Use objects
 email: developer@matthewhiggins.com
 executables: []