dimples 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2066075aca62da6b496c46e06393fe24c4e2670a
-  data.tar.gz: 72363fe158e8db41c9e8c18fa38a7a2e5e44b803
+  metadata.gz: 4d234cd1d903091ebb32b6c1d4d70f3f192b7521
+  data.tar.gz: 44a6e425dc98482f06af3ee642d9eea2acf43b4b
 SHA512:
-  metadata.gz: 4440869e1766c52e1ed6f3bf99e10b6c81c9ebddc40c3c1c579eea182495500376dad9a323eb05c240445d447428d7c189eb0a690935e8eef5e8f7b1e7d66fe5
-  data.tar.gz: a40008e17cbd7ed41d8a82b6d8479622dc075474807bd289dac4fea5e95564d2a28f22d4642efa57cb3357c838babefbea041ec44ed52831dfd7cdb4d0f613fe
+  metadata.gz: a5fee8777cea08fd48484ce4c53ecf345c45e8f566f3d8b26ea8a75af155e8ee9391fb44921c0c8f0cb1229d0e868579998d576d77e9571d3ce636908725004b
+  data.tar.gz: 2936a14e626263cfe177f09ecad4411b76a4a28f42dc06462a687b6a2374a54c21914c2860402d9ab8a9eeffbed1ee903a4eec5a5f595e7b65d528063c8066cb

data/bin/dimples

@@ -82,4 +82,4 @@ when :build
       Dimples.logger.error(error)
     end
   end
-end
+end

data/lib/dimples.rb

@@ -26,4 +26,4 @@ module Dimples
       @logger ||= Dimples::Logger.new(STDOUT)
     end
   end
-end
+end

data/lib/dimples/logger.rb

@@ -26,4 +26,4 @@ module Dimples
       "#{prefix}#{message}\033[0m\n"
     end
   end
-end
+end

data/lib/dimples/renderable.rb

@@ -5,12 +5,10 @@ module Dimples
         output = renderer.render(build_scope(context)) { body }.strip
         @rendered_contents = output
       rescue RuntimeError, TypeError, NoMethodError, SyntaxError, NameError => e
-        file = @path || "a dynamic #{self.class}"
+        sanitised_error_name = e.class.to_s.gsub(/([A-Z])/, " \\1").strip.downcase
+        error_message = "Unable to render #{@path || "a dynamic #{self.class}"} (#{sanitised_error_name})"
 
-        error_message = "Unable to render #{file}"
-        error_message << " (#{e.message})" if @site.config['verbose_logging']
-
-        raise Errors::RenderingError.new(e.message)
+        raise Errors::RenderingError.new(error_message)
       end
 
       if use_layout && defined?(@layout) && @site.templates[@layout]

data/lib/dimples/site.rb

@@ -51,7 +51,7 @@ module Dimples
       generate_files
       copy_assets
     rescue Errors::RenderingError, Errors::PublishingError, Errors::GenerationError => e
-      @errors << "Failed to generate the site: #{e.message}."
+      @errors << e.message
     end
 
     def generated?
@@ -67,10 +67,7 @@ module Dimples
 
       Dir.mkdir(@output_paths[:site])
     rescue => e
-      error_message = "Couldn't prepare the output directory"
-      error_message << " (#{e.message})" if @config['verbose_logging']
-
-      raise Errors::GenerationError(error_message)
+      raise Errors::GenerationError("Couldn't prepare the output directory (#{e.message})")
     end
 
     def scan_files
@@ -267,14 +264,11 @@ module Dimples
         FileUtils.cp_r(path, @output_paths[:site])
       end
     rescue => e
-      error_message = "Site assets failed to copy"
-      error_message << " (#{e.message})" if @config['verbose_logging']
-
-      raise Errors::GenerationError.new(error_message)
+      raise Errors::GenerationError.new("Site assets failed to copy (#{e.message})")
     end
 
     def paginate(posts:, title: nil, paths:, layout: false, context: {})
-      raise Errors::GenerationError.new("'#{layout}' template not found") unless @templates.key?(layout)
+      raise Errors::GenerationError.new("'#{layout}' template not found during pagination") unless @templates.key?(layout)
 
       per_page = @config['pagination']['per_page']
       page_count = (posts.length.to_f / per_page.to_i).ceil

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.4.1'.freeze
 end

data/lib/dimples/writeable.rb

@@ -4,18 +4,13 @@ module Dimples
       output = context ? render(context) : contents
       parent_path = File.dirname(path)
 
-      begin
-        FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
+      FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
 
-        File.open(path, 'w+') do |file|
-          file.write(output)
-        end
-      rescue SystemCallError => e
-        error_message = "Failed to write #{path}"
-        error_message << " (#{e.message})" if @site.config['verbose_logging']
-
-        raise Errors::PublishingError.new(error_message)
+      File.open(path, 'w+') do |file|
+        file.write(output)
       end
+    rescue SystemCallError => e
+      raise Errors::PublishingError.new("Failed to write #{path} (#{e.message})")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -113,6 +113,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
@@ -120,6 +123,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: A very, very, very simple gem for building static websites.