sax-machine 0.2.0.rc1 → 0.2.1

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-18mode
+  - 2.0.0
+  - ruby-head
+  - jruby-19mode
+  - jruby-head
   - rbx-19mode
-notifications:
-  irc: "irc.freenode.org#sax-machine"
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -5,6 +5,5 @@ gemspec
 group :development, :test do
   gem 'rake'
   gem 'guard-rspec'
-  gem 'growl', :require => false
   gem 'simplecov', :require => false, :platforms => :mri_19
 end

data/lib/sax-machine/sax_attribute_config.rb

@@ -20,11 +20,11 @@ module SAXMachine
       end
 
       def value_from_attrs(attrs)
-        attrs.index(@name) ? attrs[attrs.index(@name) + 1] : nil
+        attrs.fetch(@name, nil)
       end
 
       def attrs_match?(attrs)
-        attrs.index(@name) ? true : false
+        attrs.key?(@name) || attrs.value?(@name)
       end
 
       def has_value_and_attrs_match?(attrs)
@@ -37,4 +37,4 @@ module SAXMachine
     end
 
   end
-end
+end

data/lib/sax-machine/sax_collection_config.rb

@@ -5,16 +5,10 @@ module SAXMachine
       attr_reader :name
       
       def initialize(name, options)
-        @name   = name.to_s
-        @class  = options[:class]
-        @as     = options[:as].to_s
-        
-        if options.has_key?(:with)
-          # for faster comparisons later
-          @with = options[:with].to_a.flatten.collect {|o| o.to_s}
-        else
-          @with = nil
-        end
+        @name  = name.to_s
+        @class = options[:class]
+        @as    = options[:as].to_s
+        @with  = options.fetch(:with, {})
       end
       
       def accessor
@@ -22,10 +16,8 @@ module SAXMachine
       end
       
       def attrs_match?(attrs)
-        if @with
-          @with == (@with & attrs)
-        else
-          true
+        @with.all? do |key, value|
+          value === attrs[key.to_s]
         end
       end
 
@@ -42,4 +34,4 @@ module SAXMachine
     end
     
   end
-end
+end

data/lib/sax-machine/sax_document.rb

@@ -3,16 +3,27 @@ require "nokogiri"
 module SAXMachine
 
   def self.included(base)
+    base.send(:include, InstanceMethods)
     base.extend ClassMethods
   end
 
   def parse(xml_text, on_error = nil, on_warning = nil)
     sax_handler = SAXHandler.new(self, on_error, on_warning)
     parser = Nokogiri::XML::SAX::Parser.new(sax_handler)
-    parser.parse(xml_text)
+    parser.parse(xml_text) do |ctx|
+      ctx.replace_entities = true
+    end
     self
   end
 
+  module InstanceMethods
+    def initialize(attributes = {})
+      attributes.each do |name, value|
+        send("#{name}=", value)
+      end
+    end
+  end
+
   module ClassMethods
 
     def inherited(subclass)

data/lib/sax-machine/sax_element_config.rb

@@ -6,14 +6,8 @@ module SAXMachine
       
       def initialize(name, options)
         @name = name.to_s
-        
-        if options.has_key?(:with)
-          # for faster comparisons later
-          @with = options[:with].to_a.flatten.collect {|o| o.to_s}
-        else
-          @with = nil
-        end
-        
+        @with = options.fetch(:with, {})
+
         if options.has_key?(:value)
           @value = options[:value].to_s
         else
@@ -49,14 +43,12 @@ module SAXMachine
       end
 
       def value_from_attrs(attrs)
-        attrs.index(@value) ? attrs[attrs.index(@value) + 1] : nil
+        attrs.fetch(@value, nil)
       end
       
       def attrs_match?(attrs)
-        if @with
-          @with == (@with & attrs)
-        else
-          true
+        @with.all? do |key, value|
+          value === attrs[key.to_s]
         end
       end
       

data/lib/sax-machine/sax_handler.rb

@@ -32,7 +32,6 @@ module SAXMachine
     alias cdata_block characters
 
     def start_element(name, attrs = [])
-      attrs.flatten!
 
       name   = normalize_name(name)
       node   = stack.last
@@ -41,6 +40,8 @@ module SAXMachine
       sax_config = sax_config_for(object)
 
       if sax_config
+        attrs = Hash[attrs]
+
         if collection_config = sax_config.collection_config(name, attrs)
           object     = collection_config.data_class.new
           sax_config = sax_config_for(object)

data/lib/sax-machine/version.rb

@@ -1,3 +1,3 @@
 module SAXMachine
-  VERSION = "0.2.0.rc1"
+  VERSION = "0.2.1"
 end

data/sax-machine.gemspec

@@ -6,18 +6,19 @@ Gem::Specification.new do |s|
   s.version = SAXMachine::VERSION
 
   s.authors   = ["Paul Dix", "Julien Kirch", "Ezekiel Templin"]
