sax-machine 0.2.1 → 0.3.0

data/spec/sax-machine/sax_activerecord_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'active_record'
+
+describe "ActiveRecord" do
+  describe "integration" do
+    before :each do
+      class MySaxModel < ActiveRecord::Base
+        SAXMachine.configure(MySaxModel) do |c|
+          c.element :title
+        end
+      end
+    end
+
+    after :each do
+      Object.send(:remove_const, :MySaxModel)
+    end
+
+    it "parses document" do
+      document = MySaxModel.parse("<xml><title>My Title</title></xml>")
+      expect(document.title).to eq("My Title")
+    end
+  end
+end

data/spec/sax-machine/sax_configure_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+class A
+  SAXMachine.configure(A) do |c|
+    c.element :title
+  end
+end
+
+class B < A
+  SAXMachine.configure(B) do |c|
+    c.element :b
+  end
+end
+
+class C < B
+  SAXMachine.configure(C) do |c|
+    c.element :c
+  end
+end
+
+describe "SAXMachine configure" do
+  before do
+    xml = "<top><title>Test</title><b>Matched!</b><c>And Again</c></top>"
+    @a = A.new
+    @a.parse xml
+    @b = B.new
+    @b.parse xml
+    @c = C.new
+    @c.parse xml
+  end
+
+  it { expect(@a).to be_a(A) }
+  it { expect(@a).not_to be_a(B) }
+  it { expect(@a).to be_a(SAXMachine) }
+  it { expect(@a.title).to eq("Test") }
+  it { expect(@b).to be_a(A) }
+  it { expect(@b).to be_a(B) }
+  it { expect(@b).to be_a(SAXMachine) }
+  it { expect(@b.title).to eq("Test") }
+  it { expect(@b.b).to eq("Matched!") }
+  it { expect(@c).to be_a(A) }
+  it { expect(@c).to be_a(B) }
+  it { expect(@c).to be_a(C) }
+  it { expect(@c).to be_a(SAXMachine) }
+  it { expect(@c.title).to eq("Test") }
+  it { expect(@c.b).to eq("Matched!") }
+  it { expect(@c.c).to eq("And Again") }
+end

data/spec/sax-machine/sax_document_spec.rb

@@ -10,22 +10,22 @@ describe "SAXMachine" do
         end
       end
 
-      it "should provide mass assignment through initialize method" do
-        document = @klass.new(title: 'Title')
-        document.title.should == 'Title'
+      it "provides mass assignment through initialize method" do
+        document = @klass.new(title: "Title")
+        expect(document.title).to eq("Title")
       end
 
-      it "should provide an accessor" do
+      it "provides an accessor" do
         document = @klass.new
         document.title = "Title"
-        document.title.should == "Title"
+        expect(document.title).to eq("Title")
       end
 
-      it "should allow introspection of the elements" do
-        @klass.column_names.should =~ [:title]
+      it "allows introspection of the elements" do
+        expect(@klass.column_names).to match_array([:title])
       end
 
-      it "should not overwrite the getter is there is already one present" do
+      it "does not overwrites the getter is there is already one present" do
         @klass = Class.new do
           def title
             "#{@title} ***"
@@ -34,12 +34,13 @@ describe "SAXMachine" do
           include SAXMachine
           element :title
         end
+
         document = @klass.new
         document.title = "Title"
-        document.title.should == "Title ***"
+        expect(document.title).to eq("Title ***")
       end
 
-      it "should not overwrite the setter if there is already one present" do
+      it "does not overwrites the setter if there is already one present" do
         @klass = Class.new do
           def title=(val)
             @title = "#{val} **"
@@ -48,114 +49,119 @@ describe "SAXMachine" do
           include SAXMachine
           element :title
         end
+
+        document = @klass.new
+        document.title = "Title"
+        expect(document.title).to eq("Title **")
+      end
+
+      it "does not overwrites the accessor when the element is not present" do
         document = @klass.new
         document.title = "Title"
