mack-active_record 0.6.1.2 → 0.7.0

data/lib/mack-active_record/database.rb

@@ -1,74 +1,92 @@
-#
-# AR db create/drop.
-# Currently it supports 3 adapters: sqlite3, postgresql, and mysql
-#
-# ds - July 2008
-#
-
 module Mack
   module Database
     
-    module Migrator
-      def self.version
-        ActiveRecord::Migrator.current_version
-      end
-      
-      def self.migrate
-        ActiveRecord::Migrator.up(File.join(Mack.root, "db", "migrations"))
-      end
-      
-      def self.rollback(step = 1)
-        step = (ENV["STEP"] || step).to_i
-        cur_version = version.to_i
-        target_version = cur_version - step 
-        target_version = 0 if target_version < 0
-        
-        ActiveRecord::Migrator.down(File.join(Mack.root, "db", "migrations"), target_version)
+    # Sets up and establishes connections to the database based on the specified environment
+    # and the settings in the database.yml file.
+    def self.establish_connection(env = Mack.env)
+      dbs = db_settings(env)
+      ActiveRecord::Base.establish_connection(dbs)
+    end # establish_connection
+    
+    # Creates a database, if it doesn't already exist for the specified environment
+    def self.create(env = Mack.env, repis = :default)
+      dbs = db_settings(env)
+      case dbs[:adapter]
+      when "mysql"
+        establish_mysql_connection
+        create_mysql_db(env, dbs)
+      when "postgresql"
+        ENV['PGHOST']     = dbs[:host] if dbs[:host]
+        ENV['PGPORT']     = dbs[:port].to_s if dbs[:port]
+        ENV['PGPASSWORD'] = dbs[:password].to_s if dbs[:password]
+        ActiveRecord::Base.clear_active_connections!
+        create_postgresql_db(env, dbs)
+      when "sqlite3"
+        ActiveRecord::Base.clear_active_connections!
       end
-      
     end
-        
-    def self.db_settings(env)
-      dbs = YAML::load(ERB.new(IO.read(File.join(Mack.root, "config", "database.yml"))).result)
-      dbs = dbs[env]
-      dbs.symbolize_keys!
-      return dbs
+    
+    # Drops a database, if it exists for the specified environment
+    def self.drop(env = Mack.env, repis = :default)
+      dbs = db_settings(env)
+      case dbs[:adapter]
+      when "mysql"
+        establish_mysql_connection
+        drop_mysql_db(env, dbs)
+        # ActiveRecord::Base.connection.drop_database dbs[:database]
+      when "postgresql"
+        ENV['PGHOST']     = dbs[:host] if dbs[:host]
+        ENV['PGPORT']     = dbs[:port].to_s if dbs[:port]
+        ENV['PGPASSWORD'] = dbs[:password].to_s if dbs[:password]
+        ActiveRecord::Base.clear_active_connections!
+        drop_postgresql_db(env, dbs)
+      when "sqlite3"
+        ActiveRecord::Base.clear_active_connections!
+        FileUtils.rm_rf(dbs[:database])
+      end
     end
     
-    def self.establish_connection(env)
+    # Loads the structure of the given file into the database
+    def self.load_structure(file, env = Mack.env, repis = :default)
+      Mack::Database.establish_connection(env)
       dbs = db_settings(env)
-      ActiveRecord::Base.establish_connection(dbs)
+      sql = File.read(file)
+      case dbs[:adapter]
+      when "mysql", "sqlite3"
+        sql.split(";").each do |s|
+          s.strip! 
+          ActiveRecord::Base.connection.execute(s) unless s.blank?
+        end
+      else
+        ActiveRecord::Base.connection.execute(sql) unless sql.blank?
+      end
     end
     
-    # Perform db create or drop
-    # 
-    # By default the mode is drop then create, but caller will be able to 
-    # call this routine with a specific action (:drop, :create, or :drop_and_create)
-    # 
-    def self.drop_or_create_database(env, mode = :drop_and_create)
+    # Dumps the structure of the database to a file.
+    def self.dump_structure(env = Mack.env, repis = :default)
+      Mack::Database.establish_connection(env)
       dbs = db_settings(env)
+      structure = ""
+      output_file = File.join(Mack.root, "db", "#{env}_schema_structure.sql")
       case dbs[:adapter]
