weneedfeed 0.17.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a85470ed37f8724012951976f2dbe1286d5b82dabace4e9c830e6104051129
-  data.tar.gz: 980537323111e8ebafd1d0f8496dd45edaf21be74a26aba78aa8f8439e28546d
+  metadata.gz: 46e0612e810a86e2c8019c59d8d3d50aa2780032b7645f310cc4650d19ccffd1
+  data.tar.gz: 4c73b18a0bdc400c842f47096087a4c865e5806c16204c543305d3b746c23d29
 SHA512:
-  metadata.gz: 040be9432bb6892d33cae5f8ddc4fd2e228b028fe6e9706fbb86cf58eaf97cef5bb005353a91dda4c972fba17319428b654dab6c6d9bd0ad90b3127cc4583911
-  data.tar.gz: c386bd0eb5fa38abda0f7e5006f90b6e77c803a9b5b2a6f5becf5ea1aa89c945ed6d07daeb1021187a5dd428eb9fd0b474d1495a34b454c0b616e50378484700
+  metadata.gz: e12e2d7e233db01aff6095e2120d88a0e24eadf205442985b1d404f83f2bf0a17a907e121da3f9771db6b4ebd0685f858aa1d5c670158e77a71fc6fe0b77570e
+  data.tar.gz: ae98d953a2f8f5007f453029bd465727794a20a19e8ac01b0ea9c8e6b4a167a101709ecce516a56c76d62d05638521ca56796f92579544aa3d64b769c48ca68e

data/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.19.1 - 2022-08-01
+
+### Fixed
+
+- Fix bug when time item includes white spaces.
+
+## 0.19.0 - 2022-08-01
+
+### Added
+
+- Support %m月%d日配信 date format
+
+## 0.18.0 - 2022-04-17
+
+### Added
+
+- Support configurable feeds title.
+- Add --port= option to server command.
+
 ## 0.17.0 - 2022-04-15
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    weneedfeed (0.17.0)
+    weneedfeed (0.19.1)
       activesupport
       addressable
       builder
@@ -17,7 +17,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -46,8 +46,8 @@ GEM
     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)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -55,34 +55,34 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    hanami-router (2.0.0.alpha5)
+    hanami-router (2.0.0.beta1)
       mustermann (~> 1.0)
       mustermann-contrib (~> 1.0)
       rack (~> 2.0)
