mack-data_mapper 0.5.0 → 0.5.1

data/lib/helpers/orm_helpers.rb

@@ -26,10 +26,10 @@ module Mack
           end
         end
         app_errors.flatten!
-        File.join(Mack::Configuration.views_directory, "application", "_error_messages.html.erb")
+        File.join(MACK_VIEWS, "application", "_error_messages.html.erb")
         unless app_errors.empty?
           if view_partial.nil?
-            if File.exist?(File.join(Mack::Configuration.views_directory, "application", "_error_messages.html.erb"))
+            if File.exist?(File.join(MACK_VIEWS, "application", "_error_messages.html.erb"))
               render :partial => "application/error_messages", :locals => {:errors => app_errors}
             else
               render :text => DEFAULT_PARTIAL, :locals => {:errors => app_errors}

data/lib/mack-data_mapper.rb

@@ -9,33 +9,24 @@ end
 gem("datamapper", "0.3.2")
 require 'data_mapper'
 
-module Mack
-  module Configuration
-
-    def self.load_database_configurations(env = Mack::Configuration.env)
-      dbs = Mack::Configuration.database_configurations
-      unless dbs.nil?
-        settings = dbs[env]
-        settings.symbolize_keys!
-        if settings[:default]
-          settings.each do |k,v|
-            DataMapper::Database.setup(k, v.symbolize_keys)
-          end
-        else
-          DataMapper::Database.setup(settings)
-        end
-      end
-    end # load_database_configurations
-
-  end # Configuration
-end # Mack
-
-
-Mack::Configuration.load_database_configurations
+dbs = YAML::load(Erubis::Eruby.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
+
+unless dbs.nil?
+  settings = dbs[MACK_ENV]
+  settings.symbolize_keys!
+  if settings[:default]
+    settings.each do |k,v|
+      DataMapper::Database.setup(k, v.symbolize_keys)
+    end
+  else
+    DataMapper::Database.setup(settings)
+  end
+end
 
 class SchemaInfo # :nodoc:
   include DataMapper::Persistence
   
+  set_table_name "schema_info"
   property :version, :integer, :default => 0
 end
 

data/lib/scaffold_generator/scaffold_generator.rb

@@ -20,7 +20,7 @@ class ScaffoldGenerator < Genosaurus
   
   def update_routes_file
     # update routes.rb
-    routes = File.join(Mack::Configuration.config_directory, "routes.rb")
+    routes = File.join(MACK_CONFIG, "routes.rb")
     rf = File.open(routes).read
     unless rf.match(".resource :#{@name_plural}")
       puts "Updating routes.rb"

data/lib/tasks/{db_migration_tasks.rake → db_tasks.rake}

@@ -1,4 +1,3 @@
-require 'rake'
 namespace :db do
   
   desc "Migrate the database through scripts in db/migrations"
@@ -55,12 +54,8 @@ namespace :db do
     task :create => "mack:environment" do
       require 'data_mapper/migration'
       unless SchemaInfo.table.exists?
-        class SchemaInfo
-          include DataMapper::Persistence
-          property :version, :integer
-        end
-        SchemaInfo.auto_migrate!
-        SchemaInfo.create(:version => 0, :id => 1)
+        SchemaInfo.table.create!
+        SchemaInfo.create(:version => 0)
       end
       @schema_info = SchemaInfo.first
     end # create
@@ -69,7 +64,7 @@ namespace :db do
   
   
   def migration_files
-    Dir.glob(File.join(Mack::Configuration.root, "db", "migrations", "*.rb"))
+    Dir.glob(File.join(MACK_ROOT, "db", "migrations", "*.rb"))
   end
   
   def migration_number(migration)

data/test/database.yml

@@ -1,3 +1,3 @@
 test:
   adapter: sqlite3
-  database: <%= File.join(Mack::Configuration.root, "mack-data_mapper_test.db") %>
+  database: <%= File.join(MACK_ROOT, "mack-data_mapper_test.db") %>

data/test/generators/scaffold_generator_test.rb

@@ -4,7 +4,7 @@ class ScaffoldGeneratorTest < Test::Unit::TestCase
   
   def test_generate_data_mapper
     sg = ScaffoldGenerator.run("name" => "zoo")
-    File.open(File.join(Mack::Configuration.config_directory, "routes.rb")) do |f|
+    File.open(File.join(MACK_CONFIG, "routes.rb")) do |f|
       assert_match "r.resource :zoos # Added by rake generate:scaffold name=zoo", f.read
     end
     
@@ -24,7 +24,7 @@ class ScaffoldGeneratorTest < Test::Unit::TestCase
   
   def test_generate_data_mapper_with_columns
     sg = ScaffoldGenerator.run("name" => "zoo", "cols" => "name:string,description:text,created_at:datetime,updated_at:datetime")
-    File.open(File.join(Mack::Configuration.config_directory, "routes.rb")) do |f|
+    File.open(File.join(MACK_CONFIG, "routes.rb")) do |f|
       assert_match "r.resource :zoos # Added by rake generate:scaffold name=zoo", f.read
     end
     assert File.exists?(views_directory)
@@ -43,15 +43,15 @@ class ScaffoldGeneratorTest < Test::Unit::TestCase
   end
   
   def views_directory
-    File.join(Mack::Configuration.views_directory, "zoos")
+    File.join(MACK_VIEWS, "zoos")
   end
   
   def model_file
-    File.join(Mack::Configuration.app_directory, "models", "zoo.rb")
+    File.join(MACK_APP, "models", "zoo.rb")
   end
   
   def controller_file
-    File.join(Mack::Configuration.app_directory, "controllers", "zoos_controller.rb")
+    File.join(MACK_APP, "controllers", "zoos_controller.rb")
   end
   
   def migration_file

data/test/tasks/{db_migration_tasks_test.rb → db_tasks_test.rb}

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper.rb'
 
-class DbMigrationTasksTest < Test::Unit::TestCase
+class DbTasksTest < Test::Unit::TestCase
   
-  $current_rake_task = File.join(File.dirname(__FILE__), "..", "..", "lib", "tasks", "db_migration_tasks.rake")
+  $current_rake_task = File.join(File.dirname(__FILE__), "..", "..", "lib", "tasks", "db_tasks.rake")
   
   def test_db_rollback
     test_db_migrate

data/test/test_helper.rb

@@ -1,30 +1,18 @@
 require "test/unit"
 require File.join(File.dirname(__FILE__), "..", "..", "test_helpers")
 
-module Mack
-  module Configuration
-    def self.method_missing(sym, *args)
-      ev = "_mack_#{sym}".downcase
-      return ENV[ev]
-    end
-    
-    def self.set(name, value)
-      ENV["_mack_#{name.to_s.downcase}"] = value
-    end
-  end
-end
-
 $genosaurus_output_directory = File.join(File.dirname(__FILE__), "..", "tmp")
 
-ENV["_mack_config_directory"] = File.dirname(__FILE__)
-ENV["_mack_root"] = $genosaurus_output_directory
-ENV["_mack_app_directory"] = File.join($genosaurus_output_directory, "app")
-ENV["_mack_env"] = "test"
-ENV["_mack_views_directory"] = File.join(ENV["_mack_app_directory"], "views")
+Object::MACK_CONFIG = File.dirname(__FILE__) unless Object.const_defined?("MACK_CONFIG")
+Object::MACK_ROOT = $genosaurus_output_directory unless Object.const_defined?("MACK_ROOT")
+Object::MACK_APP = File.join($genosaurus_output_directory, "app") unless Object.const_defined?("MACK_APP")
+Object::MACK_ENV = "test" unless Object.const_defined?("MACK_ENV")
+Object::MACK_VIEWS = File.join(MACK_APP, "views") unless Object.const_defined?("MACK_VIEWS")
 
 require File.join(File.dirname(__FILE__), "..", "lib", "mack-data_mapper")
 require File.join(File.dirname(__FILE__), "..", "..", "mack-orm_common", "lib", "mack-orm_common")
 
+
 load File.join(File.dirname(__FILE__), "lib", "user.rb")
 
 class Test::Unit::TestCase
@@ -35,7 +23,7 @@ class Test::Unit::TestCase
   def cleanup
     database.adapter.flush_connections!
     FileUtils.rm_rf($genosaurus_output_directory)
-    FileUtils.rm_rf(File.join(Mack::Configuration.config_directory, "routes.rb"))
+    FileUtils.rm_rf(File.join(MACK_CONFIG, "routes.rb"))
   end
   
   def teardown
@@ -47,7 +35,7 @@ class Test::Unit::TestCase
     [$genosaurus_output_directory, migrations_directory, models_directory].each do |d|
       FileUtils.mkdir_p(d)
     end
-    FileUtils.cp(fixture_path("routes.rb"), File.join(Mack::Configuration.config_directory, "routes.rb"))
+    FileUtils.cp(fixture_path("routes.rb"), File.join(MACK_CONFIG, "routes.rb"))
   end
   
   def migrations_directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-data_mapper
 version: &id001 !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-06 00:00:00 -04:00
+date: 2008-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,7 @@ files:
 - lib/scaffold_generator/templates/app/views/new.html.erb.template
 - lib/scaffold_generator/templates/app/views/show.html.erb.template
 - lib/scaffold_generator/templates/test.rb.template
-- lib/tasks/db_create_drop_tasks.rake
-- lib/tasks/db_migration_tasks.rake
+- lib/tasks/db_tasks.rake
 - README
 has_rdoc: true
 homepage: 
@@ -81,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: magrathea
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: DataMapper ORM support for Mack
@@ -113,5 +112,5 @@ test_files:
 - test/lib
 - test/lib/user.rb
 - test/tasks
-- test/tasks/db_migration_tasks_test.rb
+- test/tasks/db_tasks_test.rb
 - test/test_helper.rb

data/lib/tasks/db_create_drop_tasks.rake

@@ -1,76 +0,0 @@
-require 'rake'
-namespace :db do
-  
-  desc "Create the database for your environment."
-  task :create => :environment do
-    Mack::Configuration.load_database_configurations(Mack::Configuration.env)
-    database(:default) do
-      drop_create_database
-    end
-  end
-  
-  namespace :create do
-    
-    desc "Creates your Full environment. Does NOT create your production database!"
-    task :all => :environment do
-      Mack::Configuration.load_database_configurations("test")
-      database(:default) do
-        drop_create_database
-      end
-      Mack::Configuration.load_database_configurations("development")
-      database(:default) do
-        drop_create_database
-      end
-      Rake::Task["db:migrate"].invoke
-    end
-    
-  end
-
-end
-
-private
-def drop_create_database
-  configuration = database.adapter.instance_variable_get('@configuration')
-  case database.adapter.class.name
-    when "DataMapper::Adapters::MysqlAdapter"
-      DataMapper::Database.setup(:tmp, {
-        :adapter => "mysql",
-        :host => "localhost",
-        :database => "mysql",
-        :username => ENV["DB_USERNAME"] || "root",
-        :password => ENV["DB_PASSWORD"] || ""
-      })
-      database(:tmp) do
-        puts "Dropping (MySQL): #{configuration.database}"
-        database.execute "DROP DATABASE IF EXISTS `#{configuration.database}`"
-        puts "Creating (MySQL): #{configuration.database}"
-        database.execute "CREATE DATABASE `#{configuration.database}` DEFAULT CHARACTER SET `utf8`"
-        begin
-          database.adapter.flush_connections!
-        rescue Exception => e
-        end
-      end
-    when "DataMapper::Adapters::PostgresqlAdapter"
-      ENV['PGHOST']     = configuration.host if configuration.host
-      ENV['PGPORT']     = configuration.port.to_s if configuration.port
-      ENV['PGPASSWORD'] = configuration.password.to_s if configuration.password
-
-      database.adapter.flush_connections!
-      begin
-        puts "Dropping (PostgreSQL): #{configuration.database}"
-        `dropdb -U "#{configuration.username}" #{configuration.database}`
-      rescue Exception => e
-      end
-      
-      begin
-        puts "Creating (PostgreSQL): #{configuration.database}"
-        `createdb -U "#{configuration.username}" #{configuration.database}`
-      rescue Exception => e
-      end
-    when 'DataMapper::Adapters::Sqlite3Adapter'
-      puts "Dropping (SQLite3): #{configuration.database}"
-      FileUtils.rm_rf(configuration.database)
-    else
-      raise "Task not supported for '#{database.adapter}'"
-  end
-end