dimples 1.7 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2195d33c5db58576e330e294263c8e0372b5751b
-  data.tar.gz: 8395118f614c8e2e72a31f43cb57717ca8d79c8d
+  metadata.gz: 005ba579c9f57984364c6a1a16be1ba7d5da3225
+  data.tar.gz: 46eb5a741462c4b9148926cc737e1340214ce9f4
 SHA512:
-  metadata.gz: f4b5a24e2576217a18ab9cb26c060fdf9775e6b73f6302a008df047b9d4b6ed1960b6221cada8cbcdd5f76d5e6a8e0e1aece6b410981614e2c3c63680d20d938
-  data.tar.gz: dc5359f9081e0628ee56902834bd38f9717112c72d41622a9f0d7b9961795624beb728a9ea80595f3c61d4d91866e0b1781b21f88b025d0249744039e55a4fb9
+  metadata.gz: a62e3eade61a897926ffd222adff17f2488bbd7ac7209027c9501ff5a8eab1682a2dd4040d6c16d3719a026908dabd15e96bacf5d72fe073cdb3d7f94cc4e130
+  data.tar.gz: 37440b46a3359a99046ade561b26f94b62e3780e195a7704f621c21635397a3b74fc8f62c68b36c44f58a3a643de510954f4d30f72691762af22682c6b183ac1

data/lib/dimples.rb

@@ -14,4 +14,4 @@ require 'dimples/configuration'
 require 'dimples/page'
 require 'dimples/post'
 require 'dimples/site'
-require 'dimples/template'
+require 'dimples/template'

data/lib/dimples/configuration.rb

@@ -3,15 +3,11 @@ module Dimples
     def initialize(config = {})
       @settings = Dimples::Configuration.default_settings
 
-      if config
-        @settings.each_key do |key|
-          if config.key?(key)
-            if @settings[key].is_a?(Hash)
-              @settings[key].merge!(config[key])
-            else
-              @settings[key] = config[key]
-            end
-          end
+      config.each_key do |key|
+        if @settings[key].is_a?(Hash)
+          @settings[key].merge!(config[key])
+        else
+          @settings[key] = config[key]
         end
       end
     end
@@ -26,53 +22,68 @@ module Dimples
       {
         'source_path' => current_path,
         'destination_path' => File.join(current_path, 'site'),
+        'rendering' => {},
+        'category_names' => {},
+        'paths' => default_paths,
+        'layouts' => default_layouts,
+        'pagination' => default_pagination,
+        'generation' => default_generation,
+        'file_extensions' => default_file_extensions,
+        'date_formats' => default_date_formats
+      }
+    end
 
-        'paths' => {
-          'archives' => 'archives',
-          'posts' => 'archives/%Y/%m/%d',
-          'categories' => 'archives/categories'
-        },
-
-        'layouts' => {
-          'posts' => 'posts',
-          'post' => 'post',
-          'category' => 'category',
-          'year_archives' => 'year_archives',
-          'month_archives' => 'month_archives',
-          'day_archives' => 'day_archives'
-        },
-
-        'rendering' => {
-        },
+    def self.default_layouts
+      {
+        'posts' => 'posts',
+        'post' => 'post',
+        'category' => 'category',
+        'year_archives' => 'year_archives',
+        'month_archives' => 'month_archives',
+        'day_archives' => 'day_archives'
+      }
+    end
 
-        'pagination' => {
-          'enabled' => true,
-          'per_page' => 10,
-        },
+    def self.default_paths
+      {
+        'archives' => 'archives',
+        'posts' => 'archives/%Y/%m/%d',
+        'categories' => 'archives/categories'
+      }
+    end
 
-        'generation' => {
-          'paginated_posts' => false,
-          'categories' => true,
-          'year_archives' => true,
-          'month_archives' => true,
-          'day_archives' => true,
-          'feed' => true,
-          'category_feeds' => true,
-        },
+    def self.default_pagination
+      {
+        'enabled' => true,
+        'per_page' => 10
+      }
+    end
 
