dimples 4.3.2 → 5.0.0

data/lib/dimples/template.rb

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
 module Dimples
-  # A class that models a single template.
   class Template
     include Frontable
-    include Renderable
 
     attr_accessor :path
-    attr_accessor :title
-    attr_accessor :slug
-    attr_accessor :layout
     attr_accessor :contents
+    attr_accessor :metadata
 
     def initialize(site, path)
       @site = site
-      @slug = File.basename(path, File.extname(path))
       @path = path
+      @contents, @metadata = read_with_front_matter(path)
+    end
 
-      read_with_front_matter
+    def render(context = {}, body = nil)
+      context[:template] ||= Hashie::Mash.new(@metadata)
+      renderer.render(context, body)
     end
 
-    def inspect
-      "#<#{self.class} @slug=#{@slug} @path=#{@path}>"
+    private
+
+    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 = '4.3.2'
+  VERSION = '5.0.0'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.7
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -73,61 +93,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: little-fixtures
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '3.7'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +168,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: A very, very, very simple gem for building static websites.
+description: A simple tool for building static websites.
 email:
 - d+dimples@waferbaby.com
 executables:
@@ -170,11 +182,11 @@ files:
 - lib/dimples/configuration.rb
 - lib/dimples/errors.rb
 - lib/dimples/frontable.rb
-- lib/dimples/logger.rb
 - lib/dimples/page.rb
-- lib/dimples/pagination.rb
+- lib/dimples/pager.rb
+- lib/dimples/plugin.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
@@ -198,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A basic static site generator

data/lib/dimples/logger.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Dimples
-  # A simple Logger subclass.
-  class Logger < ::Logger
-    def initialize(*)
-      super
-      @formatter = LogFormatter
-    end
-
-    def debug_generation(type, count)
-      message = "Generating #{type} (#{count} item"
-      message += 's' if count != 1
-      message += ')...'
-
-      debug(message)
-    end
-  end
-
-  # A simple Logger formatting subclass.
-  class LogFormatter < Logger::Formatter
-    def self.call(severity, _time, _program_name, message)
-      case severity
-      when 'ERROR'
-        prefix = "\033[31mError:\033[0m "
-      when 'DEBUG'
-        prefix = "\033[93m- "
-      end
-
-      "#{prefix}#{message}\033[0m\n"
-    end
-  end
-end

data/lib/dimples/pagination.rb

@@ -1,112 +0,0 @@
-# frozen_string_literal: true
-
-module Dimples
-  # A module that supports pagination.
-  module Pagination
-    def paginate(site, items, path, layout, options = {})
-      context = options.delete(:context) || {}
-      url = path.sub(site.output_paths[:site], '') + '/'
-      per_page = options.delete(:per_page) ||
-                 site.config[:pagination][:per_page]
-
-      pager = Pager.new(url, items, per_page, options)
-
-      pager.each do |index, page_items|
-        page = Dimples::Page.new(site)
-
-        page.output_directory = if index == 1
-                                  path
-                                else
-                                  File.join(path, "page#{index}")
-                                end
-
-        page.layout = layout
-        page.title = options[:title] || site.templates[layout]&.title
-        page.extension = options[:extension] if options[:extension]
-
-        context[:items] = page_items
-        context[:pagination] = pager.to_h
-
-        page.write(context)
-      end
-    end
-
-    # A class that models the context of a single page during pagination.
-    class Pager
-      include Enumerable
-
-      attr_reader :current_page
-      attr_reader :previous_page
-      attr_reader :next_page
-      attr_reader :page_count
-      attr_reader :item_count
-
-      def initialize(url, items, per_page, options = {})
-        @url = url
-        @items = items
-        @per_page = per_page
-        @page_count = (items.length.to_f / per_page.to_i).ceil
-        @page_prefix = options[:page_prefix] || 'page'
-
-        step_to(1)
-      end
-
-      def each(&block)
-        (1..@page_count).each do |index|
-          block.yield step_to(index), items_at(index)
-        end
-      end
-
-      def step_to(page)
-        @current_page = (1..@page_count).cover?(page) ? page : 1
-        @previous_page = (@current_page - 1).positive? ? @current_page - 1 : nil
-        @next_page = @current_page + 1 <= @page_count ? @current_page + 1 : nil
-
-        @current_page
-      end
-
-      def items_at(page)
-        @items.slice((page - 1) * @per_page, @per_page)
-      end
-
-      def current_page_url
-        @current_page != 1 ? "#{@url}#{@page_prefix}#{@current_page}" : @url
-      end
-
-      def first_page_url
-        @url
-      end
-
-      def last_page_url
-        @page_count != 1 ? "#{@url}#{@page_prefix}#{@page_count}" : @url
-      end
-
-      def previous_page_url
-        return unless @previous_page
-        @previous_page != 1 ? "#{@url}#{@page_prefix}#{@previous_page}" : @url
-      end
-
-      def next_page_url
-        "#{@url}#{@page_prefix}#{@next_page}" if @next_page
-      end
-
-      def to_h
-        {
-          url: @url,
-          current_page: @current_page,
-          page_count: @page_count,
-          item_count: @items.count,
-          previous_page: @previous_page,
-          next_page: @next_page,
-          links: {
-            current_page: current_page_url,
-            first_page: first_page_url,
-            last_page: last_page_url,
-            previous_page: previous_page_url,
-            next_page: next_page_url
-          }
-        }
-      end
-    end
-  end
-end

data/lib/dimples/renderable.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Dimples
-  # A mixin class that allows a document to render via Tilt.
-  module Renderable
-    attr_accessor :rendered_contents
-
-    def render(context = {}, body = nil)
-      context[:site] ||= @site
-      context[:this] ||= self
-      context[:type] ||= self.class.name.split('::').last.downcase.to_sym
-
-      output = rendering_engine.render(scope(context)) { body }.strip
-      @rendered_contents = output
-
-      if @site.templates[layout]
-        @site.templates[layout].render(context, output)
-      else
-        output
-      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 }
-
-        if @path
-          extension = File.extname(@path)[1..-1]
-          options = @site.config[:rendering][extension.to_sym] || {}
-          Tilt.new(@path, options, &callback)
-        else
-          Tilt::StringTemplate.new(&callback)
-        end
-      end
-    end
-  end
-end