dimples 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be3dfc36f4a8285d77823deff68e9585cb71baf
-  data.tar.gz: cb592149ddd792be5f46f1bf647cbcf8084c5cb9
+  metadata.gz: 010cd5047836c121e2313676a9b4145ab8e38e1b
+  data.tar.gz: f7ab369532e67afd12b0ffb976f76703c864cd1d
 SHA512:
-  metadata.gz: 93ec231ac30080beeef7d13876fb573b361c8131e5378775e8472905c2bbc5ad56561eda9f4ec8d18ac66a6060033d3ffa8ea048bec84171eccbc87171bc797a
-  data.tar.gz: eb90279afa05032d464ff0e7a38ab400e1ee82befa8341a85f20f229f54755a7322c883c514b87b7c7778dad5658943dd15262dd42d3916e15b57bfc1e4f717a
+  metadata.gz: 973a8429bcb276d6603e08e9978d082f562acf3a9befb847420b743eed7dae1cf0d60b4d7c4df5916c95dad1c3007e4257e39ca4361d297fd706a7edb052fbaa
+  data.tar.gz: 14c778c4d67efa7765bac66ea38f071915cbf923bb4bf422ac86efda9e4c67cef52e62d1e2bd088e78ac227e2d5ac8a0694f54634429d1eb16f23a4211f42761

data/lib/dimples.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'yaml'
 require 'tilt'
 
+require 'dimples/errors'
 require 'dimples/frontable'
 require 'dimples/publishable'
 require 'dimples/configuration'

data/lib/dimples/errors.rb

@@ -0,0 +1,18 @@
+module Dimples
+  module Errors
+    class Error < RuntimeError
+      attr_reader :file
+
+      def initialize(file, message)
+        @file = file
+        super(message)
+      end
+    end
+
+    class PublishingError < Error
+    end
+
+    class RenderingError < Error
+    end
+  end
+end

data/lib/dimples/frontable.rb

@@ -16,7 +16,7 @@ module Dimples
 
       if metadata
         metadata.each_pair do |key, value|
-          self.class.send(:attr_accessor, key.to_sym) unless instance_variable_get("@#{key}")
+          self.class.send(:attr_accessor, key.to_sym) unless self.respond_to?(key.to_sym)
           instance_variable_set("@#{key}", value)
         end
       end

data/lib/dimples/publishable.rb

@@ -6,10 +6,14 @@ module Dimples
       publish_path = output_file_path(path)
       parent_path = File.dirname(publish_path)
 
-      FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
+      begin
+        FileUtils.mkdir_p(parent_path) unless Dir.exist?(parent_path)
 
-      File.open(publish_path, 'w') do |file|
-        file.write(output)
+        File.open(publish_path, 'w+') do |file|
+          file.write(output)
+        end
+      rescue SystemCallError => e
+        raise Errors::PublishingError.new(publish_path, e.message)
       end
     end
 
@@ -35,18 +39,18 @@ module Dimples
       else
         Tilt::StringTemplate.new(&proc)
       end
-    
+
       begin
         output = renderer.render(scope) { body }.strip
         @rendered_contents = output
-      rescue RuntimeError, TypeError, NoMethodError, SyntaxError => e
+      rescue RuntimeError, TypeError, NoMethodError, SyntaxError, NameError => e
         problem_file = if @path
           @path.gsub(@site.source_paths[:root], '')
         else
           "dynamic #{self.class}"
         end
 
-        raise "Failed to render #{problem_file} - #{e}"
+        raise Errors::RenderingError.new(problem_file, e.message)
       end
 
       if use_layout && @layout && @site.templates[@layout]

data/lib/dimples/site.rb

@@ -42,16 +42,15 @@ module Dimples
     def generate
       prepare_site
       scan_files
-
-      generate_posts
-      generate_pages
-      generate_archives
-
-      generate_categories if @config['generation']['categories']
-      generate_posts_feed if @config['generation']['feed']
-      generate_category_feeds if @config['generation']['category_feeds']
-
+      generate_files
       copy_assets
+
+    rescue Errors::RenderingError => e
+      puts "Error: Failed to render #{e.file}: #{e.message}"
+    rescue Errors::PublishingError => e
+      puts "Error: Failed to publish #{e.file}: #{e.message}"
+    rescue => e
+      puts "Error: #{e}"
     end
 
     def prepare_site
@@ -109,13 +108,19 @@ module Dimples
       @latest_post = @posts.first
     end
 
+    def generate_files
+      generate_posts
+      generate_pages
+      generate_archives
+
+      generate_categories if @config['generation']['categories']
+      generate_posts_feed if @config['generation']['feed']
+      generate_category_feeds if @config['generation']['category_feeds']
+    end
+
     def generate_posts
       @posts.each do |post|
-        begin
-          post.write(@output_paths[:posts])
-        rescue => e
-          raise "Failed to render post #{post.path} (#{e})"
-        end
+        post.write(@output_paths[:posts])
       end
 
       if @config['generation']['paginated_posts']
@@ -125,11 +130,7 @@ module Dimples
 
     def generate_pages
       @pages.each do |page|
-        begin
-          page.write(@output_paths[:site])
-        rescue => e
-          raise "Failed to render page #{page.path.gsub(@source_paths[:root], '')} (#{e})"
-        end
+        page.write(@output_paths[:site])
       end
     end
 
@@ -164,11 +165,7 @@ module Dimples
       feed.extension = 'atom'
       feed.layout = 'feed'
 
-      begin
-        feed.write(path, options)
-      rescue => e
-        raise "Failed to generate feed #{path} (#{e})"
-      end
+      feed.write(path, options)
     end
 
     def generate_posts_feed
@@ -229,11 +226,7 @@ module Dimples
 
         output_path = File.join(paths, index != 1 ? "page#{index}" : '')
 
-        begin
-          page.write(output_path, {posts: posts.slice((index - 1) * per_page, per_page), pagination: pagination})
-        rescue => e
-          raise "Failed to generate paginated page #{path} (#{e})"
-        end
+        page.write(output_path, {posts: posts.slice((index - 1) * per_page, per_page), pagination: pagination})
       end
     end
   end

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - lib/dimples.rb
 - lib/dimples/configuration.rb
+- lib/dimples/errors.rb
 - lib/dimples/frontable.rb
 - lib/dimples/page.rb
 - lib/dimples/post.rb