feedjira 3.1.0 → 3.2.1

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
@@ -10,18 +12,18 @@ module Feedjira
       elements :"itunes:category", as: :itunes_categories,
                                    class: ITunesRSSCategory
 
-      def each_subcategory
-        return to_enum(__method__) unless block_given?
+      def each_subcategory(&block)
+        return to_enum(__method__) unless block
 
         yield text
 
         itunes_categories.each do |itunes_category|
-          itunes_category.each_subcategory(&proc)
+          itunes_category.each_subcategory(&block)
         end
       end
 
-      def each_path(ancestors = [])
-        return to_enum(__method__, ancestors) unless block_given?
+      def each_path(ancestors = [], &block)
+        return to_enum(__method__, ancestors) unless block
 
         category_hierarchy = ancestors + [text]
 
@@ -29,7 +31,7 @@ module Feedjira
           yield category_hierarchy
         else
           itunes_categories.each do |itunes_category|
-            itunes_category.each_path(category_hierarchy, &proc)
+            itunes_category.each_path(category_hierarchy, &block)
           end
         end
       end

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,10 +12,11 @@ module Feedjira
 
       def start
         return unless start_ntp
+
         parts = start_ntp.split(":")
-        parts.reverse.to_enum.with_index.map do |part, index|
+        parts.reverse.to_enum.with_index.sum do |part, index|
           part.to_f * (60**index)
-        end.reduce(:+)
+        end
       end
     end
   end

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) && !xml.include?("feedburner")
       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.
@@ -13,8 +15,8 @@ module Feedjira
 
       attr_accessor :feed_url
 
-      def self.able_to_parse?(xml) #:nodoc:
-        (/\<rss|\<rdf/ =~ xml) && (/feedburner/ =~ xml)
+      def self.able_to_parse?(xml) # :nodoc:
+        (/<rss|<rdf/ =~ xml) && xml.include?("feedburner")
       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/parser.rb

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

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.0".freeze
+  VERSION = "3.2.1"
 end

data/lib/feedjira.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "zlib"
 require "sax-machine"
 require "loofah"
@@ -10,7 +12,6 @@ require "feedjira/date_time_utilities/date_time_epoch_parser"
 require "feedjira/date_time_utilities/date_time_language_parser"
 require "feedjira/date_time_utilities/date_time_pattern_parser"
 require "feedjira/date_time_utilities"
-require "feedjira/date_time_utilities"
 require "feedjira/feed_entry_utilities"
 require "feedjira/feed_utilities"
 require "feedjira/feed"

data/spec/feedjira/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::Configuration do
@@ -8,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/feed_spec.rb

@@ -1,28 +1,31 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 class Hell < StandardError; end
 
 class FailParser
-  def self.parse(_xml, &on_failure)
-    on_failure.call "this parser always fails."
+  def self.parse(_xml)
+    yield "this parser always fails."
+    # on_failure.call
   end
 end
 
 describe Feedjira::Feed do
   describe "#add_common_feed_element" do
     before(:all) do
-      Feedjira::Feed.add_common_feed_element("generator")
+      described_class.add_common_feed_element("generator")
     end
 
-    it "should parse the added element out of Atom feeds" do
+    it "parses the added element out of Atom feeds" do
       expect(Feedjira.parse(sample_wfw_feed).generator).to eq "TypePad"
     end
 
-    it "should parse the added element out of Atom Feedburner feeds" do
+    it "parses the added element out of Atom Feedburner feeds" do
       expect(Feedjira::Parser::Atom.new).to respond_to(:generator)
     end
 
-    it "should parse the added element out of RSS feeds" do
+    it "parses the added element out of RSS feeds" do
       expect(Feedjira::Parser::RSS.new).to respond_to(:generator)
     end
   end
@@ -30,19 +33,19 @@ describe Feedjira::Feed do
   describe "#add_common_feed_entry_element" do
     before(:all) do
       tag = "wfw:commentRss"
-      Feedjira::Feed.add_common_feed_entry_element tag, as: :comment_rss
+      described_class.add_common_feed_entry_element tag, as: :comment_rss
     end
 
-    it "should parse the added element out of Atom feeds entries" do
+    it "parses the added element out of Atom feeds entries" do
       entry = Feedjira.parse(sample_wfw_feed).entries.first
       expect(entry.comment_rss).to eq "this is the new val"
     end
 
-    it "should parse the added element out of Atom Feedburner feeds entries" do
+    it "parses the added element out of Atom Feedburner feeds entries" do
       expect(Feedjira::Parser::AtomEntry.new).to respond_to(:comment_rss)
     end
 
-    it "should parse the added element out of RSS feeds entries" do
+    it "parses the added element out of RSS feeds entries" do
       expect(Feedjira::Parser::RSSEntry.new).to respond_to(:comment_rss)
     end
   end

data/spec/feedjira/{date_time_utilities_spec.rb → feed_utilities_date_time_spec.rb}

@@ -1,44 +1,46 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::FeedUtilities do
-  before(:each) do
+  before do
     @klass = Class.new do
       include Feedjira::DateTimeUtilities
     end
   end
 
   describe "handling dates" do
-    it "should parse an ISO 8601 formatted datetime into Time" do
+    it "parses an ISO 8601 formatted datetime into Time" do
       time = @klass.new.parse_datetime("2008-02-20T8:05:00-010:00")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Wed Feb 20 18:05:00 UTC 2008")
     end
 
-    it "should parse a ISO 8601 with milliseconds into Time" do
+    it "parses a ISO 8601 with milliseconds into Time" do
       time = @klass.new.parse_datetime("2013-09-17T08:20:13.931-04:00")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Tue Sep 17 12:20:13 UTC 2013")
     end
 
-    it "should parse a US Format into Time" do
+    it "parses a US Format into Time" do
       time = @klass.new.parse_datetime("8/23/2016 12:29:58 PM")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Wed Aug 23 12:29:58 UTC 2016")
     end
 
-    it "should parse a Spanish Format into Time" do
+    it "parses a Spanish Format into Time" do
       time = @klass.new.parse_datetime("Wed, 31 Ago 2016 11:08:22 GMT")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Wed Aug 31 11:08:22 UTC 2016")
     end
 
-    it "should parse Format with japanese symbols into Time" do
+    it "parses Format with japanese symbols into Time" do
       time = @klass.new.parse_datetime("水, 31 8 2016 07:37:00 PDT")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Wed Aug 31 14:37:00 UTC 2016")
     end
 
-    it "should parse epoch into Time" do
+    it "parses epoch into Time" do
       time = @klass.new.parse_datetime("1472654220")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Wed Aug 31 14:37:00 UTC 2016")

data/spec/feedjira/{feed_entry_utilities_spec.rb → feed_utilities_entry_spec.rb}

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Feedjira::FeedUtilities do
-  before(:each) do
+  before do
     @klass = Class.new do
       include Feedjira::FeedEntryUtilities
     end
   end
 
   describe "handling dates" do
-    it "should parse an ISO 8601 formatted datetime into Time" do
+    it "parses an ISO 8601 formatted datetime into Time" do
       time = @klass.new.parse_datetime("2008-02-20T8:05:00-010:00")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Wed Feb 20 18:05:00 UTC 2008")
     end
 
-    it "should parse a ISO 8601 with milliseconds into Time" do
+    it "parses a ISO 8601 with milliseconds into Time" do
       time = @klass.new.parse_datetime("2013-09-17T08:20:13.931-04:00")
       expect(time.class).to eq Time
       expect(time).to eq Time.parse_safely("Tue Sep 17 12:20:13 UTC 2013")
@@ -22,24 +24,24 @@ describe Feedjira::FeedUtilities do
   end
 
   describe "sanitizing" do
-    before(:each) do
+    before do
       @feed = Feedjira.parse(sample_atom_feed)
       @entry = @feed.entries.first
     end
 
     it "doesn't fail when no elements are defined on includer" do
-      expect { @klass.new.sanitize! }.to_not raise_error
+      expect { @klass.new.sanitize! }.not_to raise_error
     end
 
-    it "should provide a sanitized title" do
-      new_title = "<script>this is not safe</script>" + @entry.title
+    it "provides a sanitized title" do
+      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
+    it "sanitizes content in place" do
+      new_content = "<script>#{@entry.content}"
       @entry.content = new_content.dup
 
       scrubbed_content = Loofah.scrub_fragment(new_content, :prune).to_s
@@ -48,7 +50,7 @@ describe Feedjira::FeedUtilities do
       expect(@entry.content).to eq scrubbed_content
     end
 
-    it "should sanitize things in place" do
+    it "sanitizes things in place" do
       @entry.title   += "<script>"
       @entry.author  += "<script>"
       @entry.content += "<script>"