mako_rss 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5201445c6691e5eef5f6e9a9f6c52d7689dddb49
-  data.tar.gz: 2d607663ad3e8c8c184f5b49b06e27dd5fbe8b69
+SHA256:
+  metadata.gz: 27040a76fb716e97d2216d81cb166f9b4e90751d5f985792ab0075af821dc527
+  data.tar.gz: c80796f91699d944316b97d1cabb7cd2b1c464636552c3c0cc1e59a5895c66cf
 SHA512:
-  metadata.gz: d0728dfb13977584f14c236c373fbd52a1a8a05e327344c89627e94eab4be4875bdee602c713be77373e74ed3636b58e8948b9e37301c140898745edcb341900
-  data.tar.gz: 222358f8846c88346cc4fc0ac93916a41545905e5759745e599738e0be20a10522038c6cea22c9e93427dc007683d1d1721b477c0ba537c71f33343d09b2c9b4
+  metadata.gz: aabe13cc886b462f737dac4c91ec99dd1ded263bd432da987a68aed712c754cc12b9197f3139fc6edc8f385bb69bc728bf807a315b7ef9096492f90b14f76c07
+  data.tar.gz: 7da862685afb10d8bebd45101007ec51cbf028fafac59dec2a40759950581be19eb06d5a27bff7d2308e20a4bf3b3021b4f5a66fb679d47b68eac37793c0ccd1

data/.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
 
 Layout/IndentHeredoc:
   EnforcedStyle: squiggly

data/.rubocop_todo.yml

@@ -1,38 +1,44 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-07-11 13:25:18 -0400 using RuboCop version 0.49.1.
+# on 2018-12-03 18:55:17 -0500 using RuboCop version 0.60.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
+# Offense count: 7
 Metrics/AbcSize:
-  Max: 28
+  Max: 26
 
-# Offense count: 40
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 629
-
-# Offense count: 8
-# Configuration parameters: CountComments.
+# Offense count: 11
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 25
 
 # Offense count: 1
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - 'lib/mako/core.rb'
 
-# Offense count: 25
+# Offense count: 26
 Style/Documentation:
   Enabled: false
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'lib/mako/article.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAsExpressionSeparator.
 Style/Semicolon:
   Exclude:
     - 'lib/mako/article.rb'
+
+# Offense count: 58
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 581

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.5.1
 cache: bundler
 before_install: gem install bundler -v 1.14.6
 

data/lib/mako.rb

@@ -7,7 +7,7 @@ require 'httparty'
 require 'feedjira'
 require 'nokogiri'
 require 'json'
-require 'sass'
+require 'sassc'
 
 require_relative 'mako/core_ext'
 require_relative 'mako/errors'

data/lib/mako/article.rb

@@ -36,9 +36,14 @@ module Mako
       doc = Nokogiri::HTML::DocumentFragment.parse(html)
       if Mako.config.sanitize_images
         doc.css('img').each do |n|
-          n.name = 'a'
-          n.content = n['alt'] ? "📷 #{n['alt']}" : '📷 Image'
-          n['href'] = URI.parse(n['src']).absolutize!(uri)
+          begin
+            n.name = 'a'
+            n.content = n['alt'] ? "📷 #{n['alt']}" : '📷 Image'
+            n['href'] = URI.parse(n['src']).absolutize!(uri)
+          rescue URI::InvalidURIError
+            # if there's a problem, just ignore it
+            next
+          end
         end
       end
       doc.css('h1,h2,h3,h4,h5,h6').each { |n| n.name = 'p'; n.set_attribute('class', 'bold') }

data/lib/mako/cli.rb

@@ -18,7 +18,7 @@ module Mako
       if COMMANDS.include? command
         CLI.invoke(command, argv)
       else
-        help = <<~EOS
+        help = <<~HELP
           Usage:
             mako [subcommand] [path...]
 
@@ -30,7 +30,7 @@ module Mako
 
           Options:
             --with-sass  When supplied to build, also generates CSS from SCSS files.
-        EOS
+        HELP
         Mako.logger.info help
       end
     end
@@ -43,6 +43,7 @@ module Mako
     def self.invoke(command, args = [])
       Object.const_get("Mako::#{command.capitalize}").perform(args)
       return unless Mako.errors.any?
+
       Mako.errors.messages.each do |error_msg|
         Mako.logger.warn error_msg
       end

data/lib/mako/configuration.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 module Mako
   class Configuration
