rss 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0661103c506f9158deefa370289f1f197422d06b500b92319e63d953d8243842
-  data.tar.gz: f855b9669a566ac469b85820a5bbe2ff6d60be14e72040096d997057c653e596
+  metadata.gz: 58f47515ab88a55b8a9167dba145b023e87ef01de35cbe4fa6e2f0872689325a
+  data.tar.gz: a7f2ecc1d5c444d90d62ea7ccdf249c5553cca01e0741c1a3e481d71fbd1afd7
 SHA512:
-  metadata.gz: cd38d5deb4396141f6e8a7e384cea8c3af86d7a54c42dc1e8f20d8447129c2e1f12a5fcb169d836353687ab16b6838999618f760b09f8d46246b17442977889e
-  data.tar.gz: 4cfaf4d6c6794344edee289fe73a0cc810e8a9ffe95c47f845f47a883c14dcb7ae64cdf6d4ce0a3e89bd1aa96ba8440958a4cb8294a78c648886d3e91e41a857
+  metadata.gz: f8ae8d5e4ec7ab53fda8fc389b70c36542e3e964fc341e80379c1aa9128bad3cba1d31fb45bb68a8cbf5b40e81204780b7b57124b7fd431540b3bc9989ef133a
+  data.tar.gz: 7c63fda45b9f9c8002b6c7273de075ac01ec086e2e7596dc1f3d9521910dae7259248c52162e21d57f4f07cd0a20779d8a781448a2260a3bbe4e8ffc5c07283d

data/NEWS.md

@@ -1,5 +1,59 @@
 # News
 
