jekyll-recker 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea539028f1189e2337f3303c646c14a6c479c9a8bc4345e095b4807c6cbc78f0
-  data.tar.gz: 54890ff14bc9a52cecf154b1af2f44b64a4536a19c270e7bc741bb5f8be1436f
+  metadata.gz: 7de0dd41444c7a9cec90c5dfc035b3544efc0096e2b36cab9131c50122ead0b7
+  data.tar.gz: ed2122a9180d19f534c5dded62a8abcef9b56a94aad951e63fcdd30b3cf6a22f
 SHA512:
-  metadata.gz: f7907b88a8fdf1ceb6cdc8f57042b6cc1424ff09a243f50b6790953ab591b625489e656f5ac35e63f3b2760b6ec5d5e659e0fd6ee19de3d7b3b0ef839d0cc924
-  data.tar.gz: 31a39ca124631df4a59216b7734d7f6e33419a3ebfcc717d54a6a53334c5eea44be3db6c4eca1cdecf3d361f417bb58ab1af3bb26a71f4b169b054fefb351daa
+  metadata.gz: 78c36674f14a242e76bc2c82ffa9410d70e0f5f1cc9da1bbd5a26c47a12609e583101b7876ed7d56ff8e1bb3da45cab7da207cf51d05b8651958a00acf276781
+  data.tar.gz: ba89a46a1c2c48a6484bbcfab4b3e62e34c344423c1707ccb6497c086bde93a127517b5bfbba10ba4f749cc6d78cffd6d30e048fa170a823e50c1bf7031d9cf4

data/lib/jekyll_recker/commands.rb

@@ -17,7 +17,7 @@ module JekyllRecker
       end
 
       def self.action(args, options)
-        site = Jekyll::Site.new(configuration_from_options(options))
+        site = ::Jekyll::Site.new(configuration_from_options(options))
         site.reset
         site.read
         Social.action(site, args, options)

data/lib/jekyll_recker/date.rb

@@ -17,5 +17,9 @@ module JekyllRecker
         }
       end
     end
+
+    def time_to_date(time)
+      ::Date.parse(time.strftime('%Y-%m-%d'))
+    end
   end
 end

data/lib/jekyll_recker/entry.rb

@@ -3,6 +3,9 @@
 module JekyllRecker
   # Entry
   class Entry
+    include Date
+    include Filters
+
     def initialize(doc)
       @doc = doc
     end
@@ -12,7 +15,19 @@ module JekyllRecker
     end
 
     def date
-      @date ||= ::Date.parse(@doc.date.strftime('%Y-%m-%d'))
+      @date ||= time_to_date(@doc.date)
+    end
+
+    def title
+      uyd_date(date)
+    end
+
+    def subtitle
+      @doc.data['title']
+    end
+
+    def url
+      @doc.url
     end
 
     def words

data/lib/jekyll_recker/generators.rb

@@ -1,93 +1,53 @@
 # frozen_string_literal: true
 
-require 'bundler'
-
 module JekyllRecker
   # Generators Module
   module Generators
-    # Base Generator Functions
+    # Base Generator
     module Base
       include Date
       include Logging
       include Math
-
-      def production?
-        ENV['JEKYLL_ENV'] == 'production'
-      end
-
-      def word_counts
-        @word_counts ||= bodies.map(&:split).map(&:size)
-      end
-
-      def words
-        bodies.map(&:split).flatten
-      end
-
-      def bodies
-        entries.collect(&:content)
-      end
-
-      def entries
-        @site.posts.docs.select(&:published?).sort_by(&:date).reverse
-      end
-
-      def dates
-        entries.collect(&:date).map { |t| ::Date.new(t.year, t.month, t.day) }
-      end
     end
 
     # Stats Generator
     class Stats < Jekyll::Generator
       include Base
-      include Graphs
+
+      attr_reader :site
 
       def generate(site)
-        @site = site
-        logger.info 'calculating statistics'
-        @site.data['stats'] = data
-        if production?
-          logger.info 'production detected. skipping graphs'
+        @site = Site.new(site)
+        generate_stats!
+        if @site.production?
+          info 'production detected. skipping graphs'
         else
-          require 'gruff'
-          logger.info 'generating graphs'
-          generate_graphs(entries, swear_results, graphs_dir)
+          info 'generating graphs'
+          Graphs.generate_graphs(@site)
         end
       end
 
