grat 0.0.4 → 0.0.5

data/Manifest

@@ -5,6 +5,7 @@ config.ru
 lib/environment.rb
 lib/grat.rb
 lib/grat/content.rb
+lib/grat/hash_binding.rb
 lib/grat/mongomapper_patches.rb
 lib/grat/system.rb
 public/gratfiles/application.js

data/Rakefile

@@ -3,9 +3,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('grat', '0.0.4') do |p|
+Echoe.new('grat', '0.0.5') do |p|
   p.summary        = "Minimal CMS for Rack and MongoDB."
-  p.description    = "Basic interface for making webpages with Haml and (later) erb. Supports nested templates."
+  p.description    = "Basic interface for making webpages with Haml and Erb. Supports nested templates."
   p.url            = "http://samsm.com/"
   p.author         = "Sam Schenkman-Moore"
   p.email          = "samsm@samsm.com"

data/grat.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Schenkman-Moore"]
-  s.date = %q{2009-11-02}
-  s.description = %q{Basic interface for making webpages with Haml and (later) erb. Supports nested templates.}
+  s.date = %q{2009-11-03}
+  s.description = %q{Basic interface for making webpages with Haml and Erb. Supports nested templates.}
   s.email = %q{samsm@samsm.com}
-  s.extra_rdoc_files = ["README", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "config.ru", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb", "public/gratfiles/application.js", "public/gratfiles/custom.css", "public/gratfiles/einars-js-beautify/HTML-Beautify.js", "public/gratfiles/einars-js-beautify/beautify-cl.js", "public/gratfiles/einars-js-beautify/beautify-tests.js", "public/gratfiles/einars-js-beautify/beautify.js", "public/gratfiles/einars-js-beautify/bin/beautify_js", "public/gratfiles/einars-js-beautify/index.html", "public/gratfiles/einars-js-beautify/javascriptobfuscator_unpacker.js", "public/gratfiles/einars-js-beautify/license.txt", "public/gratfiles/einars-js-beautify/sanitytest.js", "public/gratfiles/einars-js-beautify/unmaintained/bbedit/jsBeautify_BBED.scpt", "public/gratfiles/einars-js-beautify/unmaintained/c-sharp/JSBeautify.cs", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/make_opera_userscript.sh", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/opera_userscript.js", "public/gratfiles/favicon.ico", "public/gratfiles/jquery-combined.min.js", "public/gratfiles/js-beautifier.min.js", "public/gratfiles/oocss.min.css", "public/gratfiles/oocss/content.css", "public/gratfiles/oocss/grids.css", "public/gratfiles/oocss/grids_debug.css", "public/gratfiles/oocss/libraries.css", "public/gratfiles/oocss/mod.css", "public/gratfiles/oocss/mod_debug.css", "public/gratfiles/oocss/mod_skins.css", "public/gratfiles/oocss/talk.css", "public/gratfiles/oocss/talk_skins.css", "public/gratfiles/oocss/template.css", "public/gratfiles/oocss/template_debug.css", "views/content_form.haml", "views/css/_content.sass", "views/css/_custom.sass", "views/css/_grids.sass", "views/css/_grids_debug.sass", "views/css/_libraries.sass", "views/css/_mod.sass", "views/css/_mod_debug.sass", "views/css/_mod_skins.sass", "views/css/_template.sass", "views/css/_template_debug.sass", "views/layout.haml", "views/list.haml", "views/missing.haml", "grat.gemspec"]
+  s.extra_rdoc_files = ["README", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/hash_binding.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb"]
+  s.files = ["Manifest", "README", "Rakefile", "config.ru", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/hash_binding.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb", "public/gratfiles/application.js", "public/gratfiles/custom.css", "public/gratfiles/einars-js-beautify/HTML-Beautify.js", "public/gratfiles/einars-js-beautify/beautify-cl.js", "public/gratfiles/einars-js-beautify/beautify-tests.js", "public/gratfiles/einars-js-beautify/beautify.js", "public/gratfiles/einars-js-beautify/bin/beautify_js", "public/gratfiles/einars-js-beautify/index.html", "public/gratfiles/einars-js-beautify/javascriptobfuscator_unpacker.js", "public/gratfiles/einars-js-beautify/license.txt", "public/gratfiles/einars-js-beautify/sanitytest.js", "public/gratfiles/einars-js-beautify/unmaintained/bbedit/jsBeautify_BBED.scpt", "public/gratfiles/einars-js-beautify/unmaintained/c-sharp/JSBeautify.cs", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/make_opera_userscript.sh", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/opera_userscript.js", "public/gratfiles/favicon.ico", "public/gratfiles/jquery-combined.min.js", "public/gratfiles/js-beautifier.min.js", "public/gratfiles/oocss.min.css", "public/gratfiles/oocss/content.css", "public/gratfiles/oocss/grids.css", "public/gratfiles/oocss/grids_debug.css", "public/gratfiles/oocss/libraries.css", "public/gratfiles/oocss/mod.css", "public/gratfiles/oocss/mod_debug.css", "public/gratfiles/oocss/mod_skins.css", "public/gratfiles/oocss/talk.css", "public/gratfiles/oocss/talk_skins.css", "public/gratfiles/oocss/template.css", "public/gratfiles/oocss/template_debug.css", "views/content_form.haml", "views/css/_content.sass", "views/css/_custom.sass", "views/css/_grids.sass", "views/css/_grids_debug.sass", "views/css/_libraries.sass", "views/css/_mod.sass", "views/css/_mod_debug.sass", "views/css/_mod_skins.sass", "views/css/_template.sass", "views/css/_template_debug.sass", "views/layout.haml", "views/list.haml", "views/missing.haml", "grat.gemspec"]
   s.homepage = %q{http://samsm.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Grat", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/environment.rb

@@ -41,3 +41,4 @@ module Grat
 end
 
 require Grat.lib_path + '/grat/system'
+require Grat.lib_path + '/grat/hash_binding'

data/lib/grat/content.rb

@@ -6,14 +6,11 @@ class Grat::Content
   key :content, String
   key :tags, Array
   key :template_url, String
-  key :variables_needed, Array
   timestamps!
   
   before_save :detect_default_content_vars
   key :default_content_vars, Hash
-  
-  key :render_engine_name, String
-  
+    
   def editable_fields
     attributes.reject {|k,v| uneditable_keys.include? k }
   end
@@ -62,13 +59,20 @@ class Grat::Content
   end
   
   def render_engine
-    @render_engine ||= case render_engine_name
-    when 'haml',nil # the default for now
-      require 'haml'
-      Haml::Engine.new(content)
-    when 'erb'
-      raise 'Unimplemented!'
+    if content.match(/\A[!%#.=-]/)
+      :haml
+    else
+      :erb
     end
+    # 
+    # 
+    # @render_engine ||= case render_engine_name
+    # when 'haml',nil # the default for now
+    #   require 'haml'
+    #   Haml::Engine.new(content)
+    # when 'erb'
+    #   raise 'Unimplemented!'
+    # end
   end
     
   def detect_default_content_vars
@@ -84,6 +88,17 @@ class Grat::Content
     end
   end
   
+  def haml_render(text, template, vars)
+    require 'haml'
+    haml_template = Haml::Engine.new(template)
+    haml_template.render(haml_template, vars) { text }
+  end
+  
+  def erb_render(text, template, vars)
+    require 'erb'
+    ERB.new(template,0).result(Grat::HashBinding.new(vars).get_binding { text })
+  end
+  
   def detect_problem_var(resolution = {})
     begin
       rendered = content_with(default_content_vars.merge(resolution), problem_var = nil)
@@ -94,7 +109,7 @@ class Grat::Content
   end
   
   def content_with(locals = {},y = '')
-    render_engine.render(render_engine,locals) { y }
+    send "#{render_engine}_render", y, content, locals
   end
   
   

data/lib/grat/hash_binding.rb

@@ -0,0 +1,18 @@
+# A class to assist in turning a hash into a binding (for erb rendering)
+class Grat::HashBinding
+  
+  attr_accessor :hash
+  
+  def initialize(hsh)
+    self.hash = hsh
+  end
+  
+  def get_binding
+    binding
+  end
+  
+  def method_missing(meth,*args)
+    hash[meth]
+  end
+  
+end

data/lib/grat.rb

@@ -38,12 +38,18 @@ class Grat::Application < Sinatra::Base
     locals = {}
     template_chain.inject('') do |sum, template|
       locals.merge!(template.default_content_vars.merge(template.attributes))
-      require 'haml'
-      haml_template = Haml::Engine.new(template.content)
-      result = haml_template.render(haml_template, locals) { sum }
+      
+      combine_docs(sum,template, locals)
+      # require 'haml'
+      # haml_template = Haml::Engine.new(template.content)
+      # result = haml_template.render(haml_template, locals) { sum }
     end
   end
   
+  def combine_docs(text,template,vars)
+    template.content_with(vars,text)
+  end
+      
   def haml(*args)
     require 'haml'
     super(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -05:00
+date: 2009-11-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Basic interface for making webpages with Haml and (later) erb. Supports nested templates.
+description: Basic interface for making webpages with Haml and Erb. Supports nested templates.
 email: samsm@samsm.com
 executables: []
 
@@ -63,6 +63,7 @@ extra_rdoc_files:
 - lib/environment.rb
 - lib/grat.rb
 - lib/grat/content.rb
+- lib/grat/hash_binding.rb
 - lib/grat/mongomapper_patches.rb
 - lib/grat/system.rb
 files: 
@@ -73,6 +74,7 @@ files:
 - lib/environment.rb
 - lib/grat.rb
 - lib/grat/content.rb
+- lib/grat/hash_binding.rb
 - lib/grat/mongomapper_patches.rb
 - lib/grat/system.rb
 - public/gratfiles/application.js