feedjira 3.1.1 → 3.1.2

data/.rubocop_todo.yml

@@ -1,36 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-10-08 04:14:19 +0900 using RuboCop version 0.59.2.
+# on 2020-09-02 20:02:06 UTC using RuboCop version 0.90.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 7
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/feedjira/date_time_utilities/date_time_epoch_parser.rb'
-    - 'lib/feedjira/feed_utilities.rb'
-    - 'lib/feedjira/parser/json_feed_item.rb'
-    - 'lib/feedjira/parser/podlove_chapter.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/UnneededSort:
-  Exclude:
-    - 'lib/feedjira/feed_utilities.rb'
-
-# Offense count: 3
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
-  Exclude:
-    - 'lib/feedjira.rb'
-    - 'lib/feedjira/parser/itunes_rss.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/UnneededCondition:
-  Exclude:
-    - 'lib/feedjira/feed_utilities.rb'
+# Offense count: 20
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -28,7 +28,6 @@ before_install:
 
 script:
   - bundle exec rake
-  - bundle exec danger
 
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Feedjira Changelog
 
+## Unreleased
+
+* 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)
+
 ## 3.1.0
 
 * Breaking Changes

data/Gemfile

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org/"
 
 gemspec
 
 gem "pry"
-gem "rubocop", "~> 0.59.2"
+gem "rubocop", "~> 0.90"
 
 group :test do
   gem "oga"
-  gem "ox", platforms: [:mri, :rbx]
+  gem "ox", platforms: %i[mri rbx]
   gem "rake"
 end

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/core/rake_task"
 require "rubocop/rake_task"
 require "yard"
@@ -14,4 +16,4 @@ YARD::Rake::YardocTask.new do |t|
   t.files   = ["lib/**/*.rb", "-", "LICENSE"]
 end
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/feedjira.gemspec

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require File.expand_path("lib/feedjira/version", __dir__)
 
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |s|
   s.authors = [
     "Adam Hess",
@@ -11,10 +10,9 @@ Gem::Specification.new do |s|
     "Jon Allured",
     "Julien Kirch",
     "Michael Stock",
-    "Paul Dix",
+    "Paul Dix"
   ]
-  s.email    = "feedjira@gmail.com"
-  s.homepage = "http://feedjira.com"
+  s.homepage = "https://github.com/feedjira/feedjira"
   s.license  = "MIT"
   s.name     = "feedjira"
   s.platform = Gem::Platform::RUBY
@@ -22,9 +20,9 @@ Gem::Specification.new do |s|
   s.version  = Feedjira::VERSION
 
   s.metadata = {
-    "homepage_uri"    => "http://feedjira.com",
+    "homepage_uri" => "http://feedjira.com",
     "source_code_uri" => "https://github.com/feedjira/feedjira",
-    "changelog_uri"   => "https://github.com/feedjira/feedjira/blob/master/CHANGELOG.md"
+    "changelog_uri" => "https://github.com/feedjira/feedjira/blob/master/CHANGELOG.md"
   }
 
   s.files         = `git ls-files`.split("\n")
@@ -36,11 +34,9 @@ Gem::Specification.new do |s|
   s.add_dependency "loofah",             ">= 2.3.1"
   s.add_dependency "sax-machine",        ">= 1.0"
 
-  s.add_development_dependency "danger"
-  s.add_development_dependency "danger-commit_lint"
+  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
-# rubocop:enable Metrics/BlockLength

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"
@@ -64,7 +65,7 @@ module Feedjira
 
     parser.parse(xml, &block)
   end
-  module_function :parse
+  module_function :parse # rubocop:disable Style/AccessModifierDeclarations
 
   # Find compatible parser for given XML
   #
@@ -76,5 +77,5 @@ module Feedjira
     start_of_doc = xml.slice(0, 2000)
     Feedjira.parsers.detect { |klass| klass.able_to_parse?(start_of_doc) }
   end
-  module_function :parser_for_xml
+  module_function :parser_for_xml # rubocop:disable Style/AccessModifierDeclarations
 end

data/lib/feedjira/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Feedjira::Configuration
 module Feedjira
   # Provides global configuration options for Feedjira
@@ -10,7 +12,7 @@ module Feedjira
     attr_accessor(
       :logger,
       :parsers,
-      :strip_whitespace,
+      :strip_whitespace
     )
 
     # Modify Feedjira's current configuration
@@ -48,7 +50,7 @@ module Feedjira
 
     # @private
     def default_logger
