feedjira 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9d2eb01b3bf275ae7d0599df9bef74ea336ddfb9afdcc31998c4f79890cf51
-  data.tar.gz: 30de1f11b4054c3860ca79a27f8fb54b2244e8140bd26340d3f64f84c2d29884
+  metadata.gz: 5169a51338551c1253b148e944e9b63cff818f85ba5eeafd2c3239ea007b5012
+  data.tar.gz: c9966b308d0f57873c56b474cdbdc7a1a96ee6dd64d5a0ca56f30c333ada9298
 SHA512:
-  metadata.gz: a83a5507737ed80d62515733dad8005f0f3d0bce59558d6b6f252a94084d459b664b7a56c5355d853cb706b62c1a7c804e5bd68df74f4cb9091bc12ce475d075
-  data.tar.gz: 8af825f5c5cde56ba80d69cbd7d55b1e36e4cb2c6c401f7092a9a8654757fcc133666dbd7ad38527b45f790523aa5449c29dd6886f43112dac49c328ccce816d
+  metadata.gz: ad3fc7290af22ec75dbba64b2397ad3e8e6f283f73c3c793eaf9b33d28410dcaa6439618c47d741858a732df7478cbcb21f987314880ef5acd108224cc6fa7a2
+  data.tar.gz: 20422cf9fdf53491356726c29b118ce6e1b3b37c0ef7294f1c01bcaf00df72097ae6afd1a88191ca765217fe7a159996247de4837a14a1716d33ad8024f7f784

data/.github/ISSUE_TEMPLATE/general-issue.md

@@ -0,0 +1,8 @@
+---
+name: Feed Parsing
+about: Anything else
+title: ''
+labels: ''
+assignees: ''
+
+---

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu]
-        ruby: [2.5, 2.6, 2.7, 3.0]
+        ruby: [2.7, 3.0, 3.1]
         handler: [nokogiri, ox, oga]
         exclude:
           - { ruby: jruby, handler: ox }

data/.rubocop.yml

@@ -1,7 +1,12 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - rubocop-rake
+  - rubocop-rspec
+  - rubocop-performance
+
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
 
 # Offense count: 3
@@ -32,3 +37,30 @@ Style/IfUnlessModifier:
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
+
+RSpec/MultipleExpectations:
+  Max: 10
+
+RSpec/ExampleLength:
+  Max: 30
+
+RSpec/InstanceVariable:
+  Enabled: false
+
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Max: 5
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
+RSpec/BeforeAfterAll:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/RepeatedExample:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Feedjira Changelog
 
+## 3.2.2
+
+* Fix time handling again usec is not a timezone
+
+* Update rubocop * drop official support for eol Ruby
+
+
+## 3.2.1
+
+* Fix time handling in ruby 3.1
+
+* Atom feeds now have an icon field via https://github.com/feedjira/feedjira/pull/452 (@jswanner)
+
 ## 3.2.0
 
 * Atom `feed_url` no longer falls back to `url` via https://github.com/feedjira/feedjira/pull/451 (@frederfred)

data/Gemfile

@@ -4,9 +4,6 @@ source "https://rubygems.org/"
 
 gemspec
 
-gem "pry"
-gem "rubocop", "~> 0.90"
-
 group :test do
   gem "oga"
   gem "ox", platforms: %i[mri rbx]

data/README.md

@@ -1,13 +1,12 @@
 # Feedjira
 
-[![Build Status][travis-badge]][travis] [![Code Climate][code-climate-badge]][code-climate] [![Gitter][gitter-badge]][gitter]
+[![Build Status][travis-badge]][travis] [![Code Climate][code-climate-badge]][code-climate]
 
 [travis-badge]: https://travis-ci.org/feedjira/feedjira.svg?branch=master
 [travis]: http://travis-ci.org/feedjira/feedjira
 [code-climate-badge]: https://codeclimate.com/github/feedjira/feedjira/badges/gpa.svg
 [code-climate]: https://codeclimate.com/github/feedjira/feedjira
 [gitter-badge]: https://badges.gitter.im/feedjira/feedjira.svg
-[gitter]: https://gitter.im/feedjira/feedjira?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
 
 Feedjira is a Ruby library designed to parse feeds.
 

data/feedjira.gemspec

@@ -22,20 +22,24 @@ Gem::Specification.new do |s|
   s.metadata = {
     "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"
+    "changelog_uri" => "https://github.com/feedjira/feedjira/blob/master/CHANGELOG.md",
+    "rubygems_mfa_required" => "true"
   }
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.required_ruby_version = ">=2.5"
+  s.required_ruby_version = ">=2.7"
 
   s.add_dependency "loofah",             ">= 2.3.1"
   s.add_dependency "sax-machine",        ">= 1.0"
 
   s.add_development_dependency "faraday"
+  s.add_development_dependency "pry"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rubocop"
+  s.add_development_dependency "rubocop-performance"
+  s.add_development_dependency "rubocop-rake"
+  s.add_development_dependency "rubocop-rspec"
   s.add_development_dependency "yard"
 end

data/lib/feedjira/core_ext/date.rb

@@ -16,7 +16,8 @@ class Date
   private
 
   def feed_utils_to_time(dest, method)
-    Time.send(method, dest.year, dest.month, dest.day, dest.hour, dest.min,
-              dest.sec, dest.zone)
+    # Convert a fraction of a day to a number of microseconds
+    usec = (dest.sec_fraction * (10**6)).to_i
+    Time.send(method, dest.year, dest.month, dest.day, dest.hour, dest.min, dest.sec, usec)
   end
 end

data/lib/feedjira/core_ext/time.rb

@@ -29,7 +29,7 @@ class Time
   def self.parse_string_safely(string)
     return nil if string.empty?
 
-    if string =~ /\A\d{14}\z/
+    if /\A\d{14}\z/.match?(string)
       parse("#{string}Z", true)
     else
       parse(string).utc

data/lib/feedjira/date_time_utilities/date_time_language_parser.rb

@@ -15,7 +15,7 @@ module Feedjira
       def self.translate(string)
         MONTHS_SPANISH.each_with_index do |m, i|
           rgx = Regexp.new("\s#{m}\s", Regexp::IGNORECASE)
-          return string.gsub(rgx, MONTHS_ENGLISH[i]) if string =~ rgx
+          return string.gsub(rgx, MONTHS_ENGLISH[i]) if string&.match?(rgx)
         end
         raise "No translation found for #{string}"
       end

data/lib/feedjira/feed_utilities.rb

@@ -75,11 +75,11 @@ module Feedjira
       old_value = send(name)
       new_value = feed.send(name)
 
-      if old_value != new_value
+      if old_value == new_value
+        false
+      else
         send("#{name}=", new_value)
         true
-      else
-        false
       end
     end
 

data/lib/feedjira/parser/atom_feed_burner.rb

@@ -21,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
+        (xml.include?("<feed") && xml.include?("Atom") && xml.include?("feedburner") && !(/<rss|<rdf/ =~ xml)) || false
       end
 
       # Feed url is <link> with type="text/html" if present,

data/lib/feedjira/parser/atom_google_alerts_entry.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "uri"
+
 module Feedjira
   module Parser
     # Parser for dealing with Feedburner Atom feed entries.

data/lib/feedjira/parser/atom_youtube.rb

@@ -14,8 +14,8 @@ module Feedjira
 
       elements :entry, as: :entries, class: AtomYoutubeEntry
 
-      def self.able_to_parse?(xml) #:nodoc:
-        %r{xmlns:yt="http://www.youtube.com/xml/schemas/2015"} =~ xml
+      def self.able_to_parse?(xml) # :nodoc:
+        xml.include?("xmlns:yt=\"http://www.youtube.com/xml/schemas/2015\"")
       end
     end
   end

data/lib/feedjira/parser/google_docs_atom.rb

@@ -17,7 +17,7 @@ module Feedjira
         @url ||= links.first
       end
 
-      def self.able_to_parse?(xml) #:nodoc:
+      def self.able_to_parse?(xml) # :nodoc:
         %r{<id>https?://docs\.google\.com/.*</id>} =~ xml
       end
 

data/lib/feedjira/parser/itunes_rss_category.rb

@@ -13,7 +13,7 @@ module Feedjira
                                    class: ITunesRSSCategory
 
       def each_subcategory(&block)
-        return to_enum(__method__) unless block_given?
+        return to_enum(__method__) unless block
 
         yield text
 
@@ -23,7 +23,7 @@ module Feedjira
       end
 
       def each_path(ancestors = [], &block)
-        return to_enum(__method__, ancestors) unless block_given?
+        return to_enum(__method__, ancestors) unless block
 
         category_hierarchy = ancestors + [text]
 

data/lib/feedjira/parser/podlove_chapter.rb

@@ -14,9 +14,9 @@ module Feedjira
         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

@@ -22,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_feed_burner.rb

@@ -15,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/rss_entry_utilities.rb

@@ -2,7 +2,8 @@
 
 module Feedjira
   module RSSEntryUtilities
-    def self.included(mod)
+    # rubocop:todo Metrics/MethodLength
+    def self.included(mod) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       mod.class_exec do
         element :title
 
@@ -34,9 +35,12 @@ module Feedjira
         element :"media:content", as: :image, value: :url
         element :enclosure, as: :image, value: :url
 
+        element :comments
+
         elements :category, as: :categories
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def entry_id
       @entry_id&.guid

data/lib/feedjira/version.rb

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

data/lib/feedjira.rb

@@ -65,7 +65,7 @@ module Feedjira
 
     parser.parse(xml, &block)
   end
-  module_function :parse # rubocop:disable Style/AccessModifierDeclarations
+  module_function :parse
 
   # Find compatible parser for given XML
   #
@@ -77,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 # rubocop:disable Style/AccessModifierDeclarations
+  module_function :parser_for_xml
 end

data/spec/feedjira/feed_spec.rb

@@ -5,26 +5,27 @@ 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
@@ -32,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}

@@ -3,44 +3,44 @@
 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")
+      expect(time).to eq Time.strptime("Tue Sep 17 12:20:13.931 UTC 2013", "%a %b %d %H:%M:%S.%N %Z %Y")
     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}

@@ -3,44 +3,44 @@
 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")
+      expect(time).to eq Time.strptime("Tue Sep 17 12:20:13.931 UTC 2013", "%a %b %d %H:%M:%S.%N %Z %Y")
     end
   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
+    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
+    it "sanitizes content in place" do
       new_content = "<script>#{@entry.content}"
       @entry.content = new_content.dup
 
@@ -50,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>"