weneedfeed 0.18.0 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15fe792e19590e141278496015fefd5f9b7b10c2fa467b2bb2d8f7b6b9206350
-  data.tar.gz: c0957471a1a209b3727a04eecec561aae7144c225b9ae469f7dfd66c9e698aa2
+  metadata.gz: d9d31309ab79323a5636742b707b64a6c89097b04a76492dab99eb0894b4194a
+  data.tar.gz: 338308559267e41142e5739d4d05829a5241939882d32768b76ff5e0f8418610
 SHA512:
-  metadata.gz: 3a52e5daab18cd4f8d5f303e6a065d0018efd23babe7b364c112bb08c488eab67e179efc5fb2037563e5d9706ec71e4992433f83cd70c0b1245ce7b54f50f145
-  data.tar.gz: a01540c21b8ddb8737b862530089df9216e6814a084a8e3c132e4b4d30c41dcd571c835c42a1d1a00c41cf39372a093f41449d028ea13282e29a0d084f2eb1ae
+  metadata.gz: f32fa9780eb02d4c3240ff9e2fa330b7b31451808ab23b23235cf1e13746922d1a022a436a5b5cb91cf1d5c50dedc7c4aa32806fad0094c0e4841db2be36ed36
+  data.tar.gz: 77c4be1a945dd40aa3d332ff7729d5540e1c29fcd701a5c317b0173c000d94be01c8d8c5349715bcf1f3c9643dc00d075c37643a676613b681dac63fc2cf0c09

data/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.19.2 - 2022-08-01
+
+### Fixed
+
+- Fix XML excape on OPML.
+
+## 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    weneedfeed (0.18.0)
+    weneedfeed (0.19.2)
       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

@@ -161,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/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/version.rb

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

data/templates/show_opml.xml.erb

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <opml version="1.0">
   <head>
-    <title><%= @schema.title %></title>
+    <title><%= @schema.title.encode(xml: :text) %></title>
   </head>
   <body>
-    <outline text="<%= @schema.title %>" title="<%= @schema.title %>">
+    <outline text=<%= @schema.title.encode(xml: :attr) %> title=<%= @schema.title.encode(xml: :attr) %>>
       <% 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 %>"/>
+        <outline type="rss" attr=<%= page_schema.title.encode(xml: :attr) %> title=<%= page_schema.title.encode(xml: :attr) %> xmlUrl="<%= "#{request.base_url}#{feed_path(page_id: page_schema.id)}" %>" htmlUrl="<%= page_schema.url %>"/>
       <% end %>
     </outline>
   </body>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weneedfeed
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-16 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.