-      def data
-        {
-          'total_words' => total(word_counts),
-          'average_words' => average(word_counts),
-          'total_posts' => entries.size,
-          'consecutive_posts' => calculate_streaks(dates).first['days'],
-          'swears' => {
-            'total' => swear_results.map(&:last).reduce(0, :+),
-            'words' => swear_results
-          }
+      def generate_stats!
+        info 'calculating statistics'
+        site.data['stats'] = {
+          'total_words' => total(site.word_counts),
+          'average_words' => average(site.word_counts),
+          'total_posts' => site.entries.size,
+          'consecutive_posts' => calculate_streaks(site.dates).first['days'],
+          'swears' => calculate_swears
         }
       end
 
       private
 
-      def swear_results
-        @swear_results ||= count_swears
-      end
-
-      def graphs_dir
-        recker = @site.config.fetch('recker', {})
-        recker.fetch('graphs', 'assets/images/graphs/')
+      def calculate_swears
+        results = Hash[count_swears]
+        results['total'] = total(results.values)
+        results
       end
 
       def count_swears
-        results = Hash.new(0)
-        bodies.map(&:split).each do |words|
-          words = words.map(&:downcase)
-          swears.each do |swear|
-            count = words.count(swear)
-            results[swear] += count
-          end
-        end
-        results.reject { |_k, v| v.zero? }.sort_by { |_k, v| -v }
+        occurences(swears, site.words).reject { |_k, v| v.zero? }.sort_by { |_k, v| -v }
       end
 
       def swears
@@ -107,6 +67,57 @@ module JekyllRecker
         ]
       end
     end
-    require 'jekyll_recker/generators/image_resize.rb'
+
+    # Image Resize Generator
+    class ImageResize < Jekyll::Generator
+      include Base
+
+      attr_reader :site
+
+      def generate(site)
+        @site = Site.new(site)
+
+        if @site.production?
+          info 'production detected, skipping images'
+          return
+        end
+
+        load_deps!
+
+        info 'checking images'
+        resizeable_images.each do |f, d|
+          info "resizing #{f} to fit #{d}"
+          image = MiniMagick::Image.new(f)
+          image.resize d
+        end
+      end
+
+      def too_big?(width, height)
+        width > 800 || height > 800
+      end
+
+      def load_deps!
+        require 'fastimage'
+        require 'mini_magick'
+      end
+
+      def graph?(file)
+        file.include?('/graphs/')
+      end
+
+      def resizeable_images
+        without_graphs = site.images.reject { |i| graph?(i) }
+        with_sizes = without_graphs.map { |f| [f, FastImage.size(f)].flatten }
+        with_sizes.select! { |f| too_big?(f[1], f[2]) }
+        with_sizes.map do |f, w, h|
+          dimensions = if w > h
+                         '800x600'
+                       else
+                         '600x800'
+                       end
+          [f, dimensions]
+        end
+      end
+    end
   end
 end

data/lib/jekyll_recker/graphs.rb

@@ -5,44 +5,55 @@ require 'bundler'
 module JekyllRecker
   # Graphs module
   module Graphs
-    def generate_graphs(posts, swears, graphs_dir)
-      WordCount.new(posts, graphs_dir).write
-      Swears.new(swears, graphs_dir).write
+    def self.generate_graphs(site)
+      require 'gruff'
+      WordCount.new(site).write
+      Swears.new(site).write
+    end
+
+    # Base Graph
+    module Base
+      attr_reader :site
+
+      def graphs_join(path)
+        File.join Bundler.root, @graphs_dir, path
+      end
     end
 
     # Word Count Graph
     class WordCount
-      def initialize(posts, graphs_dir)
-        @posts = posts[0..6].reverse
-        @graphs_dir = graphs_dir
+      include Base
+
+      def initialize(site)
+        @site = site
+        @graphs_dir = site.graphs_dir
       end
 
-      def graphs_join(path)
-        File.join Bundler.root, @graphs_dir, path
+      def posts
+        site.entries[0..6].reverse
+      end
+
+      def word_counts
+        site.word_counts[0..6].reverse
       end
 
       def title
         format = '%m/%d/%y'