-    DEFAULT_CONFIGURATION = { 'source_templates' => File.expand_path('../templates', File.dirname(__FILE__)),
+    DEFAULT_CONFIGURATION = { 'source_templates' => File.expand_path('../templates', __dir__),
                               'destination' => File.expand_path('site/', Dir.pwd),
                               'theme' => 'simple',
                               'sanitize_images' => true,

data/lib/mako/core.rb

@@ -70,6 +70,7 @@ module Mako
       requesters.each do |feed_request|
         feed_response = feed_request.fetch
         next unless feed_request.ok?
+
         constructed_feed = constructor.new(feed_data: feed_response.body,
                                            feed_url: feed_response.feed_url)
                                       .parse_and_create

data/lib/mako/feed_constructor.rb

@@ -16,6 +16,7 @@ module Mako
     def parse_and_create
       parsed_feed = parse_feed
       return false unless parsed_feed
+
       feed = create_feed(parsed_feed)
       create_articles(feed, parsed_feed)
       feed
@@ -30,7 +31,7 @@ module Mako
       Feedjira::Feed.parse(feed_data)
     rescue Feedjira::NoParserAvailable
       Mako.errors.add_error "Unable to parse #{feed_url}."
-      return false
+      false
     end
 
     # Creates new Mako::Feed object from the parsed Feedjira::Feed object
@@ -50,6 +51,7 @@ module Mako
     def create_articles(feed, parsed_feed)
       parsed_feed.entries.each do |entry|
         next unless entry.published >= (Time.now - 1.day).beginning_of_day
+
         feed.articles << Article.new(title: entry.title,
                                      published: entry.published,
                                      summary: entry_summary(entry),

data/lib/mako/feed_finder.rb

@@ -55,6 +55,7 @@ module Mako
         parsed_uri = URI.parse('http://' + uri) if parsed_uri.scheme.nil?
         request = Mako::FeedRequester.new(feed_url: parsed_uri).fetch
         next unless request.ok?
+
         if MIME_TYPES.include? request.headers['content-type'].split(';').first
           { uri: parsed_uri.to_s }
         else

data/lib/mako/feed_requester.rb

@@ -20,8 +20,8 @@ module Mako
     def fetch
       begin
         request = HTTParty.get(feed_url)
-      rescue SocketError, HTTParty::RedirectionTooDeep
-        Mako.errors.add_error "Could not complete request to #{feed_url}."
+      rescue StandardError => e
+        Mako.errors.add_error "Could not complete request to #{feed_url}: #{e.class}."
         self.ok = false
         return self
       end

data/lib/mako/html_renderer.rb

@@ -9,7 +9,7 @@ module Mako
     def initialize(args)
       @template = args.fetch(:template, File.expand_path(File.join('themes', "#{Mako.config.theme}.html.erb"), Dir.pwd))
       @bound = args.fetch(:bound)
-      @feed_template = File.expand_path('../layouts/_feed_container.html.erb', __FILE__)
+      @feed_template = File.expand_path('layouts/_feed_container.html.erb', __dir__)
     end
 
     # Wrapper for ERB renderer. Creates new ERB instance with view template

data/lib/mako/sass_renderer.rb

@@ -10,14 +10,14 @@ module Mako
       @template = args.fetch(:template, File.expand_path(File.join('themes', "#{Mako.config.theme}.scss"), Dir.pwd))
     end
 
-    # Wrapper for Sass::Engine.  Creates new Sass::Engine instance with main
+    # Wrapper for SassC::Engine.  Creates new SassC::Engine instance with main
     # Sass file and renders it.
     #
     # @return [String]
     def render
-      Sass::Engine.new(load_resource(template), syntax: :scss,
-                                                load_paths: [File.expand_path('themes/', Dir.pwd)],
-                                                style: :compressed).render
+      SassC::Engine.new(load_resource(template), syntax: :scss,
+                                                 load_paths: [File.expand_path('themes/', Dir.pwd)],
+                                                 style: :compressed).render
     end
 
     # Default file name for rendererd file.

data/lib/mako/version.rb

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

data/lib/templates/themes/sass/_code.scss

@@ -0,0 +1,14 @@
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  line-height: 1.42857;
+  word-break: break-all;
+  word-wrap: break-word;
+  border-left: .15rem solid $pd-banner;
+}
+
+code {
+  white-space: pre-wrap;
+  font-size: 90%;
+}

data/lib/templates/themes/simple.html.erb

@@ -22,7 +22,7 @@
       <% feeds.select { |f| f.articles.size.positive? }.each_with_index do |feed, index| %> 
         <section>
           <header class="article-header">
-            <h1><a href="<%= feed.url %>" id=<%= "feed-#{index}" %>><%= h(feed.title) %></a></h1>
+            <h1><a href="<%= feed.url %>" id=<%= "feed-#{index}" %>><%= feed.title %></a></h1>
           </header>
           <% feed.articles_desc.each do |article| %>
             <article>

data/lib/templates/themes/simple.scss

@@ -4,3 +4,4 @@
 @import "sass/fonts";
 @import "sass/layout";
 @import "sass/utilities";
+@import "sass/code";

data/mako_rss.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mako/version'
 
@@ -23,14 +22,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'minitest', '~> 5.1'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rubocop', '~> 0.50'
   spec.add_development_dependency 'vcr', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49'
-  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'webmock', '~> 3.1'
 
   spec.add_runtime_dependency 'feedjira', '~> 2.0'
   spec.add_runtime_dependency 'httparty', '~> 0.15'
   spec.add_runtime_dependency 'nokogiri', '~> 1.8'
-  spec.add_runtime_dependency 'sass', '~> 3.4'
+  spec.add_runtime_dependency 'sassc', '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mako_rss
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Jonathan Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.50'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: feedjira
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '2.0'
 description: 
 email:
 - jonathan.d.s.pike@gmail.com
@@ -202,6 +216,7 @@ files:
 - lib/templates/sample_subscriptions/subscriptions.json
 - lib/templates/sample_subscriptions/subscriptions.txt
 - lib/templates/sample_subscriptions/subscriptions.xml
+- lib/templates/themes/sass/_code.scss
 - lib/templates/themes/sass/_fonts.scss
 - lib/templates/themes/sass/_layout.scss
 - lib/templates/themes/sass/_reboot.scss
@@ -230,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A static site feed reader