+## 0.3.0 - 2023-08-12
+
+### Improvements
+
+  * itunes: Added support for `<itunes:type>`.
+
+    GH-16
+
+    Patch by Luis Alfredo Lorenzo.
+
+  * itunes: Added support for `<itunes:episode>` and `<itunes:season>`.
+
+    GH-31
+
+    Patch by Daniel-Ernest Luff.
+
+  * itunes: Added support for `<itunes:title>`.
+
+    GH-44
+
+    Patch by Ryan Brunner.
+
+  * itunes: Added support for `<itunes:episodeType>`.
+
+    GH-45
+
+    Reported by Tim Uckun.
+
+### Thanks
+
+  * Luis Alfredo Lorenzo
+
+  * Daniel-Ernest Luff
+
+  * Ryan Brunner
+
+  * Tim Uckun
+
+## 0.2.9 - 2020-02-19
+
+### Improvements
+
+  * Removed needless taint check with Ruby 2.7.
+    [GitHub#7][Patch by Jeremy Evans]
+
+  * Added support for `itunes:image` in `item` element.
+    [GitHub#11][Patch by Ian McKenzie]
+
+### Thanks
+
+  * Jeremy Evans
+
+  * Ian McKenzie
+
 ## 0.2.8 - 2019-01-24
 
 ### Improvements

data/README.md

@@ -1,14 +1,14 @@
 # RSS
 
-Really Simple Syndication (RSS) is a family of formats that describe 'feeds,' specially constructed XML documents that allow an interested person to subscribe and receive updates from a particular web service. This portion of the standard library provides tooling to read and create these feeds.
+Really Simple Syndication (RSS) is a family of formats that describe _feeds_, specially constructed XML documents that allow an interested person to subscribe and receive updates from a particular web service. This portion of the standard library provides tooling to read and create these feeds.
 
 The standard library supports RSS 0.91, 1.0, 2.0, and Atom, a related format. Here are some links to the standards documents for these formats:
 
 * RSS
-  * 0.9.1[http://www.rssboard.org/rss-0-9-1-netscape]
-  * 1.0[http://web.resource.org/rss/1.0/]
-  * 2.0[http://www.rssboard.org/rss-specification]
-* Atom[http://tools.ietf.org/html/rfc4287]
+  * [0.9.1](http://www.rssboard.org/rss-0-9-1-netscape)
+  * [1.0](http://web.resource.org/rss/1.0/)
+  * [2.0](http://www.rssboard.org/rss-specification)
+* [Atom](https://tools.ietf.org/html/rfc4287)
 
 ## Installation
 
@@ -32,12 +32,12 @@ Or install it yourself as:
 
 If you'd like to read someone's RSS feed with your Ruby code, you've come to the right place. It's really easy to do this, but we'll need the help of open-uri:
 
-```
+```ruby
   require 'rss'
   require 'open-uri'
 
-  url = 'http://www.ruby-lang.org/en/feeds/news.rss'
-  open(url) do |rss|
+  url = 'https://www.ruby-lang.org/en/feeds/news.rss'
+  URI.open(url) do |rss|
     feed = RSS::Parser.parse(rss)
     puts "Title: #{feed.channel.title}"
     feed.items.each do |item|
@@ -52,17 +52,17 @@ As you can see, the workhorse is RSS::Parser#parse, which takes the source of th
 
 Producing our own RSS feeds is easy as well. Let's make a very basic feed:
 
-```
+```ruby
   require "rss"
 
   rss = RSS::Maker.make("atom") do |maker|
     maker.channel.author = "matz"
     maker.channel.updated = Time.now.to_s
-    maker.channel.about = "http://www.ruby-lang.org/en/feeds/news.rss"
+    maker.channel.about = "https://www.ruby-lang.org/en/feeds/news.rss"
     maker.channel.title = "Example Feed"
 
     maker.items.new_item do |item|
-      item.link = "http://www.ruby-lang.org/en/news/2010/12/25/ruby-1-9-2-p136-is-released/"
+      item.link = "https://www.ruby-lang.org/en/news/2010/12/25/ruby-1-9-2-p136-is-released/"
       item.title = "Ruby 1.9.2-p136 is released"
       item.updated = Time.now.to_s
     end

data/lib/rss/itunes.rb

@@ -80,6 +80,8 @@ module RSS
                      ["image", :attribute, "href"],
                      ["owner", :element],
                      ["new-feed-url"],
+                     ["type", :itunes_episode],
+                     ["title"],
                     ] + ITunesBaseModel::ELEMENT_INFOS
 
     class ITunesCategory < Element
@@ -258,7 +260,62 @@ module RSS
     end
 
     ELEMENT_INFOS = ITunesBaseModel::ELEMENT_INFOS +
-      [["duration", :element, "content"]]
+      [
+        ["duration", :element, "content"],
+        ["image", :attribute, "href"],
+        ["season", :positive_integer],
+        ["episode", :positive_integer],
+        ["episodeType", :itunes_episode_type],
+        ["title"],
+      ]
+
+    class ITunesImage < Element
+      include RSS09
+
+      @tag_name = "image"
+
+      class << self
+        def required_prefix
+          ITUNES_PREFIX
+        end
+
+        def required_uri
+          ITUNES_URI
+        end
+      end
+
+      [
+        ["href", "", true]
+      ].each do |name, uri, required|
+        install_get_attribute(name, uri, required)
+      end
+
+      def initialize(*args)
+        if Utils.element_initialize_arguments?(args)
+          super
+        else
+          super()
+          self.href = args[0]
+        end
+      end
+
+      def full_name
+        tag_name_with_prefix(ITUNES_PREFIX)
+      end
+
+      private
+      def maker_target(target)
+        if href
+          target.itunes_image {|image| image}
+        else
+          nil
+        end
+      end
+
+      def setup_maker_attributes(image)
+        image.href = href
+      end
+    end
 
     class ITunesDuration < Element
       include RSS09

data/lib/rss/maker/itunes.rb

@@ -15,6 +15,8 @@ module RSS
           def_yes_other_accessor(klass, full_name)
         when :explicit_clean_other
           def_explicit_clean_other_accessor(klass, full_name)
+        when :positive_integer, :itunes_episode, :itunes_episode_type
+          klass.def_other_element(full_name)
         when :csv
           def_csv_accessor(klass, full_name)
         when :element, :attribute
@@ -171,6 +173,18 @@ module RSS
         end
       end
 
+      class ITunesImageBase < Base
+        add_need_initialize_variable("href")
+        attr_accessor("href")
+
+        def to_feed(feed, current)
+          if @href and current.respond_to?(:itunes_image)
+            current.itunes_image ||= current.class::ITunesImage.new
+            current.itunes_image.href = @href
+          end
+        end
+      end
+
       class ITunesDurationBase < Base
         attr_reader :content
         add_need_initialize_variable("content")
@@ -237,6 +251,7 @@ module RSS
       class ItemBase
         include Maker::ITunesItemModel
         class ITunesDuration < ITunesDurationBase; end
+        class ITunesImage < ITunesImageBase; end
       end
     end
   end

data/lib/rss/parser.rb

@@ -120,7 +120,7 @@ module RSS
 
       if uri.respond_to?(:read)
         uri.read
-      elsif !rss.tainted? and File.readable?(rss)
+      elsif (RUBY_VERSION >= '2.7' || !rss.tainted?) and File.readable?(rss)
         File.open(rss) {|f| f.read}
       else
         rss

data/lib/rss/rss.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: false
+
+require "English"
+require "cgi/util"
 require "time"
 
 class Time
@@ -61,8 +64,6 @@ class Time
   end
 end
 
-
-require "English"
 require_relative "utils"
 require_relative "converter"
 require_relative "xml-stylesheet"
@@ -260,7 +261,7 @@ EOC
         end
         if content
           rv = "\#{indent}<#{elem_name}>"
-          value = html_escape(content)
+          value = CGI.escapeHTML(content.to_s)
           if need_convert
             rv << convert(value)
           else
@@ -291,7 +292,7 @@ EOC
         <<-EOC
         if @#{n}
           rv = "\#{indent}<#{elem_name}>"
-          value = html_escape(@#{n}.#{type})
+          value = CGI.escapeHTML(@#{n}.#{type}.to_s)
           if need_convert
             rv << convert(value)
           else
@@ -375,7 +376,7 @@ EOC
         module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           attr_reader(:#{attr})
           def #{attr}?
-            ExplicitCleanOther.parse(@#{attr})
+            Utils::ExplicitCleanOther.parse(@#{attr})
           end
         EOC
       end
@@ -541,7 +542,7 @@ EOC
     end
 
     def explicit_clean_other_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
         def #{name}=(value)
           value = (value ? "yes" : "no") if [true, false].include?(value)
           @#{name} = value
@@ -550,7 +551,7 @@ EOC
     end
 
     def yes_other_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
         def #{name}=(new_value)
           if [true, false].include?(new_value)
             new_value = new_value ? "yes" : "no"
@@ -561,7 +562,7 @@ EOC
     end
 
     def csv_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
         def #{name}=(new_value)
           @#{name} = Utils::CSV.parse(new_value)
         end
@@ -569,13 +570,37 @@ EOC
     end
 
     def csv_integer_writer(name, disp_name=name)
-      module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
         def #{name}=(new_value)
           @#{name} = Utils::CSV.parse(new_value) {|v| Integer(v)}
         end
       EOC
     end
 
+    def itunes_episode_writer(name, disp_name=name)
+      module_eval(<<-EOC, *get_file_and_line_from_caller(2))
+        def #{name}=(new_value)
+          if @do_validate and
+               !["episodic", "serial", nil].include?(new_value)
+            raise NotAvailableValueError.new('#{disp_name}', new_value)
+          end
+          @#{name} = new_value
+        end
+      EOC
+    end
+
+    def itunes_episode_type_writer(name, disp_name=name)
+      module_eval(<<-DEF, *get_file_and_line_from_caller(2))
+        def #{name}=(new_value)
+          if @do_validate and
+               !["Full", "Trailer", "Bonus", nil].include?(new_value)
+            raise NotAvailableValueError.new('#{disp_name}', new_value)
+          end
+          @#{name} = new_value
+        end
+      DEF
+    end
+
     def def_children_accessor(accessor_name, plural_name)
       module_eval(<<-EOC, *get_file_and_line_from_caller(2))
       def #{plural_name}
@@ -659,7 +684,6 @@ EOC
 
   class Element
     extend BaseModel
-    include Utils
     extend Utils::InheritedReader
     include SetupMaker
 
@@ -736,7 +760,7 @@ EOC
         writer_type, reader_type = type
         def_corresponded_attr_writer name, writer_type, disp_name
         def_corresponded_attr_reader name, reader_type
-        if type == :boolean and /^is/ =~ name
+        if type == :boolean and /\Ais/ =~ name
           alias_method "#{$POSTMATCH}?", name
         end
         self::GET_ATTRIBUTES << [name, uri, required, element_name]
@@ -763,9 +787,13 @@ EOC
         when :yes_other
           yes_other_writer name, disp_name
         when :csv
-          csv_writer name
+          csv_writer name, disp_name
         when :csv_integer
-          csv_integer_writer name
+          csv_integer_writer name, disp_name
+        when :itunes_episode
+          itunes_episode_writer name, disp_name
+        when :itunes_episode_type
+          itunes_episode_type_writer name, disp_name
         else
           attr_writer name
         end
@@ -1023,7 +1051,7 @@ EOC
       start_tag = ["#{indent}<#{full_name}"]
       unless attrs.empty?
         start_tag << attrs.collect do |key, value|
-          %Q[#{h key}="#{h value}"]
+          %Q[#{CGI.escapeHTML(key.to_s)}="#{CGI.escapeHTML(value.to_s)}"]
         end.join("\n#{next_indent}")
       end
       start_tag.join(" ")
@@ -1231,7 +1259,7 @@ EOC
       else
         _content = content
         _content = [_content].pack("m0") if need_base64_encode?
-        h(_content)
+        CGI.escapeHTML(_content.to_s)
       end
     end
   end

data/lib/rss/utils.rb

@@ -87,24 +87,6 @@ module RSS
       [file, line]
     end
 
-    # Takes a string +s+ with some HTML in it, and escapes '&', '"', '<' and '>', by
-    # replacing them with the appropriate entities.
-    #
-    # This method is also aliased to h, for convenience.
-    #
-    # Examples:
-    #
-    #   require 'rss/utils'
-    #
-    #   RSS::Utils.html_escape("Dungeons & Dragons")
-    #   # => "Dungeons &amp; Dragons"
-    #   RSS::Utils.h(">_>")
-    #   # => "&gt;_&gt;"
-    def html_escape(s)
-      s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
-    end
-    alias h html_escape
-
     # If +value+ is an instance of class +klass+, return it, else
     # create a new instance of +klass+ with value +value+.
     def new_with_value_if_need(klass, value)

data/lib/rss/version.rb

@@ -1,4 +1,4 @@
 module RSS
   # The current version of RSS
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/lib/rss/xml-stylesheet.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require_relative "utils"
+
+require "cgi/util"
 
 module RSS
 
@@ -24,8 +25,6 @@ module RSS
 
   class XMLStyleSheet
 
-    include Utils
-
     ATTRIBUTES = %w(href type title media charset alternate)
 
     GUESS_TABLE = {
@@ -59,7 +58,7 @@ module RSS
         rv << %Q[<?xml-stylesheet]
         ATTRIBUTES.each do |name|
           if __send__(name)
-            rv << %Q[ #{name}="#{h __send__(name)}"]
+            rv << %Q[ #{name}="#{CGI.escapeHTML(__send__(name).to_s)}"]
           end
         end
         rv << %Q[?>]

data/lib/rss/xml.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: false
-require_relative "utils"
+
+require "cgi/util"
 
 module RSS
   module XML
@@ -46,7 +47,7 @@ module RSS
       def to_s
         rv = "<#{full_name}"
         attributes.each do |key, value|
-          rv << " #{Utils.html_escape(key)}=\"#{Utils.html_escape(value)}\""
+          rv << " #{CGI.escapeHTML(key.to_s)}=\"#{CGI.escapeHTML(value.to_s)}\""
         end
         if children.empty?
           rv << "/>"

data/lib/rss.rb

@@ -79,16 +79,16 @@ end
 
 require "rss/version"
 
-require 'rss/1.0'
-require 'rss/2.0'
-require 'rss/atom'
-require 'rss/content'
-require 'rss/dublincore'
-require 'rss/image'
-require 'rss/itunes'
-require 'rss/slash'
-require 'rss/syndication'
-require 'rss/taxonomy'
-require 'rss/trackback'
+require "rss/1.0"
+require "rss/2.0"
+require "rss/atom"
+require "rss/content"
+require "rss/dublincore"
+require "rss/image"
+require "rss/itunes"
+require "rss/slash"
+require "rss/syndication"
+require "rss/taxonomy"
+require "rss/trackback"
 
 require "rss/maker"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rss
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Kouhei Sutou
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rexml
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,13 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
 - LICENSE.txt
 - NEWS.md
 - README.md
-- Rakefile
 - lib/rss.rb
 - lib/rss/0.9.rb
 - lib/rss/1.0.rb
@@ -110,12 +120,11 @@ files:
 - lib/rss/xml.rb
 - lib/rss/xmlparser.rb
 - lib/rss/xmlscanner.rb
-- rss.gemspec
 homepage: https://github.com/ruby/rss
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: Family of libraries that support various formats of XML "feeds".
 test_files: []

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-Gemfile.lock

data/.travis.yml

@@ -1,26 +0,0 @@
-notifications:
-  webhooks:
-    - https://webhook.commit-email.info/
-
-language: ruby
-matrix:
-  include:
-    - name: "2.3"
-      rvm: 2.3
-    - name: "2.4"
-      rvm: 2.4.5
-    - name: "2.5"
-      rvm: 2.5.3
-    - name: "2.6"
-      rvm: 2.6
-    - name: "trunk"
-      rvm: ruby-head
-    - name: "gem"
-      rvm: 2.6
-      install:
-        - rake install
-      script:
-        - mkdir -p tmp
-        - cd tmp
-        - cp -a ../test/ ./
-        - ../run-test.rb

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in rss.gemspec
-gemspec

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-
-desc "Run test"
-task :test do
-  ruby("run-test.rb")
-end
-
-task :default => :test

data/rss.gemspec

@@ -1,80 +0,0 @@
-begin
-  require_relative "lib/rss/version"
-rescue LoadError
-  # for Ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "rss"
-  spec.version       = RSS::VERSION
-  spec.authors       = ["Kouhei Sutou"]
-  spec.email         = ["kou@cozmixng.org"]
-
-  spec.summary       = %q{Family of libraries that support various formats of XML "feeds".}
-  spec.description   = %q{Family of libraries that support various formats of XML "feeds".}
-  spec.homepage      = "https://github.com/ruby/rss"
-  spec.license       = "BSD-2-Clause"
-
-  spec.files         = [
-    ".gitignore",
-    ".travis.yml",
-    "Gemfile",
-    "LICENSE.txt",
-    "NEWS.md",
-    "README.md",
-    "Rakefile",
-    "lib/rss.rb",
-    "lib/rss/0.9.rb",
-    "lib/rss/1.0.rb",
-    "lib/rss/2.0.rb",
-    "lib/rss/atom.rb",
-    "lib/rss/content.rb",
-    "lib/rss/content/1.0.rb",
-    "lib/rss/content/2.0.rb",
-    "lib/rss/converter.rb",
-    "lib/rss/dublincore.rb",
-    "lib/rss/dublincore/1.0.rb",
-    "lib/rss/dublincore/2.0.rb",
-    "lib/rss/dublincore/atom.rb",
-    "lib/rss/image.rb",
-    "lib/rss/itunes.rb",
-    "lib/rss/maker.rb",
-    "lib/rss/maker/0.9.rb",
-    "lib/rss/maker/1.0.rb",
-    "lib/rss/maker/2.0.rb",
-    "lib/rss/maker/atom.rb",
-    "lib/rss/maker/base.rb",
-    "lib/rss/maker/content.rb",
-    "lib/rss/maker/dublincore.rb",
-    "lib/rss/maker/entry.rb",
-    "lib/rss/maker/feed.rb",
-    "lib/rss/maker/image.rb",
-    "lib/rss/maker/itunes.rb",
-    "lib/rss/maker/slash.rb",
-    "lib/rss/maker/syndication.rb",
-    "lib/rss/maker/taxonomy.rb",
-    "lib/rss/maker/trackback.rb",
-    "lib/rss/parser.rb",
-    "lib/rss/rexmlparser.rb",
-    "lib/rss/rss.rb",
-    "lib/rss/slash.rb",
-    "lib/rss/syndication.rb",
-    "lib/rss/taxonomy.rb",
-    "lib/rss/trackback.rb",
-    "lib/rss/utils.rb",
-    "lib/rss/version.rb",
-    "lib/rss/xml-stylesheet.rb",
-    "lib/rss/xml.rb",
-    "lib/rss/xmlparser.rb",
-    "lib/rss/xmlscanner.rb",
-    "rss.gemspec",
-  ]
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit"
-end