weneedfeed 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b2041bae9e09565e1b72a4799f8a57034ad73c139de460dc0d187a5b94dbbe2
-  data.tar.gz: 292b45f698fb86f8cd5632687210ab6c09cd74a6d6ad340bb6eb7b989ffc4e3a
+  metadata.gz: 0f0099d83b69c32c84f244925370a77c7724874e287e9d55d105af0b5ab53df8
+  data.tar.gz: 39646f492c8b1accb725dab3ef96a9bb5ab77291e46182789fb75f2389cc0df9
 SHA512:
-  metadata.gz: 8dc45d743eb961d6a18983b8c20340b1e4c2085c7ed1c348332bddb51c211aa2c5067211e789f9cdd192eb3b161602d63f304adc8421ade49210ce11396a0031
-  data.tar.gz: 60f284ba462f92130a3de4702e33ae3d73418a3057459b40656e75f0a27e8ad9bc8b67946b1137b590f38250d5dec695cdfe41cad58f96947cf0dc0885c2839b
+  metadata.gz: 50699fe2779917eb03e0d6845d884c26398312f7950252663dce13ac73d9f5356cbea1670ac84d39877692897711f393d1e8b55c5c3de5a9c7f8a514dd8a296c
+  data.tar.gz: 45cbe8c18b887791ccb7c3a83c35c841be13f95d4219bc16a31f8ae766a59880820291a091c3d0f58e97aba71e3ea766f4993948c063f6c18b812bf88560cfa9

data/.github/workflows/test.yml

@@ -8,13 +8,19 @@ on:
 
 jobs:
   rspec:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.7.2
+          - 3.0.2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
-          ruby-version: 2.7.2
+          ruby-version: ${{ matrix.ruby }}
       - run: bundle exec rspec --force-color
   rubocop:
     runs-on: ubuntu-20.04

data/CHANGELOG.md

@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.10.0 - 2022-04-13
+
+### Changed
+
+- Replace mimemagic with marcel.
+
+### Fixed
+
+- Fix error on activesupport 7.
+
+## 0.9.2 - 2020-12-03
+
+### Fixed
+
+- Fix item image URL on JSON source.
+- Fix item image MIME type detection.
+
+## 0.9.1 - 2020-12-03
+
+### Fixed
+
+- Fix escape bug in escaping HTML and generating XML.
+
 ## 0.9.0 - 2020-12-03
 
 ### Added

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    weneedfeed (0.9.0)
+    weneedfeed (0.10.0)
       activesupport
       builder
       faraday
       faraday_middleware
       hibana (>= 0.2)
-      mimemagic
+      marcel
       nokogiri
       rack-capture (>= 0.4.0)
       thor
@@ -15,25 +15,45 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
-    diff-lcs (1.4.4)
-    faraday (1.1.0)
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday_middleware (1.0.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    hanami-router (2.0.0.alpha3)
+    hanami-router (2.0.0.alpha5)
       mustermann (~> 1.0)
       mustermann-contrib (~> 1.0)
       rack (~> 2.0)
@@ -43,72 +63,71 @@ GEM
       hanami-router (>= 2.0.0.alpha3)
       rack
       tilt
-    i18n (1.8.5)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    mimemagic (0.3.5)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    marcel (1.0.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mustermann-contrib (1.1.1)
       hansi (~> 0.2.0)
       mustermann (= 1.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.20.1)
-    parser (2.7.2.0)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
+    racc (1.6.0)
     rack (2.2.3)
     rack-capture (0.4.0)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    regexp_parser (2.3.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rubocop (1.4.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.27.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.1.1)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
-      parser (>= 2.7.1.5)
-    rubocop-rspec (2.0.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    thor (1.2.1)
     tilt (2.0.10)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    webmock (3.9.3)
-      addressable (>= 2.3.6)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -123,4 +142,4 @@ DEPENDENCIES
   weneedfeed!
 
 BUNDLED WITH
-   2.1.4
+   2.2.29

data/lib/weneedfeed/faraday_response_middleware.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+# For faraday_middleware/response_middleware.
+# https://github.com/r7kamura/weneedfeed/issues/19
+require 'active_support'
+require 'active_support/isolated_execution_state' if ActiveSupport.gem_version >= Gem::Version.new('7')
+
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/hash/conversions'
 require 'faraday'

data/lib/weneedfeed/item.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'mimemagic'
+require 'marcel'
+require 'uri'
 
 module Weneedfeed
   class Item
@@ -53,14 +54,21 @@ module Weneedfeed
     def image_mime_type
       return unless image_url
 
-      ::MimeMagic.by_path(image_url)&.type
+      ::Marcel::Magic.by_path(image_url)&.type
     end
 
     # @return [String, nil]
     def image_path_or_url
       return unless @image_selector
 
-      @node.at(@image_selector)&.[]('src')
+      node = @node.at(@image_selector)
+      return unless node
+
+      if node.name == 'img'
+        node['src']
+      else
+        node.content
+      end
     end
 
     def image_url

data/lib/weneedfeed/scraping.rb

@@ -65,12 +65,16 @@ module Weneedfeed
 
     # @return [Nokogiri::Node]
     def parsed_body
-      ::Nokogiri::XML.parse(response.body)
+      if response.headers['Content-Type']&.include?('application/json')
+        ::Nokogiri::XML.parse(response.body)
+      else
+        ::Nokogiri::HTML.parse(response.body)
+      end
     end
 
     # @return [Faraday::Response]
     def response
-      self.class.faraday_connection.get(@url)
+      @response ||= self.class.faraday_connection.get(@url)
     end
   end
 end

data/lib/weneedfeed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Weneedfeed
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/templates/show_feed.xml.erb

@@ -19,7 +19,7 @@
       <content:encoded><![CDATA[<%= item.description %>]]></content:encoded>
       <guid isPermaLink="true"><%= item.link %></guid>
       <% if item.image_url %>
-        <enclosure url="<%= item.image_url %>" length="0" type="<%= item.image_mime_type %>"/>
+        <enclosure url=<%= item.image_url.encode(xml: :attr) %> length="0" type="<%= item.image_mime_type %>"/>
       <% end %>
     </item>
     <% end %>

data/weneedfeed.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
 
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
@@ -30,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'faraday_middleware'
   spec.add_runtime_dependency 'hibana', '>= 0.2'
-  spec.add_runtime_dependency 'mimemagic'
+  spec.add_runtime_dependency 'marcel'
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'rack-capture', '>= 0.4.0'
   spec.add_runtime_dependency 'thor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weneedfeed
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -186,6 +186,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/r7kamura/weneedfeed
   source_code_uri: https://github.com/r7kamura/weneedfeed
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -201,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Generate feeds from URL and selectors.