feedjira 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0146f6f9717aa2550c7c3ee8ad10bdc2d1670b5a877979ec3b4b92acc8556a01
-  data.tar.gz: 336327b583cbda573b23b35c6c7e43633fb832ff8054be34126340ad8c8bff3a
+  metadata.gz: db9d2eb01b3bf275ae7d0599df9bef74ea336ddfb9afdcc31998c4f79890cf51
+  data.tar.gz: 30de1f11b4054c3860ca79a27f8fb54b2244e8140bd26340d3f64f84c2d29884
 SHA512:
-  metadata.gz: db78dc79cc38419c6f81a0336f4794d8f744b2cab24786c3c9ac9b92f2b72f2c5db190a982fcfb16de6ccec1b358309c76e3c165ec16141b8816736774339662
-  data.tar.gz: b9a4466a3371c7d1fb837cdc8ffcced9af1a830810b47113cd2a790c8c1145c0aae1a9faad91b642bec50a12469917ead27a48fc798e257e2017d736ef0e5101
+  metadata.gz: a83a5507737ed80d62515733dad8005f0f3d0bce59558d6b6f252a94084d459b664b7a56c5355d853cb706b62c1a7c804e5bd68df74f4cb9091bc12ce475d075
+  data.tar.gz: 8af825f5c5cde56ba80d69cbd7d55b1e36e4cb2c6c401f7092a9a8654757fcc133666dbd7ad38527b45f790523aa5449c29dd6886f43112dac49c328ccce816d

data/.github/workflows/ruby.yml

@@ -0,0 +1,39 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        ruby: [2.5, 2.6, 2.7, 3.0]
+        handler: [nokogiri, ox, oga]
+        exclude:
+          - { ruby: jruby, handler: ox }
+
+    name: >-
+      ${{matrix.os}}-ruby-${{matrix.ruby}}-${{matrix.handler}}
+    runs-on: ${{matrix.os}}-latest
+    continue-on-error: ${{matrix.ruby == 'head' || matrix.ruby == 'jruby'}}
+    env:
+      HANDLER: ${{matrix.handler}}
+
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+
+      - name: Set up ruby and bundle
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+          bundler-cache: true
+
+      - name: Run rake
+        run: |
+          bundle exec rake

data/.rubocop.yml

@@ -4,11 +4,6 @@ AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
 
-
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'feedjira.gemspec'
-
 # Offense count: 3
 # Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:

data/CHANGELOG.md

@@ -1,18 +1,42 @@
 # Feedjira Changelog
 
