xommelier 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75bd4f6f2751ba556d0a35cefa150d5886511aae
-  data.tar.gz: ee0278a00499fa04929e81f056f89ff5a23846fa
+  metadata.gz: 5021eac8283a90857cbf59e48a66eba7f920483a
+  data.tar.gz: 9903d50374acb7e8d1478b19ae6890289a9936cf
 SHA512:
-  metadata.gz: 8b6ef44e264d5267325647479dfffe5275f9238885eef222a2a3394567fa217a207e2efac00c7240cdbf89362524c05cc8c37b3cdcc3e38cb7f3f6a2973c8ce5
-  data.tar.gz: 999d6a89bce33c2729e146f40373af807f4b57a6d9e33b7e3274cbee943b63fc5335495e5d9331067a8b38ad9f85ff51c068356c54a2f005f343ebdb97943096
+  metadata.gz: 189d9e449e0af6d6cbebb21fa8ac822184aa3d6afa4d7b02d6015909f88049327a3202c6459a9917ac0d629e0f30c3d3fddada45ae9cb031a64f58523e93bba8
+  data.tar.gz: 47df7ea79aabb669ab39b2847dc2248d92d9baf5f540ef7d27571df09265c682c9ad2e3dfb390ddf401c54df73a373ab3011885f3a88ddd78c8e45b581ad4e12

data/.gitignore

@@ -5,3 +5,4 @@
 /pkg/*
 /doc
 /coverage
+.ruby-version

data/.travis.yml

@@ -1,5 +1,7 @@
+sudo: false
 language: ruby
+cache: bundler
 rvm:
   - 1.9.3
-before_install: gem install bundler
+  - 2.3.0
 bundler_args: --without ide documentation

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in xommelier.gemspec
 gemspec

data/README.md

@@ -200,3 +200,7 @@ will output
 * Sergey Ukustov
 
 © Alexander Semyonov, 2011-2012. See MIT-LICENSE for details
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/alsemyonov/xommelier/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/xommelier/version.rb

@@ -6,5 +6,5 @@
 ################################################
 
 module Xommelier
-  VERSION = '0.1.31'
+  VERSION = '0.1.32'
 end

data/lib/xommelier/xml/element/serialization.rb

@@ -94,6 +94,7 @@ module Xommelier
             end
             attribute_values.delete("xmlns:#{xmlns.as}")
             attribute_values.delete('xmlns:xml')
+            attribute_values.delete(:xmlns) if self.xmlns.default?
             namespaces = attribute_values
             prefix = nil
           end

data/lib/xommelier/xml/element/structure.rb

@@ -9,6 +9,7 @@ require 'xommelier/xml/element'
 require 'xommelier/xml/element/structure/property'
 require 'active_support/concern'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/object/with_options'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/string/inflections'
@@ -20,6 +21,7 @@ module Xommelier
       module Structure
         extend ActiveSupport::Concern
 
+
         included do
           class_attribute :elements, :attributes
 

data/lib/xommelier/xml/element.rb

@@ -12,6 +12,7 @@ require 'xommelier/xml/element/serialization'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/module/delegation'
 
 module Xommelier
   module Xml
@@ -55,6 +56,8 @@ module Xommelier
         %(#<#{self.class.name}:0x#{object_id.to_s(16)} #{inspect_contents}>)
       end
 
+      delegate :match, to: :to_s
+
       private
 
       def inspect_contents

data/spec/functional/xommelier/atom/feed/building_hash_spec.rb

@@ -7,7 +7,7 @@
 
 require 'spec_helper'
 
-describe Xommelier::Atom::Feed do
+RSpec.describe Xommelier::Atom::Feed do
   describe '.new(Hash)' do
     let(:hash) do
       {
@@ -29,13 +29,13 @@ describe Xommelier::Atom::Feed do
 
     subject(:doc) { Xommelier::Atom::Feed.new(hash) }
 
-    it { should have(1).authors }
-    it { should have(2).contributors }
-    it { should have(3).entries }
+    its('authors.size') { should == 1 }
+    its('contributors.size') { should == 2 }
+    its('entries.size') { should == 3 }
 
-    it { doc.author.should be_an(Xommelier::Atom::Person) }
-    it { doc.contributors[1].should be_an(Xommelier::Atom::Person) }
-    it { doc.entries[1].should be_an(Xommelier::Atom::Entry) }
+    it { expect(doc.author).to be_an(Xommelier::Atom::Person) }
+    it { expect(doc.contributors[1]).to be_an(Xommelier::Atom::Person) }
+    it { expect(doc.entries[1]).to be_an(Xommelier::Atom::Entry) }
 
     its(:to_hash) { should == hash}
     its(:to_xml) { should == load_xml_file('nested_atom') }

data/spec/functional/xommelier/atom/feed/building_spec.rb

@@ -34,7 +34,7 @@ describe Xommelier::Atom::Feed do
     it_behaves_like 'Valid XML Document'
 
     its(:to_xml) { should == load_xml_file('simple_feed.atom') }
-    it('should conform to RelaxNG schema') { rng.valid?(parsed_xml).should == true }
-    it('should conform to XML Schema') { xsd.valid?(parsed_xml).should == true }
+    it('should conform to RelaxNG schema') { expect(rng.valid?(parsed_xml)).to eq(true) }
+    it('should conform to XML Schema') { expect(xsd.valid?(parsed_xml)).to eq(true) }
   end
 end

data/spec/functional/xommelier/atom/feed/parsing_spec.rb

@@ -14,45 +14,45 @@ describe Xommelier::Atom::Feed do
     let(:atom_xml) { load_xml_file('feed.atom') }
     subject(:feed) { Xommelier::Atom::Feed.parse(atom_xml) }
 
-    it { should be_kind_of(Xommelier::Atom::Feed) }
-    it { should respond_to(:complete?) }
-    it { should respond_to(:archive?) }
+    it { is_expected.to be_kind_of(Xommelier::Atom::Feed) }
+    it { is_expected.to respond_to(:complete?) }
+    it { is_expected.to respond_to(:archive?) }
 
     its(:id)        { should == 'urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6' }
     its(:title)     { should == 'Example Feed' }
     its(:updated)   { should == Time.utc(2003, 12, 13, 18, 30, 20) }
     its(:subtitle)  { should == 'A <em>lot</em> of effort went into making this effortless' }
 
-    it { should have(3).links }
+    its('links.size') { should == 3 }
     its(:link) { should be_instance_of(Xommelier::Atom::Link) }
-    it { feed.links[0].href.should == URI.parse('http://example.ru/') }
-    it { feed.links[0].rel.should == 'alternate' }
-    it { feed.links[0].type.should == 'text/html' }
-    it { feed.links[1].href.should == URI.parse('http://example.ru/feed.atom') }
-    it { feed.links[1].rel.should == 'self' }
-    it { feed.links[1].type.should == 'application/atom+xml' }
+    it { expect(feed.links[0].href).to eq(URI.parse('http://example.ru/')) }
+    it { expect(feed.links[0].rel).to eq('alternate') }
+    it { expect(feed.links[0].type).to eq('text/html') }
+    it { expect(feed.links[1].href).to eq(URI.parse('http://example.ru/feed.atom')) }
+    it { expect(feed.links[1].rel).to eq('self') }
+    it { expect(feed.links[1].type).to eq('application/atom+xml') }
     its(:feed_url) { should == URI.parse('http://example.ru/feed.atom') }
     its(:html_url) { should == URI.parse('http://example.ru/') }
     its(:next_feed_url) { should == URI.parse('http://example.ru/feed.atom?page=2') }
 
-    its(:archive) { should be_true }
-    its(:complete) { should be_false }
+    its(:archive) { should be_truthy }
+    its(:complete) { should be_falsey }
     its(:rights) { should == '© Mark Pilgrim, 2003' }
     describe 'Generator' do
       subject { feed.generator }
       context '#to_s' do
-        it { should == 'Example Toolkit' }
+        it { is_expected.to eq('Example Toolkit') }
         its(:text)  { should == 'Example Toolkit' }
       end
       its(:uri)     { should == URI.parse('http://example.com/') }
       its(:version) { should == '1.0' }
     end
 
-    it { should have(1).authors }
+    its('authors.size') { should == 1 }
     its(:author) { should be_instance_of(Xommelier::Atom::Person) }
-    it { feed.author.name.should == 'John Doe' }
+    it { expect(feed.author.name).to eq('John Doe') }
 
-    it { feed.should have(2).entries }
+    it { expect(feed.entries.size).to eq(2) }
     describe 'Entry' do
       subject(:entry) { feed.entries[0] }
 
@@ -61,24 +61,24 @@ describe Xommelier::Atom::Feed do
       its(:updated)   { should == Time.utc(2003, 12, 13, 18, 30, 02) }
       its(:published) { should == Time.utc(2003, 12, 13, 8, 29, 29) + 4.hours }
 
-      it { should have(3).links }
+      its('links.size') { should == 3 }
       its(:link) { should be_instance_of(Xommelier::Atom::Link) }
-      it { entry.links[0].href.should == URI.parse('http://example.ru/2003/12/13/atom03') }
-      it { entry.links[0].rel.should == 'alternate' }
-      it { entry.links[0].type.should == 'text/html' }
-      it { entry.links[1].href.should == URI.parse('http://example.org/audio/ph34r_my_podcast.mp3') }
-      it { entry.links[1].rel.should == 'enclosure' }
-      it { entry.links[1].type.should == 'audio/mpeg' }
-      it { entry.links[1].length.should == 1337 }
-      it { entry.links[2].href.should == URI.parse('http://example.ru/2003/12/13/atom03/comments.atom') }
-      it { entry.links[2].rel.should == 'replies' }
-      it { entry.links[2].type.should == 'application/atom+xml' }
-      it { entry.links[2].count.should == 1 }
-      it { entry.links[2].updated.should == Time.utc(2003, 12, 13, 18, 30, 20) }
+      it { expect(entry.links[0].href).to eq(URI.parse('http://example.ru/2003/12/13/atom03')) }
+      it { expect(entry.links[0].rel).to eq('alternate') }
+      it { expect(entry.links[0].type).to eq('text/html') }
+      it { expect(entry.links[1].href).to eq(URI.parse('http://example.org/audio/ph34r_my_podcast.mp3')) }
+      it { expect(entry.links[1].rel).to eq('enclosure') }
+      it { expect(entry.links[1].type).to eq('audio/mpeg') }
+      it { expect(entry.links[1].length).to eq(1337) }
+      it { expect(entry.links[2].href).to eq(URI.parse('http://example.ru/2003/12/13/atom03/comments.atom')) }
+      it { expect(entry.links[2].rel).to eq('replies') }
+      it { expect(entry.links[2].type).to eq('application/atom+xml') }
+      it { expect(entry.links[2].count).to eq(1) }
+      it { expect(entry.links[2].updated).to eq(Time.utc(2003, 12, 13, 18, 30, 20)) }
       its(:html_url) { should == URI.parse('http://example.ru/2003/12/13/atom03') }
       its(:replies_feed_url) { should == URI.parse('http://example.ru/2003/12/13/atom03/comments.atom') }
 
-      it { should have(1).authors }
+      its('authors.size') { should == 1 }
 
       describe 'Author' do
         subject { entry.author }
@@ -87,13 +87,13 @@ describe Xommelier::Atom::Feed do
         its(:email) { should == 'f8dy@example.com' }
       end
 
-      it { should have(2).contributors }
-      it { entry.contributors[0].name.should == 'Sam Ruby' }
-      it { entry.contributors[1].name.should == 'Joe Gregorio' }
+      its('contributors.size') { should == 2 }
+      it { expect(entry.contributors[0].name).to eq('Sam Ruby') }
+      it { expect(entry.contributors[1].name).to eq('Joe Gregorio') }
       its(:summary) { should == 'Some text.' }
       context 'Content' do
         subject { entry.content }
-        it { should =~ /#{Regexp.escape('[Update: The Atom draft is finished.]')}/ }
+        it { is_expected.to match(/#{Regexp.escape('[Update: The Atom draft is finished.]')}/) }
         its(:text) do
           should == "\n      <div xmlns=\"http://www.w3.org/1999/xhtml\">\n        <p><i>[Update: The Atom draft is finished.]</i></p>\n      </div>\n    "
         end

data/spec/functional/xommelier/atom/threading/building_spec.rb

@@ -41,6 +41,6 @@ describe 'Atom feed building' do
   let(:xsd)        { Nokogiri::XML::Schema(load_xml_file('atom.xsd')) }
 
   its(:to_xml) { should == load_xml_file('multi_namespace_feed.atom') }
-  it('should conform to RelaxNG schema') { rng.valid?(parsed_xml).should == true }
+  it('should conform to RelaxNG schema') { expect(rng.valid?(parsed_xml)).to eq(true) }
   it_behaves_like 'Valid XML Document'
 end

data/spec/functional/xommelier/open_search/description/parsing_spec.rb

@@ -13,7 +13,7 @@ describe Xommelier::OpenSearch::Description do
     let(:osd_xml) { load_xml_file('opensearch.full') }
     subject(:description) { Xommelier::OpenSearch::Description.parse(osd_xml) }
 
-    its(:adult_content) { should  be_false }
+    its(:adult_content) { should  be_falsey }
     its(:attribution) { should == "\n    Search data Copyright 2005, Example.com, Inc., All Rights Reserved\n  " }
     its(:contact) { should == 'admin@example.com' }
     its(:description) { should == 'Use Example.com to search the Web.' }
@@ -26,26 +26,26 @@ describe Xommelier::OpenSearch::Description do
     its(:syndication_right) { should == 'open' }
     its(:tags) { should == 'example web' }
 
-    it { should have(2).images }
+    its('images.size') { should == 2 }
     describe '#images' do
-      it { subject.images[0].should == 'http://example.com/websearch.png' }
-      it { subject.images[0].type.should == 'image/png' }
-      it { subject.images[0].height.should == 64 }
-      it { subject.images[0].width.should == 64 }
-      it { subject.images[1].should == 'http://example.com/websearch.ico' }
-      it { subject.images[1].type.should == 'image/vnd.microsoft.icon' }
-      it { subject.images[1].height.should == 16 }
-      it { subject.images[1].width.should == 16 }
+      it { expect(subject.images[0]).to eq('http://example.com/websearch.png') }
+      it { expect(subject.images[0].type).to eq('image/png') }
+      it { expect(subject.images[0].height).to eq(64) }
+      it { expect(subject.images[0].width).to eq(64) }
+      it { expect(subject.images[1]).to eq('http://example.com/websearch.ico') }
+      it { expect(subject.images[1].type).to eq('image/vnd.microsoft.icon') }
+      it { expect(subject.images[1].height).to eq(16) }
+      it { expect(subject.images[1].width).to eq(16) }
     end
 
-    it { should have(3).urls }
+    its('urls.size') { should == 3 }
     describe '#urls' do
-      it { subject.urls[0].type.should == 'application/atom+xml' }
-      it { subject.urls[0].template.should == 'http://example.com/?q={searchTerms}&pw={startPage?}&format=atom' }
-      it { subject.urls[1].type.should == 'application/rss+xml' }
-      it { subject.urls[1].template.should == 'http://example.com/?q={searchTerms}&pw={startPage?}&format=rss' }
-      it { subject.urls[2].type.should == 'text/html' }
-      it { subject.urls[2].template.should == 'http://example.com/?q={searchTerms}&pw={startPage?}' }
+      it { expect(subject.urls[0].type).to eq('application/atom+xml') }
+      it { expect(subject.urls[0].template).to eq('http://example.com/?q={searchTerms}&pw={startPage?}&format=atom') }
+      it { expect(subject.urls[1].type).to eq('application/rss+xml') }
+      it { expect(subject.urls[1].template).to eq('http://example.com/?q={searchTerms}&pw={startPage?}&format=rss') }
+      it { expect(subject.urls[2].type).to eq('text/html') }
+      it { expect(subject.urls[2].template).to eq('http://example.com/?q={searchTerms}&pw={startPage?}') }
     end
   end
 end

data/spec/functional/xommelier/rss/rss/parsing_spec.rb

@@ -14,7 +14,7 @@ describe 'RSS feed' do
     let(:rss_xml) { load_xml_file('feed.rss2.0') }
     subject(:feed) { Xommelier::RSS::Rss.parse(rss_xml) }
 
-    it { should be_kind_of(Xommelier::RSS::Rss) }
+    it { is_expected.to be_kind_of(Xommelier::RSS::Rss) }
 
     its(:title) { should == 'Liftoff News' }
     its(:last_build_date) { should == Time.utc(2003, 6, 10, 9, 41, 01) }
@@ -27,7 +27,7 @@ describe 'RSS feed' do
     its(:managing_editor) { should == 'editor@example.com' }
     its(:web_master) { should == 'webmaster@example.com' }
 
-    it { feed.should have(4).items }
+    it { expect(feed.items.size).to eq(4) }
     describe 'Item' do
       subject(:item) { feed.items[0] }
 

data/spec/lib/xommelier/atom/entry_spec.rb

@@ -12,14 +12,14 @@ describe Xommelier::Atom::Entry do
     subject { Xommelier::Atom::Entry.new }
 
     [:id, :title, :updated].each do |must_field|
-      it { should respond_to(must_field) }
+      it { is_expected.to respond_to(must_field) }
     end
     [:content, :published, :rights, :source, :summary].each do |may_field|
-      it { should respond_to(may_field) }
+      it { is_expected.to respond_to(may_field) }
     end
     %w(author category contributor link).each do |any_field|
-      it { should respond_to(any_field) }
-      it('have plural methods for embedded collections') { should respond_to(any_field.pluralize) }
+      it { is_expected.to respond_to(any_field) }
+      it('have plural methods for embedded collections') { is_expected.to respond_to(any_field.pluralize) }
     end
   end
 end

data/spec/lib/xommelier/ds_spec.rb

@@ -12,19 +12,19 @@ describe Xommelier::DS do
 end
 
 describe Xommelier::DS::Signature do
-  it { should respond_to(:signed_info) }
-  it { should respond_to(:signature_value) }
-  it { should respond_to(:key_info) }
+  it { is_expected.to respond_to(:signed_info) }
+  it { is_expected.to respond_to(:signature_value) }
+  it { is_expected.to respond_to(:key_info) }
 end
 
 describe Xommelier::DS::SignedInfo do
-  it { should respond_to(:canonicalization_method) }
-  it { should respond_to(:signature_method) }
-  it { should respond_to(:reference) }
+  it { is_expected.to respond_to(:canonicalization_method) }
+  it { is_expected.to respond_to(:signature_method) }
+  it { is_expected.to respond_to(:reference) }
 end
 
 describe Xommelier::DS::CanonicalizationMethod do
-  it { should respond_to(:algorithm) }
+  it { is_expected.to respond_to(:algorithm) }
 
   describe '.new_omit_comments' do
     subject { described_class.new_omit_comments }
@@ -38,7 +38,7 @@ describe Xommelier::DS::CanonicalizationMethod do
 end
 
 describe Xommelier::DS::SignatureMethod do
-  it { should respond_to(:hmac_output_length) }
+  it { is_expected.to respond_to(:hmac_output_length) }
 
   describe '.new_rsa_sha1' do
     subject { described_class.new_rsa_sha1 }
@@ -52,7 +52,7 @@ describe Xommelier::DS::SignatureMethod do
 end
 
 describe Xommelier::DS::Transform do
-  it { should respond_to(:xpath) }
+  it { is_expected.to respond_to(:xpath) }
 
   describe '.new_xslt' do
     subject { described_class.new_xslt }
@@ -81,9 +81,9 @@ describe Xommelier::DS::DigestMethod do
 end
 
 describe Xommelier::DS::Reference do
-  it { should respond_to(:digest_method) }
-  it { should respond_to(:digest_value) }
-  it { should respond_to(:uri) }
+  it { is_expected.to respond_to(:digest_method) }
+  it { is_expected.to respond_to(:digest_value) }
+  it { is_expected.to respond_to(:uri) }
 end
 
 describe Xommelier::DS::Signature, '(signature-example-rsa.xml)' do

data/spec/lib/xommelier/rss/email_address_spec.rb

@@ -15,15 +15,15 @@ describe Xommelier::RSS::EmailAddress do
   }.each do |email_address, (address, name)|
     it "parses #{email_address.inspect} as address:#{address.inspect}, name:#{name.inspect}" do
       e = described_class.from_xommelier(email_address)
-      e.should == address
-      e.name.should == name
+      expect(e).to eq(address)
+      expect(e.name).to eq(name)
     end
 
     it "produces #{email_address.inspect} from address:#{address.inspect}, name:#{name.inspect}" do
       e = described_class.new
       e.address = address
       e.name = name
-      e.to_xommelier.should == email_address
+      expect(e.to_xommelier).to eq(email_address)
     end
   end
 end

data/spec/lib/xommelier/xml/element/serialization_spec.rb

@@ -11,6 +11,6 @@ describe Xommelier::Xml::Element::Serialization do
   describe 'class' do
     subject { Xommelier::Atom::Feed }
 
-    it { should respond_to(:parse) }
+    it { is_expected.to respond_to(:parse) }
   end
 end

data/spec/lib/xommelier/xml/element/structure_spec.rb

@@ -10,25 +10,25 @@ require 'spec_helper'
 describe Xommelier::Xml::Element::Structure do
   subject { NamespacedModule::RootWithSimpleSubelement }
 
-  it { should respond_to(:elements) }
-  it { should respond_to(:element) }
+  it { is_expected.to respond_to(:elements) }
+  it { is_expected.to respond_to(:element) }
   it 'defines subelement' do
-    NamespacedModule::RootWithSimpleSubelement.elements.should have_key(:some)
+    expect(NamespacedModule::RootWithSimpleSubelement.elements).to have_key(:some)
   end
 
-  it { should respond_to(:attributes) }
-  it { should respond_to(:attribute) }
+  it { is_expected.to respond_to(:attributes) }
+  it { is_expected.to respond_to(:attribute) }
   it 'defines attribute' do
-    NamespacedModule::RootWithAttribute.attributes.should have_key(:another)
+    expect(NamespacedModule::RootWithAttribute.attributes).to have_key(:another)
   end
 
-  it { should respond_to(:text) }
+  it { is_expected.to respond_to(:text) }
   it 'defines as containing text' do
-    NamespacedModule::RootWithText.new.should respond_to(:text)
+    expect(NamespacedModule::RootWithText.new).to respond_to(:text)
   end
 
-  it { should respond_to(:xmlns) }
-  it { NamespacedModule::RootWithText.xmlns.uri.should == 'http://example.org/'}
-  it { NamespacedModule::RootWithAttribute.xmlns.uri.should == 'http://example.org/'}
-  it { Xommelier::Atom::Feed.xmlns.uri.should == 'http://www.w3.org/2005/Atom'}
+  it { is_expected.to respond_to(:xmlns) }
+  it { expect(NamespacedModule::RootWithText.xmlns.uri).to eq('http://example.org/')}
+  it { expect(NamespacedModule::RootWithAttribute.xmlns.uri).to eq('http://example.org/')}
+  it { expect(Xommelier::Atom::Feed.xmlns.uri).to eq('http://www.w3.org/2005/Atom')}
 end

data/spec/lib/xommelier/xml/element_spec.rb

@@ -11,33 +11,33 @@ describe Xommelier::Xml::Element do
   describe 'class' do
     subject { Xommelier::Atom::Link }
 
-    it { should respond_to(:xmlns) }
-    it { subject.xmlns.to_s.should == ATOM_XMLNS }
+    it { is_expected.to respond_to(:xmlns) }
+    it { expect(subject.xmlns.to_s).to eq(ATOM_XMLNS) }
 
-    it { should respond_to(:element_name) }
-    it { subject.element_name.should == 'link' }
+    it { is_expected.to respond_to(:element_name) }
+    it { expect(subject.element_name).to eq('link') }
   end
 
   describe 'instance' do
     subject { Xommelier::Atom::Link.new }
 
-    it { should respond_to(:to_xml) }
-    it { subject.to_xml.should == %(<?xml version="1.0" encoding="utf-8"?>\n<link xmlns="#{ATOM_XMLNS}"/>\n) }
+    it { is_expected.to respond_to(:to_xml) }
+    it { expect(subject.to_xml).to eq(%(<?xml version="1.0" encoding="utf-8"?>\n<link xmlns="#{ATOM_XMLNS}"/>\n)) }
 
     describe 'with text' do
       subject { NamespacedModule::RootWithText.new('Text') }
 
-      it { should respond_to(:text) }
-      it { subject.text.should == 'Text' }
-      it { subject.to_xml.should == %(<?xml version="1.0" encoding="utf-8"?>\n<root-with-text xmlns="http://example.org/">Text</root-with-text>\n) }
+      it { is_expected.to respond_to(:text) }
+      it { expect(subject.text).to eq('Text') }
+      it { expect(subject.to_xml).to eq(%(<?xml version="1.0" encoding="utf-8"?>\n<root-with-text xmlns="http://example.org/">Text</root-with-text>\n)) }
     end
 
     describe 'with simple subelements' do
       subject { Xommelier::Atom::Person.new(name: 'Ivan') }
 
-      it { should respond_to(:name) }
-      it { subject.name.should == 'Ivan' }
-      it { subject.to_xml.should == %(<?xml version="1.0" encoding="utf-8"?>\n<person xmlns="#{ATOM_XMLNS}">\n  <name>Ivan</name>\n</person>\n) }
+      it { is_expected.to respond_to(:name) }
+      it { expect(subject.name).to eq('Ivan') }
+      it { expect(subject.to_xml).to eq(%(<?xml version="1.0" encoding="utf-8"?>\n<person xmlns="#{ATOM_XMLNS}">\n  <name>Ivan</name>\n</person>\n)) }
     end
 
     describe 'with many simple subelements' do
@@ -45,18 +45,18 @@ describe Xommelier::Xml::Element do
         NamespacedModule::RootWithManySimpleSubelements.new(foos: %w(bar baz))
       end
 
-      it { should respond_to(:foo) }
-      it { subject.foos.should == %w(bar baz) }
-      it { subject.foo.should == 'bar' }
-      it { subject.to_xml.should == %(<?xml version="1.0" encoding="utf-8"?>\n<root-with-many-simple-subelements xmlns="http://example.org/">\n  <foo>bar</foo>\n  <foo>baz</foo>\n</root-with-many-simple-subelements>\n) }
+      it { is_expected.to respond_to(:foo) }
+      it { expect(subject.foos).to eq(%w(bar baz)) }
+      it { expect(subject.foo).to eq('bar') }
+      it { expect(subject.to_xml).to eq(%(<?xml version="1.0" encoding="utf-8"?>\n<root-with-many-simple-subelements xmlns="http://example.org/">\n  <foo>bar</foo>\n  <foo>baz</foo>\n</root-with-many-simple-subelements>\n)) }
     end
 
     describe 'with attribute' do
       subject { NamespacedModule::RootWithAttribute.new(another: 'Difference') }
 
-      it { should respond_to(:another) }
-      it { subject.another.should == 'Difference' }
-      it { subject.to_xml.should == %(<?xml version="1.0" encoding="utf-8"?>\n<root-with-attribute xmlns="http://example.org/" another="Difference"/>\n) }
+      it { is_expected.to respond_to(:another) }
+      it { expect(subject.another).to eq('Difference') }
+      it { expect(subject.to_xml).to eq(%(<?xml version="1.0" encoding="utf-8"?>\n<root-with-attribute xmlns="http://example.org/" another="Difference"/>\n)) }
     end
 
     describe 'with subelements' do
@@ -69,13 +69,13 @@ describe Xommelier::Xml::Element do
         )
       end
 
-      it { should respond_to(:one) }
-      it { should respond_to(:two) }
-      it { should respond_to(:some) }
-      it { should respond_to(:another) }
-      it { subject.another.class.should == NamespacedModule::RootWithSimpleSubelement }
-      it { subject.another.some.should == 'Text' }
-      it { subject.to_xml.should == %(<?xml version="1.0" encoding="utf-8"?>\n<root-with-subelement xmlns="http://example.org/" one="2011-08-15" two="2">\n  <some>Text</some>\n  <another>\n    <some>Text</some>\n  </another>\n</root-with-subelement>\n) }
+      it { is_expected.to respond_to(:one) }
+      it { is_expected.to respond_to(:two) }
+      it { is_expected.to respond_to(:some) }
+      it { is_expected.to respond_to(:another) }
+      it { expect(subject.another.class).to eq(NamespacedModule::RootWithSimpleSubelement) }
+      it { expect(subject.another.some).to eq('Text') }
+      it { expect(subject.to_xml).to eq(%(<?xml version="1.0" encoding="utf-8"?>\n<root-with-subelement xmlns="http://example.org/" one="2011-08-15" two="2">\n  <some>Text</some>\n  <another>\n    <some>Text</some>\n  </another>\n</root-with-subelement>\n)) }
     end
   end
 end

data/spec/lib/xommelier/xml_spec.rb

@@ -11,7 +11,7 @@ describe Xommelier::Xml do
 end
 
 describe Xommelier::Atom do
-  it { should respond_to(:xmlns) }
-  it { subject.xmlns.to_s.should == ATOM_XMLNS }
+  it { is_expected.to respond_to(:xmlns) }
+  it { expect(subject.xmlns.to_s).to eq(ATOM_XMLNS) }
   its(:schema) { should_not be_nil }
 end

data/spec/spec_helper.rb

@@ -9,11 +9,11 @@ SPEC_ROOT = File.expand_path('../..', __FILE__)
 require 'simplecov'
 require 'bundler/setup'
 require 'rspec'
+require 'rspec/its'
 
 SimpleCov.start
 
 require 'xommelier'
-require 'namespaced_module'
 
 #noinspection RubyResolve
 Dir[File.join(SPEC_ROOT, 'spec/support/**/*.rb')].each {|f| require f}