-        document.title.should == "Title **"
+        document.parse("<foo></foo>")
+        expect(document.title).to eq("Title")
+      end
+
+      it "overwrites the value when the element is present" do
+        document = @klass.new
+        document.title = "Old title"
+        document.parse("<title>New title</title>")
+        expect(document.title).to eq("New title")
+      end
+
+      it "saves the element text into an accessor" do
+        document = @klass.parse("<title>My Title</title>")
+        expect(document.title).to eq("My Title")
+      end
+
+      it "keeps the document encoding for elements" do
+        data = "<title>My Title</title>"
+        data.encode!("utf-8")
+
+        document = @klass.parse(data)
+        expect(document.title.encoding).to eq(data.encoding)
+      end
+
+      it "saves cdata into an accessor" do
+        document = @klass.parse("<title><![CDATA[A Title]]></title>")
+        expect(document.title).to eq("A Title")
+      end
+
+      it "saves the element text into an accessor when there are multiple elements" do
+        document = @klass.parse("<xml><title>My Title</title><foo>bar</foo></xml>")
+        expect(document.title).to eq("My Title")
       end
+
+      it "saves the first element text when there are multiple of the same element" do
+        document = @klass.parse("<xml><title>My Title</title><title>bar</title></xml>")
+        expect(document.title).to eq("My Title")
+      end
+
       describe "the class attribute" do
         before(:each) do
           @klass = Class.new do
             include SAXMachine
-            element :date, :class => DateTime
+            element :date, class: DateTime
           end
+
           @document = @klass.new
           @document.date = Time.now.iso8601
         end
-        it "should be available" do
-          @klass.data_class(:date).should == DateTime
+
+        it "is available" do
+          expect(@klass.data_class(:date)).to eq(DateTime)
         end
-        
-        it "should handle an integer class" do
+
+        it "handles an integer class" do
           @klass = Class.new do
             include SAXMachine
-            element :number, :class => Integer
+            element :number, class: Integer
           end
+
           document = @klass.parse("<number>5</number>")
-          document.number.should == 5
+          expect(document.number).to eq(5)
         end
-        
-        it "should handle an float class" do
+
+        it "handles an float class" do
           @klass = Class.new do
             include SAXMachine
-            element :number, :class => Float
+            element :number, class: Float
           end
+
           document = @klass.parse("<number>5.5</number>")
-          document.number.should == 5.5
-        end        
+          expect(document.number).to eq(5.5)
+        end
 
-        it "should handle an string class" do
+        it "handles an string class" do
           @klass = Class.new do
             include SAXMachine
-            element :number, :class => String
+            element :number, class: String
           end
+
           document = @klass.parse("<number>5.5</number>")
-          document.number.should == "5.5"
+          expect(document.number).to eq("5.5")
         end
-        
-        it "should handle a time class" do
+
+        it "handles a time class" do
           @klass = Class.new do
             include SAXMachine
-            element :time, :class => Time
+            element :time, class: Time
           end
+
           document = @klass.parse("<time>1994-02-04T06:20:00Z</time>")
-          document.time.should == Time.utc(1994, 2, 4, 6, 20, 0, 0)
+          expect(document.time).to eq(Time.utc(1994, 2, 4, 6, 20, 0, 0))
         end
-        
       end
+
       describe "the required attribute" do
-        it "should be available" do
+        it "is available" do
           @klass = Class.new do
             include SAXMachine
-            element :date, :required => true
+            element :date, required: true
           end
-          @klass.required?(:date).should be_true
+          expect(@klass.required?(:date)).to be_truthy
         end
       end
-
-      it "should not overwrite the accessor when the element is not present" do
-        document = @klass.new
-        document.title = "Title"
-        document.parse("<foo></foo>")
-        document.title.should == "Title"
-      end
-
-      it "should overwrite the value when the element is present" do
-        document = @klass.new
-        document.title = "Old title"
-        document.parse("<title>New title</title>")
-        document.title.should == "New title"
-      end
-
-      it "should save the element text into an accessor" do
-        document = @klass.parse("<title>My Title</title>")
-        document.title.should == "My Title"
-      end
-
-      if RUBY_VERSION >= "1.9.0"
-        it "should keep the document encoding for elements" do
-          data = "<title>My Title</title>"
-          data.encode!("utf-8")
-
-          document = @klass.parse(data)
-          document.title.encoding.should == data.encoding
-        end
-      end
-
-      it "should save cdata into an accessor" do
-        document = @klass.parse("<title><![CDATA[A Title]]></title>")
-        document.title.should == "A Title"
-      end
-
-      it "should save the element text into an accessor when there are multiple elements" do
-        document = @klass.parse("<xml><title>My Title</title><foo>bar</foo></xml>")
-        document.title.should == "My Title"
-      end
-
-      it "should save the first element text when there are multiple of the same element" do
-        document = @klass.parse("<xml><title>My Title</title><title>bar</title></xml>")
-        document.title.should == "My Title"
-
-      end
     end
 
     describe "when parsing multiple elements" do
