feedjira 3.1.1 → 3.1.2

data/lib/feedjira/parser/atom_google_alerts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with Feedburner Atom feeds.
@@ -13,7 +15,7 @@ module Feedjira
       elements :entry, as: :entries, class: AtomGoogleAlertsEntry
 
       def self.able_to_parse?(xml)
-        Atom.able_to_parse?(xml) && (%r{<id>tag:google\.com,2005:[^<]+/com\.google/alerts/} === xml) # rubocop:disable Metrics/LineLength
+        Atom.able_to_parse?(xml) && (%r{<id>tag:google\.com,2005:[^<]+/com\.google/alerts/} === xml) # rubocop:disable Style/CaseEquality
       end
 
       def self.preprocess(xml)

data/lib/feedjira/parser/atom_google_alerts_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with Feedburner Atom feed entries.
@@ -8,12 +10,11 @@ module Feedjira
 
       def url
         url = super
+        return unless url&.start_with?("https://www.google.com/url?")
 
-        if url && url.start_with?("https://www.google.com/url?")
-          uri = URI(url)
-          cons = URI.decode_www_form(uri.query).assoc("url")
-          cons && cons[1]
-        end
+        uri = URI(url)
+        cons = URI.decode_www_form(uri.query).assoc("url")
+        cons && cons[1]
       end
     end
   end

data/lib/feedjira/parser/atom_youtube.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RSS feeds.

data/lib/feedjira/parser/atom_youtube_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     class AtomYoutubeEntry

data/lib/feedjira/parser/globally_unique_identifier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     class GloballyUniqueIdentifier

data/lib/feedjira/parser/google_docs_atom.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path("./atom", File.dirname(__FILE__))
 module Feedjira
   module Parser
@@ -7,7 +9,7 @@ module Feedjira
       element :title
       element :subtitle, as: :description
       element :link, as: :url, value: :href, with: { type: "text/html" }
-      element :link, as: :feed_url, value: :href, with: { type: "application/atom+xml" } # rubocop:disable Metrics/LineLength
+      element :link, as: :feed_url, value: :href, with: { type: "application/atom+xml" }
       elements :link, as: :links, value: :href
       elements :entry, as: :entries, class: GoogleDocsAtomEntry
 
@@ -16,7 +18,7 @@ module Feedjira
       end
 
       def self.able_to_parse?(xml) #:nodoc:
