grat 0.2.4 → 0.3.0

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_development_dependency "yard", ">= 0"
     gem.add_runtime_dependency 'sinatra'
     gem.add_runtime_dependency 'haml'
-    gem.add_runtime_dependency 'mongoid', "0.9.11"
+    gem.add_runtime_dependency 'mongo_mapper', "0.6.8"
     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.4
+0.3.0

data/config.ru

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'rack'
 require 'lib/grat'
+require 'ruby-debug'
 
 Grat.database_conf # uses defaults
 # to override:

data/grat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   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-21}
+  s.date = %q{2009-12-29}
   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.9.11"])
+      s.add_runtime_dependency(%q<mongo_mapper>, ["= 0.6.8"])
       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.9.11"])
+      s.add_dependency(%q<mongo_mapper>, ["= 0.6.8"])
       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.9.11"])
+    s.add_dependency(%q<mongo_mapper>, ["= 0.6.8"])
     s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/lib/environment.rb

@@ -7,40 +7,38 @@ module Grat
   def self.root_path
     File.dirname(File.dirname(__FILE__))
   end
-  
+
   def self.lib_path
     root_path + '/lib'
   end
-  
+
   def self.view_path
     root_path + '/views'
   end
-  
+
   def self.database_conf(options = {})
     @@database_conf = options
   end
-  
+
   def self.database_load
-    require 'mongoid'
-    @@connection = if @@database_conf[:host]
-      Mongo::Connection.new(@@database_conf[:host])
-    else
-      Mongo::Connection.new
+    require 'mongo_mapper'
+    if @@database_conf[:host]
+      MongoMapper.connection = Mongo::Connection.new(@@database_conf[:host])
     end
-    
-    database = @@connection.db(@@database_conf[:database] || 'grat_development')
+
+    MongoMapper.database = @@database_conf[:database] || 'grat_development'
+
     if @@database_conf[:username] && @@database_conf[:password]
-      database.authenticate(@@database_conf[:username], @@database_conf[:password])
+      MongoMapper.database.authenticate(@@database_conf[:username], @@database_conf[:password])
     end
-    
-    Mongoid.database = database
-    
+
     require Grat.lib_path + '/grat/content'
-    
+
   end
-  
+
+
   def self.database
-    Mongoid.database
+    MongoMapper.database
   end
 end
 

data/lib/grat.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/environment.rb'
 
 class Grat::Application < Sinatra::Base
-  
+
   include Grat::System
-  
+
   set :views, Grat.view_path
   set :methodoverride, true
-  
+
   # serve some static assets directly from gem
   get '/gratfiles/:filename' do
     file_data = IO.read(Grat.root_path + '/public/gratfiles/' + params[:filename])
@@ -18,30 +18,30 @@ class Grat::Application < Sinatra::Base
     end
     file_data
   end
-  
+
   get '/__admin/all' do
     @pages = model.all
     @templates = templates
     haml :list
   end
-  
+
   get '/__admin/export' do
     content_type('text/json')
     # Content-disposition: attachment; filename=fname.ext
     response['Content-disposition'] = "attachment; filename=grat-#{request.host}-export-at-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}.json"
     model.all.to_json
   end
-  
+
   get '/__admin/import' do
     haml :import_form
   end
-  
+
   post '/__admin/import' do
     json_text = file_import_text || params[:import][:text]
     @import_results = import(json_text, params[:import][:strategy])
     redirect '/__admin/all'
   end
-  
+
   # Rather inefficient at present.
   def import(json_text, strategy)
     json_to_import = JSON.parse json_text
@@ -59,7 +59,7 @@ class Grat::Application < Sinatra::Base
       end
     end
   end
-  
+
   def import_record(hash, options = {:replace => false, :check => true})
     record = model.find_by_url(hash['url']) if options[:check]
     if record && options[:replace]
@@ -69,21 +69,21 @@ class Grat::Application < Sinatra::Base
       model.create hash
     end
   end
-  
+
   def file_import_text
     if params[:import] && params[:import][:file] && params[:import][:file][:tempfile]
       params[:import][:file][:tempfile].read
     end
   end
-  
+
   get '/__admin/edit/*' do
     haml :content_form
   end
-  
+
   get '/__admin/delete/*' do
     haml :delete
   end
-  
+
   get '/__admin/new' do
     url = params[:url]
     if url.to_s[/./]
@@ -101,18 +101,19 @@ class Grat::Application < Sinatra::Base
       end
     end
   end