-## Unreleased
+## 3.2.0
+
+* Atom `feed_url` no longer falls back to `url` via https://github.com/feedjira/feedjira/pull/451 (@frederfred)
+
+* Atom feeds now have an icon field via https://github.com/feedjira/feedjira/pull/452 (@jswanner)
+
+## 3.1.2
+
+* Enhancements
+  * Alias `managingEditor` as `managing_editor` [#443][] ([@DominikAlberski][])
+  * Add support for the `a10` namespace used in RSS 2.0 feeds generated by .NET applications.  Currently `a10:link`, `a10:updated`, `a10:content` and `a10:name` are supported. [#440][] ([@knu][])
+
+[#440]: https://github.com/feedjira/feedjira/pull/440
+[#443]: https://github.com/feedjira/feedjira/pull/443
+
+## 3.1.1
 
 * Enhancements
-  * Add support for the `a10` namespace used in RSS 2.0 feeds generated by .NET applications.  Currently `a10:link`, `a10:updated`, `a10:content` and `a10:name` are supported. [#440][] (@knu)
+  * Fix warnings in Ruby 2.7 [#434][] ([@sferik][])
+
+* General
+  * Test on Ruby 2.5, 2.6 and 2.7 [#435][] ([@HParker][])
+
+[#434]: https://github.com/feedjira/feedjira/pull/434
+[#435]: https://github.com/feedjira/feedjira/pull/435
 
 ## 3.1.0
 
 * Breaking Changes
-  * `title` of Atom entry classes always return a plain text even in case the entry has a title of the HTML or XML type. [#423][] (@knu)
+  * `title` of Atom entry classes always return a plain text even in case the entry has a title of the HTML or XML type. [#423][] ([@knu][])
 
 * Enhancements
-  * `raw_title` and `title_type` are added to Atom entry classes. [#423][] (@knu)
-  * AtomGoogleAlerts is now a supported parser [#424][] (@knu)
+  * `raw_title` and `title_type` are added to Atom entry classes. [#423][] ([@knu][])
+  * AtomGoogleAlerts is now a supported parser [#424][] ([@knu][])
+
+[#423]: https://github.com/feedjira/feedjira/pull/423
+[#424]: https://github.com/feedjira/feedjira/pull/424
 
 ## 3.0.0
 
@@ -31,16 +55,26 @@ configurable logging and parsing
 ## 2.1.0
 
 * Enhancements
-  * AtomYoutube is now a supported parser [#337][] (@jfiorato)
-  * Oga parsing is now supported [#331][] (@krasnoukhov)
-  * DateTime Handler now supports localized dates [#313][] (@PascalTurbo)
-  * RSS now supports language attribute [#344][] (@PascalTurbo)
+  * AtomYoutube is now a supported parser [#337][] ([@jfiorato][])
+  * Oga parsing is now supported [#331][] ([@krasnoukhov][])
+  * DateTime Handler now supports localized dates [#313][] ([@PascalTurbo][])
+  * RSS now supports language attribute [#344][] ([@PascalTurbo][])
   * ITunesRSS added support for:
-    * `ttl` and `last_built` [#343][] (@sferik)
-    * `itunes_category` and `itunes_category_paths` [#329][] (@knu)
-    * `itunes_complete` [#328][] (@knu)
-    * single quoted attributes [#326][] (@sferik)
-    * Add image attribute [#349][] (@sferik)
+    * `ttl` and `last_built` [#343][] ([@sferik][])
+    * `itunes_category` and `itunes_category_paths` [#329][] ([@knu][])
+    * `itunes_complete` [#328][] ([@knu][])
+    * single quoted attributes [#326][] ([@sferik][])
+    * Add image attribute [#349][] ([@sferik][])
+
+[#313]: https://github.com/feedjira/feedjira/pull/313
+[#326]: https://github.com/feedjira/feedjira/pull/326
+[#328]: https://github.com/feedjira/feedjira/pull/328
+[#329]: https://github.com/feedjira/feedjira/pull/329
+[#331]: https://github.com/feedjira/feedjira/pull/331
+[#337]: https://github.com/feedjira/feedjira/pull/337
+[#343]: https://github.com/feedjira/feedjira/pull/343
+[#344]: https://github.com/feedjira/feedjira/pull/344
+[#349]: https://github.com/feedjira/feedjira/pull/349
 
 ## 2.0.0
 
@@ -298,3 +332,11 @@ configurable logging and parsing
 ## 0.1.0
 
 * lower builder requirement to make it rails-3 friendly
+
+[@DominikAlberski]: https://github.com/DominikAlberski
+[@HParker]: https://github.com/HParker
+[@PascalTurbo]: https://github.com/PascalTurbo
+[@jfiorato]: https://github.com/jfiorato
+[@knu]: https://github.com/knu
+[@krasnoukhov]: https://github.com/krasnoukhov
+[@sferik]: https://github.com/sferik

data/feedjira.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.version  = Feedjira::VERSION
 
   s.metadata = {
-    "homepage_uri" => "http://feedjira.com",
+    "homepage_uri" => "https://github.com/feedjira/feedjira",
     "source_code_uri" => "https://github.com/feedjira/feedjira",
     "changelog_uri" => "https://github.com/feedjira/feedjira/blob/master/CHANGELOG.md"
   }
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.required_ruby_version = ">=2.2"
+  s.required_ruby_version = ">=2.5"
 
   s.add_dependency "loofah",             ">= 2.3.1"
   s.add_dependency "sax-machine",        ">= 1.0"
@@ -37,6 +37,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "faraday"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rubocop"
-  s.add_development_dependency "vcr"
   s.add_development_dependency "yard"
 end

data/lib/feedjira/feed.rb

@@ -29,7 +29,7 @@ module Feedjira
         Feedjira.parsers.each do |klass|
           klass.sax_config.collection_elements.each_value do |value|
             collection_configs = value.select do |v|
-              v.accessor == "entries" && v.data_class.class == Class
+              v.accessor == "entries" && v.data_class.is_a?(Class)
             end
 
             collection_configs.each do |config|

data/lib/feedjira/parser/atom.rb

@@ -14,17 +14,14 @@ module Feedjira
       elements :link, as: :links, value: :href
       elements :link, as: :hubs, value: :href, with: { rel: "hub" }
       elements :entry, as: :entries, class: AtomEntry
+      element :icon
 
       def self.able_to_parse?(xml)
         %r{<feed[^>]+xmlns\s?=\s?["'](http://www\.w3\.org/2005/Atom|http://purl\.org/atom/ns\#)["'][^>]*>} =~ xml
       end
 
       def url
-        @url || (links - [feed_url]).last || links.last
-      end
-
-      def feed_url
-        @feed_url ||= links.first
+        @url || (links - [feed_url]).last
       end
 
       def self.preprocess(xml)

data/lib/feedjira/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Feedjira
-  VERSION = "3.1.2"
+  VERSION = "3.2.0"
 end

data/spec/feedjira/configuration_spec.rb

@@ -10,10 +10,10 @@ describe Feedjira::Configuration do
     end
 
     it "allows parsers to be modified" do
-      CustomParser = Class.new
+      custom_parser = Class.new
 
-      Feedjira.configure { |config| config.parsers.unshift(CustomParser) }
-      expect(Feedjira.parsers.first).to eq(CustomParser)
+      Feedjira.configure { |config| config.parsers.unshift(custom_parser) }
+      expect(Feedjira.parsers.first).to eq(custom_parser)
       Feedjira.reset_configuration!
     end
   end

data/spec/feedjira/parser/atom_spec.rb

@@ -36,6 +36,11 @@ module Feedjira
         expect(@feed.description).to eq description
       end
 
+      it "should parse the icon url" do
+        feed_with_icon = Atom.parse(load_sample("SamRuby.xml"))
+        expect(feed_with_icon.icon).to eq "../favicon.ico"
+      end
+
       it "should parse the url" do
         expect(@feed.url).to eq "http://aws.typepad.com/aws/"
       end
@@ -93,7 +98,7 @@ module Feedjira
       end
     end
 
-    describe "parsing url and feed url based on rel attribute" do
+    describe "parsing url and feed_url" do
       before :each do
         @feed = Atom.parse(sample_atom_middleman_feed)
       end
@@ -102,9 +107,21 @@ module Feedjira
         expect(@feed.url).to eq "http://feedjira.com/blog"
       end
 
-      it "should parse feed url" do
+      it "should parse feed_url" do
         expect(@feed.feed_url).to eq "http://feedjira.com/blog/feed.xml"
       end
+
+      it "should not parse links without the rel='self' attribute as feed_url" do
+        xml = load_sample "atom_simple_single_entry.xml"
+        feed = Atom.parse xml
+        expect(feed.feed_url).to be_nil
+      end
+
+      it "should not parse links with the rel='self' attribute as url" do
+        xml = load_sample "atom_simple_single_entry_link_self.xml"
+        feed = Atom.parse xml
+        expect(feed.url).to be_nil
+      end
     end
   end
 end

data/spec/sample_feeds.rb

@@ -3,6 +3,8 @@
 module SampleFeeds
   FEEDS = {
     sample_atom_feed: "AmazonWebServicesBlog.xml",
+    sample_atom_simple: "atom_simple_single_entry.xml",
+    sample_atom_simple_link_self: "atom_simple_single_entry_link_self.xml",
     sample_atom_middleman_feed: "FeedjiraBlog.xml",
     sample_atom_xhtml_feed: "pet_atom.xml",
     sample_atom_feed_line_breaks: "AtomFeedWithSpacesAroundEquals.xml",

data/spec/sample_feeds/atom_simple_single_entry.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title>Example Feed</title>
+  <link href="http://example.org/"/>
+  <updated>2003-12-13T18:30:02Z</updated>
+  <author>
+    <name>John Doe</name>
+  </author>
+  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+  <entry>
+    <title>Atom-Powered Robots Run Amok</title>
+    <link href="http://example.org/2003/12/13/atom03"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <updated>2003-12-13T18:30:02Z</updated>
+    <summary>Some text.</summary>
+  </entry>
+</feed>

data/spec/sample_feeds/atom_simple_single_entry_link_self.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title>Example Feed</title>
+  <link href="http://example.org/atom.xml" rel="self"/>
+  <updated>2003-12-13T18:30:02Z</updated>
+  <author>
+    <name>John Doe</name>
+  </author>
+  <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
+  <entry>
+    <title>Atom-Powered Robots Run Amok</title>
+    <link href="http://example.org/2003/12/13/atom03"/>
+    <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+    <updated>2003-12-13T18:30:02Z</updated>
+    <summary>Some text.</summary>
+  </entry>
+</feed>

data/spec/spec_helper.rb

@@ -2,15 +2,9 @@
 
 require File.expand_path("#{File.dirname(__FILE__)}/../lib/feedjira")
 require "sample_feeds"
-require "vcr"
 
 SAXMachine.handler = ENV["HANDLER"].to_sym if ENV["HANDLER"]
 
-VCR.configure do |config|
-  config.cassette_library_dir = "fixtures/vcr_cassettes"
-  config.hook_into :faraday
-end
-
 RSpec.configure do |c|
   c.include SampleFeeds
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedjira
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Adam Hess
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loofah
@@ -86,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -121,11 +107,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE/feed-parsing.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -233,6 +219,8 @@ files:
 - spec/sample_feeds/TrotterCashionHome.xml
 - spec/sample_feeds/TypePadNews.xml
 - spec/sample_feeds/a10.xml
+- spec/sample_feeds/atom_simple_single_entry.xml
+- spec/sample_feeds/atom_simple_single_entry_link_self.xml
 - spec/sample_feeds/atom_with_link_tag_for_url_unmarked.xml
 - spec/sample_feeds/google_alerts_atom.xml
 - spec/sample_feeds/itunes.xml
@@ -244,7 +232,7 @@ homepage: https://github.com/feedjira/feedjira
 licenses:
 - MIT
 metadata:
-  homepage_uri: http://feedjira.com
+  homepage_uri: https://github.com/feedjira/feedjira
   source_code_uri: https://github.com/feedjira/feedjira
   changelog_uri: https://github.com/feedjira/feedjira/blob/master/CHANGELOG.md
 post_install_message:
@@ -255,14 +243,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A feed parsing library
@@ -326,6 +314,8 @@ test_files:
 - spec/sample_feeds/TrotterCashionHome.xml
 - spec/sample_feeds/TypePadNews.xml
 - spec/sample_feeds/a10.xml
+- spec/sample_feeds/atom_simple_single_entry.xml
+- spec/sample_feeds/atom_simple_single_entry_link_self.xml
 - spec/sample_feeds/atom_with_link_tag_for_url_unmarked.xml
 - spec/sample_feeds/google_alerts_atom.xml
 - spec/sample_feeds/itunes.xml

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-
-cache: bundler
-
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - jruby-9
-  - ruby-head
-
-env:
-  - HANDLER=nokogiri
-  - HANDLER=ox
-  - HANDLER=oga
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: jruby-9
-    - rvm: ruby-head
-  exclude:
-    - rvm: jruby-9
-      env: HANDLER=ox
-
-before_install:
-  - gem update bundler
-
-script:
-  - bundle exec rake
-
-notifications:
-  email: false