dimples 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af69955701e46818367fbe965f4bb1071427319
-  data.tar.gz: 2d2c2861d73eef0348bb98f7d06ec6e94c3b007e
+  metadata.gz: 8087737e6b6cd32e6ce78ac923d25fb81fea3ee1
+  data.tar.gz: 9115b1916e6d5e68aba8d0d72eee3e5467f8c3b9
 SHA512:
-  metadata.gz: 422c790ef28519c67b634dffe74515cf52f6941e62bff67180822f26cb95c6f89be25608a9c73761a65812d4efbb4e0e80c1e34976bad0dac20d5dbc3d39442e
-  data.tar.gz: d30324038e2fad5432ca578ba84f7936fe961c2e30885a473893dfa2844bb012a9b055ede5bf8d48958de458e20fbe3ff089d1adbed049637774db0a216183a0
+  metadata.gz: 75bf70ae2806048bec78a8289e0f8fe97f30ddadd5eb2ea4fb9a6419398d356089fd29af2814f1391fd115d516cd3a10792cca28ce1167663932d4802c5e9b6e
+  data.tar.gz: 62750172f7d2a54c770321ce28e7fd0ad43f66684d6dd52f242de058accf99d26abb0799572913007419968cb46539af3a6dcd5775490f1af7229589f04c22ad

data/lib/dimples.rb

@@ -2,8 +2,7 @@ $LOAD_PATH.unshift(__dir__)
 
 require 'fileutils'
 require 'yaml'
-require 'erubis'
-require 'redcarpet'
+require 'tilt'
 
 require 'dimples/frontable'
 require 'dimples/publishable'

data/lib/dimples/frontable.rb

@@ -1,7 +1,7 @@
 module Dimples
   module Frontable
     def read_with_yaml(path)
-      if path =~ /.yml$/
+      if File.extname(path) == '.yml'
         contents = ''
         metadata = YAML.load_file(path)
       else
@@ -10,7 +10,7 @@ module Dimples
 
         if matches
           metadata = YAML.load(matches[1])
-          contents = matches.post_match.strip!
+          contents = matches.post_match.strip
         end
       end
 

data/lib/dimples/page.rb

@@ -9,6 +9,7 @@ module Dimples
     attr_accessor :filename
     attr_accessor :extension
     attr_accessor :layout
+    attr_accessor :rendered_contents
 
     attr_writer :contents
 
@@ -24,7 +25,6 @@ module Dimples
       end
 
       @extension = @site.config['file_extensions']['pages']
-      @layout ||= @site.config['layouts']['page']
     end
 
     def type

data/lib/dimples/post.rb

@@ -15,9 +15,9 @@ module Dimples
     attr_accessor :year
     attr_accessor :month
     attr_accessor :day
+    attr_accessor :rendered_contents
 
     attr_writer :contents
-    attr_writer :markdown
 
     def initialize(site, path)
       @site = site
@@ -49,10 +49,6 @@ module Dimples
       @contents
     end
 
-    def markdown
-      @markdown ||= @site.markdown_engine.render(contents())
-    end
-
     def output_file_path(parent_path)
       parts = [parent_path]
 

data/lib/dimples/publishable.rb

@@ -1,7 +1,7 @@
 module Dimples
   module Publishable
-    def write(path, context = false)
-      output = context ? render(contents(), {this: self}.merge(context)) : contents()
+    def write(path, context = {})
+      output = render(context)
 
       publish_path = output_file_path(path)
       parent_path = File.dirname(publish_path)
@@ -13,17 +13,22 @@ module Dimples
       end
     end
 
-    def render(body, context = {}, use_layout = true)
-      context[:site] ||= @site
+    def render(context = {}, body = nil, use_layout = true)
+      context[:site] = @site unless context[:site]
+      context[:this] = self unless context[:this]
 
       begin
-        output = Erubis::Eruby.new(contents()).evaluate(context) { body }
-      rescue SyntaxError => e
-        raise "Syntax error in #{path.gsub(site.source_paths[:root], '')}"
+        proc = Proc.new { |template| contents() }
+        renderer = @path ? Tilt.new(@path, &proc) : Tilt::StringTemplate.new(&proc)
+        output = renderer.render(nil, context) { body }.strip
+
+        @rendered_contents = output
+      rescue RuntimeError, TypeError, NoMethodError => e
+        raise "Failed to render #{path ? path.gsub(@site.source_paths[:root], '') : type} - #{e}"
       end
 
       if use_layout && @layout && @site.templates[@layout]
-        output = @site.templates[@layout].render(output, context) 
+        output = @site.templates[@layout].render(context, output)
       end
 
       output

data/lib/dimples/site.rb

@@ -9,7 +9,6 @@ module Dimples
     attr_accessor :pages
     attr_accessor :posts
     attr_accessor :latest_post
-    attr_accessor :markdown_engine
     attr_accessor :page_class
     attr_accessor :post_class
 
@@ -38,12 +37,6 @@ module Dimples
       end
 
       @output_paths[:posts] = File.join(@output_paths[:site], @config['paths']['posts'])
-
-      @markdown_engine = if @config['markdown']['enabled']
-        Redcarpet::Markdown.new(Redcarpet::Render::HTML, @config['markdown']['options'])
-      else
-        false
-      end
     end
 
     def scan_files
@@ -85,7 +78,7 @@ module Dimples
 
     def generate
       scan_files
-
+      
       begin
         FileUtils.remove_dir(@output_paths[:site]) if Dir.exist?(@output_paths[:site])
         Dir.mkdir(@output_paths[:site])
@@ -95,7 +88,7 @@ module Dimples
 
       @posts.each do |post|
         begin
-          post.write(@output_paths[:posts], {})
+          post.write(@output_paths[:posts])
         rescue => e
           raise "Failed to render post #{File.basename(post.path)} (#{e})"
         end
@@ -103,7 +96,7 @@ module Dimples
 
       @pages.each do |page|
         begin
-          page.write(@output_paths[:site], {})
+          page.write(@output_paths[:site])
         rescue => e
           raise "Failed to render page from #{page.path.gsub(@source_paths[:root], '')} (#{e})"
         end
@@ -206,14 +199,14 @@ module Dimples
       end
     end
 
-    def generate_feed(path, params)
+    def generate_feed(path, options)
       feed = @page_class.new(self)
 
       feed.filename = 'feed'
       feed.extension = 'atom'
       feed.layout = 'feed'
 
-      feed.write(path, params)
+      feed.write(path, options)
     end
 
     def paginate(posts, title, per_page, paths, layout, params = {})
@@ -262,17 +255,5 @@ module Dimples
         page.write(File.join(page_paths), {posts: range, pagination: pagination}.merge(params))
       end
     end
-
-    def render(template_slug, content, layout = true)
-      return '' unless @templates[template_slug]
-
-      if content.is_a? String
-        @templates[template_slug].render(content, {}, layout)
-      elsif content.is_a? Hash
-        @templates[template_slug].render('', content, layout)
-      else
-        ''
-      end
-    end
   end
 end

data/lib/dimples/template.rb

@@ -7,6 +7,7 @@ module Dimples
     attr_accessor :title
     attr_accessor :path
     attr_accessor :contents
+    attr_accessor :rendered_contents
 
     def initialize(site, path)
     	@site = site
@@ -15,5 +16,9 @@ module Dimples
 
       @contents = read_with_yaml(path)
     end
+
+    def type
+      :template
+    end
   end
 end

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis