sinatra-dm 0.1.2 → 0.1.3

data/spec/spec_helper.rb

@@ -7,9 +7,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'sinatra/dm'
 require 'sinatra/tests'
-
 require 'dm-core'
 
+ENV['RACK_ENV'] = 'test'
+
 
 Spec::Runner.configure do |config|
   config.include RspecHpricotMatchers
@@ -22,44 +23,19 @@ def fixtures_path
 end
 
 
-class MyTestApp < Sinatra::Base
-  
-  register(Sinatra::DataMapperExtension)
-  
-  set :environment, :test
-  # set :dm_logger_level, :info
-  
-  # NOTE:: The database configuration must be set 
-  # in order for the DataMapper.auto_migrate! /auto_upgrade! migrations work
-  
-  set :database, "sqlite3://#{APP_ROOT}/db/db.test.db"
-  
-  # ::DataMapper.auto_migrate!
-  
-  
-  ## LOAD MODELS
-  require "dm_model.rb"
-  
-  ## Migrate only in test environments, else upgrade
-  # test? ? ::DataMapper.auto_migrate! : ::DataMapper.auto_upgrade!
-  
-  
-  
-  ## ROUTES TEST (IF DATA COMES THROUGH)
-  get '/db' do
-    @posts = Post.all
-    out = []
-    @posts.each { |p| out << p.name }
-    # out = @posts.map { |p| p.name }
-    out.join(', ')
-  end
-  
+# class MyTestApp < Sinatra::Base
+# 
+#  Declared in each test suite
+# 
+# end
+
+
+class Test::Unit::TestCase
+  include Sinatra::Tests::TestCase
+  Sinatra::Base.set :environment, :test
 end
 
-def dm_bootstrap
-  
-  # DataMapper.setup :default, "sqlite3://#{APP_ROOT}/db/db.bootstrap.db"  
-  # Post.auto_upgrade!
-  # ::DataMapper::Migrations.auto_upgrade!
-  
-end
+
+### BOOTSTRAP ###
+
+require 'dm_bootstrap.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-dm
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - kematzy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +08:00
+date: 2010-02-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.10.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: kematzy-tasks
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra-tests
   type: :development
@@ -59,12 +69,13 @@ files:
 - Rakefile
 - VERSION
 - lib/sinatra/dm.rb
-- lib/sinatra/dm/rake.rb
 - sinatra-dm.gemspec
-- spec/dm_model.rb
+- spec/dm_bootstrap.rb
 - spec/fixtures/db/.gitignore
+- spec/fixtures/db/custom/.gitignore
 - spec/fixtures/log/.gitignore
-- spec/sinatra/dm_spec.rb
+- spec/sinatra/dm_mysql_spec.rb
+- spec/sinatra/dm_sqlite3_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kematzy/sinatra-dm
@@ -95,6 +106,7 @@ signing_key:
 specification_version: 3
 summary: Sinatra Extension for working with DataMapper
 test_files: 
-- spec/dm_model.rb
-- spec/sinatra/dm_spec.rb
+- spec/dm_bootstrap.rb
+- spec/sinatra/dm_mysql_spec.rb
+- spec/sinatra/dm_sqlite3_spec.rb
 - spec/spec_helper.rb

data/lib/sinatra/dm/rake.rb

@@ -1,128 +0,0 @@
-
-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']
-  
-  desc "Backups DBs into .sql files (=> db:backup:sql)"
-  task :backups => ['db:backup:sql']
-  
-  namespace :backup do 
-    
-    desc "Backups DBs into .sql file"
-    task :sql => ['db:dump']
-    
-    desc "Backups DB .db file and compresses it"
-    task :db, [:db] do |t, args| 
-      unless args.db
-        puts %Q[\nERROR:\n\n  You must define the DB variable like this:\n  rake db:backup:db db=db/name-of-database.db\n\n]
-      else
-        db_name = args.db.sub(/^db\//,'')
-        `cd db/ && tar zcf ../db/backups/#{Time.now.strftime("%Y%d%m-%H%M%S")}-#{db_name}.tar.gz #{db_name} `
-        puts "\n-- created a compressed backup version of [ #{args.db} ]\n\n"
-      end
-    end
-    
-  end #/namespace :backup
-  
-  
-  desc "Bootstrap database with .sql files (db=db/name.db)"
-  task :bootstrap, [:db] do |t, args| 
-    # To put the data into a SQLite database from a sql file use:
-    # sqlite database < database.sql
-    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 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
-  
-  namespace :bootstrap do 
-    
-    desc "Bootstrap NEW DB (db=db/name.db, bf=db/bootstraps/name.sql)"
-    task :new, [:db, :bf] do |t, args| 
-      unless args.db && args.bf
-        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 msg
-      else
-        sh "sqlite3 #{args.db} < #{args.bf}"
-        puts "-- created new DB [ #{args.db} ]\n"
-        puts "-- - bootstrapped with [ #{args.bf} ]\n\n"
-      end
-    end
-    
-  end #/namespace :bootstrap
-  
-  desc "Dump database(s) to .sql file(s)"
-  task :dump do 
-    # In order to dump a SQLite database you can use the following command:
-    # sqlite database .dump > database.sql
-    dump_all_dbs_and_wrap_dumps_with_comments(:backups)
-    puts "-- dumped all DBs into .sql files\n\n"
-  end
-  
-  namespace :dump do 
-    
-    desc "Dump current database as a bootstrap .sql file"
-    task :bootstrap do 
-      dump_all_dbs_and_wrap_dumps_with_comments(:bootstraps)
-    end
-    
-  end #/ namespace :dump
-  
-end #/ namespace :db
-
-
-##
-# TODO: add some comments here
-#  
-# ==== Examples
-# 
-# 
-# @api private
-def dump_all_dbs_and_wrap_dumps_with_comments(dump_dir = :backups ) 
-  Dir["db/*.db"].each do |db|
-    
-    if dump_dir == :bootstraps
-      backup_file = "db/#{dump_dir}/#{File.basename(db)}.sql"
-    else
-      backup_file = "db/#{dump_dir}/#{Time.now.strftime("%Y%d%m-%H%M%S")}-#{File.basename(db)}.sql"
-    end
-    
-    comment = %Q['-- ++++ ]
-    if dump_dir == :bootstraps
-      comment << %Q[\n-- BOOTSTRAP FILE FOR DB [ #{File.basename(db)} ] ]
-    else
-      comment << %Q[\n-- BACKUP OF DB [ #{File.basename(db)} ] ]
-    end
-    comment << %Q[\n-- IN APP [ #{File.dirname(File.expand_path(__FILE__))}/ ] ]
-    comment << %Q[\n-- Created on [ #{Time.now.strftime("%Y-%d-%m at %H:%M:%S")} ] ]
-    comment << %Q[\n-- ]
-    comment << %Q[\n-- /++++ \n']
-    
-    `echo #{comment} > #{backup_file}`
-    sh "sqlite3 #{db} .dump >> #{backup_file}"
-    `echo '\n-- \n-- /EOF \n-- ' >> #{backup_file}`
-  end
-  
-end
-

data/spec/dm_model.rb

@@ -1,14 +0,0 @@
-class ::Post
-  include DataMapper::Resource
-  property :id,                   Serial
-  property :name,                 String
-end #/ Post
-
-  
-# Post.auto_migrate!
-DataMapper.auto_migrate!
-
-
-Post.create!(:name => "Post1" )
-Post.create!(:name => "Post2" )
-Post.create!(:name => "Post3" )

data/spec/sinatra/dm_spec.rb

@@ -1,84 +0,0 @@
-
-require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
-
-# dm_bootstrap
-
-describe "Sinatra" do 
-  
-  describe "DM" do 
-    
-    before(:each) do
-      class ::Test::Unit::TestCase 
-        def app; ::MyTestApp.new ; end
-      end
-      @app = app
-    end
-    
-    after(:each) do
-      class ::Test::Unit::TestCase 
-        def app; nil ; end
-      end
-      @app = nil
-    end
-    
-    # it_should_behave_like "MyTestApp"
-          
-    describe "Using Defaults" do 
-      
-      it "should set the correct adapter" do
-        MyTestApp.database.options['adapter'].should == "sqlite3"
-      end
-      
-      it "should set the correct db path" do
-        MyTestApp.database.options['path'].should == "#{fixtures_path}/db/db.test.db"
-      end
-      
-      it "should set the correct dm_logger_level" do
-        MyTestApp.database_logger.init_args[1].should == :debug
-      end
-      
-      it "should set the correct dm_logger_level" do
-        MyTestApp.database_logger.init_args[0].should == "#{fixtures_path}/log/dm.test.log"
-      end
-      
-      it "should return the data from the database" do
-        get("/db")
-        body.should == "Post1, Post2, Post3"  
-      end
-      
-    end #/ Using Defaults
-    
-    describe "Using Custom Settings" do 
-      
-      class MySQLTestApp < Sinatra::Base 
-        register(Sinatra::DataMapperExtension)
-        
-        # NOTE:: :dm_logger_level & :dm_logger_path must be set before :database 
-        # in order to use custom settings
-        set :dm_logger_level, :info
-        set :dm_logger_path, "#{::APP_ROOT}/log/dm.custom.log"
-        
-        set :database, 'mysql://localhost/the_database_name'
-      end
-      
-      it "should set the correct adapter" do
-        MySQLTestApp.database.options['adapter'].should == "mysql"
-      end
-      
-      it "should set the correct db path" do
-        MySQLTestApp.database.options['path'].should == "/the_database_name"
-      end
-      
-      it "should set the correct dm_logger_level" do
-        MySQLTestApp.database_logger.init_args[1].should == :info
-      end
-      
-      it "should set the correct dm_logger_level" do
-        MySQLTestApp.database_logger.init_args[0].should == "#{fixtures_path}/log/dm.custom.log"
-      end
-      
-    end #/ Using Custom Settings
-    
-    
-  end #/ DM
-end #/ Sinatra