dimples 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1fcb58443841c212bac82b1a41c55215f67bf75
-  data.tar.gz: 7523fcde7bc143b6957fc5d7cd143ed9b93fcfe3
+  metadata.gz: 2d3f5d7e758762e3cba7f8d53520a06c1a7abe3f
+  data.tar.gz: be2d879b4f1475166d56b4210f03e26afe3834e9
 SHA512:
-  metadata.gz: e17511e2db523562c9b6d7a0f5d653b396266601271d9d60bf0a273bcd1d3342e1ce9e4638357482c38836b310b3dce090617cd7ffc2b62703df324a5e0c6e95
-  data.tar.gz: 5d7bd437e97142deaf5935d4c9a9d9308ae1caf7812574e874edf1e8941f449f7c43dc4d02db02942c8ec5d62cd61f4b283731f04ac9d8d86368e175e82c9dfa
+  metadata.gz: 2eb2cd4791972d0475602e3860a8054e1ad1d554c31b8933d9551b4e5549f27de10dbdadb6cf6da19603e1c7dd4aef35781e9e6d5db2090da85a803057b9c85e
+  data.tar.gz: 0a4f49d040199d11db9b8d5a4df417db3f60cfb65786263d3265617f4f3166cde8d39885fa311ff25313442dbaf3213ec3f658fd0a7503ef4c8d05419f7e8ecf

data/lib/dimples/category.rb

@@ -15,7 +15,7 @@ module Dimples
     end
 
     def inspect
-      "#<#{self.class.to_s} @slug=#{@slug} @name=#{@name}>"
+      "#<#{self.class} @slug=#{@slug} @name=#{@name}>"
     end
   end
 end

data/lib/dimples/page.rb

@@ -50,7 +50,7 @@ module Dimples
     end
 
     def inspect
-      "#<#{self.class.to_s} @output_path=#{output_path}>"
+      "#<#{self.class} @output_path=#{output_path}>"
     end
   end
 end

data/lib/dimples/pagination.rb

@@ -6,7 +6,8 @@ module Dimples
     def paginate(site, items, path, layout, options = {})
       context = options.delete(:context) || {}
       url = path.gsub(site.output_paths[:site], '') + '/'
-      per_page = options.delete(:per_page) || site.config['pagination']['per_page']
+      per_page = options.delete(:per_page) ||
+                 site.config['pagination']['per_page']
 
       pager = Pager.new(url, items, per_page, options)
 

data/lib/dimples/post.rb

@@ -41,7 +41,7 @@ module Dimples
     end
 
     def inspect
-      "#<#{self.class.to_s} @slug=#{@slug} @output_path=#{output_path}>"
+      "#<#{self.class} @slug=#{@slug} @output_path=#{output_path}>"
     end
   end
 end

data/lib/dimples/renderable.rb

@@ -10,17 +10,7 @@ module Dimples
       context[:this] ||= self
       context[:type] ||= self.class.name.split('::').last.downcase.to_sym
 
-      scope = Object.new.tap do |s|
-        context.each_pair do |key, value|
-          s.instance_variable_set("@#{key}".to_sym, value)
-        end
-      end
-
-      scope.class.send(:define_method, :render_template) do |template, context = {}|
-        @site.templates[template].render(context) if @site.templates[template]
-      end
-
-      output = rendering_engine.render(scope) { body }.strip
+      output = rendering_engine.render(scope(context)) { body }.strip
       @rendered_contents = output
 
       if @site.templates[layout]
@@ -30,6 +20,19 @@ module Dimples
       end
     end
 
+    def scope(context)
+      Object.new.tap do |scope|
+        context.each_pair do |key, value|
+          scope.instance_variable_set("@#{key}".to_sym, value)
+        end
+
+        method_name = :render_template
+        scope.class.send(:define_method, method_name) do |template, locals = {}|
+          @site.templates[template]&.render(locals)
+        end
+      end
+    end
+
     def rendering_engine
       @rendering_engine ||= begin
         callback = proc { contents }

data/lib/dimples/site.rb

@@ -45,10 +45,7 @@ module Dimples
     end
 
     def generate
-      scan_templates
-      scan_pages
-      scan_posts
-
+      scan_files
       prepare_output_directory
 
       generate_pages unless @pages.count.zero?
@@ -70,6 +67,14 @@ module Dimples
       @errors.count.zero?
     end
 
+    def scan_files
+      Dimples.logger.debug('Scanning files...') if @config['verbose_logging']
+
+      scan_templates
+      scan_pages
+      scan_posts
+    end
+
     def scan_templates
       Dir.glob(File.join(@source_paths[:templates], '**', '*.*')).each do |path|
         template = Dimples::Template.new(self, path)
@@ -257,7 +262,7 @@ module Dimples
     end
 
     def inspect
-      "#<#{self.class.to_s} " \
+      "#<#{self.class} " \
       "@source_paths=#{@source_paths} " \
       "@output_paths=#{@output_paths}>"
     end

data/lib/dimples/template.rb

@@ -21,7 +21,7 @@ module Dimples
     end
 
     def inspect
-      "#<#{self.class.to_s} @slug=#{@slug} @path=#{@path}>"
+      "#<#{self.class} @slug=#{@slug} @path=#{@path}>"
     end
   end
 end

data/lib/dimples/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Daniel Bogan