feedjira 3.0.0.beta1 → 3.2.0

data/lib/feedjira/parser/google_docs_atom_entry.rb

@@ -1,31 +1,15 @@
-# rubocop:disable Style/Documentation
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     class GoogleDocsAtomEntry
       include SAXMachine
       include FeedEntryUtilities
+      include AtomEntryUtilities
 
-      element :title
-      element :link, as: :url, value: :href, with: { type: "text/html", rel: "alternate" } # rubocop:disable Metrics/LineLength
-      element :name, as: :author
-      element :content
-      element :summary
-      element :published
-      element :id, as: :entry_id
-      element :created, as: :published
-      element :issued, as: :published
-      element :updated
-      element :modified, as: :updated
-      elements :category, as: :categories, value: :term
-      elements :link, as: :links, value: :href
       element :"docs:md5Checksum", as: :checksum
       element :"docs:filename", as: :original_filename
       element :"docs:suggestedFilename", as: :suggested_filename
-
-      def url
-        @url ||= links.first
-      end
     end
   end
 end

data/lib/feedjira/parser/itunes_rss.rb

@@ -1,4 +1,5 @@
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # iTunes is RSS 2.0 + some apple extensions
@@ -19,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
@@ -62,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,4 +1,5 @@
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # iTunes extensions to the standard RSS2.0 item
@@ -11,17 +12,17 @@ module Feedjira
       elements :"itunes:category", as: :itunes_categories,
                                    class: ITunesRSSCategory
 
-      def each_subcategory
+      def each_subcategory(&block)
         return to_enum(__method__) unless block_given?
 
         yield text
 
         itunes_categories.each do |itunes_category|
-          itunes_category.each_subcategory(&proc)
+          itunes_category.each_subcategory(&block)
         end
       end
 
-      def each_path(ancestors = [])
+      def each_path(ancestors = [], &block)
         return to_enum(__method__, ancestors) unless block_given?
 
         category_hierarchy = ancestors + [text]
@@ -30,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
@@ -5,14 +7,9 @@ module Feedjira
     class ITunesRSSItem
       include SAXMachine
       include FeedEntryUtilities
+      include RSSEntryUtilities
 
-      element :author
-      element :guid, as: :entry_id
-      element :title
-      element :link, as: :url
-      element :description, as: :summary
-      element :"content:encoded", as: :content
-      element :pubDate, as: :published
+      sax_config.top_level_elements["enclosure"].clear
 
       # If author is not present use author tag on the item
       element :"itunes:author", as: :itunes_author
@@ -34,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,4 +1,5 @@
-# rubocop:disable Style/Documentation
+# 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,5 +1,5 @@
-# rubocop:disable Style/Documentation
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     class PodloveChapter
@@ -12,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,4 +1,5 @@
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RSS feeds.
@@ -11,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
@@ -20,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,37 +1,12 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RDF feed entries.
     class RSSEntry
       include SAXMachine
       include FeedEntryUtilities
-
-      element :title
-      element :link, as: :url
-
-      element :"dc:creator", as: :author
-      element :author, as: :author
-      element :"content:encoded", as: :content
-      element :description, as: :summary
-
-      element :"media:content", as: :image, value: :url
-      element :enclosure, as: :image, value: :url
-
-      element :pubDate, as: :published
-      element :pubdate, as: :published
-      element :"dc:date", as: :published
-      element :"dc:Date", as: :published
-      element :"dcterms:created", as: :published
-
-      element :"dcterms:modified", as: :updated
-      element :issued, as: :published
-      elements :category, as: :categories
-
-      element :guid, as: :entry_id
-      element :"dc:identifier", as: :dc_identifier
-
-      def id
-        @entry_id ||= @dc_identifier || @url
-      end
+      include RSSEntryUtilities
     end
   end
 end

data/lib/feedjira/parser/rss_feed_burner.rb

@@ -1,4 +1,5 @@
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RSS feeds.
@@ -15,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,38 +1,18 @@
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with RDF feed entries.
     class RSSFeedBurnerEntry
       include SAXMachine
       include FeedEntryUtilities
+      include RSSEntryUtilities
 
-      element :title
-
-      element :"feedburner:origLink", as: :url
-      element :link, as: :url
-
-      element :"dc:creator", as: :author
-      element :author, as: :author
-      element :"content:encoded", as: :content
-      element :description, as: :summary
-
-      element :"media:content", as: :image, value: :url
-      element :enclosure, as: :image, value: :url
-
-      element :pubDate, as: :published
-      element :pubdate, as: :published
-      element :"dc:date", as: :published
-      element :"dc:Date", as: :published
-      element :"dcterms:created", as: :published
-
-      element :"dcterms:modified", as: :updated
-      element :issued, as: :published
-      elements :category, as: :categories
-
-      element :guid, as: :entry_id
+      element :"feedburner:origLink", as: :orig_link
+      private :orig_link
 
       def url
-        @url || @link
+        orig_link || super
       end
     end
   end

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,5 +1,5 @@
-# rubocop:disable Style/Documentation
-# rubocop:disable Style/DocumentationMethod
+# frozen_string_literal: true
+
 module Feedjira
   class Preprocessor
     def initialize(xml)
@@ -20,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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Feedjira
+  module RSSEntryUtilities
+    def self.included(mod)
+      mod.class_exec do
+        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
+        element :issued, as: :published
+        element :"dc:date", as: :published
+        element :"dc:Date", as: :published
+        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
+
+        element :"media:thumbnail", as: :image, value: :url
+        element :"media:content", as: :image, value: :url
+        element :enclosure, as: :image, value: :url
+
+        elements :category, as: :categories
+      end
+    end
+
+    def entry_id
+      @entry_id&.guid
+    end
+
+    def url
+      @url || @entry_id&.url
+    end
+
+    def id
+      entry_id || @dc_identifier || @url
+    end
+  end
+end

data/lib/feedjira/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
-  VERSION = "3.0.0.beta1".freeze
+  VERSION = "3.2.0"
 end

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