sinatra-dm 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/sinatra/dm.rb

@@ -15,7 +15,7 @@ module Sinatra
   # 
   module DataMapperExtension 
     
-    VERSION = '0.1.1' unless const_defined?(:VERSION)
+    VERSION = '0.1.2' unless const_defined?(:VERSION)
     def self.version; "Sinatra::DataMapperExtension v#{VERSION}"; end
     
     module Helpers 
@@ -46,7 +46,9 @@ module Sinatra
       # @database = nil  
       set :dm_setup_context, context
       set :database_url, url
-      puts "-- Initiated DataMapper DB [#{database_url.sub(::APP_ROOT, '...')}]"
+      db_type = database_url.split('://').first
+      db_url = database_url.sub(::APP_ROOT, '').sub("#{db_type}://",'')
+      puts "-- - activated DataMapper #{db_type.capitalize} Database at [ #{db_url} ]"
       database_logger
       database
     end
@@ -137,6 +139,7 @@ module Sinatra
     
     
     def self.registered(app)
+      app.set :db_dir, "#{::APP_ROOT}/db"
       app.set :dm_logger_level, :debug
       app.set :dm_logger_path, lambda { "#{::APP_ROOT}/log/dm.#{environment}.log" }
       app.set :dm_setup_context, :default
@@ -147,6 +150,14 @@ module Sinatra
       
       app.helpers DataMapperExtension::Helpers
       
+      ## add the extension specific options to those inspectable by :options_inspect method
+      if app.respond_to?(:sinatra_options_for_inspection)
+        %w( db_dir dm_logger_path dm_logger_level database_url 
+        dm_setup_context database ).each do |m|
+          app.sinatra_options_for_inspection << m
+        end
+      end
+      
       # QUESTION:: Should this actually be here? 
       # or should I just use the rake tasks
       # 

data/lib/sinatra/dm/rake.rb

@@ -1,6 +1,15 @@
 
 namespace :db do 
   
+  namespace :production do
+    
+    desc "Convert development.db into production.db"
+    task :setup do 
+      sh "cp db/development.db db/production.db"
+    end
+  end #/ namespace production
+  
+  
   desc "Backup database to .tar.gz file (=> db:backup:db)"
   task :backup  => ['db:backup:db']
   
@@ -33,10 +42,14 @@ namespace :db do
     unless args.db
       msg = %Q[\nERROR:\n\n  You must define the :db variable like this:\n]
       msg << %Q[  rake db:bootstrap db=db/name-of-database.db\n\n]
-      puts mgs
+      puts msg
     else
       sh "sqlite3 #{args.db} < db/bootstraps/#{args.db.sub(/^db\//,'')}.sql"
       puts "-- DB [ #{args.db}] bootstrapped with [ db/bootstraps/#{args.db.sub(/^db\//,'')}.sql ]l\n\n"
+      # if test(?d, '.git/config')
+      #   sh "git add db/bootstraps/#{args.db.sub(/^db\//,'')}.sql"
+      #   sh %Q{git commit -m "#{Time.now.strftime("%Y-%d-%m at %H:%M:%S")} : updated DB bootstraps for #{args.db}" }
+      # end
     end
     
   end
@@ -49,7 +62,7 @@ namespace :db do
         msg = %Q[\nERROR:\n\n  You must define the DB variable like this:\n]
         msg << %Q[  rake db:bootstrap:new db=db/name-of-database.db\n]
         msg << %Q[  bf=db/bootstraps/name.sql \n\n]
-        puts mgs
+        puts msg
       else
         sh "sqlite3 #{args.db} < #{args.bf}"
         puts "-- created new DB [ #{args.db} ]\n"

data/sinatra-dm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-dm}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-11-06}
   s.description = %q{Sinatra Extension for working with DataMapper (another Sinatra-Sequel Rip-off)}
   s.email = %q{kematzy@gmail.com}
   s.extra_rdoc_files = [

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 
+::APP_ROOT = File.join(File.dirname(__FILE__), 'fixtures') 
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -20,7 +21,6 @@ def fixtures_path
   "#{File.dirname(File.expand_path(__FILE__))}/fixtures"
 end
 
-::APP_ROOT = fixtures_path
 
 class MyTestApp < Sinatra::Base
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-dm
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - kematzy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 +08:00
+date: 2009-11-06 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency