weneedfeed 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c580b642b78a2c26bf06d840fad6a745d498630779c670784deba389d9b28f1a
-  data.tar.gz: e29a86399e141b1c650a064cf6c45066149d93dee722b70fa657366519015f7b
+  metadata.gz: e666f142f72459d43fd7c6fe071740d1fce11dbac4605bcd1d7fbcc8766187ab
+  data.tar.gz: a6fdf6ce28e9c610d9f47fa747eaedc4d0198c59c70fd5b736d99dbeaf90d7df
 SHA512:
-  metadata.gz: 3293b7dbba14a24988a77bb2070adfef0a4c4f343197d5633076c497747d6f66d9642b89e37ec11f9d2c51a0f91b18c8dfd614cf053339adfc3c7b4390702774
-  data.tar.gz: f9549a610dec4b77e9e6f86829890bc31928f086652480cbe2c501b1c9fda479a1a0d549ec6efb3a40d1f8ea4fcdb4cc4ccc198403c57ab0a2dbf3c9010ea27f
+  metadata.gz: e07f3fe6d8d712e20384310e1bee1eca48065ccf2c0a400aaccd6e9d0f0d219b011f7944c34d11870bb5e3b83750f17de267d8eff260926916daaff1b9f08f35
+  data.tar.gz: 792f22dbcda78c4df3f0d738fe6dee28dae5a64eb075f8a1603da6d0c9d5ca68bba3337374f3f2d6dd93e798a6c1f57c4436a9ff34425ee84366d94b56c89903

data/.github/workflows/test.yml

@@ -18,5 +18,3 @@ jobs:
       - uses: r7kamura/rubocop-problem-matchers-action@v1
       - run: bundle exec rubocop --parallel
       - run: bundle exec rspec --force-color
-
-

data/.rubocop.yml

@@ -1,4 +1,8 @@
+require:
+  - rubocop-rspec
+
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.5
 
 Lint/SuppressedException:
@@ -7,8 +11,20 @@ Lint/SuppressedException:
 Metrics:
   Enabled: false
 
+RSpec/ImplicitSubject:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 
 Style/TrailingCommaInArguments:
   Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false

data/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.7.0 - 2020-11-23
+
+### Added
+
+- Convert JSON response into XML.
+
+### Fixed
+
+- Fix bug that item_description_selector is not used.
+
 ## 0.6.1 - 2020-11-15
 
 ### Changed

data/Gemfile

@@ -9,4 +9,5 @@ gem 'rack-test'
 gem 'rake', '~> 12.0'
 gem 'rspec'
 gem 'rubocop'
+gem 'rubocop-rspec'
 gem 'webmock'

data/Gemfile.lock

@@ -1,8 +1,11 @@
 PATH
   remote: .
   specs:
-    weneedfeed (0.6.1)
+    weneedfeed (0.7.0)
+      activesupport
+      builder
       faraday
+      faraday_middleware
       hibana (>= 0.2)
       nokogiri
       rack-capture (>= 0.4.0)
@@ -11,14 +14,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.0.3.4)
+      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)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.7)
     crack (0.4.4)
     diff-lcs (1.4.4)
     faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     hanami-router (2.0.0.alpha3)
       mustermann (~> 1.0)
       mustermann-contrib (~> 1.0)
@@ -29,7 +42,10 @@ GEM
       hanami-router (>= 2.0.0.alpha3)
       rack
       tilt
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
     mini_portile2 (2.4.0)
+    minitest (5.14.2)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -38,7 +54,7 @@ GEM
       mustermann (= 1.1.1)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
@@ -64,26 +80,33 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.4)
-    rubocop (1.0.0)
+    rubocop (1.4.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.6.0)
+      rubocop-ast (>= 1.1.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.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)
     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)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
@@ -93,6 +116,7 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec
   rubocop
+  rubocop-rspec
   webmock
   weneedfeed!
 

data/lib/weneedfeed.rb

@@ -7,6 +7,7 @@ module Weneedfeed
   autoload :Capture, 'weneedfeed/capture'
   autoload :Command, 'weneedfeed/command'
   autoload :Controllers, 'weneedfeed/controllers'
+  autoload :FaradayResponseMiddleware, 'weneedfeed/faraday_response_middleware'
   autoload :Helpers, 'weneedfeed/helpers'
   autoload :Item, 'weneedfeed/item'
   autoload :Page, 'weneedfeed/page'

data/lib/weneedfeed/faraday_response_middleware.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/array/conversions'
+require 'active_support/core_ext/hash/conversions'
+require 'faraday'
+require 'faraday_middleware/response_middleware'
+require 'json'
+
+module Weneedfeed
+  class FaradayResponseMiddleware < ::FaradayMiddleware::ResponseMiddleware
+    define_parser do |body, options|
+      options ||= {}
+      options = { dasherize: false }.merge(options)
+      object = ::JSON.parse(body)
+      object.to_xml(options)
+    end
+
+    # @note Overriding.
+    def parse_response?(env)
+      env.response.headers['Content-Type'].to_s.include?('application/json')
+    end
+  end
+end

data/lib/weneedfeed/item.rb

@@ -48,10 +48,21 @@ module Weneedfeed
     def link
       ::URI.join(
         @url,
-        @node.at(@link_selector)['href']
+        link_path_or_url
       ).to_s
     end
 
+    # @return [Nokogiri::Node, nil]
+    def link_node
+      @node.at(@link_selector)
+    end
+
+    # @return [String, nil]
+    def link_path_or_url
+      node = link_node
+      node['href'] || node.inner_text
+    end
+
     # @return [Time, nil]
     def time
       return unless @time_selector

data/lib/weneedfeed/schema.rb

@@ -25,6 +25,7 @@ module Weneedfeed
       @raw['pages'].map do |hash|
         ::Weneedfeed::PageSchema.new(
           id: hash['id'],
+          item_description_selector: hash['item_description_selector'],
           item_link_selector: hash['item_link_selector'],
           item_time_selector: hash['item_time_selector'],
           item_title_selector: hash['item_title_selector'],

data/lib/weneedfeed/scraping.rb

@@ -5,6 +5,15 @@ require 'nokogiri'
 
 module Weneedfeed
   class Scraping
+    class << self
+      # @return [Faraday::Connection]
+      def faraday_connection
+        @faraday_connection ||= ::Faraday.new do |connection|
+          connection.use ::Weneedfeed::FaradayResponseMiddleware
+        end
+      end
+    end
+
     # @param [String, nil] item_description_selector
     # @param [String] item_link_selector
     # @param [String, nil] item_time_selector
@@ -48,12 +57,12 @@ module Weneedfeed
 
     # @return [Nokogiri::Node]
     def parsed_body
-      ::Nokogiri::HTML.parse(response.body)
+      ::Nokogiri::XML.parse(response.body)
     end
 
     # @return [Faraday::Response]
     def response
-      ::Faraday.get(@url)
+      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.6.1'
+  VERSION = '0.7.0'
 end

data/weneedfeed.gemspec

@@ -25,7 +25,10 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'builder'
   spec.add_runtime_dependency 'faraday'
+  spec.add_runtime_dependency 'faraday_middleware'
   spec.add_runtime_dependency 'hibana', '>= 0.2'
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'rack-capture', '>= 0.4.0'

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: weneedfeed
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hibana
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +151,7 @@ files:
 - lib/weneedfeed/controllers/base.rb
 - lib/weneedfeed/controllers/show_feed.rb
 - lib/weneedfeed/controllers/show_top_page.rb
+- lib/weneedfeed/faraday_response_middleware.rb
 - lib/weneedfeed/helpers.rb
 - lib/weneedfeed/helpers/parameters.rb
 - lib/weneedfeed/item.rb