dimples 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6137fed4c04eb60b2980b23535eaa6f2896b29a7
-  data.tar.gz: d067089b92d87469f81dc41f8e746cce3be5981f
+  metadata.gz: e3345e978e2a4e91417d04d9e82188ea9181d129
+  data.tar.gz: ea4f09a5cb4592814a4762c65c69a48082d7eeef
 SHA512:
-  metadata.gz: d936bbfb627af7aec7f603cfa62084e5cfb6734e53c5f1a61211175f18a728cba3f55165caacd68624505724949be075c73853f2a49d22aba0619853334251bb
-  data.tar.gz: 71e5fd671cadeeb9ba4543577d0a562aa190c2dfede666f23aabebbeca2ba66f8d623ba75555f333af2039acc56efb1421fe76f6f9aed35efe1df37a95ff512d
+  metadata.gz: 564ee215d346821935d18797c859da4a733e2dbdf1a0e2b7e62f1279edbe817e160afe518178f971596afa444f6d442a5b11519f5fa5922590ddf297e533828d
+  data.tar.gz: b2a4d12624112e7594c53e31c8d610ccc38fedea9ac3b7b28d4acac52c0bdf91368e15162261df9351c6480fd389d3fc65d61e9b545eda6801a271a8d3f76df1

data/lib/dimples.rb

@@ -5,8 +5,11 @@ require 'yaml'
 require 'tilt'
 
 require 'dimples/errors'
+
 require 'dimples/frontable'
-require 'dimples/publishable'
+require 'dimples/writeable'
+require 'dimples/renderable'
+
 require 'dimples/configuration'
 require 'dimples/category'
 require 'dimples/page'

data/lib/dimples/page.rb

@@ -1,7 +1,8 @@
 module Dimples
   class Page
     include Frontable
-    include Publishable
+    include Writeable
+    include Renderable
 
     attr_accessor :path
     attr_accessor :title
@@ -22,7 +23,9 @@ module Dimples
         @filename = File.basename(path, File.extname(path))
         @contents = read_with_yaml(path)
       else
+        @path = nil
         @filename = 'index'
+        @contents = ''
       end
     end
 

data/lib/dimples/post.rb

@@ -1,7 +1,8 @@
 module Dimples
   class Post
     include Frontable
-    include Publishable
+    include Writeable
+    include Renderable
 
     attr_accessor :path
     attr_accessor :title
@@ -17,6 +18,7 @@ module Dimples
     attr_accessor :rendered_contents
     attr_accessor :previous_post
     attr_accessor :next_post
+    attr_accessor :draft
 
     attr_writer :contents
 
@@ -35,11 +37,14 @@ module Dimples
       @layout = @site.config['layouts']['post']
       @categories = {}
 
+      @draft = false
+
       @year = @date.strftime('%Y')
       @month = @date.strftime('%m')
       @day = @date.strftime('%d')
 
       @contents = read_with_yaml(path)
+
     end
 
     def contents

data/lib/dimples/{publishable.rb → renderable.rb}

@@ -1,22 +1,5 @@
 module Dimples
-  module Publishable
-    def write(path, context = {})
-      output = context ? render(context) : contents()
-
-      publish_path = output_file_path(path)
-      parent_path = File.dirname(publish_path)
-
-      begin
-        FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
-
-        File.open(publish_path, 'w+') do |file|
-          file.write(output)
-        end
-      rescue SystemCallError => e
-        raise Errors::PublishingError.new(publish_path, e.message)
-      end
-    end
-
+  module Renderable
     def render(context = {}, body = nil, use_layout = true)
       class_name = self.class.name.split('::').last.downcase.to_sym
 
@@ -29,17 +12,6 @@ module Dimples
         scope.instance_variable_set("@#{key}".to_sym, value)
       end
 
-      proc = Proc.new { |template| contents() }
-
-      renderer = if @path
-        extension = File.extname(@path)[1..-1]
-        options = @site.config['rendering'][extension] || {}
-
-        Tilt.new(@path, options, &proc)
-      else
-        Tilt::StringTemplate.new(&proc)
-      end
-
       begin
         output = renderer.render(scope) { body }.strip
         @rendered_contents = output
@@ -53,11 +25,24 @@ module Dimples
         raise Errors::RenderingError.new(problem_file, e.message)
       end
 
-      if use_layout && @layout && @site.templates[@layout]
+      if use_layout && defined?(@layout) && @site.templates[@layout]
         output = @site.templates[@layout].render(context, output)
       end
 
       output
     end
+
+    def renderer
+      proc = Proc.new { |template| contents() }
+
+      if @path
+        extension = File.extname(@path)[1..-1]
+        options = @site.config['rendering'][extension] || {}
+
+        Tilt.new(@path, options, &proc)
+      else
+        Tilt::StringTemplate.new(&proc)
+      end
+    end
   end
 end

data/lib/dimples/site.rb

@@ -28,6 +28,7 @@ module Dimples
       @post_class = Dimples::Post
 
       @config = Dimples::Configuration.new(config)
+      @generation_options = default_generation_options
 
       @source_paths[:root] = File.expand_path(@config['source_path'])
       @output_paths[:site] = File.expand_path(@config['destination_path'])
@@ -39,7 +40,9 @@ module Dimples
       @output_paths[:posts] = File.join(@output_paths[:site], @config['paths']['posts'])
     end
 
-    def generate
+    def generate(options = {})
+      @generation_options.merge!(options)
+
       prepare_site
       prepare_categories
       scan_files
@@ -91,6 +94,7 @@ module Dimples
     def scan_posts
       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
 
         %w[year month day].each do |date_type|
           if @config['generation']["#{date_type}_archives"]
@@ -232,5 +236,13 @@ module Dimples
         page.write(output_path, {posts: posts.slice((index - 1) * per_page, per_page), pagination: pagination})
       end
     end
+
+    private
+
+    def default_generation_options
+      {
+        include_drafts: false
+      }
+    end
   end
 end

data/lib/dimples/template.rb

@@ -1,7 +1,7 @@
 module Dimples
   class Template
     include Frontable
-    include Publishable
+    include Renderable
 
     attr_accessor :slug
     attr_accessor :title

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/dimples/writeable.rb

@@ -0,0 +1,20 @@
+module Dimples
+  module Writeable
+    def write(path, context = {})
+      output = context ? render(context) : contents()
+
+      publish_path = output_file_path(path)
+      parent_path = File.dirname(publish_path)
+
+      begin
+        FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
+
+        File.open(publish_path, 'w+') do |file|
+          file.write(output)
+        end
+      rescue SystemCallError => e
+        raise Errors::PublishingError.new(publish_path, e.message)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -24,6 +24,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: A very, very, very simple gem for building static websites.
 email:
 - d+dimples@waferbaby.com
@@ -38,10 +108,11 @@ files:
 - lib/dimples/frontable.rb
 - lib/dimples/page.rb
 - lib/dimples/post.rb
-- lib/dimples/publishable.rb
+- lib/dimples/renderable.rb
 - lib/dimples/site.rb
 - lib/dimples/template.rb
 - lib/dimples/version.rb
+- lib/dimples/writeable.rb
 homepage: http://github.com/waferbaby/dimples
 licenses:
 - LICENSE