-      Logger.new(STDOUT).tap do |logger|
+      Logger.new($stdout).tap do |logger|
         logger.progname = "Feedjira"
         logger.level = Logger::WARN
       end
@@ -65,7 +67,7 @@ module Feedjira
         Feedjira::Parser::Atom,
         Feedjira::Parser::ITunesRSS,
         Feedjira::Parser::RSS,
-        Feedjira::Parser::JSONFeed,
+        Feedjira::Parser::JSONFeed
       ]
     end
   end

data/lib/feedjira/core_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "feedjira/core_ext/time"
 require "feedjira/core_ext/date"
 require "feedjira/core_ext/string"

data/lib/feedjira/core_ext/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Date code pulled and adapted from:
 # Ruby Cookbook by Lucas Carlson and Leonard Richardson
 # Published by O'Reilly
@@ -15,6 +17,6 @@ class Date
 
   def feed_utils_to_time(dest, method)
     Time.send(method, dest.year, dest.month, dest.day, dest.hour, dest.min,
-      dest.sec, dest.zone)
+              dest.sec, dest.zone)
   end
 end

data/lib/feedjira/core_ext/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class String
   def sanitize!
     replace(sanitize)

data/lib/feedjira/core_ext/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "time"
 require "date"
 

data/lib/feedjira/date_time_utilities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module DateTimeUtilities
     # This is our date parsing heuristic.
@@ -6,20 +8,18 @@ module Feedjira
       DateTimePatternParser,
       DateTimeLanguageParser,
       DateTimeEpochParser,
-      DateTime,
+      DateTime
     ].freeze
 
     # Parse the given string starting with the most common parser (default ruby)
     # and going over all other available parsers
     def parse_datetime(string)
       res = DATE_PARSERS.detect do |parser|
-        begin
-          return parser.parse(string).feed_utils_to_gm_time
-        rescue StandardError => e
-          Feedjira.logger.debug { "Failed to parse date #{string}" }
-          Feedjira.logger.debug(e)
-          nil
-        end
+        return parser.parse(string).feed_utils_to_gm_time
+      rescue StandardError => e
+        Feedjira.logger.debug { "Failed to parse date #{string}" }
+        Feedjira.logger.debug(e)
+        nil
       end
 
       Feedjira.logger.warn { "Failed to parse date #{string}" } if res.nil?

data/lib/feedjira/date_time_utilities/date_time_epoch_parser.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Feedjira
   module DateTimeUtilities
     class DateTimeEpochParser
       def self.parse(string)
         epoch_time = string.to_i
         return Time.at(epoch_time).to_datetime if epoch_time.to_s == string
+
         raise "#{string} is not a valid epoch time"
       end
     end

data/lib/feedjira/date_time_utilities/date_time_language_parser.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Feedjira
   module DateTimeUtilities
     class DateTimeLanguageParser
       MONTHS_ENGLISH =
-        %w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec).freeze
+        %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec].freeze
       MONTHS_SPANISH =
-        %w(Ene Feb Mar Abr May Jun Jul Ago Sep Oct Nov Dic).freeze
+        %w[Ene Feb Mar Abr May Jun Jul Ago Sep Oct Nov Dic].freeze
 
       def self.parse(string)
         DateTime.parse(translate(string))

data/lib/feedjira/date_time_utilities/date_time_pattern_parser.rb

@@ -1,21 +1,21 @@
+# frozen_string_literal: true
+
 module Feedjira
   module DateTimeUtilities
     class DateTimePatternParser
       # Japanese Symbols are required for strange Date Strings like
       # '水, 31 8 2016 07:37:00 PDT'
-      JAPANESE_SYMBOLS = %w(日 月 火 水 木 金 土).freeze
+      JAPANESE_SYMBOLS = %w[日 月 火 水 木 金 土].freeze
       PATTERNS = ["%m/%d/%Y %T %p", "%d %m %Y %T %Z"].freeze
 
       def self.parse(string)
         PATTERNS.each do |p|
-          begin
-            datetime = DateTime.strptime(prepare(string), p)
-            return datetime
-          rescue StandardError => e
-            Feedjira.logger.debug("Failed to parse date #{string}")
-            Feedjira.logger.debug(e)
-            nil
-          end
+          datetime = DateTime.strptime(prepare(string), p)
+          return datetime
+        rescue StandardError => e
+          Feedjira.logger.debug("Failed to parse date #{string}")
+          Feedjira.logger.debug(e)
+          nil
         end
         raise "No pattern matched #{string}"
       end

data/lib/feedjira/feed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   class Feed
     class << self

data/lib/feedjira/feed_entry_utilities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module FeedEntryUtilities
     include Enumerable
@@ -39,9 +41,9 @@ module Feedjira
     end
 
     def sanitize!
-      %w(title author summary content image).each do |name|
+      %w[title author summary content image].each do |name|
         if respond_to?(name) && send(name).respond_to?(:sanitize!)
-          send(name).send :sanitize!
+          send(name).send(:sanitize!)
         end
       end
     end
@@ -51,7 +53,7 @@ module Feedjira
     def each
       @rss_fields ||= instance_variables.map do |ivar|
         ivar.to_s.sub("@", "")
-      end.select do |field|
+      end.select do |field| # rubocop:disable Style/MultilineBlockChain
         # select callable (public) methods only
         respond_to?(field)
       end

data/lib/feedjira/feed_utilities.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Feedjira
   module FeedUtilities
-    UPDATABLE_ATTRIBUTES = %w(title feed_url url last_modified etag).freeze
+    UPDATABLE_ATTRIBUTES = %w[title feed_url url last_modified etag].freeze
 
     attr_writer   :new_entries, :updated, :last_modified
     attr_accessor :etag
@@ -41,7 +43,7 @@ module Feedjira
     def last_modified
       @last_modified ||= begin
         published = entries.reject { |e| e.published.nil? }
-        entry = published.sort_by { |e| e.published if e.published }.last
+        entry = published.max_by(&:published)
         entry ? entry.published : nil
       end
     end
@@ -100,6 +102,7 @@ module Feedjira
 
       feed.entries.each do |entry|
         break unless new_entry?(entry, latest_entry)
+
         found_new_entries << entry
       end
 

data/lib/feedjira/parser.rb

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

data/lib/feedjira/parser/atom.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with Atom feeds.
@@ -14,7 +16,7 @@ module Feedjira
       elements :entry, as: :entries, class: AtomEntry
 
       def self.able_to_parse?(xml)
-        %r{\<feed[^\>]+xmlns\s?=\s?[\"\'](http://www\.w3\.org/2005/Atom|http://purl\.org/atom/ns\#)[\"\'][^\>]*\>} =~ xml # rubocop:disable Metrics/LineLength
+        %r{<feed[^>]+xmlns\s?=\s?["'](http://www\.w3\.org/2005/Atom|http://purl\.org/atom/ns\#)["'][^>]*>} =~ xml
       end
 
       def url

data/lib/feedjira/parser/atom_entry.rb

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

data/lib/feedjira/parser/atom_feed_burner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with Feedburner Atom feeds.
@@ -10,7 +12,7 @@ module Feedjira
       element :link, as: :url_text_html, value: :href,
                      with: { type: "text/html" }
       element :link, as: :url_notype, value: :href, with: { type: nil }
-      element :link, as: :feed_url_link, value: :href, with: { type: "application/atom+xml" } # rubocop:disable Metrics/LineLength
+      element :link, as: :feed_url_link, value: :href, with: { type: "application/atom+xml" }
       element :"atom10:link", as: :feed_url_atom10_link, value: :href,
                               with: { type: "application/atom+xml" }
       elements :"atom10:link", as: :hubs, value: :href, with: { rel: "hub" }
@@ -19,7 +21,7 @@ module Feedjira
       attr_writer :url, :feed_url
 
       def self.able_to_parse?(xml)
-        ((/<feed/ =~ xml) && (/Atom/ =~ xml) && (/feedburner/ =~ xml) && !(/\<rss|\<rdf/ =~ xml)) || false # rubocop:disable Metrics/LineLength
+        ((/<feed/ =~ xml) && (/Atom/ =~ xml) && (/feedburner/ =~ xml) && !(/<rss|<rdf/ =~ xml)) || false
       end
 
       # Feed url is <link> with type="text/html" if present,

data/lib/feedjira/parser/atom_feed_burner_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Feedjira
   module Parser
     # Parser for dealing with Feedburner Atom feed entries.
@@ -7,9 +9,7 @@ module Feedjira
       include AtomEntryUtilities
 
       element :"feedburner:origLink", as: :orig_link
-      # rubocop:disable Style/AccessModifierDeclarations
       private :orig_link
-      # rubocop:enable Style/AccessModifierDeclarations
 
       element :"media:thumbnail", as: :image, value: :url
       element :"media:content", as: :image, value: :url