fairytale 0.8.0 → 0.8.1

data/lib/fairytale.rb

@@ -1,67 +1,44 @@
 require 'rubygems'
-require 'stringio'
 require 'fileutils'
-require 'erb'
-require 'tilt'
-require 'digest/sha1'
+require 'fairytale/helpers'
 
 module Fairytale
+  include Fairytale::Helpers
+  
   def get url, layout = :"views/layout.erb", &block
+    @url = url
+    
     print "Building #{url} ... "
     view_content = block.call
-    view_content = tilt(layout, url: url) { view_content } unless layout.nil?
+    
+    unless layout.nil?
+      view_content = tilt(layout) { view_content }
+    end
     
     save url, view_content
     print "saved"
     
-    reset!
+    reset
     puts
   end
   
-  def save url, content
-    path = "webroot#{url}"
-    path += "index.html" if url[-1] == '/'
-    FileUtils.mkdir_p File.dirname path
-    File.open(path, "w+") { |f| f.write content }
-  end
-  
-  def reset!
-    instance_variables.each { |var_symbol| instance_variable_set var_symbol, nil }
-  end
-  
+  # Present merely to mirror Sinatra
   def before &block
     block.call
   end
   
-  def md file, params = {}, &block
-    file = "content/#{file.to_s}" if file.class == Symbol
-    tilt(file, params, &block)
-  end
-  
-  def erb file, params = {}, &block
-    file = "views/#{file.to_s}.erb" if file.class == Symbol
-    tilt(file, params, &block)
-  end
-  
-  def sass file, params = {}, &block
-    file = "webroot/assets/css/#{file.to_s}.sass" if file.class == Symbol
-    tilt(file, params, &block)
-  end
-  
-  def scss file, params = {}, &block
-    file = "webroot/assets/css/#{file.to_s}.scss" if file.class == Symbol
-    tilt(file, params, &block)
-  end
-  
-  def tilt file, params = {}, &block
-    engine_options = params[:engine_options] || {}
-    template = Tilt.new file.to_s, nil, engine_options
-    template.render(self, params) { block.call }
-  end
-  
-  def digest file
-    Digest::SHA1.hexdigest File.read(file)
-  end
+  protected
+    def save url, content
+      path = "public#{url}"
+      path += "index.html" if url[-1] == '/'
+      FileUtils.mkdir_p File.dirname path
+      File.open(path, "w+") { |f| f.write content }
+    end
+    
+    # Resets this object, ready for the next 'request'
+    def reset
+      instance_variables.each { |var_symbol| instance_variable_set var_symbol, nil }
+    end
 end
 
 include Fairytale

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairytale
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies: []
 description: Sinatra is awesome for building sites. Fairytale brings its power and
   freedom to static site compilation.