jekyll-recker 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eae22b002ade0f4221755d4de3893fe42e802da54705d41887b7cc6def3f4a8
-  data.tar.gz: b76f167177035a42fb196ee51c3ca44b55ce945e11f72dd49c53340bb47b786d
+  metadata.gz: 7f3c029100fd9fc95b7f7b065e17bbb5cd2baf321fd0b3f93aeac96505e816d6
+  data.tar.gz: f66cd31401dd09fd965f34372c117dd26ab582cb8d761d5a00fa1a41352c3e31
 SHA512:
-  metadata.gz: 032c96a18fb0a1e9d83e5cf2ce84e801b8573aaa7e8eac01093cb166f74d7e751b6e72bbec8af0be0ac2d5a1d502560b9651585be4a4ea52e1f13c8e5377b23d
-  data.tar.gz: 78dd6d4ac429dc0c3edfe28fb4ef64f1ed05c678d0b82aa566f0fcdd1dce4c45351cd8334425ef68a528f1af625b0104b552204f309f18cc2b0f262e1423db30
+  metadata.gz: 2171c0a55cb2e419ae0c120880fef8e11fd4d01b554327f2adca939f8a92c5c0e0b37934acf58d64bbf276688cc7785aa4c06b46db5a224be721b71a0a3d4805
+  data.tar.gz: f07aadca9f824b3c22bcbca26c208fe29e1ffa6fee993984263456f951d861d58ec2697aed963a9bbd7924c3d8b6282ef2f6857f335ab8a343b3486fef039e88

data/lib/jekyll_recker/entry.rb

@@ -32,7 +32,7 @@ module JekyllRecker
 
     def words
       content.split.map do |token|