-        'file_extensions' => {
-          'pages' => 'html',
-          'posts' => 'html',
-        },
+    def self.default_generation
+      {
+        'paginated_posts' => false,
+        'categories' => true,
+        'year_archives' => true,
+        'month_archives' => true,
+        'day_archives' => true,
+        'feed' => true,
+        'category_feeds' => true
+      }
+    end
 
-        'date_formats' => {
-          'year' => '%Y',
-          'month' => '%Y-%m',
-          'day' => '%Y-%m-%d',
-        },
+    def self.default_file_extensions
+      {
+        'pages' => 'html',
+        'posts' => 'html'
+      }
+    end
 
-        'category_names' => {}
+    def self.default_date_formats
+      {
+        'year' => '%Y',
+        'month' => '%Y-%m',
+        'day' => '%Y-%m-%d'
       }
     end
   end
-end
+end

data/lib/dimples/errors.rb

@@ -15,4 +15,4 @@ module Dimples
     class RenderingError < Error
     end
   end
-end
+end

data/lib/dimples/frontable.rb

@@ -14,14 +14,19 @@ module Dimples
         end
       end
 
-      if metadata
-        metadata.each_pair do |key, value|
-          self.class.send(:attr_accessor, key.to_sym) unless self.respond_to?(key.to_sym)
-          self.send("#{key}=", value)
-        end
-      end
+      apply_metadata(metadata) if metadata
 
       contents
     end
+
+    def apply_metadata(metadata)
+      metadata.each_pair do |key, value|
+        unless respond_to?(key.to_sym)
+          self.class.send(:attr_accessor, key.to_sym)
+        end
+
+        send("#{key}=", value)
+      end
+    end
   end
-end
+end

data/lib/dimples/page.rb

@@ -10,36 +10,33 @@ module Dimples
     attr_accessor :filename
     attr_accessor :extension
     attr_accessor :layout
+    attr_accessor :contents
     attr_accessor :rendered_contents
 
-    attr_writer :contents
-
     def initialize(site, path = nil)
       @site = site
       @extension = @site.config['file_extensions']['pages']
+      @path = path
 
-      if path
-        @path = path
-        @filename = File.basename(path, File.extname(path))
-        @contents = read_with_yaml(path)
+      if @path
+        @filename = File.basename(@path, File.extname(@path))
+        @contents = read_with_yaml(@path)
       else
-        @path = nil
         @filename = 'index'
         @contents = ''
       end
     end
 
-    def contents
-      @contents
-    end
-
     def output_file_path(parent_path)
       parts = [parent_path]
 
-      parts << File.dirname(@path).gsub(@site.source_paths[:pages], '') unless @path.nil?
+      unless @path.nil?
+        parts << File.dirname(@path).gsub(@site.source_paths[:pages], '')
+      end
+
       parts << "#{@filename}.#{@extension}"
 
       File.join(parts)
     end
   end
-end
+end

data/lib/dimples/post.rb

@@ -11,6 +11,7 @@ module Dimples
     attr_accessor :filename
     attr_accessor :extension
     attr_accessor :layout
+    attr_accessor :contents
     attr_accessor :slug
     attr_accessor :date
     attr_accessor :year
@@ -21,8 +22,6 @@ module Dimples
     attr_accessor :next_post
     attr_accessor :draft
 
-    attr_writer :contents
-
     def initialize(site, path)
       @site = site
       @path = path
@@ -30,7 +29,8 @@ module Dimples
       @filename = 'index'
       @extension = @site.config['file_extensions']['posts']
 
-      parts = File.basename(path, File.extname(path)).match(/(\d{4})-(\d{2})-(\d{2})-(.+)/)
+      date_format = /(\d{4})-(\d{2})-(\d{2})-(.+)/
+      parts = File.basename(path, File.extname(path)).match(date_format)
 
       @slug = parts[4]
       @date = Time.mktime(parts[1], parts[2], parts[3])
@@ -47,13 +47,10 @@ module Dimples
       @contents = read_with_yaml(path)
     end
 
-    def contents
-      @contents
-    end
 
     def output_file_path(parent_path)
       parent_path = @date.strftime(parent_path) if parent_path =~ /%/
       File.join([parent_path, @slug, "#{@filename}.#{@extension}"])
     end
   end