@@ -167,14 +173,13 @@ describe "SAXMachine" do
         end
       end
 
-      it "should save the element text for a second tag" do
+      it "saves the element text for a second tag" do
         document = @klass.parse("<xml><title>My Title</title><name>Paul</name></xml>")
-        document.name.should == "Paul"
-        document.title.should == "My Title"
+        expect(document.name).to eq("Paul")
+        expect(document.title).to eq("My Title")
       end
 
-
-      it "should not overwrite the getter is there is already one present" do
+      it "does not overwrites the getter is there is already one present" do
         @klass = Class.new do
           def items
             []
@@ -183,12 +188,13 @@ describe "SAXMachine" do
           include SAXMachine
           elements :items
         end
+
         document = @klass.new
         document.items = [1, 2, 3, 4]
-        document.items.should == []
+        expect(document.items).to eq([])
       end
 
-      it "should not overwrite the setter if there is already one present" do
+      it "does not overwrites the setter if there is already one present" do
         @klass = Class.new do
           def items=(val)
             @items = [1, *val]
@@ -197,11 +203,11 @@ describe "SAXMachine" do
           include SAXMachine
           elements :items
         end
+
         document = @klass.new
         document.items = [2, 3]
-        document.items.should == [1, 2, 3]
+        expect(document.items).to eq([1, 2, 3])
       end
-
     end
 
     describe "when using options for parsing elements" do
@@ -209,19 +215,19 @@ describe "SAXMachine" do
         before :each do
           @klass = Class.new do
             include SAXMachine
-            element :description, :as => :summary
+            element :description, as: :summary
           end
         end
 
-        it "should provide an accessor using the 'as' name" do
+        it "provides an accessor using the 'as' name" do
           document = @klass.new
           document.summary = "a small summary"
-          document.summary.should == "a small summary"
+          expect(document.summary).to eq("a small summary")
         end
 
-        it "should save the element text into the 'as' accessor" do
+        it "saves the element text into the 'as' accessor" do
           document = @klass.parse("<description>here is a description</description>")
-          document.summary.should == "here is a description"
+          expect(document.summary).to eq("here is a description")
         end
       end
 
@@ -230,35 +236,34 @@ describe "SAXMachine" do
           before :each do
             @klass = Class.new do
               include SAXMachine
-              element :link, :value => :href, :with => {:foo => "bar"}
+              element :link, value: :href, with: { foo: "bar" }
             end
           end
 
-          it "should save the value of a matching element" do
+          it "saves the value of a matching element" do
             document = @klass.parse("<link href='test' foo='bar'>asdf</link>")
-            document.link.should == "test"
+            expect(document.link).to eq("test")
           end
 
-          it "should save the value of the first matching element" do
+          it "saves the value of the first matching element" do
             document = @klass.parse("<xml><link href='first' foo='bar' /><link href='second' foo='bar' /></xml>")
-            document.link.should == "first"
+            expect(document.link).to eq("first")
           end
 
           describe "and the :as option" do
             before :each do
               @klass = Class.new do
                 include SAXMachine
-                element :link, :value => :href, :as => :url, :with => {:foo => "bar"}
-                element :link, :value => :href, :as => :second_url, :with => {:asdf => "jkl"}
+                element :link, value: :href, as: :url, with: { foo: "bar" }
+                element :link, value: :href, as: :second_url, with: { asdf: "jkl" }
               end
             end
 
-            it "should save the value of the first matching element" do
+            it "saves the value of the first matching element" do
               document = @klass.parse("<xml><link href='first' foo='bar' /><link href='second' asdf='jkl' /><link href='second' foo='bar' /></xml>")
-              document.url.should == "first"
-              document.second_url.should == "second"
+              expect(document.url).to eq("first")
+              expect(document.second_url).to eq("second")
             end
-
           end
         end
 
@@ -266,29 +271,28 @@ describe "SAXMachine" do
           before :each do
             @klass = Class.new do
               include SAXMachine
-              element :link, :with => {:foo => "bar"}
+              element :link, with: { foo: "bar" }
             end
           end
 
-          it "should save the text of an element that has matching attributes" do
+          it "saves the text of an element that has matching attributes" do
             document = @klass.parse("<link foo=\"bar\">match</link>")