-        first = @posts.first.date.strftime(format)
-        last = @posts.last.date.strftime(format)
+        first = posts.first.date.strftime(format)
+        last = posts.last.date.strftime(format)
         "Word Count: #{first} - #{last}"
       end
 
       def labels
-        Hash[@posts.each_with_index.map { |p, i| [i, p.date.strftime('%a')] }]
-      end
-
-      # TODO: copied from jekyll
-      def number_of_words(input)
-        input.split.length
+        Hash[posts.each_with_index.map { |p, i| [i, p.date.strftime('%a')] }]
       end
 
       def write
-        g = Gruff::Line.new('800x600')
+        g = ::Gruff::Line.new('800x600')
         g.theme = Gruff::Themes::PASTEL
         g.hide_legend = true
         g.labels = labels
-        g.data :words, @posts.collect(&:content).map { |c| number_of_words(c) }
+        g.data :words, word_counts
         g.title = title
         g.x_axis_label = 'Day'
         g.y_axis_label = 'Word Count'
@@ -53,20 +64,18 @@ module JekyllRecker
 
     # Swears Chart
     class Swears
-      attr_reader :results
+      include Base
 
-      def initialize(results, graphs_dir)
-        @results = results
-        @graphs_dir = graphs_dir
-      end
+      attr_reader :results
 
-      # TODO: I SUCK
-      def graphs_join(path)
-        File.join Bundler.root, @graphs_dir, path
+      def initialize(site)
+        @results = site.data['stats']['swears'].clone
+        @results.delete('total')
+        @graphs_dir = site.graphs_dir
       end
 
       def write
-        g = Gruff::Pie.new('800x600')
+        g = ::Gruff::Pie.new('800x600')
         g.theme = Gruff::Themes::PASTEL
         g.hide_legend = false
         g.legend_at_bottom = true

data/lib/jekyll_recker/logging.rb

@@ -9,11 +9,12 @@ module JekyllRecker
       base.extend(self)
     end
 
+    def info(msg)
+      Jekyll.logger.info 'jekyll-recker:', msg
+    end
+
     def logger
-      @logger ||= Logger.new(
-        STDOUT,
-        formatter: proc { |_severity, _datetime, _progname, msg| "jekyll-recker: #{msg}\n" }
-      )
+      ::Jekyll.logger
     end
   end
 end

data/lib/jekyll_recker/math.rb

@@ -11,5 +11,13 @@ module JekyllRecker
     def total(numlist)
       numlist.inject(0) { |sum, x| sum + x }
     end
+
+    def occurences(keys, targets)
+      results = Hash.new(0)
+      targets.each do |target|
+        results[target] += 1 if keys.include? target
+      end
+      results
+    end
   end
 end

data/lib/jekyll_recker/site.rb

@@ -11,14 +11,60 @@ module JekyllRecker
       @entries ||= build_entries
     end
 
+    def latest
+      entries.first
+    end
+
+
     def production?
       ENV['JEKYLL_ENV'] == 'production'
     end
 
+    def data
+      @site.data
+    end
+
+    def url
+      @site.config['url']
+    end
+
+    def word_counts
+      entries.collect(&:word_count)
+    end
+
+    def words
+      entries.collect(&:words).flatten
+    end
+
+    def dates
+      entries.collect(&:date)
+    end
+
+    def images
+      exts = ['.jpg', 'jpeg', '.png', '.svg']
+      @site.static_files.collect(&:path).select { |f| exts.include? File.extname(f) }
+    end
+
+    def recker_config
+      @site.config.fetch('recker', {})
+    end
+
+    def config
+      @site.config
+    end
+
+    def graphs_dir
+      recker_config.fetch('graphs', 'assets/images/graphs/')
+    end
+
     private
 
     def build_entries
-      @site.posts.docs.select(&:published?).sort_by(&:date).reverse.map { |p| Entry.new(p) }
+      @site.posts.docs
+        .select(&:published?)
+        .sort_by(&:date)
+        .reverse
+        .map { |p| Entry.new(p) }
     end
   end
 end

data/lib/jekyll_recker/social.rb

@@ -19,17 +19,19 @@ module JekyllRecker
     class Share
       include Logging
 
+      attr_reader :site
+
       def self.share(site, dry: false)
         backend = new(site, dry: dry)
-        logger.info "#{backend.name} - building configuration"
+        info "#{backend.name} - building configuration"
         backend.configure!
 
-        logger.info "#{backend.name} - sharing \"#{backend.latest_title}\""
+        info "#{backend.name} - sharing \"#{backend.latest_title}\""
         backend.post!
       end
 
       def initialize(site, dry: false)
-        @site = site
+        @site = Site.new(site)
         @dry = dry
       end
 
@@ -38,29 +40,28 @@ module JekyllRecker
       end
 
       def config
-        @site.config.fetch('recker', {}).fetch(config_key, {})
+        site.recker_config.fetch(config_key, {})
       end
 
       def config_key
         self.class.const_get(:KEY)
       end
-      alias name :config_key
+      alias :name :config_key
 
       def post_body
-        url = File.join @site.config['url'], latest.url
         <<~BODY
-          #{latest.data['date'].strftime('%A, %B %-d %Y')}
-          #{latest.data['title']}
-          #{url}
+          #{latest.title}
+          #{latest.subtitle}
+          #{File.join site.url, latest.url}
         BODY
       end
 
-      def latest
-        @latest ||= @site.posts.docs.last
+      def latest_title
+        latest.title
       end
 
-      def latest_title
-        latest.data['title']
+      def latest
+        site.latest
       end
 
       def configure!
@@ -91,9 +92,9 @@ module JekyllRecker
       def post!
         message_body = ::Slack::Notifier::Util::LinkFormatter.format(post_body)
         workspaces.each do |key, config|
-          logger.info "posting to #{key} workspace"
+          info "posting to #{key} workspace"
           if @dry
-            logger.info("BEGIN MESSAGE\n#{message_body.strip}\nEND MESSAGE")
+            puts "BEGIN MESSAGE\n#{message_body.strip}\nEND MESSAGE"
           else
             ::Slack::Notifier.new(
               @creds[key].strip,
@@ -139,8 +140,8 @@ module JekyllRecker
 
       def post!
         if dry?
-          logger.info('tweeting in dry mode, printing message')
-          logger.info("BEGIN TWEET\n#{post_body}END TWEET")
+          info('tweeting in dry mode, printing message')
+          puts "BEGIN TWEET\n#{post_body}END TWEET"
         else
           @client.update(post_body)
         end

data/lib/jekyll_recker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllRecker
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-recker
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Alex Recker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -37,7 +37,6 @@ files:
 - lib/jekyll_recker/entry.rb
 - lib/jekyll_recker/filters.rb
 - lib/jekyll_recker/generators.rb
-- lib/jekyll_recker/generators/image_resize.rb
 - lib/jekyll_recker/graphs.rb
 - lib/jekyll_recker/logging.rb
 - lib/jekyll_recker/math.rb

data/lib/jekyll_recker/generators/image_resize.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module JekyllRecker
-  module Generators
-    # Image Resize Generator
-    class ImageResize < Jekyll::Generator
-      include Base
-
-      def generate(site)
-        @site = site
-        if production?
-          logger.info 'production detected, skipping images'
-          return
-        else
-          logger.info 'loading image resizing deps'
-          require 'fastimage'
-          require 'mini_magick'
-        end
-        logger.info 'checking images'
-        resizeable_images.each do |f, d|
-          logger.info "resizing #{f} to fit #{d}"
-          image = MiniMagick::Image.new(f)
-          image.resize d
-        end
-      end
-
-      def image?(file)
-        ['.jpg', 'jpeg', '.png', '.svg'].include? File.extname(file)
-      end
-
-      def too_big?(width, height)
-        width > 800 || height > 800
-      end
-
-      def graph?(file)
-        file.include?('/graphs/')
-      end
-
-      def images
-        @site.static_files.collect(&:path).select { |f| image?(f) }
-      end
-
-      def resizeable_images
-        without_graphs = images.reject { |i| graph?(i) }
-        with_sizes = without_graphs.map { |f| [f, FastImage.size(f)].flatten }
-        with_sizes.select! { |f| too_big?(f[1], f[2]) }
-        with_sizes.map do |f, w, h|
-          dimensions = if w > h
-                         '800x600'
-                       else
-                         '600x800'
-                       end
-          [f, dimensions]
-        end
-      end
-    end
-  end
-end