-  
+
   put '/*' do
     content.update_attributes(focus_params)
     redirect edit_path(content.url)
   end
-  
+
   delete '/*' do
     content.destroy
     redirect edit_path(content.url)
   end
-  
+
   post '/*' do
+    # debugger
     content.update_attributes(focus_params)
     if params[:content][:submit].include? 'make'
       redirect edit_path(next_content_url)
@@ -120,7 +121,7 @@ class Grat::Application < Sinatra::Base
       redirect edit_path(content.url)
     end
   end
-  
+
   def next_content_url
     current_content = content
     new_url = '/broken'
@@ -137,10 +138,10 @@ class Grat::Application < Sinatra::Base
       new_url
     end
   end
-  
+
   get '/*' do
     pass if content.new_record?
-    
+
     case request_type
     when 'html'
       locals = {}
@@ -155,36 +156,36 @@ class Grat::Application < Sinatra::Base
       content.to_json
     end
   end
-  
+
   not_found do
     haml :missing
   end
-  
+
   def edit_path(url)
     "/__admin/edit#{url}"
   end
-  
+
   def delete_path(url)
     "/__admin/delete#{url}"
   end
-  
+
   def combine_docs(text,template,vars)
     template.content_with(vars,text)
   end
-  
+
   def haml(*args)
     require 'haml'
     super(*args)
   end
-  
+
   def templates
     model.find_all_by_tag('template')
   end
-    
+
   helpers do
     def form_nest(name)
       "content[#{name}]"
     end
   end
-  
+
 end

data/lib/grat/content.rb

@@ -1,75 +1,75 @@
-class Grat::Content < Mongoid::Document
-  include Mongoid::Timestamps
+class Grat::Content
+  include MongoMapper::Document
   attr_accessor :suggested_fields
-  
-  field :url
+
+  key :url
   validates_uniqueness_of :url
-  field :content
-  field :tags, :type => Array
-  field :template_url
-  
+  key :content
+  key :tags, Array
+  key :template_url
+
   before_save :detect_default_content_vars
-  field :default_content_vars, :type => Hash
-  
+  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
-  
+
   def uneditable_keys
     # url is in here so it can maually be placed at the top of edit form.
     # Same deal with template_url
     ["updated_at", "_id", "url", "created_at","content","tags",'template_url','template',
       'default_content_vars','variables_needed','render_engine_name']
   end
-  
+
   def tags=(val)
-    @attributes[:tags] = (val.kind_of?(Array) ? val : val.split(' '))
+    super(val.kind_of?(Array) ? val : val.split(' '))
   end
-  
+
   def tags
-    @attributes[:tags] or []
+    super or []
   end
-  
+
   def self.find_all_by_tag(tag_name)
     all(:conditions => {'tags' => [tag_name]})
   end
-  
+
   def type
     self.class.to_s.sub(/.+::/, '')
   end
-  
+
   def default_content_vars
-    @attributes[:default_content_vars] or {}
+    super or {}
   end
-  
+
   def default_content_vars=(val)
-    @attributes[:default_content_vars] = val.kind_of?(String) ? JSON.parse(val) : val
+    super val.kind_of?(String) ? JSON.parse(val) : val
   end
-  
+
   def template
     @template ||= Grat::Content.find_by_url(template_url) if template_url
   end
-  
+
   def template=(var)
     raise 'This is probably a mistake.'
   end
-  
+
   def template_url=(var)
-    @attributes[:template_url] = var unless var.nil? || var.empty?
+    super(var) unless var.nil? || var.empty?
   end
-  
+
   def demo_string
     'String needed'
   end
-  
+
   def demo_array
     %w(an array is needed)
   end
-  
+
   def render_engine
     if content.match(/\A[!%#.=-]/)
       :haml
@@ -77,7 +77,7 @@ class Grat::Content < Mongoid::Document
       :erb
     end
   end
-    
+
   def detect_default_content_vars
     counter = 0
     while problem_var = detect_problem_var
@@ -90,18 +90,18 @@ class Grat::Content < Mongoid::Document
       raise "Don't know how to reconcile."
     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)
@@ -110,11 +110,11 @@ class Grat::Content < Mongoid::Document
       $!.to_s.sub(/.+`/,'').sub(/'.+/,'')
     end
   end
-  
+
   def content_with(locals = {},y = '')
     send "#{render_engine}_render", y, content, locals
   end
-  
+
   def suggested_fields
     @suggested_fields or []
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -05:00
+date: 2009-12-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,14 +43,14 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: mongo_mapper
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.11
+        version: 0.6.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: json