-end
+end

data/lib/dimples/renderable.rb

@@ -1,27 +1,12 @@
 module Dimples
   module Renderable
     def render(context = {}, body = nil, use_layout = true)
-      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
-
       begin
-        output = renderer.render(scope) { body }.strip
+        output = renderer.render(build_scope(context)) { body }.strip
         @rendered_contents = output
       rescue RuntimeError, TypeError, NoMethodError, SyntaxError, NameError => e
-        problem_file = if @path
-          @path.gsub(@site.source_paths[:root], '')
-        else
-          "dynamic #{self.class}"
-        end
-
-        raise Errors::RenderingError.new(problem_file, e.message)
+        file = @path || "dynamic #{self.class}"
+        raise Errors::RenderingError.new(file, e.message)
       end
 
       if use_layout && defined?(@layout) && @site.templates[@layout]
@@ -31,8 +16,22 @@ module Dimples
       output
     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
-      proc = Proc.new { |template| contents() }
+      proc = proc { contents }
 
       if @path
         extension = File.extname(@path)[1..-1]
@@ -44,4 +43,4 @@ module Dimples
       end
     end
   end
-end
+end

data/lib/dimples/site.rb

@@ -17,7 +17,7 @@ module Dimples
       @output_paths = {}
       @templates = {}
       @categories = {}
-      @archives = {year: {}, month: {}, day: {}}
+      @archives = { year: {}, month: {}, day: {} }
 
       @pages = []
       @posts = []
@@ -33,12 +33,13 @@ module Dimples
       @source_paths[:root] = File.expand_path(@config['source_path'])
       @output_paths[:site] = File.expand_path(@config['destination_path'])
 
-      %w[pages posts public templates].each do |path|
+      %w(pages posts public templates).each do |path|
         @source_paths[path.to_sym] = File.join(@source_paths[:root], path)
       end
 
-      %w[archives posts categories].each do |path|
-        @output_paths[path.to_sym] = File.join(@output_paths[:site], @config['paths'][path])
+      %w(archives posts categories).each do |path|
+        output_path = File.join(@output_paths[:site], @config['paths'][path])
+        @output_paths[path.to_sym] = output_path
       end
     end
 
@@ -55,16 +56,17 @@ module Dimples
     rescue Errors::PublishingError => e
       puts "Error: Failed to publish #{e.file}: #{e.message}"
     rescue => e
-      puts "Error: #{e}"
+      puts "Error: #{e.backtrace}"
     end
 
     def prepare_site
-      begin
-        FileUtils.remove_dir(@output_paths[:site]) if Dir.exist?(@output_paths[:site])
-        Dir.mkdir(@output_paths[:site])
-      rescue => e
-        raise "Failed to prepare the site directory (#{e})"
+      if Dir.exist?(@output_paths[:site])
+        FileUtils.remove_dir(@output_paths[:site])
       end
+
+      Dir.mkdir(@output_paths[:site])
+    rescue => e
+      raise "Failed to prepare the site directory (#{e})"
     end
 
     def scan_files
@@ -90,7 +92,7 @@ module Dimples
     end
 
     def scan_posts
-      Dir.glob(File.join(@source_paths[:posts], '*.*')).reverse.each do |path|
+      Dir.glob(File.join(@source_paths[:posts], '*.*')).reverse_each do |path|
         post = @post_class.new(self, path)
         next if !@generation_options[:include_drafts] && post.draft
 
@@ -100,21 +102,38 @@ module Dimples
           (@categories[slug] ||= []) << post
         end
 
-        (@archives[:year][post.year] ||= []) << post
-        (@archives[:month]["#{post.year}/#{post.month}"] ||= []) << post
-        (@archives[:day]["#{post.year}/#{post.month}/#{post.day}"] ||= []) << post
+        archive_year(post.year) << post
+        archive_month(post.year, post.month) << post
+        archive_day(post.year, post.month, post.day) << post
 
         @posts << post
       end
 
       @posts.each_index do |index|
