grat 0.0.5.1 → 0.0.5.2

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('grat', '0.0.5.1') do |p|
+Echoe.new('grat', '0.0.5.2') do |p|
   p.summary        = "Minimal CMS for Rack and MongoDB."
   p.description    = "Basic interface for making webpages with Haml and Erb. Supports nested templates."
   p.url            = "http://samsm.com/"

data/grat.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.0.5.1"
+  s.version = "0.0.5.2"
 
   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-03}
+  s.date = %q{2009-11-04}
   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/hash_binding.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb"]

data/lib/grat/content.rb

@@ -10,7 +10,11 @@ class Grat::Content
   
   before_save :detect_default_content_vars
   key :default_content_vars, Hash
-    
+  
+  def attributes_for_variables
+    attributes.reject {|k,v| k == '_id' }
+  end
+  
   def editable_fields
     attributes.reject {|k,v| uneditable_keys.include? k }
   end
@@ -64,15 +68,6 @@ class Grat::Content
     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

data/lib/grat.rb

@@ -37,12 +37,10 @@ class Grat::Application < Sinatra::Base
     pass if content.new_record?
     locals = {}
     template_chain.inject('') do |sum, template|
-      locals.merge!(template.default_content_vars.merge(template.attributes))
-      
+      locals = template.default_content_vars.
+                 merge(template.attributes_for_variables).
+                 merge(locals)
       combine_docs(sum,template, locals)
-      # require 'haml'
-      # haml_template = Haml::Engine.new(template.content)
-      # result = haml_template.render(haml_template, locals) { sum }
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.1
+  version: 0.0.5.2
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -05:00
+date: 2009-11-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency