dimples 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65b3390259e961fbd65ac4deee280a236440ae2f
-  data.tar.gz: ff08dd71317105a3020fe348cab53187a7cbff89
+  metadata.gz: d65b80a2178346477e6764b9427935e6efa0b29c
+  data.tar.gz: 0a0ac665aa58a094ec72e3ab88d524d0896fd348
 SHA512:
-  metadata.gz: 873f3072be0e2908e6a07f8fe68c4c304602f37f2397e8714f05ded6affb932b4741adfebe4e56dd5885194c4a744e1ff5848bc21b0f13a837038783b88233d0
-  data.tar.gz: 8fad5b09ff01ffcb3cfc7beced962a523a53abc81f3058d265bfd633f3872d4b38b70757814875cf64e1e0550e410c771bafe2fad1a211f369ace6a50bf50b79
+  metadata.gz: 45c629d7a0fc140cf20edd35ab60384edad125db510c20875dc16a6eef9ac7c6d7d300986ee70f507d618dd5544e79daa6c0bbb8507ad025cd5ac628a5ec2be0
+  data.tar.gz: 208f30c81208efb99991d78480c9e6284541a8c93ac068ec28a22a6164f60843c2d6bf5a67c8393081ebb93e8e8843e9cf6ec74950ff9a42d2bdfacf8fd43539

data/bin/dimples

@@ -60,7 +60,7 @@ if Dir.exist?(lib_path)
   end
 end
 
-site_klass = config.class_override(:site) || Dimples.Site
+site_klass = config.class_override(:site) || Dimples::Site
 site = site_klass.new(config)
 
 case command.to_sym

data/lib/dimples/renderer.rb

@@ -10,19 +10,18 @@ module Dimples
       callback = proc { @source.contents }
 
       @engine = if @source.path
-        Tilt.new(@source.path, {}, &callback)
-      else
-        Tilt::StringTemplate.new(&callback)
-      end
+                  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
+      template = @site.templates[@source.layout]
+      output = template.render(context, output) unless template.nil?
 
       output
     end
@@ -39,4 +38,4 @@ module Dimples
       end
     end
   end
-end
+end

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -145,7 +145,6 @@ files:
 - lib/dimples/logger.rb
 - lib/dimples/page.rb
 - lib/dimples/post.rb
-- lib/dimples/renderable.rb
 - lib/dimples/renderer.rb
 - lib/dimples/site.rb
 - lib/dimples/template.rb

data/lib/dimples/renderable.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Dimples
-  # A mixin class that handles rendering via a Tilt template.
-  module Renderable
-    def render(context = {}, body = nil, use_layout = true)
-      output = renderer.render(build_scope(context)) { body }.strip
-      @rendered_contents = output
-
-      if use_layout && defined?(@layout) && @site.templates[@layout]
-        output = @site.templates[@layout].render(context, output)
-      end
-
-      output
-    rescue => e
-      error_message = "Unable to render #{@path || self.class} (#{e})"
-      raise Errors::RenderingError.new, error_message
-    end
-
-    def build_scope(context)
-      context[:site] ||= @site
-      context[:this] ||= self
-      context[:type] ||= self.class.name.split('::').last.downcase.to_sym
-
-      scope = Object.new
-
-      context.each_pair do |key, value|
-        scope.instance_variable_set("@#{key}".to_sym, value)
-      end
-
-      scope
-    end
-
-    def renderer
-      callback = proc { contents }
-
-      if @path
-        extension = File.extname(@path)[1..-1]
-        options = @site.config['rendering'][extension] || {}
-
-        Tilt.new(@path, options, &callback)
-      else
-        Tilt::StringTemplate.new(&callback)
-      end
-    end
-  end
-end