grat 0.0.2 → 0.0.3

data/Manifest

@@ -5,6 +5,7 @@ config.ru
 lib/environment.rb
 lib/grat.rb
 lib/grat/content.rb
+lib/grat/mongomapper_patches.rb
 lib/grat/page.rb
 lib/grat/system.rb
 lib/grat/template.rb

data/Rakefile

@@ -3,13 +3,13 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('grat', '0.0.2') do |p|
+Echoe.new('grat', '0.0.3') do |p|
   p.description    = "Minimal CMS for Rack and MongoDB."
   p.url            = "http://samsm.com/"
   p.author         = "Sam Schenkman-Moore"
   p.email          = "samsm@samsm.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ['ruby-debug','sinarta','haml','sass','mongomapper']
+  p.development_dependencies = ['sinatra','haml','sass','mongomapper']
 end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/config.ru

@@ -5,7 +5,7 @@ require 'lib/grat'
 
 Grat.database_conf # uses defaults
 # to override:
-# Grat.database_conf(:host => 'localhost', :database => 'grat_delete')
+# Grat.database_conf(:host => 'db.mongohq.com', :database => 'grat_production', :username => 'you', :password => 'whatever')
 
 use Rack::ShowExceptions
 run Grat::Application

data/grat.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   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-01}
+  s.date = %q{2009-11-02}
   s.description = %q{Minimal CMS for Rack and MongoDB.}
   s.email = %q{samsm@samsm.com}
-  s.extra_rdoc_files = ["README", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/page.rb", "lib/grat/system.rb", "lib/grat/template.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "config.ru", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/page.rb", "lib/grat/system.rb", "lib/grat/template.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/mongomapper_patches.rb", "lib/grat/page.rb", "lib/grat/system.rb", "lib/grat/template.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/page.rb", "lib/grat/system.rb", "lib/grat/template.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"]
@@ -23,21 +23,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<sinarta>, [">= 0"])
+      s.add_development_dependency(%q<sinatra>, [">= 0"])
       s.add_development_dependency(%q<haml>, [">= 0"])
       s.add_development_dependency(%q<sass>, [">= 0"])
       s.add_development_dependency(%q<mongomapper>, [">= 0"])
     else
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<sinarta>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<sass>, [">= 0"])
       s.add_dependency(%q<mongomapper>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<sinarta>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<sass>, [">= 0"])
     s.add_dependency(%q<mongomapper>, [">= 0"])

data/lib/environment.rb

@@ -15,16 +15,25 @@ module Grat
   end
   
   def self.database_conf(options = {})
-    @@database_conf = options    
+    @@database_conf = options
   end
   
   def self.database_load
-    require 'mongomapper'
-    if @@database_conf[:hostname]
-      MongoMapper.connection = XGen::Mongo::Driver::Mongo.new(@@database_conf[:hostname])
+    require lib_path + '/grat/mongomapper_patches'
+    connection = if @@database_conf[:host]
+      # auth = db.authenticate(my_user_name, my_password)
+      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]
+      database.authenticate(@@database_conf[:username], @@database_conf[:password])
+    end
+    
+    MongoMapper.direct_database = database
     
     require Grat.lib_path + '/grat/content'
     require Grat.lib_path + '/grat/page'

data/lib/grat/mongomapper_patches.rb

@@ -0,0 +1,11 @@
+require 'mongomapper'
+
+module MongoMapper
+  
+  # This allows for passwords, amongst other things.
+  def self.direct_database=(mongo_db_connection)
+    @@database_name = mongo_db_connection.name
+    @@database = mongo_db_connection
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,21 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 01:00:00 -04:00
+date: 2009-11-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sinarta
+  name: sinatra
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -73,6 +63,7 @@ extra_rdoc_files:
 - lib/environment.rb
 - lib/grat.rb
 - lib/grat/content.rb
+- lib/grat/mongomapper_patches.rb
 - lib/grat/page.rb
 - lib/grat/system.rb
 - lib/grat/template.rb
@@ -84,6 +75,7 @@ files:
 - lib/environment.rb
 - lib/grat.rb
 - lib/grat/content.rb
+- lib/grat/mongomapper_patches.rb
 - lib/grat/page.rb
 - lib/grat/system.rb
 - lib/grat/template.rb