-        @posts[index].next_post = @posts.fetch(index - 1, nil) if index - 1 >= 0
-        @posts[index].previous_post = @posts.fetch(index + 1, nil) if index + 1 < @posts.count
+        if index - 1 >= 0
+          @posts[index].next_post = @posts.fetch(index - 1, nil)
+        end
+
+        if index + 1 < @posts.count
+          @posts[index].previous_post = @posts.fetch(index + 1, nil)
+        end
       end
 
       @latest_post = @posts.first
     end
 
+    def archive_year(year)
+      @archives[:year][year] ||= []
+    end
+
+    def archive_month(year, month)
+      @archives[:month]["#{year}/#{month}"] ||= []
+    end
+
+    def archive_day(year, month, day)
+      @archives[:day]["#{year}/#{month}/#{day}"] ||= []
+    end
+
     def prepare_template(template)
     end
 
@@ -140,7 +159,10 @@ module Dimples
       end
 
       if @config['generation']['paginated_posts']
-        paginate(posts: @posts, paths: [@output_paths[:archives]], layout: @config['layouts']['posts'])
+        paths = [@output_paths[:archives]]
+        layout = @config['layouts']['posts']
+
+        paginate(posts: @posts, paths: paths, layout: layout)
       end
     end
 
@@ -152,32 +174,35 @@ module Dimples
 
     def generate_categories
       @categories.each do |slug, posts|
-        category_name = @config['category_names'][slug] || slug.capitalize
-        paginate(posts: posts, title: category_name, paths: [@output_paths[:categories], slug], layout: @config['layouts']['category'], context: {category: slug})
+        name = @config['category_names'][slug] || slug.capitalize
+        paths = [@output_paths[:categories], slug]
+        layout = @config['layouts']['category']
+        context = { category: slug }
+
+        paginate(posts: posts, title: name, paths: paths, layout: layout, context: context)
       end
     end
 
     def generate_archives
-      %w[year month day].each do |date_type|
-
+      %w(year month day).each do |date_type|
         if @config['generation']["#{date_type}_archives"]
-          template = @config['layouts']["#{date_type}_archives"]
+          layout = @config['layouts']["#{date_type}_archives"]
 
           @archives[date_type.to_sym].each_value do |posts|
             title = posts[0].date.strftime(@config['date_formats'][date_type])
             paths = [@output_paths[:archives], posts[0].year]
-            dates = {year: posts[0].year}
+            dates = { year: posts[0].year }
 
             case date_type
-              when 'month'
-                paths << posts[0].month
-                dates[:month] = posts[0].month
-              when 'day'
-                paths.concat([posts[0].month, posts[0].day])
-                dates[:day] = posts[0].month
+            when 'month'
+              paths << posts[0].month
+              dates[:month] = posts[0].month
+            when 'day'
+              paths.concat([posts[0].month, posts[0].day])
+              dates.merge(month: posts[0].month, day: posts[0].day)
             end
 
-            paginate(posts: posts, title: title, paths: paths, layout: template, context: dates)
+            paginate(posts: posts, title: title, paths: paths, layout: layout, context: dates)
           end
         end
       end
@@ -194,60 +219,84 @@ module Dimples
     end
 
     def generate_posts_feed
-      generate_feed(@output_paths[:site], {posts: @posts[0..@config['pagination']['per_page'] - 1]})
+      posts = @posts[0..@config['pagination']['per_page'] - 1]
+      generate_feed(@output_paths[:site], posts: posts)
     end
 
     def generate_category_feeds
       @categories.each do |slug, posts|
-        generate_feed(File.join(@output_paths[:categories], slug), {posts: posts[0..@config['pagination']['per_page'] - 1], category: slug})
+        path = File.join(@output_paths[:categories], slug)
+        posts = posts[0..@config['pagination']['per_page'] - 1]
+
+        generate_feed(path, posts: posts, category: slug)
       end
     end
 
     def copy_assets
-      begin
-        FileUtils.cp_r(File.join(@source_paths[:public], '.'), @output_paths[:site]) if Dir.exist?(@source_paths[:public])
-      rescue => e
-        raise "Failed to copy site assets (#{e})"
+      if Dir.exist?(@source_paths[:public])
+        path = File.join(@source_paths[:public], '.')
+        FileUtils.cp_r(path, @output_paths[:site])
       end
+    rescue => e
+      raise "Failed to copy site assets (#{e})"
     end
 
     def paginate(posts:, title: nil, paths:, layout: false, context: {})
-      fail "'#{layout}' template not found" unless @templates.has_key?(layout)
+      raise "'#{layout}' template not found" unless @templates.key?(layout)
 
       per_page = @config['pagination']['per_page']
       page_count = (posts.length.to_f / per_page.to_i).ceil
 
-      pagination_path = paths[0].gsub(@output_paths[:site], '') + '/'
-      pagination_path += paths[1..-1].join('/') + "/" if paths.length > 1
+      page_path = paths[0].gsub(@output_paths[:site], '') + '/'
+      page_path += paths[1..-1].join('/') + '/' if paths.length > 1
 
-      for index in 1..page_count
+      (1..page_count).each do |index|
         page = @page_class.new(self)
 
         page.layout = layout
         page.title = title || @templates[layout].title
 
-        pagination = {
-          page: index,
-          pages: page_count,
-          post_count: posts.length,
-          path: pagination_path
-        }
+        pagination = build_pagination(index, page_count, posts.count, page_path)
+        output_path = File.join(paths, index != 1 ? "page#{index}" : '')
 
-        pagination[:previous_page] = pagination[:page] - 1 if (pagination[:page] - 1) > 0
-        pagination[:next_page] = pagination[:page] + 1 if (pagination[:page] + 1) <= pagination[:pages]
+        context[:posts] = posts.slice((index - 1) * per_page, per_page)
+        context[:pagination] = pagination
 
-        if pagination[:previous_page]
-          pagination[:previous_page_url] = pagination[:path]
-          pagination[:previous_page_url] += "page" + pagination[:previous_page].to_s if pagination[:previous_page] != 1
-        end
+        page.write(output_path, context)
+      end
+    end
 
-        pagination[:next_page_url] = pagination[:path] + "page" + pagination[:next_page].to_s if pagination[:next_page]
+    def build_pagination(index, page_count, item_count, path)
+      pagination = {
+        page: index,
+        pages: page_count,
+        post_count: item_count,
+        path: path
+      }
 
-        output_path = File.join(paths, index != 1 ? "page#{index}" : '')
-        context.merge!({posts: posts.slice((index - 1) * per_page, per_page), pagination: pagination})
+      if (pagination[:page] - 1) > 0
+        pagination[:previous_page] = pagination[:page] - 1
+      end
 
-        page.write(output_path, context)
+      if (pagination[:page] + 1) <= pagination[:pages]
+        pagination[:next_page] = pagination[:page] + 1
+      end
+
+      if pagination[:previous_page]
+        pagination[:previous_page_url] = pagination[:path]
+
+        if pagination[:previous_page] != 1
+          page_string = "page#{pagination[:previous_page]}"
+          pagination[:previous_page_url] += page_string
+        end
+      end
+
+      if pagination[:next_page]
+        page_string = "#{pagination[:path]}page#{pagination[:next_page]}"
+        pagination[:next_page_url] = page_string
       end
+
+      pagination
     end
 
     private
@@ -258,4 +307,4 @@ module Dimples
       }
     end
   end
-end
+end

data/lib/dimples/template.rb

@@ -10,11 +10,11 @@ module Dimples
     attr_accessor :rendered_contents
 
     def initialize(site, path)
-    	@site = site
+      @site = site
       @slug = File.basename(path, File.extname(path))
       @path = path
 
       @contents = read_with_yaml(path)
     end
   end
-end
+end

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.7"
+  VERSION = '1.7.1'.freeze
 end

data/lib/dimples/writeable.rb

@@ -1,7 +1,7 @@
 module Dimples
   module Writeable
     def write(path, context = {})
-      output = context ? render(context) : contents()
+      output = context ? render(context) : contents
 
       publish_path = output_file_path(path)
       parent_path = File.dirname(publish_path)
@@ -17,4 +17,4 @@ module Dimples
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: 1.7.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt