julien51-sax-machine 0.0.13 → 0.0.14

data/lib/sax-machine/sax_config.rb

@@ -3,6 +3,8 @@ require "sax-machine/sax_collection_config"
 
 module SAXMachine
   class SAXConfig
+    attr_reader :top_level_elements, :collection_elements
+
     def initialize
       @top_level_elements  = []
       @collection_elements = []

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

@@ -22,8 +22,9 @@ module SAXMachine
     end
 
     def start_element(name, attrs = [])
+      
       @name   = name
-      @attrs  = attrs
+      @attrs  = attrs.map { |a| SAXHandler.decode_xml(a) }
 
       if parsing_collection?
         @collection_handler.start_element(@name, @attrs)
@@ -49,7 +50,7 @@ module SAXMachine
       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
@@ -112,5 +113,20 @@ module SAXMachine
     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'   => '&',
+        '#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.13"
+  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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: julien51-sax-machine
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  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