moomerman-rambo 0.4.3 → 0.4.4

data/README

@@ -7,7 +7,7 @@ To run the example:
 
 git clone git://github.com/moomerman/rambo.git
 cd rambo/example/blog/
-rake db:setup # assumes database named rambo_blog
+rake db:setup # check config.yml for your specific db settings
 rake server
 
 head over to http://localhost:4000/

data/lib/rambo/env.rb

@@ -1,21 +1,25 @@
 module Rambo
   class Env
     def initialize
-      # load from config - only do this IF database required
-      require 'dm-core'
-      require 'dm-validations'
-      require 'dm-timestamps'
-      #DataMapper.setup(:default, 'mysql://localhost/moo_development')
-      @connection ||= DataMapper.setup(
-        :default, 
-        :adapter => :mysql, 
-        :host => 'localhost', 
-        :database => 'rambo_blog', 
-        :username => 'root', 
-        :password => ''
-      )
-      #DataObjects::Mysql.logger = DataObjects::Logger.new(STDOUT, :debug)
-    
+      # TODO: config reload
+      @@config ||= YAML.load_file("config.yml") rescue nil || {}
+      
+      if dbconf = @@config['database']
+        require 'dm-core'
+        require 'dm-validations'
+        require 'dm-timestamps'
+        #DataMapper.setup(:default, 'mysql://localhost/moo_development')
+        @connection ||= DataMapper.setup(
+          :default, 
+          :adapter => dbconf['adapter'], 
+          :host => dbconf['host'], 
+          :database => dbconf['database'], 
+          :username => dbconf['username'], 
+          :password => dbconf['password']
+        )
+        #DataObjects::Mysql.logger = DataObjects::Logger.new(STDOUT, :debug)
+      end
+      
       Dir["controller/*.rb"].each { |x| funkyload x }
       Dir["model/*.rb"].each { |x| funkyload x }
       Dir["lib/*.rb"].each { |x| funkyload x }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moomerman-rambo
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Richard Taylor