weneedfeed 0.11.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4bfc07ec09b3fc76791f599dd17fb684011a1578022d3959a9d75ba2dee16f
-  data.tar.gz: 9108f2c16e46464d0901d9c7856fb8b75bdead5fff144b4167ec816e8124aa6a
+  metadata.gz: fa3500ddeba8701a3cc8c7f729fbfef3c61f95050572bc34327c489842c5744d
+  data.tar.gz: dd89a38ec4ceed97813e9fc5b73b5df1f1c7568ae0dd6b3ab2e0e6a52d0f7bec
 SHA512:
-  metadata.gz: 56781eb12af36d6fe86c62ea13055b42acb422835d000efaa244d212e4a10f649e9395ea21a83ecbac29246c82ecf41f8396cf0f354379ba774abf514a692a8d
-  data.tar.gz: c41a3cad5280ef1f3a8072b743bb90cc1c1e35f643392c8216ad6c95c551b9ec9bde21eb37cfeab62ebec11eef6cc7beb5fc75a752c25a5f9b68b6f26c85d65e
+  metadata.gz: 8e74fb89776dde8f1c7dfb068ddea721a9a9ce6da67d31aa496673e53efcd0993f3deee7452685d643ab73e56ac56fdf42be59aa11413593ee1de326bd219a2c
+  data.tar.gz: d9036bccf6f43b8480eb36d7ea3db5dc348e879705e93b92290ea953b04302898caa5cf4a3aea8fda71704291ab0bf1841e3c761873798f72172191f17c57c88

data/.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   rspec:

data/.rubocop.yml

@@ -1,4 +1,5 @@
 require:
+  - rubocop-rake
   - rubocop-rspec
 
 AllCops:

data/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.14.0 - 2022-04-14
+
+### Added
+
+- Support YAML aliases (on psych 4.x).
+
+## 0.13.0 - 2022-04-14
+
+### Changed
+
+- Normalize item URLs.
+
+## 0.12.0 - 2022-04-14
+
+### Fixed
+
+- Handle incorrect URLs a little better.
+
 ## 0.11.0 - 2022-04-13
 
 ### Changed

data/Gemfile

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

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    weneedfeed (0.11.0)
+    weneedfeed (0.14.0)
       activesupport
+      addressable
       builder
       faraday
       faraday_middleware
       hibana (>= 0.2)
       marcel
       nokogiri
+      psych (>= 4)
       rack-capture (>= 0.4.0)
       thor
 
@@ -80,6 +82,8 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
+    psych (4.0.3)
+      stringio
     public_suffix (4.0.7)
     racc (1.6.0)
     rack (2.2.3)
@@ -115,10 +119,13 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
     rubocop-rspec (2.9.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
+    stringio (3.0.1)
     thor (1.2.1)
     tilt (2.0.10)
     tzinfo (2.0.4)
@@ -137,6 +144,7 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec
   rubocop
+  rubocop-rake
   rubocop-rspec
   webmock
   weneedfeed!

data/lib/weneedfeed/application.rb

@@ -9,9 +9,9 @@ module Weneedfeed
       get '/feeds/:page_id.xml', to: ::Weneedfeed::Controllers::ShowFeed, as: :feed
     end
 
-    # @param [Hash] schema
-    def initialize(schema:)
-      @schema = ::Weneedfeed::Schema.new(schema)
+    # @param [String] schema_path
+    def initialize(schema_path:)
+      @schema = ::Weneedfeed::Schema.load_file(schema_path)
       super()
     end
 

data/lib/weneedfeed/capture.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rack/capture'
-require 'yaml'
 
 module Weneedfeed
   class Capture
@@ -44,7 +43,7 @@ module Weneedfeed
     # @return [Weneedfeed::Application]
     def app
       @app ||= ::Weneedfeed::Application.new(
-        schema: ::YAML.load_file(@schema_path)
+        schema_path: @schema_path
       )
     end
 
@@ -53,11 +52,6 @@ module Weneedfeed
       @base_uri ||= ::URI.parse(@base_url)
     end
 
-    # @return [Hash]
-    def schema
-      ::YAML.load_file(@schema_path)
-    end
-
     # @return [String]
     def script_name
       case base_uri.path

data/lib/weneedfeed/command.rb

@@ -2,7 +2,6 @@
 
 require 'rack'
 require 'thor'
-require 'yaml'
 
 module Weneedfeed
   class Command < ::Thor
@@ -55,8 +54,7 @@ module Weneedfeed
     )
 
     def server
-      schema = ::YAML.load_file(options[:schema_path])
-      application = Weneedfeed::Application.new(schema: schema)
+      application = Weneedfeed::Application.new(schema_path: options[:schema_path])
       ::Rack::Handler.default.run(application)
     end
   end

data/lib/weneedfeed/faraday_response_middleware.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-# For faraday_middleware/response_middleware.
+# To load ActiveSupport::IsolatedExecutionState on activesupport 7.
 # 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'

data/lib/weneedfeed/item.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require 'addressable'
 require 'marcel'
-require 'uri'
 
 module Weneedfeed
   class Item
@@ -74,24 +74,20 @@ module Weneedfeed
     def image_url
       return unless image_path_or_url
 
-      ::URI.join(
+      ::Addressable::URI.join(
         @url,
         image_path_or_url
-      ).to_s
-    rescue ::URI::InvalidURIError
-      "#{@url}#{image_path_or_url}"
+      ).normalize.to_s
     end
 
     # @return [String]
     def link
       return unless link_path_or_url
 
-      ::URI.join(
+      ::Addressable::URI.join(
         @url,
         link_path_or_url
-      ).to_s
-    rescue ::URI::InvalidURIError
-      "#{@url}#{link_path_or_url}"
+      ).normalize.to_s
     end
 
     # @return [Nokogiri::Node, nil]

data/lib/weneedfeed/schema.rb

@@ -1,7 +1,18 @@
 # frozen_string_literal: true
 
+require 'yaml'
+
 module Weneedfeed
   class Schema
+    class << self
+      # @param [String] schema_path
+      # @return [Weneedfeed::Schema]
+      def load_file(schema_path)
+        raw = ::YAML.load_file(schema_path, aliases: true)
+        new(raw)
+      end
+    end
+
     # @param [Hash] raw
     def initialize(raw)
       @raw = raw

data/lib/weneedfeed/version.rb

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

data/weneedfeed.gemspec

@@ -28,12 +28,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'addressable'
   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 'marcel'
   spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'psych', '>= 4'
   spec.add_runtime_dependency 'rack-capture', '>= 0.4.0'
   spec.add_runtime_dependency 'thor'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weneedfeed
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  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
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rack-capture
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - r7kamura@gmail.com
 executables:
@@ -187,7 +215,7 @@ metadata:
   homepage_uri: https://github.com/r7kamura/weneedfeed
   source_code_uri: https://github.com/r7kamura/weneedfeed
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Generate feeds from URL and selectors.
 test_files: []