-            document.link.should == "match"
+            expect(document.link).to eq("match")
           end
 
-          it "should not save the text of an element that doesn't have matching attributes" do
+          it "does not saves the text of an element that doesn't have matching attributes" do
             document = @klass.parse("<link>no match</link>")
-            document.link.should be_nil
+            expect(document.link).to be_nil
           end
 
-          it "should save the text of an element that has matching attributes when it is the second of that type" do
+          it "saves 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"
-
+            expect(document.link).to eq("match")
           end
 
-          it "should save the text of an element that has matching attributes plus a few more" do
+          it "saves 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"
+            expect(document.link).to eq("match")
           end
         end
 
@@ -296,19 +300,19 @@ describe "SAXMachine" do
           before :each do
             @klass = Class.new do
               include SAXMachine
-              element :link, :as => :first, :with => {:foo => "bar"}
-              element :link, :as => :second, :with => {:asdf => "jkl"}
+              element :link, as: :first, with: { foo: "bar" }
+              element :link, as: :second, with: { asdf: "jkl" }
             end
           end
 
-          it "should match the first element" do
+          it "matches the first element" do
             document = @klass.parse("<xml><link>no match</link><link foo=\"bar\">first match</link><link>no match</link></xml>")
-            document.first.should == "first match"
+            expect(document.first).to eq("first match")
           end
 
-          it "should match the second element" do
+          it "matches the second element" do
             document = @klass.parse("<xml><link>no match</link><link foo='bar'>first match</link><link asdf='jkl'>second match</link><link>hi</link></xml>")
-            document.second.should == "second match"
+            expect(document.second).to eq("second match")
           end
         end
 
@@ -316,75 +320,77 @@ describe "SAXMachine" do
           before :each do
             @klass = Class.new do
               include SAXMachine
-              element :link, :with => {:foo => /ar$/}
+              element :link, with: { foo: /ar$/ }
             end
           end
 
-          it "should save the text of an element that has matching attributes" do
+          it "saves the text of an element that has matching attributes" do
             document = @klass.parse("<link foo=\"bar\">match</link>")
-            document.link.should == "match"
+            expect(document.link).to eq("match")
           end
 
-          it "should not save the text of an element that doesn't have matching attributes" do
+          it "does not saves the text of an element that doesn't have matching attributes" do
             document = @klass.parse("<link>no match</link>")
-            document.link.should be_nil
+            expect(document.link).to be_nil
           end
 
-          it "should save the text of an element that has matching attributes when it is the second of that type" do
+          it "saves 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"
+            expect(document.link).to eq("match")
           end
 
-          it "should save the text of an element that has matching attributes plus a few more" do
+          it "saves 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"
+            expect(document.link).to eq("match")
           end
         end
-      end # using the 'with' option
+      end
 
       describe "using the 'value' option" do
         before :each do
           @klass = Class.new do
             include SAXMachine
-            element :link, :value => :foo
+            element :link, value: :foo
           end
         end
 
-        it "should save the attribute value" do
+        it "saves the attribute value" do
           document = @klass.parse("<link foo='test'>hello</link>")
-          document.link.should == 'test'
+          expect(document.link).to eq("test")
         end
 
-        it "should save the attribute value when there is no text enclosed by the tag" do
+        it "saves the attribute value when there is no text enclosed by the tag" do
           document = @klass.parse("<link foo='test'></link>")
-          document.link.should == 'test'
+          expect(document.link).to eq("test")
         end
 
-        it "should save the attribute value when the tag close is in the open" do
+        it "saves the attribute value when the tag close is in the open" do
           document = @klass.parse("<link foo='test'/>")
-          document.link.should == 'test'
+          expect(document.link).to eq("test")
         end
 
-        it "should save two different attribute values on a single tag" do
+        it "saves two different attribute values on a single tag" do
           @klass = Class.new do
             include SAXMachine
-            element :link, :value => :foo, :as => :first
-            element :link, :value => :bar, :as => :second
+            element :link, value: :foo, as: :first
+            element :link, value: :bar, as: :second
           end
+
           document = @klass.parse("<link foo='foo value' bar='bar value'></link>")
-          document.first.should == "foo value"
-          document.second.should == "bar value"
+          expect(document.first).to eq("foo value")
+          expect(document.second).to eq("bar value")
         end
 
-        it "should not fail if one of the attribute hasn't been defined" do
+        it "does not fail if one of the attribute hasn't been defined" do
           @klass = Class.new do
             include SAXMachine
-            element :link, :value => :foo, :as => :first
-            element :link, :value => :bar, :as => :second
+            element :link, value: :foo, as: :first
+            element :link, value: :bar, as: :second
           end
+
           document = @klass.parse("<link foo='foo value'></link>")
-          document.first.should == "foo value"
-          document.second.should be_nil
+          expect(document.first).to eq("foo value")
+          expect(document.second).to be_nil
         end
       end
 
@@ -393,19 +399,18 @@ describe "SAXMachine" do
           @klass = Class.new do
             include SAXMachine
             element :link
-            element :link, :value => :foo, :as => :link_foo
-            element :link, :value => :bar, :as => :link_bar
+            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
+        it "parses 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'
+          expect(document.link).to eq("hello")
+          expect(document.link_foo).to eq("test1")
+          expect(document.link_bar).to eq("test2")
         end
       end
-
     end
   end
 
@@ -414,33 +419,34 @@ describe "SAXMachine" do
       before :each do
         @klass = Class.new do
           include SAXMachine
-          elements :entry, :as => :entries
+          elements :entry, as: :entries
         end
       end
 
-      it "should provide a collection accessor" do
+      it "provides a collection accessor" do
         document = @klass.new
         document.entries << :foo
-        document.entries.should == [:foo]
+        expect(document.entries).to eq([:foo])
       end
 
-      it "should parse a single element" do
+      it "parses a single element" do
         document = @klass.parse("<entry>hello</entry>")
-        document.entries.should == ["hello"]
+        expect(document.entries).to eq(["hello"])
       end
 
-      it "should parse multiple elements" do
+      it "parses multiple elements" do
         document = @klass.parse("<xml><entry>hello</entry><entry>world</entry></xml>")
-        document.entries.should == ["hello", "world"]
+        expect(document.entries).to eq(["hello", "world"])
       end
 
-      it "should parse multiple elements when taking an attribute value" do
+      it "parses multiple elements when taking an attribute value" do
         attribute_klass = Class.new do
           include SAXMachine
-          elements :entry, :as => :entries, :value => :foo
+          elements :entry, as: :entries, value: :foo
         end
+
         doc = attribute_klass.parse("<xml><entry foo='asdf' /><entry foo='jkl' /></xml>")
-        doc.entries.should == ["asdf", "jkl"]
+        expect(doc.entries).to eq(["asdf", "jkl"])
       end
     end
 
@@ -458,22 +464,22 @@ describe "SAXMachine" do
 
         class Item
           include SAXMachine
-
         end
+
         @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: "Bar" }, class: Bar
+          elements :item, as: :items, with: { type: /Foo/ }, class: Foo
         end
       end
-      
-      it "should cast into the correct class" do
+
+      it "casts into the correct class" do
         document = @klass.parse("<items><item type=\"Bar\"><title>Bar title</title></item><item type=\"Foo\"><title>Foo title</title></item></items>")
-        document.items.size.should == 2
-        document.items.first.should be_a(Bar)
-        document.items.first.title.should == "Bar title"
-        document.items.last.should be_a(Foo)
-        document.items.last.title.should == "Foo title"
+        expect(document.items.size).to eq(2)
+        expect(document.items.first).to be_a(Bar)
+        expect(document.items.first.title).to eq("Bar title")
+        expect(document.items.last).to be_a(Foo)
+        expect(document.items.last.title).to eq("Foo title")
       end
     end
 
@@ -483,81 +489,85 @@ describe "SAXMachine" do
           include SAXMachine
           element :title
         end
+
         @klass = Class.new do
           include SAXMachine
-          elements :entry, :as => :entries, :class => Foo
+          elements :entry, as: :entries, class: Foo
         end
       end
 
-      it "should parse a single element with children" do
+      it "parses a single element with children" do
         document = @klass.parse("<entry><title>a title</title></entry>")
-        document.entries.size.should == 1
-        document.entries.first.title.should == "a title"
+        expect(document.entries.size).to eq(1)
+        expect(document.entries.first.title).to eq("a title")
       end
 
-      it "should parse multiple elements with children" do
+      it "parses multiple elements with children" do
         document = @klass.parse("<xml><entry><title>title 1</title></entry><entry><title>title 2</title></entry></xml>")
