dimples 6.5.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c408ebc105da1277ad32d6cc979cd8be0ac1d01a063dee1bd96e62a4a8f7066
-  data.tar.gz: 48a27e0263f74bc939f043ef961c95113be22280377ecdaf992967461bf4c3e9
+  metadata.gz: b8a5a0e150bc568f6593260d6af73dfcdfc2979ff7e39866d3cc798c706955ff
+  data.tar.gz: 7c5521a81ac0325d431c1027287bf216e4669b341bcf5e6f6fabfa9f05beb0a5
 SHA512:
-  metadata.gz: 4294ccad6f74b54cd8546d12f23ce976bffccfd6852a3ef1711103cc9459649dd247b360ba14eb77ebe42bad145fe355e88eb6be62d792bad8f2768351c48918
-  data.tar.gz: 787ef8197927275b4667aeb454a660ea3e7a34a8c1a17ba172de8504828bd3e020baf3f5ffdcb708a4d521ab786279fa03481221f17c98d45c9e7e96d681fff8
+  metadata.gz: 73b0502dcdd803eef073c4d075d7f3d2eaa9f6a9b8897f1c5d21d0c49b7c3682c91aba70b7b89c4140c65a14df7e6a0ed83fdaa42b6925327521929cdd37f58b
+  data.tar.gz: 3750f6c5e82b6d4f84a659bb8f15a36c969cd4698eaa736946f4fd81d7a5a28ec49e3d3529820d6a0b1cd3b3ac6f2e786b83431b0de40bf21a16d60fbd505de3

data/bin/dimples

@@ -29,7 +29,6 @@ Options:
   opt :config, 'Config file path', type: :string
   opt :source, 'Source directory', type: :string
   opt :destination, 'Destination directory', type: :string
-  opt :verbose, 'Verbose mode', default: false
 end
 
 Optimist.educate if ARGV.empty?
@@ -47,19 +46,19 @@ source_path = if options[:source]
 
 config_path = options[:config] || File.join(source_path, 'config.json')
 
-if File.exist?(config_path)
-  begin
-    file_contents = File.read(config_path)
-    Optimist.die "Config file is empty (#{config_path})" if file_contents.empty?
-
-    config = JSON.parse(file_contents, symbolize_names: true)
-  rescue JSON::ParserError
-    Optimist.die "Invalid or malformed config file (#{config_path})"
-  end
-else
+unless File.exist?(config_path)
   Optimist.die "Unable to find config file (#{config_path})"
 end
 
+begin
+  file_contents = File.read(config_path)
+  Optimist.die "Config file is empty (#{config_path})" if file_contents.empty?
+
+  config = JSON.parse(file_contents, symbolize_names: true)
+rescue JSON::ParserError
+  Optimist.die "Invalid or malformed config file (#{config_path})"
+end
+
 config[:source] = source_path
 
 if options[:destination]

data/lib/dimples/configuration.rb

@@ -3,6 +3,10 @@
 module Dimples
   # Default configuration options for a site.
   module Configuration
+    def self.prepare(config)
+      Hashie::Mash.new(defaults).deep_merge(config)
+    end
+
     def self.defaults
       {
         source: Dir.pwd,
@@ -23,6 +27,7 @@ module Dimples
         archives: 'archives',
         paginated_posts: 'posts',
         posts: 'archives/%Y/%m/%d',
+        drafts: 'archives/drafts/%Y/%m/%d',
         categories: 'archives/categories'
       }
     end

data/lib/dimples/post.rb

@@ -15,6 +15,12 @@ module Dimples
       @metadata[:date] = Date.new(parts[1].to_i, parts[2].to_i, parts[3].to_i)
       @metadata[:slug] = parts[4]
       @metadata[:categories] ||= []
+      @metadata[:draft] ||= false
+    end
+
+    def url
+      path = date.strftime(draft ? @site.config.paths.drafts : @site.config.paths.posts)
+      "/#{path}/#{slug}/"
     end
 
     def year

data/lib/dimples/renderer.rb

@@ -12,7 +12,13 @@ module Dimples
       context[:site] ||= @site
       context[:pagination] ||= nil
 
-      output = engine.render(scope, context) { body }.strip
+      begin
+        output = engine.render(scope, context) { body }.strip
+      rescue StandardError => e
+        raise RenderingError,
+              "Unable to render #{@source.path || 'dynamic file'} (#{e})"
+      end
+
       @source.metadata[:rendered_contents] = output
 
       if @source.metadata[:layout]

data/lib/dimples/site.rb

@@ -14,11 +14,11 @@ module Dimples
     attr_reader :latest_post
 
     def initialize(config = {})
-      @config = Hashie::Mash.new(Configuration.defaults).deep_merge(config)
+      @config = Configuration.prepare(config)
 
       @paths = {}.tap do |paths|
         paths[:source] = File.expand_path(@config.source)
-        paths[:destination] = File.expand_path(@config.destination)
+        paths[:destination] = File.expand_path(Time.now.strftime(@config.destination))
 
         %w[pages posts static templates].each do |type|
           paths[type.to_sym] = File.join(paths[:source], type)
@@ -133,24 +133,21 @@ module Dimples
 
     def publish_posts
       @posts.each do |post|
-        path = File.join(
-          @paths[:destination],
-          post.date.strftime(@config.paths.posts),
-          post.slug
-        )
-
+        path = File.join(@paths[:destination], post.url.split('/'))
         post.write(path)
       end
 
+      published_posts = @posts.select { |post| !post.draft }
+
       if @config.generation.main_feed
-        publish_feeds(@posts, @paths[:destination])
+        publish_feeds(published_posts, @paths[:destination])
       end
 
       return unless @config.generation.paginated_posts
 
       Dimples::Pager.paginate(
         self,
-        @posts,
+        published_posts,
         File.join(@paths[:destination], @config.paths.paginated_posts),
         @config.layouts.paginated_post
       )

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.7
+        version: '4.1'
   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
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -62,9 +56,6 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -72,9 +63,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -98,76 +86,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.21'
 description: A simple tool for building static websites.
 email:
 - d+dimples@waferbaby.com
@@ -203,14 +171,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A basic static site generator