saxaphone 0.2.1 → 0.3.0

data/lib/saxaphone/document.rb

@@ -18,7 +18,8 @@ module Saxaphone
     end
 
     def start_element(name, attributes = [])
-      new_element = element_stack.empty? ? root_element_class.new(name) : element_stack.last.new_element(name)
+      element_class = element_stack.empty? ? root_element_class : element_stack.last.element_for(name)
+      new_element = element_class.new(name, '', attributes)
       element_stack << new_element
     end
 

data/lib/saxaphone/element.rb

@@ -28,10 +28,6 @@ module Saxaphone
         element_handlers[element_name] = ElementHandler.new(class_name, block)
       end
 
-      def has_attributes(attribute_names)
-        raise 'not implemented'
-      end
-
       def element_handlers
         @element_handlers ||= {}
       end
@@ -42,10 +38,10 @@ module Saxaphone
     end
 
     attr_accessor :name, :content, :attributes
-    def initialize(name = '', content = '')
+    def initialize(name = '', content = '', attribute_array = [])
       self.name = name
       self.content = content
-      self.attributes = {}
+      self.attributes = Hash[attribute_array]
       setup
     end
 
@@ -58,13 +54,13 @@ module Saxaphone
       end
     end
 
-    def new_element(element_name)
+    def element_for(element_name)
       if element_handler = self.class.element_handlers[element_name]
-        klass = Saxaphone::Util.constantize(element_handler.class_name)
+        Saxaphone::Util.constantize(element_handler.class_name)
       else
-        klass = Saxaphone::Element
+        Saxaphone::Element
       end
-      klass.new(element_name)
+      
     end
 
     def append_content(string)

data/test/element_test.rb

@@ -16,6 +16,13 @@ class Saxaphone::ElementTest < MiniTest::Spec
     assert_equal 'hola', element.setup_attr
   end
 
+  def test_initialize
+    element = Saxaphone::Element.new('foo', 'bar', [['a', 'b']])
+    assert_equal 'foo', element.name
+    assert_equal 'bar', element.content
+    assert_equal({'a' => 'b'}, element.attributes)
+  end
+
   def test_element_attributes
     element = define_element do
       element_attributes %w(foo bar)
@@ -47,7 +54,7 @@ class Saxaphone::ElementTest < MiniTest::Spec
       end
     end
 
-    child_element = element.new_element('omg')
+    child_element = element.element_for('omg').new('omg')
     
     assert_kind_of TestChildElement, child_element
     child_element.special = 'weee'
@@ -61,7 +68,7 @@ class Saxaphone::ElementTest < MiniTest::Spec
       has_element 'wtf', 'Saxaphone::ElementTest::TestChildElement'
     end
 
-    child_element = element.new_element('wtf')
+    child_element = element.element_for('wtf').new('wtf')
     
     assert_kind_of TestChildElement, child_element
     element.add_element(child_element)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saxaphone
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 -07:00
+date: 2011-07-18 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2157419940 !ruby/object:Gem::Requirement
+  requirement: &2156448040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157419940
+  version_requirements: *2156448040
 description: Use objects
 email: developer@matthewhiggins.com
 executables: []