weneedfeed 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fb7f94b87cc29f50d6a50a9c4f4f289d175bba47e4514eccd35b373a0438ff6
-  data.tar.gz: 56071e66614605dd824597dc7149260d47b8beee95b2338190c20cbd1fb30bbf
+  metadata.gz: b6a5d43bf327c8b96247ed37ce2c98ec546e7a339a8eb777dc647a3a594450a4
+  data.tar.gz: e9ff73155c418c0989d29b0f3f4e4b4133ea5bbb33b92a349b492bddf5965f38
 SHA512:
-  metadata.gz: 25bc5a5e40fb87b3f2516aa949819b0ec258f2bb6ee8d9ab8a1ea8f1672a428c002d4448ad86028e51140db7c4d9462c95ca2678b9e421423a8b17d54454294b
-  data.tar.gz: 874ab7d89dfeb3f238aaf2ed3aff6146dac0e4f5a8410a45feb6967219a6062f67e0b38b12bc6369ac597a46f5cf1503db1d213dbdeb1d5f6a6de9ee45e3b41d
+  metadata.gz: 122215c08d29522f980db52d10de20b9c718a17d7064081a277c3587454f5aedb534e2cf3b3818c1cd42fb89db016d1b59eb096ad91f5dd45e563c45d0971935
+  data.tar.gz: 7f5ae31b297ad9b5dfad5053bb45baae7a3d844014f3269efed007103ff2146d5592d89984987c8a8dde0e13a4ce7845391e6a1215351e6f883f1c0342eb368e

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+## 0.2.0 - 2020-11-07
+
+### Changed
+
+- Change required ruby version from 2.4.0 to 2.5.0.
+
+### Fixed
+
+- Fix feed URL when SCRIPT_NAME is used.
+
+## 0.1.0 - 2020-10-29
+
+### Added
+
+- 1st release.

data/README.md

@@ -17,6 +17,7 @@ And then execute:
 
 ```sh
 bundle install
+```
 
 Or install it yourself as:
 

data/lib/weneedfeed/application.rb

@@ -5,8 +5,8 @@ require 'hibana'
 module Weneedfeed
   class Application < ::Hibana::Application
     route do
-      get '/', to: ::Weneedfeed::Controllers::ShowTopPage
-      get '/feeds/:page_name.xml', to: ::Weneedfeed::Controllers::ShowFeed
+      get '/', to: ::Weneedfeed::Controllers::ShowTopPage, as: :top_page
+      get '/feeds/:page_name.xml', to: ::Weneedfeed::Controllers::ShowFeed, as: :feed
     end
 
     # @param [Hash] schema

data/lib/weneedfeed/version.rb

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

data/lib/weneedfeed/views/show_top_page.rb

@@ -8,6 +8,24 @@ module Weneedfeed
         super(**argv)
         @pages = pages
       end
+
+      private
+
+      # @return [String]
+      def base_path
+        request.path.delete_suffix(router.path(:top_page))
+      end
+
+      # @param [String] page_name
+      # @return [String]
+      def feed_path(page_name:)
+        "#{base_path}#{router.path(:feed, page_name: page_name)}"
+      end
+
+      # @return [Hanami::Router]
+      def router
+        ::Weneedfeed::Application.router
+      end
     end
   end
 end

data/templates/show_feed.xml.erb

@@ -4,8 +4,8 @@
   xmlns:content="http://purl.org/rss/1.0/modules/content/">
   <channel>
     <description></description>
-    <link><%= "#{request.base_url}#{request.script_name}" %></link>
-    <atom:link href="<%= request.base_url %>/feeds/<%= page_name %>" rel="self"/>
+    <link><%= "#{request.base_url}#{request.path}" %></link>
+    <atom:link href="<%= "#{request.base_url}#{request.path}" %>" rel="self"/>
     <title><%= @page.title %></title>
     <lastBuildDate><%= Time.now.rfc822 %></lastBuildDate>
     <% items.each do |item| %>

data/templates/show_top_page.html.erb

@@ -9,7 +9,7 @@
     <ul>
       <% @pages.each do |page_name, hash| %>
       <li>
-        <a href="/feeds/<%= page_name %>"><%= hash['title'] %></a>
+        <a href="<%= feed_path(page_name: page_name) %>"><%= hash['title'] %></a>
       </li>
       <% end %>
     </ul>

data/weneedfeed.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Generate feeds from URL and XPath.'
   spec.homepage      = 'https://github.com/r7kamura/weneedfeed'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weneedfeed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -77,6 +77,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -114,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="