-  s.date      = Date.today
   s.email     = %q{paul@pauldix.net}
   s.homepage  = %q{http://github.com/pauldix/sax-machine}
 
   s.summary   = %q{Declarative SAX Parsing with Nokogiri}
 
+  s.license   = %q{MIT}
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
   s.platform = Gem::Platform::RUBY
 
-  s.add_dependency 'nokogiri', "~> 1.5.2"
-  s.add_development_dependency "rspec", "~> 2.10.0"
-end
+  s.add_dependency 'nokogiri', "~> 1.6.0"
+  s.add_development_dependency "rspec", "~> 2.13.0"
+end

data/spec/sax-machine/atom.xml

@@ -9,7 +9,7 @@
     <generator uri="http://www.typepad.com/">TypePad</generator>
     <link rel="self" href="http://feeds.feedburner.com/PaulDixExplainsNothing" type="application/atom+xml" /><entry>
         <title>Marshal data too short error with ActiveRecord</title>
-        <link rel="alternate" type="text/html" href="http://feeds.feedburner.com/~r/PaulDixExplainsNothing/~3/383536354/marshal-data-to.html" />
+        <link rel="alternate" type="text/html" href="http://feeds.feedburner.com/~r/PaulDixExplainsNothing/~3/383536354/marshal-data-to.html?param1=1&amp;param2=2" />
         <link rel="replies" type="text/html" href="http://www.pauldix.net/2008/09/marshal-data-to.html" thr:count="2" thr:updated="2008-11-17T14:40:06-05:00" />
         <id>tag:typepad.com,2003:post-55147740</id>
         <published>2008-09-04T16:07:19-04:00</published>
@@ -38,7 +38,7 @@
 &lt;/div&gt;&lt;img src="http://feeds.feedburner.com/~r/PaulDixExplainsNothing/~4/383536354" height="1" width="1"/&gt;</content>
 
 
-    <feedburner:origLink>http://www.pauldix.net/2008/09/marshal-data-to.html</feedburner:origLink></entry>
+    <feedburner:origLink>http://www.pauldix.net/2008/09/marshal-data-to.html?param1=1&amp;param2=2</feedburner:origLink></entry>
     <entry>
         <title>Serializing data speed comparison: Marshal vs. JSON vs. Eval vs. YAML</title>
         <link rel="alternate" type="text/html" href="http://feeds.feedburner.com/~r/PaulDixExplainsNothing/~3/376401099/serializing-dat.html" />

data/spec/sax-machine/sax_document_spec.rb

@@ -10,6 +10,11 @@ describe "SAXMachine" do
         end
       end
 
+      it "should provide mass assignment through initialize method" do
+        document = @klass.new(title: 'Title')
+        document.title.should == 'Title'
+      end
+
       it "should provide an accessor" do
         document = @klass.new
         document.title = "Title"
@@ -54,7 +59,7 @@ describe "SAXMachine" do
             element :date, :class => DateTime
           end
           @document = @klass.new
-          @document.date = DateTime.now.to_s
+          @document.date = Time.now.iso8601
         end
         it "should be available" do
           @klass.data_class(:date).should == DateTime
@@ -306,6 +311,35 @@ describe "SAXMachine" do
             document.second.should == "second match"
           end
         end
+
+        describe "with only one element as a regular expression" do
+          before :each do
+            @klass = Class.new do
+              include SAXMachine
+              element :link, :with => {:foo => /ar$/}
+            end
+          end
+
+          it "should save the text of an element that has matching attributes" do
+            document = @klass.parse("<link foo=\"bar\">match</link>")
+            document.link.should == "match"
+          end
+
+          it "should not save the text of an element that doesn't have matching attributes" do
+            document = @klass.parse("<link>no match</link>")
+            document.link.should be_nil
+          end
+
+          it "should save the text of an element that has matching attributes when it is the second of that type" do
+            document = @klass.parse("<xml><link>no match</link><link foo=\"bar\">match</link></xml>")
+            document.link.should == "match"
+          end
+
+          it "should save the text of an element that has matching attributes plus a few more" do
+            document = @klass.parse("<xml><link>no match</link><link asdf='jkl' foo='bar'>match</link>")
+            document.link.should == "match"
+          end
+        end
       end # using the 'with' option
 
       describe "using the 'value' option" do
@@ -429,7 +463,7 @@ describe "SAXMachine" do
         @klass = Class.new do
           include SAXMachine
           elements :item, :as => :items, :with => {:type => 'Bar'}, :class => Bar
-          elements :item, :as => :items, :with => {:type => 'Foo'}, :class => Foo
+          elements :item, :as => :items, :with => {:type => /Foo/}, :class => Foo
         end
       end
       
@@ -523,6 +557,7 @@ describe "SAXMachine" do
         element :title
         element :name, :as => :author
         element "feedburner:origLink", :as => :url
+        element :link, :as => :alternate, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
         element :summary
         element :content
         element :published
@@ -541,6 +576,12 @@ describe "SAXMachine" do
       f = Atom.parse(@xml)
       f.url.should == "http://www.pauldix.net/"
     end
+
+    it "should parse entry url" do
+      f = Atom.parse(@xml)
+      f.entries.first.url.should == "http://www.pauldix.net/2008/09/marshal-data-to.html?param1=1&param2=2"
+      f.entries.first.alternate.should == "http://feeds.feedburner.com/~r/PaulDixExplainsNothing/~3/383536354/marshal-data-to.html?param1=1&param2=2"
+    end
   end
 
   describe "parsing a tree" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sax-machine
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc1
-  prerelease: 6
+  version: 0.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Paul Dix
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.13.0
 description: 
 email: paul@pauldix.net
 executables: []
@@ -80,7 +80,8 @@ files:
 - spec/sax-machine/sax_document_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/pauldix/sax-machine
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -91,18 +92,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3574605312337356673
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Declarative SAX Parsing with Nokogiri