grat 0.2.1 → 0.2.2

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.add_development_dependency "yard", ">= 0"
     gem.add_runtime_dependency 'sinatra'
     gem.add_runtime_dependency 'haml'
-    gem.add_runtime_dependency 'mongoid'
+    gem.add_runtime_dependency 'mongoid', "0.9.6"
     gem.add_runtime_dependency 'json'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/grat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Schenkman-Moore"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2009-12-11}
   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 = [
@@ -97,20 +97,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
-      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, ["= 0.9.6"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
-      s.add_dependency(%q<mongoid>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["= 0.9.6"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
-    s.add_dependency(%q<mongoid>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["= 0.9.6"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/lib/grat/content.rb

@@ -27,7 +27,11 @@ class Grat::Content < Mongoid::Document
   end
   
   def tags=(val)
-    super(val.kind_of?(Array) ? val : val.split(' '))
+    @attributes[:tags] = (val.kind_of?(Array) ? val : val.split(' '))
+  end
+  
+  def tags
+    @attributes[:tags] or []
   end
   
   def self.find_all_by_tag(tag_name)
@@ -39,7 +43,11 @@ class Grat::Content < Mongoid::Document
   end
   
   def default_content_vars
-    @default_content_vars or {}
+    @attributes[:default_content_vars] or {}
+  end
+  
+  def default_content_vars=(val)
+    @attributes[:default_content_vars] = val.kind_of?(String) ? JSON.parse(val) : val
   end
   
   def template
@@ -51,7 +59,7 @@ class Grat::Content < Mongoid::Document
   end
   
   def template_url=(var)
-    super(var) unless var.nil? || var.empty?
+    @attributes[:template_url] = var unless var.nil? || var.empty?
   end
   
   def demo_string
@@ -78,7 +86,7 @@ class Grat::Content < Mongoid::Document
       (detect_problem_var(problem_var => demo_string) ||
         default_content_vars.merge!(problem_var => demo_string)) or
       (detect_problem_var(problem_var => demo_array) ||
-        default_content_vars.merge!(problem_var => demo_string)) or
+        default_content_vars.merge!(problem_var => demo_array)) or
       raise "Don't know how to reconcile."
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -05:00
+date: 2009-12-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: json