-        when "mysql"
-          establish_mysql_connection
-          drop_mysql_db(env, dbs) if mode == :drop or mode == :drop_and_create
-          create_mysql_db(env, dbs) if mode == :create or mode == :drop_and_create
-          
-        when "postgresql"
-          ENV['PGHOST']     = dbs[:host] if dbs[:host]
-          ENV['PGPORT']     = dbs[:port].to_s if dbs[:port]
-          ENV['PGPASSWORD'] = dbs[:password].to_s if dbs[:password]
-          
-          ActiveRecord::Base.clear_active_connections!
-          drop_postgresql_db(env, dbs) if mode == :drop or mode == :drop_and_create
-          create_postgresql_db(env, dbs) if mode == :create or mode == :drop_and_create
-          
-        when "sqlite3"
-          ActiveRecord::Base.clear_active_connections!
-          FileUtils.rm_rf(dbs[:database]) if mode == :drop or mode == :drop_and_create
+      when "mysql"
+        File.open(output_file, "w") {|f| f.puts ActiveRecord::Base.connection.structure_dump}
+      when "postgresql"
+        `pg_dump -i -U "#{dbs[:username]}" -s -x -O -n #{ENV["SCHEMA"] ||= "public"} -f #{output_file} #{dbs[:database]}`
+      when "sqlite3"
+        `sqlite3 #{dbs[:database]} .schema > #{output_file}`
+      else
+        raise "Task not supported for '#{dbs[:adapter]}'"
       end
     end
-            
+    
     private
+    def self.db_settings(env)
+      dbs = YAML::load(ERB.new(IO.read(File.join(Mack.root, "config", "database.yml"))).result)
+      dbs = dbs[env]
+      dbs.symbolize_keys!
+      return dbs
+    end
     
     def self.drop_postgresql_db(env, dbs)
       begin
@@ -90,10 +108,12 @@ module Mack
     end
     
     def self.establish_mysql_connection
+      dbs = db_settings(Mack.env)
+      
       # connect to mysql meta database
       ActiveRecord::Base.establish_connection(
         :adapter => "mysql",
-        :host => "localhost",
+        :host => dbs[:host] || "localhost",
         :database => "mysql",
         :username => ENV["DB_USERNAME"] || "root",
         :password => ENV["DB_PASSWORD"] || ""
@@ -113,6 +133,8 @@ module Mack
     def self.drop_mysql_db(env, dbs)
       puts "Dropping (MySQL): #{dbs[:database]}"
       ActiveRecord::Base.connection.execute "DROP DATABASE IF EXISTS `#{dbs[:database]}`"
+      # ActiveRecord::Base.connection.drop_database dbs[:database]
     end
-  end
-end
+    
+  end # Database
+end # Mack

data/lib/mack-active_record/database_migrations.rb

@@ -0,0 +1,29 @@
+module Mack
+  module Database
+    module Migrations
+      
+      # Migrates the database to the latest version
+      def self.migrate
+        ActiveRecord::Migrator.up(File.join(Mack.root, "db", "migrations"))
+      end
+      
+      # Rolls back the database by the specified number of steps. Default is 1
+      def self.rollback(step = 1)
+        cur_version = version.to_i
+        target_version = cur_version - step 
+        target_version = 0 if target_version < 0
+        ActiveRecord::Migrator.down(File.join(Mack.root, "db", "migrations"), target_version)
+      end
+      
+      # Not implemented
+      def self.abort_if_pending_migrations
+      end
+      
+      # Returns the current version of the database
+      def self.version
+        ActiveRecord::Migrator.current_version
+      end
+            
+    end # Migrations
+  end # Database
+end # Mack

data/lib/mack-active_record/generators.rb

@@ -0,0 +1,11 @@
+module Mack
+  module Database
+    module Generators
+      
+      def self.controller_template_location
+        File.join(File.dirname(__FILE__), "scaffold_generator", "templates", "app", "controllers", "controller.rb.template")
+      end
+      
+    end # Generators
+  end # Database
+end # Mack

data/lib/mack-active_record/helpers/orm_helpers.rb

@@ -5,20 +5,17 @@ class ActiveRecord::Base # :nodoc:
 end
 
 module Mack
-  module ViewHelpers
+  module ViewHelpers # :nodoc:
     module ActiveRecordHelpers
       DEFAULT_PARTIAL = %{
-<div>
-  <div class="errorExplanation" id="errorExplanation">
-    <h2><%= pluralize_word(errors.size, "error") %> occured.</h2>
-    <ul>
-      <% for error in errors %>
-        <li><%= error %></li>
-      <% end %>
-    </ul>
-  </div>
-</div>
-      }
+<div class="errorExplanation" id="errorExplanation">
+  <h2><%= pluralize_word(errors.size, "error") %> occured.</h2>
+  <ul>
+    <% for error in errors %>
+      <li><%= error %></li>
+    <% end %>  
+  </ul>
+</div>}.strip unless Mack::ViewHelpers::ActiveRecordHelpers.const_defined?("DEFAULT_PARTIAL")
   
       def error_messages_for(object_names = [], view_partial = nil)
         object_names = [object_names]

