dimples 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e5f03c50fe8926f6f855a323f979cbbb6f1d229
-  data.tar.gz: d7787365993d7c243af27c594378f3600d42fdbd
+  metadata.gz: 65b3390259e961fbd65ac4deee280a236440ae2f
+  data.tar.gz: ff08dd71317105a3020fe348cab53187a7cbff89
 SHA512:
-  metadata.gz: 030acdc4c08d8a860a6f593951434da2ab9ffbc4cc3bd678efca07ccf994251b0c33edc30b8a42631656a14e0516709f10bf20712c75b47f998a294352fe42ab
-  data.tar.gz: e7e446e86609c455a65ec55ac08fac9e21a577b3940662e1df7b6b4963c8ec7f369d5598550c864b181d2a1870d6189b3909389d3b9c4fed406a26cd8e418be1
+  metadata.gz: 873f3072be0e2908e6a07f8fe68c4c304602f37f2397e8714f05ded6affb932b4741adfebe4e56dd5885194c4a744e1ff5848bc21b0f13a837038783b88233d0
+  data.tar.gz: 8fad5b09ff01ffcb3cfc7beced962a523a53abc81f3058d265bfd633f3872d4b38b70757814875cf64e1e0550e410c771bafe2fad1a211f369ace6a50bf50b79

data/lib/dimples.rb

@@ -12,13 +12,12 @@ require 'dimples/errors'
 require 'dimples/logger'
 
 require 'dimples/frontable'
-require 'dimples/writeable'
-require 'dimples/renderable'
 
 require 'dimples/category'
 require 'dimples/configuration'
 require 'dimples/page'
 require 'dimples/post'
+require 'dimples/renderer'
 require 'dimples/site'
 require 'dimples/template'
 

data/lib/dimples/page.rb

@@ -4,12 +4,9 @@ module Dimples
   # A class that models a single site page.
   class Page
     include Frontable
-    include Writeable
-    include Renderable
 
     attr_accessor :path
     attr_accessor :title
-    attr_accessor :template
     attr_accessor :filename
     attr_accessor :extension
     attr_accessor :layout
@@ -41,5 +38,27 @@ module Dimples
 
       File.join(parts)
     end
+
+    def render(context = {})
+      renderer.render(context)
+    end
+
+    def renderer
+      @renderer ||= Renderer.new(@site, self)
+    end
+
+    def write(path, context = {})
+      output = context ? render(context) : contents
+      parent_path = File.dirname(path)
+
+      FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
+
+      File.open(path, 'w+') do |file|
+        file.write(output)
+      end
+    rescue SystemCallError => e
+      error_message = "Failed to write #{path} (#{e.message})"
+      raise Errors::PublishingError, error_message
+    end
   end
 end

data/lib/dimples/post.rb

@@ -2,24 +2,12 @@
 
 module Dimples
   # A class that models a single site post.
-  class Post
-    include Frontable
-    include Writeable
-    include Renderable
-
-    attr_accessor :path
-    attr_accessor :title
+  class Post < Page
     attr_accessor :categories
-    attr_accessor :template
-    attr_accessor :filename
-    attr_accessor :extension
-    attr_accessor :layout
-    attr_accessor :contents
     attr_accessor :slug
     attr_accessor :year
     attr_accessor :month
     attr_accessor :day
-    attr_accessor :rendered_contents
     attr_accessor :previous_post
     attr_accessor :next_post
     attr_reader :date
@@ -27,18 +15,15 @@ module Dimples
     FILENAME_DATE = /(\d{4})-(\d{2})-(\d{2})-(.+)/
 
     def initialize(site, path)
-      @site = site
-      @path = path
-      @filename = 'index'
-      @extension = 'html'
+      super(site, path)
 
       parts = File.basename(path, File.extname(path)).match(FILENAME_DATE)
 
+      @filename = 'index'
       @slug = parts[4]
-      self.date = Time.mktime(parts[1], parts[2], parts[3])
-
       @layout = @site.config['layouts']['post']
-      @contents = read_with_front_matter(path)
+
+      self.date = Time.mktime(parts[1], parts[2], parts[3])
     end
 
     def date=(date)
@@ -50,7 +35,7 @@ module Dimples
     end
 
     def output_path(parent_path)
-      parent_path = @date.strftime(parent_path) if parent_path =~ /%/
+      parent_path = @date.strftime(parent_path) if parent_path.match?(/%/)
       File.join([parent_path, @slug.to_s, "#{@filename}.#{@extension}"])
     end
   end

