mack-active_record 0.5.1 → 0.5.5

data/lib/helpers/orm_helpers.rb

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

data/lib/mack-active_record.rb

@@ -4,14 +4,15 @@ require 'erubis'
 begin
   require 'mack-orm_common'
 rescue Exception => e
+  puts e
 end
 
 require 'activerecord'
 
-dbs = YAML::load(Erubis::Eruby.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
+dbs = Mack::Configuration.database_configurations
 
 unless dbs.nil?
-  ActiveRecord::Base.establish_connection(dbs[MACK_ENV])
+  ActiveRecord::Base.establish_connection(dbs[Mack::Configuration.env])
   class SchemaInfo < ActiveRecord::Base # :nodoc:
     set_table_name 'schema_info'
   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_CONFIG, "routes.rb")
+    routes = File.join(Mack::Configuration.config_directory, "routes.rb")
     rf = File.open(routes).read
     unless rf.match(".resource :#{@name_plural}")
       puts "Updating routes.rb"

data/lib/scaffold_generator/templates/app/controllers/controller.rb.template

@@ -26,7 +26,7 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
     if @<%= @name_singular %>.save
       redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
     else
-      render(:action => "new")
+      render(:action, "new")
     end
   end
 
@@ -36,7 +36,7 @@ class <%= @name_plural_camel %>Controller < Mack::Controller::Base
     if @<%= @name_singular %>.update_attributes(params(:<%= @name_singular %>))
       redirect_to(<%= @name_plural %>_show_url(:id => @<%= @name_singular %>.id))
     else
-      render(:action => "edit")
+      render(:action, "edit")
     end
   end
 

data/lib/tasks/db_create_drop_tasks.rake

@@ -0,0 +1,70 @@
+require 'rake'
+namespace :db do
+  
+  desc "Create the database for your environment."
+  task :create => :environment do
+    drop_create_database
+  end
+  
+  namespace :create do
+    
+    desc "Creates your Full environment. Does NOT create your production database!"
+    task :all => :environment do
+      drop_create_database("development")
+      drop_create_database("test")
+      ActiveRecord::Base.establish_connection(Mack::Configuration.database_configurations["development"])
+      Rake::Task["db:migrate"].invoke
+    end
+    
+  end
+
+end
+
+private
+def drop_create_database(env = Mack::Configuration.env)
+  abcs = Mack::Configuration.database_configurations
+  db_settings = abcs[env]
+  case db_settings["adapter"]
+    when "mysql"
+      ActiveRecord::Base.establish_connection(
+        :adapter => "mysql",
+        :host => "localhost",
+        :database => "mysql",
+        :username => ENV["DB_USERNAME"] || "root",
+        :password => ENV["DB_PASSWORD"] || ""
+      )
+      puts "Dropping (MySQL): #{db_settings["database"]}"
+      ActiveRecord::Base.connection.execute "DROP DATABASE IF EXISTS `#{db_settings["database"]}`"
+      
+      if db_settings["collation"]
+        puts "Dropping (MySQL): #{db_settings["database"]}"
+        ActiveRecord::Base.connection.execute "CREATE DATABASE `#{db_settings["database"]}` DEFAULT CHARACTER SET `#{db_settings["charset"] || 'utf8'}` COLLATE `#{db_settings["collation"]}`"
+      else
+        puts "Creating (MySQL): #{db_settings["database"]}"
+        ActiveRecord::Base.connection.execute "CREATE DATABASE `#{db_settings["database"]}` DEFAULT CHARACTER SET `#{db_settings["charset"] || 'utf8'}`"
+      end
+    when "postgresql"
+      ENV['PGHOST']     = db_settings["host"] if db_settings["host"]
+      ENV['PGPORT']     = db_settings["port"].to_s if db_settings["port"]
+      ENV['PGPASSWORD'] = db_settings["password"].to_s if db_settings["password"]
+      enc_option = "-E #{db_settings["encoding"]}" if db_settings["encoding"]
+
+      ActiveRecord::Base.clear_active_connections!
+      begin
+        puts "Dropping (PostgreSQL): #{db_settings["database"]}"
+        `dropdb -U "#{db_settings["username"]}" #{db_settings["database"]}`
+      rescue Exception => e
+      end
+      
+      begin
+        puts "Creating (PostgreSQL): #{db_settings["database"]}"
+        `createdb #{enc_option} -U "#{db_settings["username"]}" #{db_settings["database"]}`
+      rescue Exception => e
+      end
+    when 'sqlite3'
+      ActiveRecord::Base.clear_active_connections!
+      FileUtils.rm_rf(db_settings["database"])
+    else
+      raise "Task not supported by '#{db_settings["adapter"]}'"
+  end
+end

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