data/lib/mack-active_record/model_generator/manifest.yml

@@ -10,10 +10,10 @@ model_template:
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test.rb.template") %>
-  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_test.rb") %>
+  output_path: <%= File.join("test", "models", "#{param(:name).singular.underscore}_test.rb") %>
 <% elsif testing_framework == "rspec" %>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "rspec.rb.template") %>
-  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_spec.rb") %>
+  output_path: <%= File.join("test", "models", "#{param(:name).singular.underscore}_spec.rb") %>
 <% end %>

data/lib/mack-active_record/tasks/db_migration_tasks.rake

@@ -1,21 +1,8 @@
-require 'rake'
 namespace :db do
-  
-  desc "Migrate the database through scripts in db/migrations"
-  task :migrate => "mack:environment" do
-    #ActiveRecord::Migrator.up(File.join(Mack.root, "db", "migrations"))
-    Mack::Database::Migrator.migrate
-  end # migrate
-  
-  desc "Rolls the schema back to the previous version. Specify the number of steps with STEP=n"
-  task :rollback => ["mack:environment"] do
-    Mack::Database::Migrator.rollback
-    #ActiveRecord::Migrator.rollback(File.join(Mack.root, "db", "migrations"), (ENV["STEP"] || 1).to_i)
-  end # rollback
 
   desc "Displays the current schema version of your database"
   task :version => "mack:environment" do
-    puts "\nYour database is currently at version: #{Mack::Database::Migrator.version}\n"
-  end
+    puts "\nYour database is currently at version: #{Mack::Database::Migrations.version}\n"
+  end # version
   
 end # db

data/lib/mack-active_record/test_extensions.rb

@@ -0,0 +1,101 @@
+require "test/unit"
+require 'spec'
+
+if Mack.env == "test"
+  module Mack
+    module Testing # :nodoc: 
+    end
+  end
+
+  # Wrap it so we don't accidentally alias the run method n times and run out of db connections!
+  unless Mack::Testing.const_defined?("AR_TEST_EXTENSIONS")     
+    
+    module Mack
+      module Testing
+        AR_TEST_EXTENSIONS = 1
+        # module Helpers
+        #   alias_method :mack_rake_task, :rake_task
+        # 
+        #   def rake_task(name, env = {}) # :nodoc:
+        #     DataMapper::MigrationRunner.reset!
+        #     mack_rake_task(name, env, [File.join(File.dirname(__FILE__), "tasks", "db_create_drop_tasks.rake"),
+        #                                File.join(File.dirname(__FILE__), "tasks", "db_migration_tasks.rake")])
+        #   end
+        # end # Helpers
+            
+        module ActiveRecordHelpers
+          def rollback_transaction
+            begin
+              ActiveRecord::Base.transaction do
+                yield if block_given?
+                raise "Rollback!"
+              end
+            rescue => ex
+              # we need to do this so we can throw up actual errors!
+              unless ex.to_s == "Rollback!"
+                raise ex
+              end
+            end
+          end # rollback_transaction
+        end # ActiveRecordHelpers
+      end # Testing
+    end # Mack
+
+    module Spec # :nodoc:
+      module Example # :nodoc:
+        module ExampleMethods # :nodoc:
+          include Mack::Testing::ActiveRecordHelpers
+
+          alias_method :ar_spec_execute, :execute
+          
+          def before_spec_extension
+          end
+          
+          def after_spec_extension
+          end
+
+          def execute(options, instance_variables)
+            before_spec_extension
+            if !app_config.disable_transactional_tests
+              rollback_transaction do
+                @__res = ar_spec_execute(options, instance_variables)
+              end
+            else
+              @__res = ar_spec_execute(options, instance_variables)
+            end
+            after_spec_extension
+            @__res
+          end
+
+        end # ExampleGroup
+      end # Example
+    end # Spec
+  
+    module Test # :nodoc:
+      module Unit # :nodoc:
+        class TestCase # :nodoc:
+          include Mack::Testing::ActiveRecordHelpers
+  
+          # Let's alias the run method in the class above us so we can create a new one here
+          # but still reference it.
+          alias_method :ar_test_case_run, :run # :nodoc:
+  
+          # We need to wrap the run method so we can do things like
+          # run a cleanup method if it exists
+          def run(result, &progress_block) # :nodoc:
+            if !app_config.disable_transactional_tests
+              rollback_transaction do
+                ar_test_case_run(result, &progress_block)
+              end
+            else
+              ar_test_case_run(result, &progress_block)
+            end
+          end
+  
+        end # TestCase
+      end # Unit
+    end # Test
+  
+  end
+  
+end

data/lib/mack-active_record.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'genosaurus'
-
+require 'mack-orm'
 require 'activerecord'
 
 module ActiveRecord # :nodoc:
@@ -9,9 +9,10 @@ end
 fl = File.join(File.dirname(__FILE__), "mack-active_record")
 
 require File.join(fl, "database")
+require File.join(fl, "database_migrations")
+require File.join(fl, "generators")
 require File.join(fl, "helpers", "orm_helpers")
-require File.join(fl, "model_column")
-require File.join(fl, "genosaurus_helpers")
+require File.join(fl, "test_extensions")
 
 # [:migration, :model, :scaffold].each do |gen|
 #   require File.join(fl, "#{gen}_generator", "#{gen}_generator")

data/lib/mack-active_record_tasks.rb

@@ -1,3 +1,4 @@
+require 'mack-orm_tasks'
 Dir.glob(File.join(File.dirname(__FILE__), "mack-active_record", "tasks", "*.rake")).each do |f|
   load(f)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-active_record
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -04:00
+date: 2008-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mack-orm
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
     version: 
 description: "mack-active_record was developed by: markbates"
 email: mark@mackframework.com
@@ -32,48 +42,38 @@ extra_rdoc_files:
 - README
 files: 
 - lib/mack-active_record/database.rb
-- lib/mack-active_record/genosaurus_helpers.rb
+- lib/mack-active_record/database_migrations.rb
+- lib/mack-active_record/generators.rb
 - lib/mack-active_record/helpers/orm_helpers.rb
 - lib/mack-active_record/migration_generator/migration_generator.rb
 - lib/mack-active_record/migration_generator/templates/db/migrations/%=@migration_name%.rb.template
-- lib/mack-active_record/model_column.rb
 - lib/mack-active_record/model_generator/manifest.yml
 - lib/mack-active_record/model_generator/model_generator.rb
 - lib/mack-active_record/model_generator/templates/model.rb.template
 - lib/mack-active_record/model_generator/templates/rspec.rb.template
 - lib/mack-active_record/model_generator/templates/test.rb.template
-- lib/mack-active_record/scaffold_generator/manifest.yml
-- lib/mack-active_record/scaffold_generator/scaffold_generator.rb
 - lib/mack-active_record/scaffold_generator/templates/app/controllers/controller.rb.template
-- lib/mack-active_record/scaffold_generator/templates/app/views/edit.html.erb.template
-- lib/mack-active_record/scaffold_generator/templates/app/views/index.html.erb.template
-- lib/mack-active_record/scaffold_generator/templates/app/views/new.html.erb.template
-- lib/mack-active_record/scaffold_generator/templates/app/views/show.html.erb.template
-- lib/mack-active_record/scaffold_generator/templates/spec.rb.template
-- lib/mack-active_record/scaffold_generator/templates/test.rb.template
-- lib/mack-active_record/tasks/db_create_drop_tasks.rake
 - lib/mack-active_record/tasks/db_migration_tasks.rake
+- lib/mack-active_record/test_extensions.rb
 - lib/mack-active_record.rb
 - lib/mack-active_record_tasks.rb
 - README
-- doc/classes/Mack/Database/Migrator.html
+- doc/classes/Mack/Database/Generators.html
+- doc/classes/Mack/Database/Migrations.html
 - doc/classes/Mack/Database.html
-- doc/classes/Mack/Genosaurus/ActiveRecord/Helpers.html
-- doc/classes/Mack/Genosaurus/ActiveRecord/ModelColumn.html
+- doc/classes/Mack/Testing/ActiveRecordHelpers.html
 - doc/classes/Mack/ViewHelpers/ActiveRecordHelpers.html
-- doc/classes/Mack/ViewHelpers.html
 - doc/classes/Mack.html
 - doc/classes/MigrationGenerator.html
 - doc/classes/ModelGenerator.html
-- doc/classes/ScaffoldGenerator.html
 - doc/created.rid
+- doc/files/lib/mack-active_record/database_migrations_rb.html
 - doc/files/lib/mack-active_record/database_rb.html
-- doc/files/lib/mack-active_record/genosaurus_helpers_rb.html
+- doc/files/lib/mack-active_record/generators_rb.html
 - doc/files/lib/mack-active_record/helpers/orm_helpers_rb.html
 - doc/files/lib/mack-active_record/migration_generator/migration_generator_rb.html
-- doc/files/lib/mack-active_record/model_column_rb.html
 - doc/files/lib/mack-active_record/model_generator/model_generator_rb.html
-- doc/files/lib/mack-active_record/scaffold_generator/scaffold_generator_rb.html
+- doc/files/lib/mack-active_record/test_extensions_rb.html
 - doc/files/lib/mack-active_record_rb.html
 - doc/files/lib/mack-active_record_tasks_rb.html
 - doc/files/README.html