-        document.entries.size.should == 2
-        document.entries.first.title.should == "title 1"
-        document.entries.last.title.should == "title 2"
+        expect(document.entries.size).to eq(2)
+        expect(document.entries.first.title).to eq("title 1")
+        expect(document.entries.last.title).to eq("title 2")
       end
 
-      it "should not parse a top level element that is specified only in a child" do
+      it "does not parse a top level element that is specified only in a child" do
         document = @klass.parse("<xml><title>no parse</title><entry><title>correct title</title></entry></xml>")
-        document.entries.size.should == 1
-        document.entries.first.title.should == "correct title"
+        expect(document.entries.size).to eq(1)
+        expect(document.entries.first.title).to eq("correct title")
       end
 
-      it "should parse elements, and make attributes and inner text available" do
+      it "parses elements, and make attributes and inner text available" do
         class Related
           include SAXMachine
-          element 'related', :as=>:item
-          element 'related', :as=>:attr, :value=>'attr'
+          element "related", as: :item
+          element "related", as: :attr, value: "attr"
         end
+
         class Foo
-          elements 'related', :as=>'items', :class=>Related
+          elements "related", as: "items", class: Related
         end
 
         doc = Foo.parse(%{<xml><collection><related attr='baz'>something</related><related>somethingelse</related></collection></xml>})
-        doc.items.first.should_not be_nil
-        doc.items.size.should == 2
-        doc.items.first.item.should == 'something'
-        doc.items.last.item.should == 'somethingelse'
+        expect(doc.items.first).not_to be_nil
+        expect(doc.items.size).to eq(2)
+        expect(doc.items.first.item).to eq("something")
+        expect(doc.items.last.item).to eq("somethingelse")
       end
 
-      it "should parse out an attribute value from the tag that starts the collection" do
+      it "parses out an attribute value from the tag that starts the collection" do
         class Foo
-          element :entry, :value => :href, :as => :url
+          element :entry, value: :href, as: :url
         end
+
         document = @klass.parse("<xml><entry href='http://pauldix.net'><title>paul</title></entry></xml>")
-        document.entries.size.should == 1
-        document.entries.first.title.should == "paul"
-        document.entries.first.url.should == "http://pauldix.net"
+        expect(document.entries.size).to eq(1)
+        expect(document.entries.first.title).to eq("paul")
+        expect(document.entries.first.url).to eq("http://pauldix.net")
       end
     end
   end
-  
+
   describe "when dealing with element names containing dashes" do
-    it 'should automatically convert dashes to underscores' do      
+    it "converts dashes to underscores" do
       class Dashes
         include SAXMachine
         element :dashed_element
       end
-      
-      parsed = Dashes.parse('<dashed-element>Text</dashed-element>')
-      parsed.dashed_element.should eq "Text"
+
+      parsed = Dashes.parse("<dashed-element>Text</dashed-element>")
+      expect(parsed.dashed_element).to eq "Text"
     end
   end
 
   describe "full example" do
     before :each do
-      @xml = File.read('spec/sax-machine/atom.xml')
+      @xml = File.read("spec/fixtures/atom.xml")
+
       class AtomEntry
         include SAXMachine
         element :title
-        element :name, :as => :author
-        element "feedburner:origLink", :as => :url
-        element :link, :as => :alternate, :value => :href, :with => {:type => "text/html", :rel => "alternate"}
+        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
@@ -566,21 +576,25 @@ describe "SAXMachine" do
       class Atom
         include SAXMachine
         element :title
-        element :link, :value => :href, :as => :url, :with => {:type => "text/html"}
-        element :link, :value => :href, :as => :feed_url, :with => {:type => "application/atom+xml"}
-        elements :entry, :as => :entries, :class => AtomEntry
+        element :link, value: :href, as: :url, with: { type: "text/html" }
+        element :link, value: :href, as: :feed_url, with: { type: "application/atom+xml" }
+        elements :entry, as: :entries, class: AtomEntry
       end
-    end # before
 
-    it "should parse the url" do
-      f = Atom.parse(@xml)
-      f.url.should == "http://www.pauldix.net/"
+      @feed = Atom.parse(@xml)
+    end
+
+    it "parses the url" do
+      expect(@feed.url).to eq("http://www.pauldix.net/")
+    end
+
+    it "parses entry url" do
+      expect(@feed.entries.first.url).to eq("http://www.pauldix.net/2008/09/marshal-data-to.html?param1=1&param2=2")
+      expect(@feed.entries.first.alternate).to eq("http://feeds.feedburner.com/~r/PaulDixExplainsNothing/~3/383536354/marshal-data-to.html?param1=1&param2=2")
     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"