data/lib/dimples/renderer.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Dimples
+  # A class that renders the contents of a document into markup.
+  class Renderer
+    def initialize(site, source)
+      @site = site
+      @source = source
+
+      callback = proc { @source.contents }
+
+      @engine = if @source.path
+        Tilt.new(@source.path, {}, &callback)
+      else
+        Tilt::StringTemplate.new(&callback)
+      end
+    end
+
+    def render(context = {}, body = nil)
+      output = @engine.render(scope(context)) { body }.strip
+      @source.rendered_contents = output
+
+      if template = @site.templates[@source.layout]
+        output = template.render(context, output)
+      end
+
+      output
+    end
+
+    def scope(context = {})
+      context[:site] ||= @site
+      context[:this] ||= @source
+      context[:type] ||= @source.class.name.split('::').last.downcase.to_sym
+
+      Object.new.tap do |scope|
+        context.each_pair do |key, value|
+          scope.instance_variable_set("@#{key}".to_sym, value)
+        end
+      end
+    end
+  end
+end

data/lib/dimples/site.rb

@@ -35,6 +35,23 @@ module Dimples
       set_output_paths
     end
 
+    def generate
+      prepare_output_directory
+      scan_files
+      generate_files
+      copy_assets
+    rescue Errors::RenderingError,
+           Errors::PublishingError,
+           Errors::GenerationError => e
+      @errors << e.message
+    end
+
+    def generated?
+      @errors.count.zero?
+    end
+
+    private
+
     def set_source_paths
       @source_paths = {
         root: File.expand_path(@config['source_path'])
@@ -56,23 +73,6 @@ module Dimples
       end
     end
 
-    def generate
-      prepare_output_directory
-      scan_files
-      generate_files
-      copy_assets
-    rescue Errors::RenderingError,
-           Errors::PublishingError,
-           Errors::GenerationError => e
-      @errors << e.message
-    end
-
-    def generated?
-      @errors.count.zero?
-    end
-
-    private
-
     def prepare_output_directory
       if Dir.exist?(@output_paths[:site])
         FileUtils.remove_dir(@output_paths[:site])
@@ -136,11 +136,9 @@ module Dimples
 
     def scan_post(path)
       @post_class.new(self, path).tap do |post|
-        unless post.categories.nil?
-          post.categories.each do |slug|
-            @categories[slug] ||= Dimples::Category.new(self, slug)
-            @categories[slug].posts << post
-          end
+        post.categories&.each do |slug|
+          @categories[slug] ||= Dimples::Category.new(self, slug)
+          @categories[slug].posts << post
         end
 
         add_post_to_archives(post)
@@ -337,7 +335,7 @@ module Dimples
         url: url
       }
 
-      if (index - 1) > 0
+      if (index - 1).positive?
         pagination[:previous_page] = index - 1
         pagination[:previous_page_url] = url
 

data/lib/dimples/template.rb

@@ -4,11 +4,11 @@ module Dimples
   # A class that models a single template.
   class Template
     include Frontable
-    include Renderable
 
-    attr_accessor :slug
-    attr_accessor :title
     attr_accessor :path
+    attr_accessor :title
+    attr_accessor :slug
+    attr_accessor :layout
     attr_accessor :contents
     attr_accessor :rendered_contents
 
@@ -19,5 +19,13 @@ module Dimples
 
       @contents = read_with_front_matter(path)
     end
+
+    def render(context = {}, body = nil)
+      renderer.render(context, body)
+    end
+
+    def renderer
+      @renderer ||= Renderer.new(@site, self)
+    end
   end
 end

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '2.6.2'.freeze
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -146,10 +146,10 @@ files:
 - lib/dimples/page.rb
 - lib/dimples/post.rb
 - lib/dimples/renderable.rb
+- lib/dimples/renderer.rb
 - lib/dimples/site.rb
 - lib/dimples/template.rb
 - lib/dimples/version.rb
-- lib/dimples/writeable.rb
 homepage: http://github.com/waferbaby/dimples
 licenses:
 - MIT

data/lib/dimples/writeable.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Dimples
-  # A mixin class that neatly handles writing out a file.
-  module Writeable
-    def write(path, context = {})
-      output = context ? render(context) : contents
-      parent_path = File.dirname(path)
-
-      FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
-
-      File.open(path, 'w+') do |file|
-        file.write(output)
-      end
-    rescue SystemCallError => e
-      error_message = "Failed to write #{path} (#{e.message})"
-      raise Errors::PublishingError, error_message
-    end
-  end
-end