weneedfeed 0.12.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df6dfcc585251215fe01c5a985fc9e83c7bf6e706578751e4b5f4e4a38ebc8f
-  data.tar.gz: 7287d78034b62dafabedfbfa011c0af18d2c7cf23d605d3c0b0c6dce795062eb
+  metadata.gz: 819bba3695f6ec96a66d4a2eca1521ffd70362061267ae43278bc9e2a50263f7
+  data.tar.gz: bfe94358ddedce6a9d2fc029c1cef72b7672e6dd29c1a0de7c7ad9535f9b4d74
 SHA512:
-  metadata.gz: 6baa16dd012ccdcccc2bf9173e2884295514e70eded457138d1a55f06a951572a6404bc4650268524d3ba1a1191fec00b7a1575d4b77d652753e714f2af61167
-  data.tar.gz: 10336f0bb0bbcfe115805b834be4a976ad9256a6e6a4efa54aa0a247092ec3da3ff2b3cb1e72bf260b057ea6a9d82382db508e0a420441fbb09ea32615547727
+  metadata.gz: f6cf9a9347388458458b433b0397f942b1a1db30712d5cc35155b90ef5ccda42e23eb2dcf5e264b8440fb2cec1b74ba14886718da840824da012f043a5f899fe
+  data.tar.gz: 978321586272751213ac40ad55fb4907c868e9e893985b3464be7d8d6e0f8af28242d341f35af9b4bba50708208a0fdc20904c4e00821ab10ad045b8735525f9

data/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.15.0 - 2022-04-14
+
+### Changed
+
+- Use hashed title and content as guid fallback.
+
+## 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    weneedfeed (0.12.0)
+    weneedfeed (0.15.0)
       activesupport
       addressable
       builder
@@ -10,6 +10,7 @@ PATH
       hibana (>= 0.2)
       marcel
       nokogiri
+      psych (>= 4)
       rack-capture (>= 0.4.0)
       thor
 
@@ -81,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)
@@ -122,6 +125,7 @@ GEM
       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)

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/item.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'addressable'
+require 'digest/sha1'
 require 'marcel'
 
 module Weneedfeed
@@ -50,6 +51,11 @@ module Weneedfeed
       @node.at(@description_selector)&.inner_html
     end
 
+    # @return [String]
+    def guid
+      link || hashed_title_and_description
+    end
+
     # @return [String, nil]
     def image_mime_type
       return unless image_url
@@ -77,17 +83,17 @@ module Weneedfeed
       ::Addressable::URI.join(
         @url,
         image_path_or_url
-      ).to_s
+      ).normalize.to_s
     end
 
-    # @return [String]
+    # @return [String, nil]
     def link
       return unless link_path_or_url
 
       ::Addressable::URI.join(
         @url,
         link_path_or_url
-      ).to_s
+      ).normalize.to_s
     end
 
     # @return [Nokogiri::Node, nil]
@@ -120,6 +126,13 @@ module Weneedfeed
 
     private
 
+    # @return [String]
+    def hashed_title_and_description
+      source = [title, description].join(':')
+      sha1 = ::Digest::SHA1.hexdigest(source)
+      "urn:sha1:#{sha1}"
+    end
+
     # @return [Nokogiri::Node, nil]
     def time_node
       @node.at(@time_selector)

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.12.0'
+  VERSION = '0.15.0'
 end

data/templates/show_feed.xml.erb

@@ -17,7 +17,7 @@
       <% end %>
       <description><![CDATA[<%= item.description %>]]></description>
       <content:encoded><![CDATA[<%= item.description %>]]></content:encoded>
-      <guid isPermaLink="true"><%= item.link %></guid>
+      <guid isPermaLink="true"><%= item.guid %></guid>
       <% if item.image_url %>
         <enclosure url=<%= item.image_url.encode(xml: :attr) %> length="0" type="<%= item.image_mime_type %>"/>
       <% end %>

data/weneedfeed.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   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,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: weneedfeed
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2022-04-14 00:00:00.000000000 Z
@@ -122,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
@@ -150,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - r7kamura@gmail.com
 executables:
@@ -201,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
@@ -217,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: []