@@ -1,3 +1,4 @@
+require 'rake'
 namespace :db do
   
   desc "Migrate the database through scripts in db/migrations"
@@ -71,7 +72,7 @@ namespace :db do
   
   
   def migration_files
-    Dir.glob(File.join(MACK_ROOT, "db", "migrations", "*.rb"))
+    Dir.glob(File.join(Mack::Configuration.root, "db", "migrations", "*.rb"))
   end
   
   def migration_number(migration)

data/test/database.yml

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

data/test/fixtures/zoo_with_cols/zoos_controller.rb.fixture

@@ -26,7 +26,7 @@ class ZoosController < Mack::Controller::Base
     if @zoo.save
       redirect_to(zoos_show_url(:id => @zoo.id))
     else
-      render(:action => "new")
+      render(:action, "new")
     end
   end
 
@@ -36,7 +36,7 @@ class ZoosController < Mack::Controller::Base
     if @zoo.update_attributes(params(:zoo))
       redirect_to(zoos_show_url(:id => @zoo.id))
     else
-      render(:action => "edit")
+      render(:action, "edit")
     end
   end
 

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_CONFIG, "routes.rb")) do |f|
+    File.open(File.join(Mack::Configuration.config_directory, "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_CONFIG, "routes.rb")) do |f|
+    File.open(File.join(Mack::Configuration.config_directory, "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_VIEWS, "zoos")
+    File.join(Mack::Configuration.views_directory, "zoos")
   end
   
   def model_file
-    File.join(MACK_APP, "models", "zoo.rb")
+    File.join(Mack::Configuration.app_directory, "models", "zoo.rb")
   end
   
   def controller_file
-    File.join(MACK_APP, "controllers", "zoos_controller.rb")
+    File.join(Mack::Configuration.app_directory, "controllers", "zoos_controller.rb")
   end
   
   def migration_file

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

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

data/test/test_helper.rb

@@ -1,13 +1,26 @@
 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")
 
-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")
+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")
 
 require File.join(File.dirname(__FILE__), "..", "lib", "mack-active_record")
 require File.join(File.dirname(__FILE__), "..", "..", "mack-orm_common", "lib", "mack-orm_common")
@@ -23,7 +36,7 @@ class Test::Unit::TestCase
   def cleanup
     ActiveRecord::Base.clear_active_connections!
     FileUtils.rm_rf($genosaurus_output_directory)
-    FileUtils.rm_rf(File.join(MACK_CONFIG, "routes.rb"))
+    FileUtils.rm_rf(File.join(Mack::Configuration.config_directory, "routes.rb"))
   end
   
   def teardown
@@ -35,7 +48,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_CONFIG, "routes.rb"))
+    FileUtils.cp(fixture_path("routes.rb"), File.join(Mack::Configuration.config_directory, "routes.rb"))
   end
   
   def migrations_directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-active_record
 version: &id001 !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -04:00
+date: 2008-05-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,7 +55,8 @@ 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_tasks.rake
+- lib/tasks/db_create_drop_tasks.rake
+- lib/tasks/db_migration_tasks.rake
 - README
 has_rdoc: true
 homepage: 
@@ -111,5 +112,5 @@ test_files:
 - test/lib
 - test/lib/user.rb
 - test/tasks
-- test/tasks/db_tasks_test.rb
+- test/tasks/db_migration_tasks_test.rb
 - test/test_helper.rb