-        token.gsub!(/[^0-9a-z ]/i, '')
+        token.gsub!(/[^0-9a-z ']/i, '')
         token.downcase
       end
     end

data/lib/jekyll_recker/filters.rb

@@ -4,7 +4,7 @@ module JekyllRecker
   # Filters
   module Filters
     def uyd_date(date)
-      date.strftime('%A, %B %d %Y')
+      date.strftime('%A, %B %-d %Y')
     end
 
     def pretty(num)

data/lib/jekyll_recker/generators.rb

@@ -8,28 +8,41 @@ module JekyllRecker
       include Date
       include Logging
       include Math
-    end
-
-    # Stats Generator
-    class Stats < Jekyll::Generator
-      include Base
 
       attr_reader :site
 
+      def name
+        self.class.name.split('::').last.downcase
+      end
+
       def generate(site)
         @site = Site.new(site)
-        generate_stats!
         if @site.production?
-          info 'production detected. skipping graphs'
+          info "skipping #{name} generator"
         else
-          info 'generating graphs'
-          Graphs.generate_graphs(@site)
+          info "running #{name} generator"
+          data = crunch
+          File.open(data_file_target, 'w') { |f| f.write(JSON.pretty_generate(data)) } unless data.nil?
         end
       end
 
-      def generate_stats!
-        info 'calculating statistics'
-        site.data['stats'] = {
+      def data_file_target
+        File.join site.data_dir, "#{name}.json"
+      end
+    end
+
+    # Stats Generator
+    class Stats < Jekyll::Generator
+      include Base
+
+      attr_reader :site
+
+      def crunch
+        generate_stats
+      end
+
+      def generate_stats
+        {
           'total_words' => total(site.word_counts),
           'average_words' => average(site.word_counts),
           'total_posts' => site.entries.size,
@@ -51,45 +64,44 @@ module JekyllRecker
       end
 
       def swears
-        %w[
-          ass
-          asshole
-          booger
-          crap
-          damn
-          fart
-          fuck
-          hell
-          jackass
-          piss
-          poop
-          shit
-        ]
+        site.recker_config.fetch('swears', [])
       end
     end
 
-    # Image Resize Generator
-    class ImageResize < Jekyll::Generator
+    # Graphs Generator
+    class Graphs < Jekyll::Generator
       include Base
 
-      attr_reader :site
+      def crunch
+        JekyllRecker::Graphs.generate_graphs(site)
+        nil
+      end
+    end
 
-      def generate(site)
-        @site = Site.new(site)
+    # Git Generator
+    class Git < Jekyll::Generator
+      include Base
 
-        if @site.production?
-          info 'production detected, skipping images'
-          return
-        end
+      def crunch
+        {
+          'commit_count' => Shell.run('git rev-list --count master').chomp
+        }
+      end
+    end
 
-        load_deps!
+    # Image Resize Generator
+    class ImageResize < Jekyll::Generator
+      include Base
 
+      def crunch
+        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
+        nil
       end
 
       def too_big?(width, height)
@@ -101,13 +113,12 @@ module JekyllRecker
         require 'mini_magick'
       end
 
-      def graph?(file)
-        file.include?('/graphs/')
+      def images_without_graphs
+        site.images.reject { |i| i.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 = images_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

data/lib/jekyll_recker/graphs.rb

@@ -66,14 +66,18 @@ module JekyllRecker
     class Swears
       include Base
 
-      attr_reader :results
-
       def initialize(site)
-        @results = site.data['stats']['swears'].clone
-        @results.delete('total')
+        @data_dir = site.data_dir
         @graphs_dir = site.graphs_dir
       end
 
+      def results
+        path = File.join(@data_dir, 'stats.json')
+        data = JSON.parse(File.read(path))['swears']
+        data.delete('total')
+        data
+      end
+
       def write
         g = ::Gruff::Pie.new('800x600')
         g.theme = Gruff::Themes::PASTEL

data/lib/jekyll_recker/site.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'bundler'
+
 module JekyllRecker
   # Site
   class Site
@@ -15,7 +17,6 @@ module JekyllRecker
       entries.first
     end
 
-
     def production?
       ENV['JEKYLL_ENV'] == 'production'
     end
@@ -57,14 +58,18 @@ module JekyllRecker
       recker_config.fetch('graphs', 'assets/images/graphs/')
     end
 
+    def data_dir
+      File.join Bundler.root, '_data'
+    end
+
     private
 
     def build_entries
       @site.posts.docs
-        .select(&:published?)
-        .sort_by(&:date)
-        .reverse
-        .map { |p| Entry.new(p) }
+           .select(&:published?)
+           .sort_by(&:date)
+           .reverse
+           .map { |p| Entry.new(p) }
     end
   end
 end

data/lib/jekyll_recker/social.rb

@@ -46,7 +46,7 @@ module JekyllRecker
       def config_key
         self.class.const_get(:KEY)
       end
-      alias :name :config_key
+      alias name config_key
 
       def post_body
         <<~BODY
@@ -90,22 +90,29 @@ module JekyllRecker
       end
 
       def post!
-        message_body = ::Slack::Notifier::Util::LinkFormatter.format(post_body)
         workspaces.each do |key, config|
           info "posting to #{key} workspace"
           if @dry
-            puts "BEGIN MESSAGE\n#{message_body.strip}\nEND MESSAGE"
+            puts "BEGIN MESSAGE\n#{post_body.strip}\nEND MESSAGE"
           else
-            ::Slack::Notifier.new(
-              @creds[key].strip,
-              channel: config.fetch('channel'),
-              username: config.fetch('username'),
-              icon_emoji: config.fetch('emoji')
-            ).post(text: message_body)
+            post(key, config)
           end
         end
       end
 
+      def post(key, config)
+        ::Slack::Notifier.new(
+          @creds[key].strip,
+          channel: config.fetch('channel'),
+          username: config.fetch('username'),
+          icon_emoji: config.fetch('emoji')
+        ).post(text: message_body)
+      end
+
+      def post_body
+        ::Slack::Notifier::Util::LinkFormatter.format(super)
+      end
+
       private
 
       def extract_from_config(data)

data/lib/jekyll_recker/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-recker
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Alex Recker