@@ -1,7 +1,14 @@ require "spec" require "spec/rake/spectask" +require 'lib/sax-machine.rb' Spec::Rake::SpecTask.new do |t| t.spec_opts = ['--options', "\"#{File.dirname(__FILE__)}/spec/spec.opts\""] t.spec_files = FileList['spec/**/*_spec.rb'] +end + +task :install do + rm_rf "*.gem" + puts `gem build sax-machine.gemspec` + puts `sudo gem install sax-machine-#{SAXMachine::VERSION}.gem` end \ No newline at end of file Rakefile @@ -12,12 +12,13 @@ module SAXMachine def characters(string) if @collection_parse @collection_parse.characters(string) - elsif parse_current_element? + elsif @capture_characters && parse_current_element? @value ||= string end end def start_element(name, attrs = []) + @capture_characters = true if @collection_parse @collection_parse.start_element(name, attrs) else @@ -26,9 +27,12 @@ module SAXMachine if collection_class = @object.class.sax_config.collection_element?(@current_element_name) @collection_parse = SAXHandler.new(collection_class.new) elsif element = @object.class.sax_config.attribute_value_element?(@current_element_name, @current_element_attrs) - mark_as_parsed(name) - @object.send(@object.class.sax_config.setter_for_element(name, @current_element_attrs), - @current_element_attrs[@current_element_attrs.index(element[:value]) + 1]) + @capture_characters = false + unless value_element_parsed?(element) + mark_as_parsed(name) + @object.send(@object.class.sax_config.setter_for_element(name, @current_element_attrs), + @current_element_attrs[@current_element_attrs.index(element[:value]) + 1]) + end end end end @@ -65,5 +69,28 @@ module SAXMachine @parsed_elements.has_key?(@current_element_name) && @parsed_elements[@current_element_name].detect {|attrs| attrs == @current_element_attrs} end + + def value_element_parsed?(element) + if @parsed_elements.has_key?(@current_element_name) + if element.has_key?(:with) + intersects = @parsed_elements[@current_element_name].collect {|attrs| element[:with] & attrs} + current_attrs_without_value = Array.new(@current_element_attrs) + i = @current_element_attrs.index(element[:value]) + current_attrs_without_value.delete_at i + current_attrs_without_value.delete_at i + intersects.detect {|attrs| attrs == current_attrs_without_value} + else + true + end + else + false + end + end + + def remove_value_element(element) + i = @current_element_attrs.index(element[:value]) + @current_element_attrs.delete_at i + @current_element_attrs.delete_at i + end end end \ No newline at end of file lib/sax-machine/sax_handler.rb @@ -83,7 +83,26 @@ describe "SAXMachine" do end end - describe "using the 'with' option" do + describe "using the :with option" do + describe "and the :value option" do + before :each do + @klass = Class.new do + include SAXMachine + element :link, :value => :href, :with => {:foo => "bar"} + end + 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" + end + + it "should save the value of the first matching element" do + document = @klass.parse("<xml><link href='first' foo='bar'>asdf</link><link href='second' foo='bar'>jkl</link></xml>") + document.link.should == "first" + end + end + describe "with only one element" do before :each do @klass = Class.new do spec/sax-machine/sax_document_spec.rb 5878aae7627c5ac2bf0fef24cd3c654433633355 Paul Dix paul@pauldix.net http://github.com/pauldix/sax-machine/commit/aaf03a441f46381748a7511deb7a8b030e7845b5 aaf03a441f46381748a7511deb7a8b030e7845b5 2009-01-13T13:43:44-08:00 2009-01-13T13:43:44-08:00 added spec and fix for combining :value and :with options on element. wired up a rake task to build and install gem locally. aaec906dcce6f8658e811466243550748eeeab8c Paul Dix paul@pauldix.net