+    it "parses content" do
+      expect(@feed.entries.first.content).to eq(File.read("spec/fixtures/atom-content.html"))
     end
   end
 
@@ -598,32 +612,35 @@ describe "SAXMachine" do
         </category>
       </categories>
       ]
-      class CategoryCollection;
-      end
+
+      class CategoryCollection; end
+
       class Category
         include SAXMachine
         attr_accessor :id
-        element :category, :value => :id, :as => :id
+        element :category, value: :id, as: :id
         element :title
-        element :categories, :as => :collection, :class => CategoryCollection
+        element :categories, as: :collection, class: CategoryCollection
         ancestor :ancestor
       end
+
       class CategoryCollection
         include SAXMachine
-        elements :category, :as => :categories, :class => Category
+        elements :category, as: :categories, class: Category
       end
+
       @collection = CategoryCollection.parse(@xml)
     end
 
-    it "should parse the first category" do
-      @collection.categories.first.id.should == "1"
-      @collection.categories.first.title.should == "First"
-      @collection.categories.first.ancestor.should == @collection
+    it "parses the first category" do
+      expect(@collection.categories.first.id).to eq("1")
+      expect(@collection.categories.first.title).to eq("First")
+      expect(@collection.categories.first.ancestor).to eq(@collection)
     end
 
-    it "should parse the nested category" do
-      @collection.categories.first.collection.categories.first.id.should == "2"
-      @collection.categories.first.collection.categories.first.title.should == "Second"
+    it "parses the nested category" do
+      expect(@collection.categories.first.collection.categories.first.id).to eq("2")
+      expect(@collection.categories.first.collection.categories.first.title).to eq("Second")
     end
   end
 
@@ -641,24 +658,26 @@ describe "SAXMachine" do
         </category>
       </categories>
       ]
+
       class CategoryTree
         include SAXMachine
         attr_accessor :id
-        element :category, :value => :id, :as => :id
+        element :category, value: :id, as: :id
         element :title
-        elements :category, :as => :categories, :class => CategoryTree
+        elements :category, as: :categories, class: CategoryTree
       end
+
       @collection = CategoryTree.parse(@xml)
     end
 
-    it "should parse the first category" do
-      @collection.categories.first.id.should == "1"
-      @collection.categories.first.title.should == "First"
+    it "parses the first category" do
+      expect(@collection.categories.first.id).to eq("1")
+      expect(@collection.categories.first.title).to eq("First")
     end
 
-    it "should parse the nested category" do
-      @collection.categories.first.categories.first.id.should == "2"
-      @collection.categories.first.categories.first.title.should == "Second"
+    it "parses the nested category" do
+      expect(@collection.categories.first.categories.first.id).to eq("2")
+      expect(@collection.categories.first.categories.first.title).to eq("Second")
     end
   end
 
@@ -671,21 +690,23 @@ describe "SAXMachine" do
           </texts>
         </item>
       ]
+
       @klass = Class.new do
         include SAXMachine
         attr_accessor :id
-        element :item, :value => "id", :as => :id
+        element :item, value: "id", as: :id
         element :title
       end
+
       @item = @klass.parse(@xml)
     end
 
-    it "should have an id" do
-      @item.id.should == "1"
+    it "has an id" do
+      expect(@item.id).to eq("1")
     end
 
-    it "should have a title" do
-      @item.title.should == "Hello"
+    it "has a title" do
+      expect(@item.title).to eq("Hello")
     end
   end
 
@@ -696,28 +717,31 @@ describe "SAXMachine" do
           <author name="John Doe" role="writer" />
         </item>
       ]
+
       class AuthorElement
         include SAXMachine
         attribute :name
         attribute :role
       end
+
       class ItemElement
         include SAXMachine
-        element :author, :class => AuthorElement
+        element :author, class: AuthorElement
       end
+
       @item = ItemElement.parse(@xml)
     end
 
-    it 'should have the child element' do
-      @item.author.should_not be_nil
+    it "has the child element" do
+      expect(@item.author).not_to be_nil
     end
 
-    it 'should have the author name' do
-      @item.author.name.should == 'John Doe'
+    it "has the author name" do
+      expect(@item.author.name).to eq("John Doe")
     end
 
-    it 'should have the author role' do
-      @item.author.role.should == 'writer'
+    it "has the author role" do
+      expect(@item.author.role).to eq("writer")
     end
   end
 
