grat 0.1.3 → 0.2.0

data/README.rdoc

@@ -32,7 +32,7 @@ Use it like so:
 9. Protect from writes by strangers with Rack::If
      # http://github.com/samsm/Rackif
    
-     use Rack::If, :method => /(POST)|(PUT)|(DELETE)/ do
+     use Rack::If, {:method => /(POST)|(PUT)|(DELETE)/, :path => /__admin/}, :any do
        use Rack::Auth::Basic, "Grat protected" do |username, password|
          'secret' == password
        end

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 'mongomapper'
+    gem.add_runtime_dependency 'mongoid'
     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.1.3
+0.2.0

data/lib/environment.rb

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'json'
 
 module Grat
+  @@connection = nil
   @@database_conf = {}
   def self.root_path
     File.dirname(File.dirname(__FILE__))
@@ -20,20 +21,27 @@ module Grat
   end
   
   def self.database_load
-    require 'mongomapper'
-    if @@database_conf[:host]
-      MongoMapper.connection = Mongo::Connection.new(@@database_conf[:host])
+    require 'mongoid'
+    @@connection = if @@database_conf[:host]
+      Mongo::Connection.new(@@database_conf[:host])
+    else
+      Mongo::Connection.new
     end
     
-    MongoMapper.database = @@database_conf[:database] || 'grat_development'
-    
+    database = @@connection.db(@@database_conf[:database] || 'grat_development')
     if @@database_conf[:username] && @@database_conf[:password]
-      MongoMapper.database.authenticate(@@database_conf[:username], @@database_conf[:password])
+      database.authenticate(@@database_conf[:username], @@database_conf[:password])
     end
-        
+    
+    Mongoid.database = database
+    
     require Grat.lib_path + '/grat/content'
     
   end
+  
+  def self.database
+    Mongoid.database
+  end
 end
 
 require Grat.lib_path + '/grat/system'

data/lib/grat/content.rb

@@ -1,17 +1,15 @@
-class Grat::Content
-  include MongoMapper::Document
-  
+class Grat::Content < Mongoid::Document
+  include Mongoid::Timestamps
   attr_accessor :suggested_fields
   
-  key :url, String
+  field :url
   validates_uniqueness_of :url
-  key :content, String
-  key :tags, Array
-  key :template_url, String
-  timestamps!
+  field :content
+  field :tags, :type => Array
+  field :template_url
   
   before_save :detect_default_content_vars
-  key :default_content_vars, Hash
+  field :default_content_vars, :type => Hash
   
   def attributes_for_variables
     attributes.reject {|k,v| k == '_id' }
@@ -41,7 +39,7 @@ class Grat::Content
   end
   
   def default_content_vars
-    super or {}
+    @default_content_vars or {}
   end
   
   def template

data/lib/grat/system.rb

@@ -47,8 +47,8 @@ module Grat::System
   def model
     return @model if @model
     
-    # Sinatra reloads are slow when mongomapper has to re-require
-    # This avoids requiring mongomapper when it isn't needed
+    # Sinatra reloads are slow when mongoid has to re-require
+    # This avoids requiring mongoid when it isn't needed
     Grat.database_load
     
     @model = Grat::Content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 -05:00
+date: 2009-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mongomapper
+  name: mongoid
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement