sinatra-dm 0.1.2 → 0.1.3

data/sinatra-dm.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-dm}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2009-11-06}
+  s.date = %q{2010-02-22}
   s.description = %q{Sinatra Extension for working with DataMapper (another Sinatra-Sequel Rip-off)}
   s.email = %q{kematzy@gmail.com}
   s.extra_rdoc_files = [
@@ -24,12 +24,13 @@ Gem::Specification.new do |s|
      "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"
   ]
   s.homepage = %q{http://github.com/kematzy/sinatra-dm}
@@ -38,8 +39,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Sinatra Extension for working with DataMapper}
   s.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"
   ]
 
@@ -50,15 +52,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.10.1"])
       s.add_runtime_dependency(%q<dm-core>, [">= 0.10.1"])
+      s.add_runtime_dependency(%q<kematzy-tasks>, [">= 0.1.0"])
       s.add_development_dependency(%q<sinatra-tests>, [">= 0.1.5"])
     else
       s.add_dependency(%q<sinatra>, [">= 0.10.1"])
       s.add_dependency(%q<dm-core>, [">= 0.10.1"])
+      s.add_dependency(%q<kematzy-tasks>, [">= 0.1.0"])
       s.add_dependency(%q<sinatra-tests>, [">= 0.1.5"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0.10.1"])
     s.add_dependency(%q<dm-core>, [">= 0.10.1"])
+    s.add_dependency(%q<kematzy-tasks>, [">= 0.1.0"])
     s.add_dependency(%q<sinatra-tests>, [">= 0.1.5"])
   end
 end
+

data/spec/dm_bootstrap.rb

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

data/spec/sinatra/dm_mysql_spec.rb

@@ -0,0 +1,148 @@
+
+require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
+
+describe "Sinatra" do 
+  
+  describe "DM" do 
+    
+    describe "when using a MySQL db" 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, :debug
+        set :dm_logger_path, "#{fixtures_path}/log/dm.mysql_test_app.log"
+        
+        # NB!! sets the connection to an existing db [sinatra_dm_tests]
+        # in a standard install MySQL db (ie: unsecured) without a password
+        set :database, 'mysql://root:@localhost/sinatra_dm_tests'
+        
+        ## ROUTES TEST (IF DATA COMES THROUGH)
+        get '/db-mysql' do
+          Post.all.map(&:name).join(', ') # Post1, Post2,...
+        end
+        
+      end
+      
+      before(:each) do 
+        class ::Test::Unit::TestCase 
+          def app; ::MySQLTestApp.new ; end
+        end
+        @app = app
+        
+        dm_bootstrap('MySQL-Test')  ## INIT THE TABLES AND LOAD THE DATA
+      end
+      
+      after(:each) do 
+        class ::Test::Unit::TestCase 
+          def app; nil ; end
+        end
+        @app = nil
+      end
+      
+      describe "Configurations" do 
+        
+        it "should set :db_dir to [../db]  (NB! unused value when using MySQL)" do 
+          MySQLTestApp.db_dir.should == "#{fixtures_path}/db"
+        end
+        
+        it "should set :dm_logger_level to :debug" do 
+          MySQLTestApp.dm_logger_level.should == :debug
+        end
+        
+        it "should set :dm_logger_path to [../log/dm.mysql_test_app.log]" do 
+          MySQLTestApp.dm_logger_path.should == "#{fixtures_path}/log/dm.mysql_test_app.log"
+        end
+        
+        it "should set :dm_setup_context to :default" do 
+          MySQLTestApp.dm_setup_context.should == :default
+        end
+        
+        it "should set :dm_database_url to [mysql://]" do 
+          MySQLTestApp.dm_database_url.should == "mysql://root:@localhost/sinatra_dm_tests"
+        end
+        
+      end #/ Configurations
+      
+      
+      describe "Helper method " do 
+        
+        describe "#database" do 
+          
+          it "should return an MySQL Adapter" do 
+            app.database.should be_a_kind_of(DataMapper::Adapters::MysqlAdapter)
+          end
+          
+          describe "and the MySQL Adapter " do 
+            
+            it "should be configured with the correct DB host [localhost]" do 
+              app.database.options['host'].should == "localhost"
+            end
+            
+            it "should be configured with the correct DB path [/sinatra_dm_tests]" do 
+              app.database.options['path'].should == "/sinatra_dm_tests"
+            end
+            
+            it "should be configured with the correct DB user [root]" do 
+              app.database.options['user'].should == "root"
+            end
+            
+            it "should be configured with the correct DB password [ (empty)]" do 
+              app.database.options['password'].should == ""
+            end
+            
+            it "should be configured with the correct setup [:default]" do 
+              app.database.name.should == :default
+            end
+            
+          end #/ and the MySQL Adapter 
+          
+          
+        end #/ #database
+        
+        describe "#db_logger" do 
+          
+          it "should be a DataMapper::Logger Object" do 
+            app.db_logger.should be_a_kind_of(DataMapper::Logger)
+          end
+          
+          it "should have the correct log path [../log/dm.mysql_test_app.log]" do 
+            app.db_logger.init_args[0].should == "#{fixtures_path}/log/dm.mysql_test_app.log"
+          end
+          
+          it "should have the correct log level [:debug]" do 
+            app.db_logger.init_args[1].should == :debug
+          end
+          
+          it "should write log messages to the log file" do 
+            custom_message = "__INFO_MYSQL_MESSAGE__ written at [#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]"
+            app.db_logger.info(custom_message)
+            IO.read(app.db_logger.init_args[0]).should match(/#{Regexp.escape(custom_message)}/)
+          end
+          
+          it "should write debug log messages to the log file" do 
+            custom_message = "__DEBUG_MYSQL_MESSAGE__ written at [#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]"
+            app.db_logger.debug(custom_message)
+            IO.read(app.db_logger.init_args[0]).should match(/#{Regexp.escape(custom_message)}/)
+          end
+          
+        end #/ #db_logger
+        
+      end #/ Helper method 
+      
+      
+      describe "DB Queries" do 
+        
+        it "should return the data from the database" do 
+          get("/db-mysql")
+          body.should == "MySQL-TestPost1, MySQL-TestPost2, MySQL-TestPost3" 
+        end
+        
+      end #/ DB Queries
+        
+      
+    end #/ when using a MySQL 
+  end #/ DM
+end #/ Sinatra

data/spec/sinatra/dm_sqlite3_spec.rb

@@ -0,0 +1,308 @@
+
+require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
+
+describe "Sinatra" do 
+  
+  describe "DM" do 
+    
+    describe "when using a SQLite3 db" do 
+      
+      describe "and using Default Settings" do 
+        
+        class MyTestApp < Sinatra::Base 
+          register(Sinatra::DataMapperExtension)
+          
+          # NOTE:: need to set this for the logger to function
+          set :environment, ENV['RACK_ENV'].to_sym || :test
+          
+          # NOTE:: The database configuration must be set 
+          # in order for the DataMapper.auto_migrate! /auto_upgrade! migrations work
+          set :database, dm_database_url
+          
+          ## ROUTES TEST (IF DATA COMES THROUGH)
+          get '/db-default' do
+            Post.all.map(&:name).join(', ') # Post1, Post2,...
+          end
+          
+        end
+        
+        before(:each) do 
+          class ::Test::Unit::TestCase 
+            def app; ::MyTestApp.new ; end
+          end
+          @app = app
+          
+          dm_bootstrap('SQLite3-Default')  ## INIT THE TABLES AND LOAD THE DATA
+        end
+        
+        after(:each) do 
+          class ::Test::Unit::TestCase 
+            def app; nil ; end
+          end
+          @app = nil
+        end
+        
+        describe "Configuration" do 
+          
+          it "should set :db_dir to ../db" do 
+            MyTestApp.db_dir.should == "#{fixtures_path}/db"
+          end
+          
+          it "should set :dm_logger_level to :debug" do 
+            MyTestApp.dm_logger_level.should == :debug
+          end
+          
+          it "should set :dm_logger_path to [../log/dm.< environment >.log]" do 
+            MyTestApp.dm_logger_path.should == "#{fixtures_path}/log/dm.test.log"
+          end
+          
+          it "should set :dm_setup_context to :default" do 
+            MyTestApp.dm_setup_context.should == :default
+          end
+          
+          it "should set :dm_database_url to [../db/db.< environment >.db]" do 
+            MyTestApp.dm_database_url.should == "sqlite3://#{fixtures_path}/db/db.test.db"
+          end
+          
+        end #/ Configuration 
+        
+        describe "Helpers" do 
+          
+          describe "#database" do 
+            
+            it "should return an SQLite3 Adapter" do 
+              app.database.should be_a_kind_of(DataMapper::Adapters::Sqlite3Adapter)
+            end
+            
+            it "should be configured with the correct DB path [../db/db.< environment >.db]" do 
+              app.database.options['path'].should == "#{fixtures_path}/db/db.test.db"
+            end
+            
+            it "should be configured with the correct setup [:default]" do 
+              app.database.name.should == :default
+            end
+            
+          end #/ #database
+          
+          describe "#db_logger" do 
+            
+            it "should be a DataMapper::Logger Object" do 
+              app.db_logger.should be_a_kind_of(DataMapper::Logger)
+            end
+            
+            it "should have the correct log path [../log/dm.< environment >.log]" do 
+              app.db_logger.init_args[0].should == "#{fixtures_path}/log/dm.test.log"
+            end
+            
+            it "should have the correct log level [:debug]" do 
+              app.db_logger.init_args[1].should == :debug
+            end
+            
+            it "should write log messages to the log file" do 
+              custom_message = "__DEBUG_DEFAULT_MESSAGE__ written at [#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]"
+              app.db_logger.debug(custom_message)
+              IO.read(app.db_logger.init_args[0]).should match(/#{Regexp.escape(custom_message)}/)
+            end
+            
+          end #/ #db_logger
+          
+        end #/ Helpers
+        
+        
+        describe "Class Methods" do 
+          
+          describe "#database_logger" do 
+            
+            it "should be a DataMapper::Logger Object" do 
+              MyTestApp.database_logger.should be_a_kind_of(DataMapper::Logger)
+            end
+            
+            it "should have the correct log path [../log/dm.< environment >.log]" do 
+              MyTestApp.database_logger.init_args[0].should == "#{fixtures_path}/log/dm.test.log"
+            end
+            
+            it "should write log messages to the log file" do 
+              custom_message = "__DEBUG_CLASS_METHOD_DEFAULT_MESSAGE__ written at [#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]"
+              MyTestApp.database_logger.debug(custom_message)
+              IO.read(MyTestApp.database_logger.init_args[0]).should match(/#{Regexp.escape(custom_message)}/)
+            end
+            
+          end #/ #database_logger
+          
+          describe "#database" do 
+            
+            it "should return an SQLite3 Adapter" do 
+              MyTestApp.database.should be_a_kind_of(DataMapper::Adapters::Sqlite3Adapter)
+            end
+            
+            it "should be configured with the correct DB path [../db/db.< environment >.db]" do 
+              MyTestApp.database.options['path'].should == "#{fixtures_path}/db/db.test.db"
+            end
+            
+            it "should be configured with the correct setup [:default]" do 
+              MyTestApp.database.name.should == :default
+            end
+            
+          end #/ #database
+          
+          describe "#database=" do 
+            
+            it "should allow changing the DB settings" do 
+              lambda { 
+                MyTestApp.database = "sqlite3://#{fixtures_path}/db/db.class_method.db", :class_method
+              }.should_not raise_error(Exception)
+              MyTestApp.database.options['path'].should == "#{fixtures_path}/db/db.class_method.db"
+              MyTestApp.database.name.should == :class_method
+            end
+            
+            it "should throw ArgumentError when using the wrong syntax ..App.database(vars, vars)" do 
+              lambda { 
+                MyTestApp.database("sqlite3://#{fixtures_path}/db/db.class_method.db", :class_method)
+              }.should raise_error(ArgumentError)
+            end
+            
+          end #/ #database=
+          
+        end #/ Class Methods
+        
+        
+        describe "DB Queries" do 
+          
+          it "should return the data from the database" do 
+            get("/db-default")
+            body.should == "SQLite3-DefaultPost1, SQLite3-DefaultPost2, SQLite3-DefaultPost3" 
+          end
+          
+        end #/ DB Queries
+        
+      end #/ and using Default Settings
+      
+      
+      describe "and using Custom Settings" do 
+        
+        class MyCustomTestApp < Sinatra::Base 
+          register(Sinatra::DataMapperExtension)
+          
+          # NOTE:: :dm_logger_level & :dm_logger_path must be set before :database 
+          # in order to use custom settings
+          set :db_dir, "#{fixtures_path}/db/custom"
+          set :dm_logger_level, :info
+          set :dm_logger_path, "#{fixtures_path}/log/dm.my_custom_test_app.log"
+          set :dm_setup_context, :custom
+          set :dm_database_url, lambda { "sqlite3://#{db_dir}/db.my_custom_test_app.db" }
+          
+          # NOTE:: The database configuration must be set 
+          # in order for the DataMapper.auto_migrate! /auto_upgrade! migrations work
+          set :database, dm_database_url
+          
+          ## ROUTES TEST (IF DATA COMES THROUGH)
+          get '/db-custom' do
+            Post.all.map(&:name).join(', ') # Post1, Post2,...
+          end
+          
+        end
+        
+        before(:each) do 
+          class ::Test::Unit::TestCase 
+            def app; ::MyCustomTestApp.new ; end
+          end
+          @app = app
+          
+          dm_bootstrap('SQLite3-Custom')  ## INIT THE TABLES AND LOAD THE DATA
+        end
+        
+        after(:each) do 
+          class ::Test::Unit::TestCase 
+            def app; nil ; end
+          end
+          @app = nil
+        end
+        
+        describe "Configurations" do 
+          
+          it "should set :db_dir to ../db/custom" do 
+            MyCustomTestApp.db_dir.should == "#{fixtures_path}/db/custom"
+          end
+          
+          it "should set :dm_logger_level to :info" do 
+            MyCustomTestApp.dm_logger_level.should == :info
+          end
+          
+          it "should set :dm_logger_path to [../log/dm.my_custom_test_app.log]" do 
+            MyCustomTestApp.dm_logger_path.should == "#{fixtures_path}/log/dm.my_custom_test_app.log"
+          end
+          
+          it "should set :dm_setup_context to :custom" do 
+            MyCustomTestApp.dm_setup_context.should == :custom
+          end
+          
+          it "should set :dm_database_url to [../db/db.my_custom_test_app.db]" do 
+            MyCustomTestApp.dm_database_url.should == "sqlite3://#{fixtures_path}/db/custom/db.my_custom_test_app.db"
+          end
+          
+        end #/ Configurations
+        
+        
+        describe "Helper method " do 
+          
+          describe "#database" do 
+            
+            it "should return an SQLite3 Adapter" do 
+              app.database.should be_a_kind_of(DataMapper::Adapters::Sqlite3Adapter)
+            end
+            
+            it "should be configured with the correct DB path [../db/db.my_custom_test_app.db]" do 
+              app.database.options['path'].should == "#{fixtures_path}/db/custom/db.my_custom_test_app.db"
+            end
+            
+            it "should be configured with the correct setup [:custom]" do 
+              app.database.name.should == :custom
+            end
+            
+          end #/ #database
+          
+          describe "#db_logger" do 
+            
+            it "should be a DataMapper::Logger Object" do 
+              app.db_logger.should be_a_kind_of(DataMapper::Logger)
+            end
+            
+            it "should have the correct log path [../log/dm.my_custom_test_app.log]" do 
+              app.db_logger.init_args[0].should == "#{fixtures_path}/log/dm.my_custom_test_app.log"
+            end
+            
+            it "should have the correct log level [:info]" do 
+              app.db_logger.init_args[1].should == :info
+            end
+            
+            it "should write log messages to the log file" do 
+              custom_message = "__INFO_CUSTOM_MESSAGE__ written at [#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]"
+              app.db_logger.info(custom_message)
+              IO.read(app.db_logger.init_args[0]).should match(/#{Regexp.escape(custom_message)}/)
+            end
+            
+            it "should NOT write debug log messages to the log file" do 
+              custom_message = "__DEBUG_CUSTOM_MESSAGE__ written at [#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]"
+              app.db_logger.debug(custom_message)
+              IO.read(app.db_logger.init_args[0]).should_not match(/#{Regexp.escape(custom_message)}/)
+            end
+            
+          end #/ #db_logger
+          
+        end #/ Helper method 
+        
+        
+        describe "DB Queries" do 
+          
+          it "should return the data from the database" do 
+            get("/db-custom")
+            body.should == "SQLite3-CustomPost1, SQLite3-CustomPost2, SQLite3-CustomPost3" 
+          end
+          
+        end #/ DB Queries
+        
+      end #/ and using Custom Settings
+      
+    end #/ when using a SQLite3 db
+  end #/ DM
+end #/ Sinatra