-    hansi (0.2.0)
+    hansi (0.2.1)
     hashdiff (1.0.1)
     hibana (0.2.0)
       hanami-router (>= 2.0.0.alpha3)
       rack
       tilt
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     marcel (1.0.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    multipart-post (2.1.1)
-    mustermann (1.1.1)
+    minitest (5.16.2)
+    multipart-post (2.2.3)
+    mustermann (1.1.2)
       ruby2_keywords (~> 0.0.1)
-    mustermann-contrib (1.1.1)
+    mustermann-contrib (1.1.2)
       hansi (~> 0.2.0)
-      mustermann (= 1.1.1)
-    nokogiri (1.13.4)
+      mustermann (= 1.1.2)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
-    psych (4.0.3)
+    psych (4.0.4)
       stringio
     public_suffix (4.0.7)
     racc (1.6.0)
@@ -125,10 +125,10 @@ GEM
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    stringio (3.0.1)
+    stringio (3.0.2)
     thor (1.2.1)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
+    tilt (2.0.11)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     webmock (3.14.0)

data/README.md

@@ -32,6 +32,8 @@ Weneedfeed requires `weneedfeed.yml` that describes URLs and selectors.
 ### Example
 
 ```yaml
+title: Example RSS feeds
+
 pages:
   - id: example1
     title: Example 1
@@ -55,70 +57,75 @@ pages:
     item_title_selector: .//p[2]
 ```
 
-### `id`
+### `title`
+
+- optional (default: `"Weneedfeed"`)
+- Used for feeds title on top page and OPML outline.
+
+### `pages.id`
 
 Feed ID.
 
 - required
 - Used for feed URL and `<link>` element in `<channel>` element.
 
-### `title`
+### `pages.title`
 
 Feed title.
 
 - required
 - Used for RSS `<title>` element in `<channel>` element.
 
-### `description`
+### `pages.description`
 
 Feed description.
 
 - optional
 - Used for RSS `<description>` element in `<channel>` element.
 
-### `url`
+### `pages.url`
 
 HTML source URL.
 
 - required
 - Used to fetch HTML page for building feed.
 
-### `item_selector`
+### `pages.item_selector`
 
 CSS or XPath selector to search each item.
 
 - required
 - Equivalent unit to RSS `<item>` element.
 
-### `item_link_selector`
+### `pages.item_link_selector`
 
 CSS or XPath selector to find `<a>` element in each item.
 
 - required
 - Used for `<link>` in `<item>`.
 
-### `item_title_selector`
+### `pages.item_title_selector`
 
 CSS or XPath selector to find element with title information in each item.
 
 - required
 - Used for `<title>` in `<item>`.
 
-### `item_description_selector`
+### `pages.item_description_selector`
 
 CSS or XPath selector to find element with description information in each item.
 
 - optional
 - Used for `<description>` in `<item>`.
 
-### `item_image_selector`
+### `pages.item_image_selector`
 
 CSS or XPath selector to find `<img>`element in each item.
 
 - optional
 - Used for `<enclosure>` in `<item>`.
 
-### `item_time_selector`
+### `pages.item_time_selector`
 
 CSS or XPath selector to find element with datetime information in each item.
 
@@ -154,6 +161,8 @@ Usage:
 Options:
   [--schema-path=SCHEMA_PATH]  # Path to weneedfeed YAML schema file.
                                # Default: weneedfeed.yml
+  [--port=PORT]                # TCP port to bind to.
+                               # Default: 8080
 
 Run HTTP server.
 ```

data/lib/weneedfeed/command.rb

@@ -53,9 +53,16 @@ module Weneedfeed
       type: :string
     )
 
+    method_option(
+      :port,
+      default: '8080',
+      desc: 'TCP port to bind to.',
+      type: :string
+    )
+
     def server
       application = Weneedfeed::Application.new(schema_path: options[:schema_path])
-      ::Rack::Handler.default.run(application)
+      ::Rack::Handler.default.run(application, Port: options[:port])
     end
   end
 end

data/lib/weneedfeed/controllers/show_opml.rb

@@ -7,12 +7,12 @@ module Weneedfeed
         response.content_type = 'application/xml; charset=utf-8'
         response.write(
           ::Weneedfeed::Views::ShowOpml.new(
-            page_schemata: schema.page_schemata.sort_by(&:title),
             partial_template_path: ::File.expand_path(
               'templates/show_opml.xml.erb',
               "#{__dir__}/../../.."
             ),
-            request: request
+            request: request,
+            schema: schema
           ).to_s
         )
       end

data/lib/weneedfeed/controllers/show_top_page.rb

@@ -4,16 +4,15 @@ module Weneedfeed
   module Controllers
     class ShowTopPage < ::Weneedfeed::Controllers::Base
       def call
-        page_schemata = schema.page_schemata.sort_by(&:title)
         response.content_type = 'text/html'
         response.write(
           ::Weneedfeed::Views::ShowTopPage.new(
-            page_schemata: page_schemata,
             partial_template_path: ::File.expand_path(
               'templates/show_top_page.html.erb',
               "#{__dir__}/../../.."
             ),
-            request: request
+            request: request,
+            schema: schema
           ).to_s
         )
       end

data/lib/weneedfeed/item.rb

@@ -10,11 +10,17 @@ module Weneedfeed
       # @param [String] string
       # @return [Time, nil]
       def parse_time(string)
-        ::Time.parse(string)
-      rescue ArgumentError, RangeError
+        ::Time.strptime(string, '%Y年%m月%d日')
+      rescue ::ArgumentError
         begin
-          ::Time.strptime(string, '%Y年%m月%d日')
+          time = ::Time.strptime(string, '%m月%d日')
+          time -= 60 * 60 * 24 * 365 if time > Time.now
+          time
         rescue ArgumentError
+          begin
+            ::Time.parse(string)
+          rescue ArgumentError, RangeError
+          end
         end
       end
     end
@@ -143,7 +149,7 @@ module Weneedfeed
       node = time_node
       return unless node
 
-      node['datetime'] || node.inner_text
+      node['datetime'] || node.inner_text&.strip
     end
   end
 end

data/lib/weneedfeed/schema.rb

@@ -4,6 +4,8 @@ require 'yaml'
 
 module Weneedfeed
   class Schema
+    DEFAULT_TITLE = 'Weneedfeed'
+
     class << self
       # @param [String] schema_path
       # @return [Weneedfeed::Schema]
@@ -48,5 +50,10 @@ module Weneedfeed
         )
       end
     end
+
+    # @return [String]
+    def title
+      @raw['title'] || DEFAULT_TITLE
+    end
   end
 end

data/lib/weneedfeed/version.rb

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

data/lib/weneedfeed/views/show_opml.rb

@@ -3,10 +3,10 @@
 module Weneedfeed
   module Views
     class ShowOpml < Base
-      # @param [Array<Hash>] page_schemata
-      def initialize(page_schemata:, **argv)
+      # @param [Weneedfeed::Schema] schema
+      def initialize(schema:, **argv)
         super(**argv)
-        @page_schemata = page_schemata
+        @schema = schema
       end
 
       private
@@ -21,6 +21,11 @@ module Weneedfeed
       def feed_path(page_id:)
         "#{base_path}#{router.path(:feed, page_id: page_id)}"
       end
+
+      # @return [Array<String>]
+      def page_schemata
+        @schema.page_schemata.sort_by(&:title)
+      end
     end
   end
 end

data/lib/weneedfeed/views/show_top_page.rb

@@ -3,10 +3,10 @@
 module Weneedfeed
   module Views
     class ShowTopPage < Base
-      # @param [Array<Hash>] page_schemata
-      def initialize(page_schemata:, **argv)
+      # @param [Weneedfeed::Schema] schema
+      def initialize(schema:, **argv)
         super(**argv)
-        @page_schemata = page_schemata
+        @schema = schema
       end
 
       private
@@ -27,6 +27,11 @@ module Weneedfeed
         "#{base_path}#{router.path(:opml)}"
       end
 
+      # @return [Array<String>]
+      def page_schemata
+        @schema.page_schemata.sort_by(&:title)
+      end
+
       # @return [Hanami::Router]
       def router
         ::Weneedfeed::Application.router

data/templates/show_opml.xml.erb

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <opml version="1.0">
   <head>
-    <title>Weneedfeed</title>
+    <title><%= @schema.title %></title>
   </head>
   <body>
-    <outline text="Weneedfeed" title="Weneedfeed">
-      <% @page_schemata.each do |page_schema| %>
+    <outline text="<%= @schema.title %>" title="<%= @schema.title %>">
+      <% page_schemata.each do |page_schema| %>
         <outline type="rss" text="<%= page_schema.title %>" title="<%= page_schema.title %>" xmlUrl="<%= "#{request.base_url}#{feed_path(page_id: page_schema.id)}" %>" htmlUrl="<%= page_schema.url %>"/>
       <% end %>
     </outline>

data/templates/show_top_page.html.erb

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width">
-    <title>Weneedfeed</title>
+    <title><%= @schema.title %></title>
   </head>
   <body>
     <section>
@@ -11,7 +11,7 @@
         <h1>Feeds</h1>
       </header>
       <ul>
-        <% @page_schemata.each do |page_schema| %>
+        <% page_schemata.each do |page_schema| %>
         <li>
           <a href="<%= feed_path(page_id: page_schema.id) %>"><%= page_schema.title %></a>
         </li>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weneedfeed
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Generate feeds from URL and selectors.