data/spec/support/schema_validatable.rb

@@ -7,10 +7,10 @@
 
 require 'rspec'
 shared_examples 'Valid XML Document' do
-  it { subject.class.schema.should be_present }
+  it { expect(subject.class.schema).to be_present }
   specify do
     begin
-      should be_valid
+      is_expected.to be_valid
     rescue RSpec::Expectations::ExpectationNotMetError => e
       puts subject.to_xml
       puts subject.schema_validation_errors

data/xommelier.gemspec

@@ -19,11 +19,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.add_dependency 'nokogiri', '~> 1.5'
-  s.add_dependency 'activesupport', '~> 3.2.0'
-  s.add_dependency 'activemodel', '~> 3.2.0'
-  s.add_development_dependency 'bundler', '~> 1.3.2'
-  s.add_development_dependency 'rake', '~> 10.0.3'
-  s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'simplecov', '~> 0.7.1'
+  s.add_dependency 'nokogiri', '~> 1.6.8'
+  s.add_dependency 'activesupport', '~> 4.2.2'
+  s.add_dependency 'activemodel'
+  s.add_dependency 'tzinfo', '~> 1.1'
+
+  s.add_development_dependency 'rspec', '~> 2.99.0'
+  s.add_development_dependency 'rspec-its', '~> 1.0.1'
+  s.add_development_dependency 'rake', '~> 10.4.2'
+  s.add_development_dependency 'yard', '~> 0.8.7.6'
+  s.add_development_dependency 'simplecov', '~> 0.6.1'
+  s.add_development_dependency 'redcarpet', '>= 3.2.3'
 end

metadata

@@ -1,113 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Alexander Semyonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.99.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 0.8.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 0.8.7.6
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 3.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 3.2.3
 description: XML-Object Mapper with many built-in XML formats supported
 email:
 - al@semyonov.us
@@ -115,9 +157,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -214,9 +256,9 @@ files:
 - spec/lib/xommelier/xml/element_spec.rb
 - spec/lib/xommelier/xml_spec.rb
 - spec/lib/xommelier_spec.rb
-- spec/namespaced_module.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
+- spec/support/namespaced_module.rb
 - spec/support/schema_validatable.rb
 - xommelier.gemspec
 homepage: http://github.com/alsemyonov/xommelier
@@ -229,17 +271,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: xommelier
-rubygems_version: 2.0.3
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Xommelier is an XML Sommelier
@@ -270,8 +312,8 @@ test_files:
 - spec/lib/xommelier/xml/element_spec.rb
 - spec/lib/xommelier/xml_spec.rb
 - spec/lib/xommelier_spec.rb
-- spec/namespaced_module.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
+- spec/support/namespaced_module.rb
 - spec/support/schema_validatable.rb
 has_rdoc: