xommelier 0.1.19 → 0.1.20

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

@@ -28,6 +28,10 @@ module Xommelier
             options[:type]
           end
 
+          def complex_type?
+            type < Xml::Element
+          end
+
           # @return [true, false] has default value?
           def default?
             options.key?(:default) && required?

data/spec/fixtures/opensearch.full.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>Web Search</ShortName>
+  <Description>Use Example.com to search the Web.</Description>
+  <Url template="http://example.com/?q={searchTerms}&amp;pw={startPage?}&amp;format=atom" type="application/atom+xml"/>
+  <Url template="http://example.com/?q={searchTerms}&amp;pw={startPage?}&amp;format=rss" type="application/rss+xml"/>
+  <Url template="http://example.com/?q={searchTerms}&amp;pw={startPage?}" type="text/html"/>
+  <Query role="example" searchTerms="cat"/>
+  <Tags>example web</Tags>
+  <Contact>admin@example.com</Contact>
+  <LongName>Example.com Web Search</LongName>
+  <Developer>Example.com Development Team</Developer>
+  <Attribution>
+    Search data Copyright 2005, Example.com, Inc., All Rights Reserved
+  </Attribution>
+  <SyndicationRight>open</SyndicationRight>
+  <AdultContent>false</AdultContent>
+  <Language>en-us</Language>
+  <InputEncoding>UTF-8</InputEncoding>
+  <OutputEncoding>UTF-8</OutputEncoding>
+  <Image height="64" width="64" type="image/png">http://example.com/websearch.png</Image>
+  <Image height="16" width="16" type="image/vnd.microsoft.icon">http://example.com/websearch.ico</Image>
+</OpenSearchDescription>

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

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Xommelier::Atom::Feed do
+  describe '.new(Hash)' do
+    let(:hash) do
+      {
+        title: 'Xommelier nest elements',
+        subtitle: 'Xommelier is able to build complex objects from very nested hash',
+        author: {name: 'Alexander', email: 'al@semyonov.us'},
+        updated: Time.utc(2012, 04, 04, 04, 04),
+        contributors: [
+                 {name: 'Artyom', email: 'sevenov@gmail.com'},
+                 {name: 'Ivan', email: 'ivan@example.com'},
+                 {name: 'Pyotr', email: 'pyotr@example.com'},
+               ],
+        entries: [
+                 {title: 'First article', updated: Time.utc(2012, 01, 01, 01, 01)},
+                 {title: 'Second article', updated: Time.utc(2012, 02, 02, 02, 02)},
+                 {title: 'Third article', updated: Time.utc(2012, 03, 03, 03, 03)},
+               ]
+      }
+    end
+
+    subject(:doc) { Xommelier::Atom::Feed.new(hash) }
+
+    it { should have(1).authors }
+    it { should have(3).contributors }
+    it { should have(3).entries }
+
+    it { doc.author.should be_an(Xommelier::Atom::Person) }
+    it { doc.contributors[2].should be_an(Xommelier::Atom::Person) }
+    it { doc.entries[1].should be_an(Xommelier::Atom::Entry) }
+
+    its(:to_hash) { should == hash}
+    its(:to_xml) { should == load_xml_file('nested_atom') }
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Xommelier::Atom::Feed do
+  describe '.to_xml' do
+    subject(:feed) do
+      Xommelier::Atom::Feed.new.tap do |feed|
+        feed.id = 'urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6'
+        feed.title = 'Example Feed'
+        feed.link = Xommelier::Atom::Link.new(href: 'http://example.org/')
+        feed.updated = Time.utc(2003, 12, 13, 18, 30, 02)
+        feed.author = Xommelier::Atom::Person.new(name: 'John Doe')
+        feed.entry = Xommelier::Atom::Entry.new(
+          title: 'Atom-Powered Robots Run Amok',
+          id: 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a',
+          updated: Time.utc(2003, 12, 13, 18, 30, 02),
+          summary: 'Some text.'
+        ).tap do |entry|
+          entry.link = Xommelier::Atom::Link.new(href: 'http://example.org/2003/12/13/atom03')
+        end
+      end
+    end
+
+    let(:parsed_xml) { Nokogiri::XML(feed.to_xml) }
+    let(:rng)        { Nokogiri::XML::RelaxNG(load_xml_file('atom.rng')) }
+    let(:xsd)        { Xommelier::Atom.schema }
+
+    it { should be_valid }
+
+    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 }
+  end
+end

data/spec/functional/{atom_feed_parsing_spec.rb → xommelier/atom/feed/parsing_spec.rb}

@@ -1,11 +1,10 @@
 # coding: utf-8
 require 'spec_helper'
 require 'active_support/core_ext/numeric/time'
-require 'xommelier/atom/threading'
-require 'xommelier/atom/history'
+require 'xommelier/atom/full'
 
-describe 'Atom feed' do
-  describe 'parsing' do
+describe Xommelier::Atom::Feed do
+  describe '.parse' do
     let(:atom_xml) { load_xml_file('feed.atom') }
     let(:feed) { Xommelier::Atom::Feed.parse(atom_xml) }
 

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

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Xommelier::OpenSearch::Description do
+  describe '.to_xml' do
+    let(:hash) do
+      {
+        short_name:        'Web Search',
+        description:       'Use Example.com to search the Web.',
+        urls:              [{template: 'http://example.com/?q={searchTerms}&pw={startPage?}&format=atom',
+                             type:     'application/atom+xml'},
+                            {template: 'http://example.com/?q={searchTerms}&pw={startPage?}&format=rss',
+                             type:     'application/rss+xml'},
+                            {template: 'http://example.com/?q={searchTerms}&pw={startPage?}',
+                             type:     'text/html'}],
+        query:             {role: 'example', search_terms: 'cat'},
+        tags:              'example web',
+        contact:           'admin@example.com',
+        long_name:         'Example.com Web Search',
+        developer:         'Example.com Development Team',
+        attribution:       "\n    Search data Copyright 2005, Example.com, Inc., All Rights Reserved\n  ",
+        syndication_right: 'open',
+        language:          'en-us',
+        input_encoding:    'UTF-8',
+        output_encoding:   'UTF-8',
+        adult_content:     false,
+        images:            [{height: 64, width: 64, type: 'image/png', text: 'http://example.com/websearch.png'},
+                            {height: 16, width: 16, type: 'image/vnd.microsoft.icon', text: 'http://example.com/websearch.ico'}]
+      }
+    end
+    subject(:description) { Xommelier::OpenSearch::Description.new(hash) }
+
+    its(:to_hash) { should == hash }
+    it { should be_valid }
+    its(:to_xml) { should == load_xml_file('opensearch.full') }
+  end
+end

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

@@ -0,0 +1,47 @@
+# coding: utf-8
+require 'spec_helper'
+require 'xommelier/open_search'
+
+describe Xommelier::OpenSearch::Description do
+  describe '.parse' do
+    let(:osd_xml) { load_xml_file('opensearch.full') }
+    let(:description) { Xommelier::OpenSearch::Description.parse(osd_xml) }
+
+    subject { description }
+
+    its(:adult_content) { should  be_false }
+    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.' }
+    its(:developer) { should == 'Example.com Development Team' }
+    its(:input_encoding) { should == 'UTF-8' }
+    its(:language) { should == 'en-us' }
+    its(:long_name) { should == 'Example.com Web Search' }
+    its(:output_encoding) { should == 'UTF-8' }
+    its(:short_name) { should == 'Web Search' }
+    its(:syndication_right) { should == 'open' }
+    its(:tags) { should == 'example web' }
+
+    it { should have(2).images }
+    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 }
+    end
+
+    it { should have(3).urls }
+    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?}' }
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Xommelier::RSS::EmailAddress do
+  {
+    'al@semyonov.us' => ['al@semyonov.us', nil],
+    'al@semyonov.us (Alexander)' => ['al@semyonov.us', 'Alexander'],
+    'al@semyonov.us (Alexander Semyonov)' => ['al@semyonov.us', 'Alexander Semyonov']
+  }.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
+    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
+    end
+  end
+end

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

@@ -35,11 +35,11 @@ describe Xommelier::Xml::Element do
 
     describe 'with many simple subelements' do
       subject do
-        NamespacedModule::RootWithManySimpleSubelements.new(foos: ['bar', 'baz'])
+        NamespacedModule::RootWithManySimpleSubelements.new(foos: %w(bar baz))
       end
 
       it { should respond_to(:foo) }
-      it { subject.foos.should == ['bar', 'baz'] }
+      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) }
     end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rspec'
 require 'xommelier'
 require 'namespaced_module'
 
+#noinspection RubyResolve
 Dir[File.join(SPEC_ROOT, 'spec/support/**/*.rb')].each {|f| require f}
 
 ATOM_XMLNS = 'http://www.w3.org/2005/Atom'

data/xommelier.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "xommelier/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'xommelier/version'
 
 Gem::Specification.new do |s|
-  s.name        = "xommelier"
+  s.name        = 'xommelier'
   s.version     = Xommelier::VERSION
-  s.authors     = ["Alexander Semyonov"]
-  s.email       = ["al@semyonov.us"]
-  s.homepage    = "http://github.com/alsemyonov/xommelier"
+  s.authors     = ['Alexander Semyonov']
+  s.email       = %w(al@semyonov.us)
+  s.homepage    = 'http://github.com/alsemyonov/xommelier'
   s.summary     = %q{Xommelier is an XML Sommelier}
   s.description = %q{XML-Object Mapper with many built-in XML formats supported}
 
-  s.rubyforge_project = "xommelier"
+  s.rubyforge_project = 'xommelier'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = %w(lib)
 
   s.add_dependency 'nokogiri', '~> 1.5.0'
   s.add_dependency 'activesupport', '~> 3.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -106,8 +106,20 @@ files:
 - lib/xommelier/open_search.rb
 - lib/xommelier/opml.rb
 - lib/xommelier/rss.rb
+- lib/xommelier/rss/atomic.rb
 - lib/xommelier/schemas/atom.xsd
+- lib/xommelier/schemas/dublincore/dc.xsd
+- lib/xommelier/schemas/dublincore/dcmitype.xsd
+- lib/xommelier/schemas/dublincore/dcterms.xsd
+- lib/xommelier/schemas/dublincore/qualifieddc.xsd
+- lib/xommelier/schemas/dublincore/simpledc.xsd
+- lib/xommelier/schemas/opensearch.xsd
 - lib/xommelier/schemas/rss.xsd
+- lib/xommelier/schemas/syndication/creativeCommons.xsd
+- lib/xommelier/schemas/syndication/fh.xsd
+- lib/xommelier/schemas/syndication/schematron.xsd
+- lib/xommelier/schemas/syndication/thr.xsd
+- lib/xommelier/schemas/syndication/trackback.xsd
 - lib/xommelier/version.rb
 - lib/xommelier/xml.rb
 - lib/xommelier/xml/element.rb
@@ -120,16 +132,20 @@ files:
 - spec/fixtures/feed.rss2.0.xml
 - spec/fixtures/multi_namespace_feed.atom.xml
 - spec/fixtures/nested_atom.xml
+- spec/fixtures/opensearch.full.xml
 - spec/fixtures/rss-2.0-namespace.xml
 - spec/fixtures/simple_feed.atom.xml
 - spec/fixtures/simple_feed.rss.xml
-- spec/functional/atom_feed_building_spec.rb
-- spec/functional/atom_feed_parsing_spec.rb
-- spec/functional/atom_feed_thread_building_spec.rb
-- spec/functional/build_nested_document_from_hash_spec.rb
-- spec/functional/rss_feed_building_spec.rb
-- spec/functional/rss_feed_parsing_spec.rb
+- spec/functional/xommelier/atom/feed/building_hash_spec.rb
+- spec/functional/xommelier/atom/feed/building_spec.rb
+- spec/functional/xommelier/atom/feed/parsing_spec.rb
+- spec/functional/xommelier/atom/threading/building_spec.rb
+- spec/functional/xommelier/open_search/description/building_spec.rb
+- spec/functional/xommelier/open_search/description/parsing_spec.rb
+- spec/functional/xommelier/rss/rss/building_spec.rb
+- spec/functional/xommelier/rss/rss/parsing_spec.rb
 - spec/lib/xommelier/atom/entry_spec.rb
+- spec/lib/xommelier/rss/email_address_spec.rb
 - spec/lib/xommelier/xml/element/serialization_spec.rb
 - spec/lib/xommelier/xml/element/structure_spec.rb
 - spec/lib/xommelier/xml/element_spec.rb
@@ -169,16 +185,20 @@ test_files:
 - spec/fixtures/feed.rss2.0.xml
 - spec/fixtures/multi_namespace_feed.atom.xml
 - spec/fixtures/nested_atom.xml
+- spec/fixtures/opensearch.full.xml
 - spec/fixtures/rss-2.0-namespace.xml
 - spec/fixtures/simple_feed.atom.xml
 - spec/fixtures/simple_feed.rss.xml
-- spec/functional/atom_feed_building_spec.rb
-- spec/functional/atom_feed_parsing_spec.rb
-- spec/functional/atom_feed_thread_building_spec.rb
-- spec/functional/build_nested_document_from_hash_spec.rb
-- spec/functional/rss_feed_building_spec.rb
-- spec/functional/rss_feed_parsing_spec.rb
+- spec/functional/xommelier/atom/feed/building_hash_spec.rb
+- spec/functional/xommelier/atom/feed/building_spec.rb
+- spec/functional/xommelier/atom/feed/parsing_spec.rb
+- spec/functional/xommelier/atom/threading/building_spec.rb
+- spec/functional/xommelier/open_search/description/building_spec.rb
+- spec/functional/xommelier/open_search/description/parsing_spec.rb
+- spec/functional/xommelier/rss/rss/building_spec.rb
+- spec/functional/xommelier/rss/rss/parsing_spec.rb
 - spec/lib/xommelier/atom/entry_spec.rb
+- spec/lib/xommelier/rss/email_address_spec.rb
 - spec/lib/xommelier/xml/element/serialization_spec.rb
 - spec/lib/xommelier/xml/element/structure_spec.rb
 - spec/lib/xommelier/xml/element_spec.rb

data/spec/functional/atom_feed_building_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe 'Atom feed building' do
-  subject(:feed) do
-    Xommelier::Atom::Feed.new.tap do |feed|
-      feed.id = 'urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6'
-      feed.title = 'Example Feed'
-      feed.link = Xommelier::Atom::Link.new(href: 'http://example.org/')
-      feed.updated = Time.utc(2003, 12, 13, 18, 30, 02)
-      feed.author = Xommelier::Atom::Person.new(name: 'John Doe')
-      feed.entry = Xommelier::Atom::Entry.new(
-        title: 'Atom-Powered Robots Run Amok',
-        id: 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a',
-        updated: Time.utc(2003, 12, 13, 18, 30, 02),
-        summary: 'Some text.'
-      ).tap do |entry|
-        entry.link = Xommelier::Atom::Link.new(href: 'http://example.org/2003/12/13/atom03')
-      end
-    end
-  end
-
-  let(:parsed_xml) { Nokogiri::XML(feed.to_xml) }
-  let(:rng)        { Nokogiri::XML::RelaxNG(load_xml_file('atom.rng')) }
-  let(:xsd)        { Xommelier::Atom.schema }
-
-  it { should be_valid }
-
-  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 }
-end

data/spec/functional/build_nested_document_from_hash_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe 'Build document from nested hash' do
-  let(:hash) do
-    {
-      title: 'Xommelier nest elements',
-      subtitle: 'Xommelier is able to build complex objects from very nested hash',
-      author: {name: 'Alexander', email: 'al@semyonov.us'},
-      updated: Time.utc(2012, 04, 04, 04, 04),
-      contributors: [
-        {name: 'Artyom', email: 'sevenov@gmail.com'},
-        {name: 'Ivan', email: 'ivan@example.com'},
-        {name: 'Pyotr', email: 'pyotr@example.com'},
-      ],
-      entries: [
-        {title: 'First article', updated: Time.utc(2012, 01, 01, 01, 01)},
-        {title: 'Second article', updated: Time.utc(2012, 02, 02, 02, 02)},
-        {title: 'Third article', updated: Time.utc(2012, 03, 03, 03, 03)},
-      ]
-    }
-  end
-
-  let(:doc) do
-    Xommelier::Atom::Feed.new(hash)
-  end
-
-  subject { doc }
-
-  its(:to_xml) { should == load_xml_file('nested_atom') }
-  it { should have(1).authors }
-  it { should have(3).contributors }
-  it { should have(3).entries }
-
-  it { doc.author.should be_an(Xommelier::Atom::Person) }
-  it { doc.contributors[2].should be_an(Xommelier::Atom::Person) }
-  it { doc.entries[1].should be_an(Xommelier::Atom::Entry) }
-
-  its(:to_hash) { should == hash}
-end