mako_rss 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290598ad944edc63e67424f6a7fe9000eef34764
-  data.tar.gz: 4549a791353d7f41cff731aef8c8b4ded2a65d96
+  metadata.gz: 36e2ef1d6c047979056ee71f1bc6b1b60ad42f8c
+  data.tar.gz: da1e7fc95881733c0263c3f9a5e0bb9cdba579de
 SHA512:
-  metadata.gz: d512d6f6a001ddb3125370831fd69796b32ad69d28fb2ad6306e8f9fb6a5e294a04643fa8b22837e6674775528239825f5c553c2206f4e2f6c6dd7e4a143f5b2
-  data.tar.gz: 03b3a7d9f2aae435f16dff3d93ccb1a223cfee968b61e8dee27f191b71d6457846e54da565ef142982efd8c89bebca2a86f05984a8680b4a1a9d48b04568d340
+  metadata.gz: c171053333bb66e7781ecac1e3239447fa896358002eeae728f92608a9e4c62fa4f72cebd29855fecf1845d45e0770d9bc49438b141ddba6f954338e65080548
+  data.tar.gz: bd83759022b68479a87eed75d5bb662af64f2c154e3fb6469d526fdce5e8b615bec48bf7351d2dd6382798d6516c16e8f12f6692ec9822fd669a3b9927563947

data/lib/mako/article.rb

@@ -2,13 +2,13 @@
 
 module Mako
   class Article
-    attr_reader :title, :published, :summary, :url
+    attr_reader :title, :published, :summary, :uri
 
     def initialize(args)
       @title = args.fetch(:title, '')
       @published = args.fetch(:published)
+      @uri = URI.parse(args.fetch(:url))
       @summary = sanitize(args.fetch(:summary))
-      @url = args.fetch(:url)
     end
 
     # Converts published Time object to formatted string
@@ -18,17 +18,29 @@ module Mako
       @published.strftime('%A, %d %B %Y at %I:%M %P')
     end
 
+    # Converts URI object into string
+    #
+    # @return [String]
+    def url
+      uri.to_s
+    end
+
     private
 
-    # @private
-    # Removes img tags (if configured) and transforms h1 tags into
-    # p tags with the class bold
+    # Transforms img tags into a tags (if configured) and transforms h1 tags
+    # into p tags with the class bold
     #
     # @param [String] html an html document string
     # @return [String] a sanitized html document string
     def sanitize(html)
       doc = Nokogiri::HTML::DocumentFragment.parse(html)
-      doc.css('img').each(&:remove) if Mako.config.sanitize_images
+      if Mako.config.sanitize_images
+        doc.css('img').each do |n|
+          n.name = 'a'
+          n.content = "📷 #{n['alt']}" || '📷 Image'
+          n['href'] = URI.parse(n['src']).absolutize!(uri)
+        end
+      end
       doc.css('h1,h2,h3,h4,h5,h6').each { |n| n.name = 'p'; n.set_attribute('class', 'bold') }
       doc.to_s
     end

data/lib/mako/commands/subscribe.rb

@@ -9,6 +9,7 @@ module Mako
       end
       feeds = Mako::FeedFinder.new(uris: args).find
       write_to_subscriptions(feeds)
+      Mako.logger.info "Subscribed to the following feeds: #{feeds}"
     end
 
     def self.write_to_subscriptions(feed_urls)

data/lib/mako/core.rb

@@ -49,7 +49,6 @@ module Mako
 
     private
 
-    # @private
     # Prints configuration file, source, and destination directory to STDOUT.
     def log_configuration_information
       Mako.logger.info "Configuration File: #{Mako.config.config_file}"

data/lib/mako/core_ext/uri.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module URI
+  class Generic
+    # Compares parsed URI with a base URI and adds the host section, if needed
+    #
+    # @param base_uri [URI]
+    def absolutize!(base_uri)
+      base_uri.host == host ? to_s : base_uri.merge(self).to_s
+    end
+  end
+end

data/lib/mako/core_ext.rb

@@ -2,3 +2,4 @@
 
 require_relative 'core_ext/numeric'
 require_relative 'core_ext/time'
+require_relative 'core_ext/uri'

data/lib/mako/feed_constructor.rb

@@ -23,7 +23,6 @@ module Mako
 
     private
 
-    # @private
     # Takes raw XML and parses it into a Feedjira::Feed object
     #
     # @return [Feedjira::Feed]

data/lib/mako/feed_finder.rb

@@ -30,21 +30,19 @@ module Mako
         else
           html = Nokogiri::HTML(request[:body])
           potential_feed_uris = html.xpath(XPATHS.detect { |path| !html.xpath(path).empty? })
-          next if potential_feed_uris.empty?
+          if potential_feed_uris.empty?
+            Mako.errors.add_error "Could not find feed for #{request[:uri]}"
+            next
+          end
           uri_string = potential_feed_uris.first.value
           feed_uri = URI.parse(uri_string)
-          if request[:uri].host == feed_uri.host
-            feed_uri.to_s
-          else
-            request[:uri].merge(feed_uri).to_s
-          end
+          feed_uri.absolutize!(request[:uri])
         end
       end.compact
     end
 
     private
 
-    # @private
     # Make requests for each URI passed in and return an array of hashes
     # with either just the URI (in the case that the URI passed in was already
     # a feed URI), or the URI and the response body.

data/lib/mako/subscription_list_writer.rb

@@ -22,7 +22,6 @@ module Mako
 
     private
 
-    # @private
     # Returns the rendered string for the correct file type.
     #
     # @return [String]

data/lib/mako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mako
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mako_rss
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jonathan Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,6 +181,7 @@ files:
 - lib/mako/core_ext.rb
 - lib/mako/core_ext/numeric.rb
 - lib/mako/core_ext/time.rb
+- lib/mako/core_ext/uri.rb
 - lib/mako/errors.rb
 - lib/mako/feed.rb
 - lib/mako/feed_constructor.rb