-        %r{<id>https?://docs\.google\.com/.*\</id\>} =~ xml
+        %r{<id>https?://docs\.google\.com/.*</id>} =~ xml
       end
 
       def feed_url

data/lib/feedjira/parser/google_docs_atom_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     class GoogleDocsAtomEntry

data/lib/feedjira/parser/itunes_rss.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # iTunes is RSS 2.0 + some apple extensions
@@ -18,7 +20,7 @@ module Feedjira
       element :language
       element :lastBuildDate, as: :last_built
       element :link, as: :url
-      element :managingEditor
+      element :managingEditor, as: :managing_editor
       element :rss, as: :version, value: :version
       element :title
       element :ttl
@@ -61,7 +63,7 @@ module Feedjira
       elements :item, as: :entries, class: ITunesRSSItem
 
       def self.able_to_parse?(xml)
-        %r{xmlns:itunes\s?=\s?[\"\']http://www\.itunes\.com/dtds/podcast-1\.0\.dtd[\"\']}i =~ xml # rubocop:disable Metrics/LineLength
+        %r{xmlns:itunes\s?=\s?["']http://www\.itunes\.com/dtds/podcast-1\.0\.dtd["']}i =~ xml
       end
     end
   end

data/lib/feedjira/parser/itunes_rss_category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # iTunes extensions to the standard RSS2.0 item

data/lib/feedjira/parser/itunes_rss_item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # iTunes extensions to the standard RSS2.0 item
@@ -29,7 +31,7 @@ module Feedjira
       element :enclosure, value: :length, as: :enclosure_length
       element :enclosure, value: :type, as: :enclosure_type
       element :enclosure, value: :url, as: :enclosure_url
-      elements "psc:chapter", as: :raw_chapters, class: Feedjira::Parser::PodloveChapter # rubocop:disable Metrics/LineLength
+      elements "psc:chapter", as: :raw_chapters, class: Feedjira::Parser::PodloveChapter
 
       # Podlove requires clients to re-order by start time in the
       # event the publisher doesn't provide them in that

data/lib/feedjira/parser/itunes_rss_owner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     class ITunesRSSOwner

data/lib/feedjira/parser/json_feed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with JSON Feeds.
@@ -6,7 +8,7 @@ module Feedjira
       include FeedUtilities
 
       def self.able_to_parse?(json)
-        %r{https:\/\/jsonfeed.org\/version\/} =~ json
+        %r{https://jsonfeed.org/version/} =~ json
       end
 
       def self.parse(json)
@@ -14,7 +16,7 @@ module Feedjira
       end
 
       attr_reader :json, :version, :title, :url, :feed_url, :description,
-        :expired, :entries
+                  :expired, :entries
 
       def initialize(json)
         @json = json

data/lib/feedjira/parser/json_feed_item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with JSON Feed items.
@@ -5,7 +7,7 @@ module Feedjira
       include FeedEntryUtilities
 
       attr_reader :json, :entry_id, :url, :external_url, :title, :content, :summary,
-        :published, :updated, :image, :banner_image, :author, :categories
+                  :published, :updated, :image, :banner_image, :author, :categories
 
       def initialize(json)
         @json = json
@@ -27,11 +29,13 @@ module Feedjira
 
       def parse_published(date_published)
         return nil unless date_published
+
         Time.parse_safely(date_published)
       end
 
       def parse_updated(date_modified)
         return nil unless date_modified
+
         Time.parse_safely(date_modified)
       end
 
@@ -39,11 +43,13 @@ module Feedjira
       # Prefer content_html unless it isn't included.
       def parse_content(content_html, content_text)
         return content_html unless content_html.nil?
+
         content_text
       end
 
       def author_name(author_obj)
         return nil if author_obj.nil?
+
         author_obj["name"]
       end
     end

data/lib/feedjira/parser/podlove_chapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     class PodloveChapter
@@ -10,6 +12,7 @@ module Feedjira
 
       def start
         return unless start_ntp
+
         parts = start_ntp.split(":")
         parts.reverse.to_enum.with_index.map do |part, index|
           part.to_f * (60**index)

data/lib/feedjira/parser/rss.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RSS feeds.
@@ -10,6 +12,7 @@ module Feedjira
       element :language
       element :lastBuildDate, as: :last_built
       element :link, as: :url
+      element :"a10:link", as: :url, value: :href
       element :rss, as: :version, value: :version
       element :title
       element :ttl
@@ -19,7 +22,7 @@ module Feedjira
       attr_accessor :feed_url
 
       def self.able_to_parse?(xml)
-        (/\<rss|\<rdf/ =~ xml) && !(/feedburner/ =~ xml)
+        (/<rss|<rdf/ =~ xml) && !(/feedburner/ =~ xml)
       end
     end
   end

data/lib/feedjira/parser/rss_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RDF feed entries.

data/lib/feedjira/parser/rss_feed_burner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RSS feeds.
@@ -14,7 +16,7 @@ module Feedjira
       attr_accessor :feed_url
 
       def self.able_to_parse?(xml) #:nodoc:
-        (/\<rss|\<rdf/ =~ xml) && (/feedburner/ =~ xml)
+        (/<rss|<rdf/ =~ xml) && (/feedburner/ =~ xml)
       end
     end
   end

data/lib/feedjira/parser/rss_feed_burner_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RDF feed entries.
@@ -7,9 +9,7 @@ module Feedjira
       include RSSEntryUtilities
 
       element :"feedburner:origLink", as: :orig_link
-      # rubocop:disable Style/AccessModifierDeclarations
       private :orig_link
-      # rubocop:enable Style/AccessModifierDeclarations
 
       def url
         orig_link || super

data/lib/feedjira/parser/rss_image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RSS images

data/lib/feedjira/preprocessor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   class Preprocessor
     def initialize(xml)
@@ -18,7 +20,7 @@ module Feedjira
     end
 
     def content_nodes
-      doc.search 'entry > content[type="xhtml"], entry > summary[type="xhtml"], entry > title[type="xhtml"]' # rubocop:disable Metrics/LineLength
+      doc.search 'entry > content[type="xhtml"], entry > summary[type="xhtml"], entry > title[type="xhtml"]'
     end
 
     def raw_html(node)

data/lib/feedjira/rss_entry_utilities.rb

@@ -7,12 +7,15 @@ module Feedjira
         element :title
 
         element :"content:encoded", as: :content
+        element :"a10:content", as: :content
         element :description, as: :summary
 
         element :link, as: :url
+        element :"a10:link", as: :url, value: :href
 
         element :author
         element :"dc:creator", as: :author
+        element :"a10:name", as: :author
 
         element :pubDate, as: :published
         element :pubdate, as: :published
@@ -22,6 +25,7 @@ module Feedjira
         element :"dcterms:created", as: :published
 
         element :"dcterms:modified", as: :updated
+        element :"a10:updated", as: :updated
 
         element :guid, as: :entry_id, class: Feedjira::Parser::GloballyUniqueIdentifier
         element :"dc:identifier", as: :dc_identifier
@@ -35,11 +39,11 @@ module Feedjira
     end
 
     def entry_id
-      @entry_id && @entry_id.guid
+      @entry_id&.guid
     end
 
     def url
-      @url || (@entry_id && @entry_id.url)
+      @url || @entry_id&.url
     end
 
     def id

data/lib/feedjira/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
-  VERSION = "3.1.1".freeze
+  VERSION = "3.1.2"
 end

data/spec/feedjira/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::Configuration do

data/spec/feedjira/date_time_utilities_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::FeedUtilities do

data/spec/feedjira/feed_entry_utilities_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::FeedUtilities do
@@ -32,14 +34,14 @@ describe Feedjira::FeedUtilities do
     end
 
     it "should provide a sanitized title" do
-      new_title = "<script>this is not safe</script>" + @entry.title
+      new_title = "<script>this is not safe</script>#{@entry.title}"
       @entry.title = new_title
       scrubbed_title = Loofah.scrub_fragment(new_title, :prune).to_s
       expect(@entry.title.sanitize).to eq scrubbed_title
     end
 
     it "should sanitize content in place" do
-      new_content = "<script>" + @entry.content
+      new_content = "<script>#{@entry.content}"
       @entry.content = new_content.dup
 
       scrubbed_content = Loofah.scrub_fragment(new_content, :prune).to_s

data/spec/feedjira/feed_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 class Hell < StandardError; end

data/spec/feedjira/feed_utilities_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::FeedUtilities do
@@ -73,13 +75,13 @@ describe Feedjira::FeedUtilities do
       expect(feed.last_modified.class).to eq Time
     end
 
-    it "should return new_entries? as true when entries are put into new_entries" do # rubocop:disable Metrics/LineLength
+    it "should return new_entries? as true when entries are put into new_entries" do
       feed = @klass.new
       feed.new_entries << :foo
       expect(feed.new_entries?).to eq true
     end
 
-    it "should return a last_modified value from the entry with the most recent published date if the last_modified date hasn't been set" do # rubocop:disable Metrics/LineLength
+    it "should return a last_modified value from the entry with the most recent published date if the last_modified date hasn't been set" do
       feed = Feedjira::Parser::Atom.new
       entry = Feedjira::Parser::AtomEntry.new
       entry.published = Time.now.to_s
@@ -87,7 +89,7 @@ describe Feedjira::FeedUtilities do
       expect(feed.last_modified).to eq entry.published
     end
 
-    it "should not throw an error if one of the entries has published date of nil" do # rubocop:disable Metrics/LineLength
+    it "should not throw an error if one of the entries has published date of nil" do
       feed = Feedjira::Parser::Atom.new
       entry = Feedjira::Parser::AtomEntry.new
       entry.published = Time.now.to_s

data/spec/feedjira/parser/atom_entry_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::Parser::AtomEntry do
@@ -32,7 +34,7 @@ describe Feedjira::Parser::AtomEntry do
   end
 
   it "should provide a summary" do
-    summary = "Late last year an entrepreneur from Turkey visited me at Amazon HQ in Seattle. We talked about his plans to use AWS as part of his new social video portal startup. I won't spill any beans before he's ready to..." # rubocop:disable Metrics/LineLength
+    summary = "Late last year an entrepreneur from Turkey visited me at Amazon HQ in Seattle. We talked about his plans to use AWS as part of his new social video portal startup. I won't spill any beans before he's ready to..."
     expect(@entry.summary).to eq summary
   end
 
@@ -42,7 +44,7 @@ describe Feedjira::Parser::AtomEntry do
   end
 
   it "should parse the categories" do
-    expect(@entry.categories).to eq %w(Turkey Seattle)
+    expect(@entry.categories).to eq %w[Turkey Seattle]
   end
 
   it "should parse the updated date" do
@@ -69,7 +71,7 @@ describe Feedjira::Parser::AtomEntry do
 
     expect(title_value).to eq "AWS Job: Architect & Designer Position in Turkey"
 
-    expected_fields = %w(
+    expected_fields = %w[
       author
       categories
       content
@@ -81,7 +83,7 @@ describe Feedjira::Parser::AtomEntry do
       title_type
       updated
       url
-    )
+    ]
     expect(all_fields.sort).to eq expected_fields
   end