@@ -729,31 +753,34 @@ describe "SAXMachine" do
           <author name="Jane Doe" role="artist" />
         </item>
       ]
+
       class AuthorElement2
         include SAXMachine
         attribute :name
         attribute :role
       end
+
       class ItemElement2
         include SAXMachine
-        elements :author, :as => :authors, :class => AuthorElement2
+        elements :author, as: :authors, class: AuthorElement2
       end
+
       @item = ItemElement2.parse(@xml)
     end
 
-    it 'should have the child elements' do
-      @item.authors.should_not be_nil
-      @item.authors.count.should == 2
+    it "has the child elements" do
+      expect(@item.authors).not_to be_nil
+      expect(@item.authors.count).to eq(2)
     end
 
-    it 'should have the author names' do
-      @item.authors.first.name.should == 'John Doe'
-      @item.authors.last.name.should == 'Jane Doe'
+    it "has the author names" do
+      expect(@item.authors.first.name).to eq("John Doe")
+      expect(@item.authors.last.name).to eq("Jane Doe")
     end
 
-    it 'should have the author roles' do
-      @item.authors.first.role.should == 'writer'
-      @item.authors.last.role.should == 'artist'
+    it "has the author roles" do
+      expect(@item.authors.first.role).to eq("writer")
+      expect(@item.authors.last.role).to eq("artist")
     end
   end
 
@@ -764,28 +791,31 @@ describe "SAXMachine" do
           <author role="writer">John Doe</author>
         </item>
       ]
+
       class AuthorElement3
         include SAXMachine
         value :name
         attribute :role
       end
+
       class ItemElement3
         include SAXMachine
-        element :author, :class => AuthorElement3
+        element :author, class: AuthorElement3
       end
+
       @item = ItemElement3.parse(@xml)
     end
 
-    it 'should have the child elements' do
-      @item.author.should_not be_nil
+    it "has the child elements" do
+      expect(@item.author).not_to be_nil
     end
 
-    it 'should have the author names' do
-      @item.author.name.should == 'John Doe'
+    it "has the author names" do
+      expect(@item.author.name).to eq("John Doe")
     end
 
-    it 'should have the author roles' do
-      @item.author.role.should == 'writer'
+    it "has the author roles" do
+      expect(@item.author.role).to eq("writer")
     end
   end
 
@@ -798,41 +828,64 @@ describe "SAXMachine" do
           <author role="artist">Jane Doe</author>
         </item>
       ]
+
       class AuthorElement4
         include SAXMachine
         value :name
         attribute :role
       end
+
       class ItemElement4
         include SAXMachine
         element :title
-        elements :author, :as => :authors, :class => AuthorElement4
+        elements :author, as: :authors, class: AuthorElement4
 
         def title=(blah)
-          #raise 'woo'
           @title = blah
         end
       end
+
       @item = ItemElement4.parse(@xml)
     end
 
-    it 'should have the title' do
-      @item.title.should == 'sweet'
+    it "has the title" do
+      expect(@item.title).to eq("sweet")
     end
 
-    it 'should have the child elements' do
-      @item.authors.should_not be_nil
-      @item.authors.count.should == 2
+    it "has the child elements" do
+      expect(@item.authors).not_to be_nil
+      expect(@item.authors.count).to eq(2)
     end
 
-    it 'should have the author names' do
-      @item.authors.first.name.should == 'John Doe'
-      @item.authors.last.name.should == 'Jane Doe'
+    it "has the author names" do
+      expect(@item.authors.first.name).to eq("John Doe")
+      expect(@item.authors.last.name).to eq("Jane Doe")
+    end
+
+    it "has the author roles" do
+      expect(@item.authors.first.role).to eq("writer")
+      expect(@item.authors.last.role).to eq("artist")
+    end
+  end
+
+  describe "with error handling" do
+    before do
+      @xml = %[
+        <item id="1">
+          <title>sweet</title>
+      ]
+
+      class ItemElement5
+        include SAXMachine
+        element :title
+      end
+
+      @errors = []
+      @item = ItemElement5.parse(@xml, ->(x) { @errors << x })
     end
 
-    it 'should have the author roles' do
-      @item.authors.first.role.should == 'writer'
-      @item.authors.last.role.should == 'artist'
+    it "has error" do
+      expect(@errors.uniq.size).to eq(1)
     end
   end
 end