astro-sax-machine 0.0.12.20090419 → 0.0.14

data/lib/sax-machine/sax_config.rb

@@ -3,37 +3,38 @@ require "sax-machine/sax_collection_config"
 
 module SAXMachine
   class SAXConfig
+    attr_reader :top_level_elements, :collection_elements
+
     def initialize
       @top_level_elements  = []
       @collection_elements = []
     end
-    
+
     def add_top_level_element(name, options)
       @top_level_elements << ElementConfig.new(name, options)
     end
-    
+
     def add_collection_element(name, options)
       @collection_elements << CollectionConfig.new(name, options)
     end
-    
+
     def collection_config(name)
       @collection_elements.detect { |ce| ce.name.to_s == name.to_s }
     end
 
-    def element_config_for_attribute(name, attrs)
-      element_configs = @top_level_elements.select do |element_config|
+    def element_configs_for_attribute(name, attrs)
+      @top_level_elements.select do |element_config|
         element_config.name == name &&
         element_config.has_value_and_attrs_match?(attrs)
       end
-      element_configs.empty? ? nil : element_configs
     end
-  
+
     def element_config_for_tag(name, attrs)
       @top_level_elements.detect do |element_config|
         element_config.name == name &&
         element_config.attrs_match?(attrs)
       end
     end
-    
+
   end
 end

data/lib/sax-machine/sax_document.rb

@@ -41,6 +41,26 @@ module SAXMachine
       attr_reader options[:as] unless instance_methods.include?(options[:as].to_s)
       attr_writer options[:as] unless instance_methods.include?("#{options[:as]}=")
     end
+
+    def columns
+      sax_config.top_level_elements
+    end
+
+    def column(sym)
+      columns.select{|c| c.column == sym}[0]
+    end
+
+    def data_class(sym)
+      column(sym).data_class
+    end
+
+    def required?(sym)
+      column(sym).required?
+    end
+
+    def column_names
+      columns.map{|e| e.column}
+    end
     
     def elements(name, options = {})
       options[:as] ||= name

data/lib/sax-machine/sax_element_config.rb

@@ -2,7 +2,7 @@ module SAXMachine
   class SAXConfig
     
     class ElementConfig
-      attr_reader :name, :setter
+      attr_reader :name, :setter, :data_class
       
       def initialize(name, options)
         @name = name.to_s
@@ -28,6 +28,16 @@ module SAXMachine
         else
           @setter = "#{@as}="
         end
+        @data_class = options[:class]
+        @required = options[:required]
+      end
+
+      def column
+        @as || @name.to_sym
+      end
+
+      def required?
+        @required
       end
 
       def value_from_attrs(attrs)

data/lib/sax-machine/sax_handler.rb

@@ -3,12 +3,12 @@ require "nokogiri"
 module SAXMachine
   class SAXHandler < Nokogiri::XML::SAX::Document
     attr_reader :object
-    
+
     def initialize(object)
       @object = object
       @parsed_configs = {}
     end
-    
+
     def characters(string)
       if parsing_collection?
         @collection_handler.characters(string)
@@ -16,90 +16,117 @@ module SAXMachine
         @value << string
       end
     end
-    
+
     def cdata_block(string)
       characters(string)
     end
-    
+
     def start_element(name, attrs = [])
-      @name   = name
-      @attrs  = attrs
       
+      @name   = name
+      @attrs  = attrs.map { |a| SAXHandler.decode_xml(a) }
+
       if parsing_collection?
         @collection_handler.start_element(@name, @attrs)
-        
+
       elsif @collection_config = sax_config.collection_config(@name)
         @collection_handler = @collection_config.handler
         @collection_handler.start_element(@name, @attrs)
-        
-      elsif @element_config = sax_config.element_config_for_attribute(@name, @attrs)
-        parse_element_attribute
-        
+
+      elsif (element_configs = sax_config.element_configs_for_attribute(@name, @attrs)).any?
+        parse_element_attributes(element_configs)
+        set_element_config_for_element_value
+
       else
-        @value = ""
-        @element_config = sax_config.element_config_for_tag(@name, @attrs)
+        set_element_config_for_element_value
       end
     end
-    
+
     def end_element(name)
       if parsing_collection? && @collection_config.name == name
         @object.send(@collection_config.accessor) << @collection_handler.object
         reset_current_collection
-        
+
       elsif parsing_collection?
         @collection_handler.end_element(name)
-        
-      elsif characaters_captured? && !parsed_config?
+
+      elsif characaters_captured?
         mark_as_parsed
         @object.send(@element_config.setter, @value)
       end
-      
+
       reset_current_tag
     end
-    
+
     def characaters_captured?
       !@value.nil? && !@value.empty?
     end
-    
+
     def parsing_collection?
       !@collection_handler.nil?
     end
-    
-    def parse_element_attribute
-      unless parsed_config?
-        mark_as_parsed
-        @element_config.each do |config|
-          @object.send(config.setter, config.value_from_attrs(@attrs))
+
+    def parse_collection_instance_attributes
+      instance = @collection_handler.object
+      @attrs.each_with_index do |attr_name,index|
+        instance.send("#{attr_name}=", @attrs[index + 1]) if index % 2 == 0 && instance.methods.include?("#{attr_name}=")
+      end
+    end
+
+    def parse_element_attributes(element_configs)
+      element_configs.each do |ec|
+        unless parsed_config?(ec)
+          @object.send(ec.setter, ec.value_from_attrs(@attrs))
+          mark_as_parsed(ec)
         end
       end
-      
       @element_config = nil
     end
-    
-    def mark_as_parsed
-      # TODO: make this code not suck like this
-      @parsed_configs[@element_config] = true unless (@element_config.respond_to?(:collection?) && @element_config.collection?) || 
-        (@element_config.class == Array && @element_config.first.collection?)
+
+    def set_element_config_for_element_value
+      @value = ""
+      @element_config = sax_config.element_config_for_tag(@name, @attrs)
+    end
+
+    def mark_as_parsed(element_config=nil)
+      element_config ||= @element_config
+      @parsed_configs[element_config] = true unless element_config.collection?
     end
-    
-    def parsed_config?
-      @parsed_configs[@element_config]
+
+    def parsed_config?(element_config=nil)
+      element_config ||= @element_config
+      @parsed_configs[element_config]
     end
-    
+
     def reset_current_collection
       @collection_handler = nil
       @collection_config  = nil
     end
-    
+
     def reset_current_tag
       @name   = nil
       @attrs  = nil
       @value  = nil
       @element_config = nil
     end
-    
+
     def sax_config
       @object.class.sax_config
     end
+  
+    ##
+    # Decodes XML special characters.
+    def self.decode_xml(str)
+      return str.map &method(:decode_xml) if str.kind_of?(Array)
+
+      entities = {
+        '#38'   => '&amp;',
+        '#13'   => "\r",
+      } 
+      entities.keys.inject(str) { |string, key|
+        string.gsub(/&#{key};/, entities[key])
+      } 
+    end
+  
   end
 end

data/lib/sax-machine.rb

@@ -7,5 +7,5 @@ require "sax-machine/sax_handler"
 require "sax-machine/sax_config"
 
 module SAXMachine
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

data/spec/sax-machine/sax_document_spec.rb

@@ -15,6 +15,10 @@ describe "SAXMachine" do
         document.title = "Title"
         document.title.should == "Title"
       end
+      
+      it "should allow introspection of the elements" do
+        @klass.column_names.should =~ [:title]
+      end
 
       it "should not overwrite the setter if there is already one present" do
         @klass = Class.new do
@@ -28,6 +32,28 @@ describe "SAXMachine" do
         document.title = "Title"
         document.title.should == "Title **"
       end
+      describe "the class attribute" do
+        before(:each) do
+          @klass = Class.new do
+            include SAXMachine
+            element :date, :class => DateTime
+          end
+          @document = @klass.new
+          @document.date = DateTime.now.to_s
+        end
+        it "should be available" do
+          @klass.data_class(:date).should == DateTime
+        end
+      end
+      describe "the required attribute" do
+        it "should be available" do
+          @klass = Class.new do
+            include SAXMachine
+            element :date, :required => true
+          end
+          @klass.required?(:date).should be_true
+        end
+      end
       
       it "should not overwrite the accessor when the element is not present" do
         document = @klass.new
@@ -110,6 +136,11 @@ describe "SAXMachine" do
             end
           end
           
+          it "should escape correctly the ampersand" do
+            document = @klass.parse("<link href='http://api.flickr.com/services/feeds/photos_public.gne?id=49724566@N00&amp;lang=en-us&amp;format=atom' foo='bar'>asdf</link>")
+            document.link.should == "http://api.flickr.com/services/feeds/photos_public.gne?id=49724566@N00&amp;lang=en-us&amp;format=atom"
+          end
+          
           it "should save the value of a matching element" do
             document = @klass.parse("<link href='test' foo='bar'>asdf</link>")
             document.link.should == "test"
@@ -232,6 +263,25 @@ describe "SAXMachine" do
           document.second.should be_nil
         end
       end
+      
+      describe "when desiring both the content and attributes of an element" do
+        before :each do
+          @klass = Class.new do
+            include SAXMachine
+            element :link
+            element :link, :value => :foo, :as => :link_foo
+            element :link, :value => :bar, :as => :link_bar
+          end
+        end
+
+        it "should parse the element and attribute values" do
+          document = @klass.parse("<link foo='test1' bar='test2'>hello</link>")
+          document.link.should == 'hello'
+          document.link_foo.should == 'test1'
+          document.link_bar.should == 'test2'
+        end
+      end
+      
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-sax-machine
 version: !ruby/object:Gem::Version 
-  version: 0.0.12.20090419
+  version: 0.0.14
 platform: ruby
 authors: 
 - Paul Dix
@@ -44,6 +44,7 @@ files:
 - spec/sax-machine/sax_document_spec.rb
 has_rdoc: false
 homepage: http://github.com/pauldix/sax-machine
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -64,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Declarative SAX Parsing with Nokogiri