merb_activerecord 0.5 → 0.9.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 YOUR NAME
+Copyright (c) 2007 Duane Johnson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb_activerecord"
 NAME = "merb_activerecord"
-VERSION = "0.5"
+VERSION = "0.9.2"
 AUTHOR = "Duane Johnson"
 EMAIL = "canadaduane@gmail.com"
 HOMEPAGE = "http://merbivore.com"
@@ -20,21 +20,26 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 0.5')
-  s.require_path = 'lib'
+  s.add_dependency("merb-core", ">= 0.9.2")
+  s.require_path = "lib"
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,activerecord_generators}/**/*")
 end
 
+windows = (PLATFORM =~ /win32|cygwin/) rescue nil
+
+SUDO = windows ? "" : "sudo"
+
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-task :install do
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
+desc "Install merb_activerecord"
+task :install => :package do
+  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
 end
 
+desc "Release the current version on rubyforge"
 task :release => :package do
   sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
 end

data/activerecord_generators/database_sessions_migration/database_sessions_migration_generator.rb

@@ -1,9 +1,11 @@
-require 'merb'
-class DatabaseSessionsMigrationGenerator < RubiGen::Base
+class DatabaseSessionsMigrationGenerator < Merb::GeneratorBase
   
   default_options :author => nil
 
   def initialize(runtime_args, runtime_options = {})
+    # put somthing into the runtime_args so that super doesn't show the 
+    # description
+    runtime_args.push ""
     super
     @name = 'database_sessions'
   end

data/activerecord_generators/migration/migration_generator.rb

@@ -1,14 +1,42 @@
-require 'merb/generators/merb_generator_helpers'
-
-class MigrationGenerator < Merb::GeneratorHelpers::MigrationGeneratorBase
+class MigrationGenerator < Merb::GeneratorBase
+  attr_reader :model_attributes, :model_class_name, :model_file_name, :table_name
   
-  def initialize( *args )
-    super( *args )
-    @migration_template_name = "new_migration.erb"
+  def initialize(args, runtime_args = {})
+    @base =                 File.dirname(__FILE__)
+    super
+    @model_file_name  =      args.shift.snake_case
+    @table_name       =      @model_file_name.pluralize
+    @model_class_name =     @model_file_name.to_const_string
+    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
   end
   
-  def self.superclass
-    RubiGen::Base
-  end
+  def manifest
+    record do |m|
+      @m = m
+      
+      m.directory "schema/migrations"
+      
+      current_migration_number = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
+      @migration_file_name = format("%03d_%s", (current_migration_number.to_i+1), model_file_name) + "_migration"
     
+      @assigns = {  :model_file_name  => model_file_name, 
+                    :model_attributes => model_attributes,
+                    :model_class_name => model_class_name,
+                    :table_name       => table_name,
+                    :migration_file_name => @migration_file_name
+                  }
+      copy_dirs
+      copy_files
+    end
+  end
+  
+  protected
+  def banner
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates an Active Record Migration stub..
+
+      USAGE: #{spec.name}"
+    EOS
+  end
+      
 end

data/activerecord_generators/migration/templates/schema/migrations/%migration_file_name%.rb

@@ -0,0 +1,17 @@
+class <%= model_class_name %>Migration < ActiveRecord::Migration
+  def self.up
+    <%= "create_table :#{table_name} do |t|" if table_name %>
+<% for attribute in model_attributes -%>
+      t.<%= "%-11s" % attribute.last %> :<%= attribute.first %> 
+<% end -%>
+
+      t.timestamps
+    <%= "end" if table_name %> 
+  end
+
+  def self.down
+<% if table_name -%>
+    drop_table :<%= table_name %>
+<% end -%>
+  end
+end

data/activerecord_generators/model/model_generator.rb

@@ -1,16 +1,41 @@
-require 'merb/generators/merb_generator_helpers'
-
-class ModelGenerator < Merb::GeneratorHelpers::ModelGeneratorBase
+class ModelGenerator < Merb::GeneratorBase
+  attr_reader :model_attributes, :model_class_name, :model_file_name, :migration_args
   
-  def initialize( *args )
-    super( *args )
-    @model_template_name = "new_model.erb"
-    @migration_generator_name = "migration"
-    @model_test_generator_name = "merb_model_test"
+  def initialize(args, runtime_args = {})
+    @base =                 File.dirname(__FILE__)
+    @migration_args = args.dup
+    super
+    @model_file_name =      args.shift.snake_case
+    @model_class_name =     @model_file_name.to_const_string
+    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
+    @model_file_name =      "#{@model_class_name.snake_case}"
+    
+    
   end
   
-  def self.superclass
-    RubiGen::Base
-  end
+  def manifest
+    record do |m|
+      @m = m
     
+      @assigns = {  :model_file_name  => model_file_name, 
+                    :model_attributes => model_attributes,
+                    :model_class_name => model_class_name
+                  }
+      copy_dirs
+      copy_files
+      
+      m.dependency "migration", [*self.migration_args]
+      m.dependency "merb_model_test", [model_file_name], @assigns
+    end
+  end
+  
+  protected
+  def banner
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates an Active Record Model stub..
+
+      USAGE: #{spec.name}"
+    EOS
+  end
+      
 end

data/activerecord_generators/model/templates/app/models/%model_file_name%.rb

@@ -0,0 +1,2 @@
+class <%= model_class_name %> < ActiveRecord::Base
+end

data/activerecord_generators/resource_controller/resource_controller_generator.rb

@@ -1,26 +1,74 @@
-require 'merb/generators/merb_generator_helpers'
-
-class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
+class ResourceControllerGenerator < Merb::GeneratorBase
+  
+  attr_reader :controller_class_name, 
+              :controller_file_name, 
+              :controller_base_path,
+              :controller_modules,
+              :model_class_name,
+              :full_controller_const,
+              :singular_model,
+              :plural_model
+  
+  def initialize(args, runtime_args = {})
+    @base =             File.dirname(__FILE__)
+    
+    super
+    name = args.shift
+    nfp = name.snake_case.gsub("::", "/")
+    nfp = nfp.split("/")
+    @model_class_name = nfp.pop.singularize.to_const_string
+    @model_class_name = runtime_args[:model_class_name] if runtime_args[:model_class_name]
+    @singular_model         = @model_class_name.snake_case
+    @plural_model           = @singular_model.pluralize
+    
+    nfp << @plural_model
+    
+    @controller_file_name = nfp.join("/")
+    
+    # Need to setup the directories
+    unless @controller_file_name == File.basename(@controller_file_name)
+      @controller_base_path   = controller_file_name.split("/")[0..-2].join("/") 
+    end
+    
+    @controller_modules     = @controller_file_name.to_const_string.split("::")[0..-2]
+    @controller_class_name  = @controller_file_name.to_const_string.split("::").last
 
-  def initialize(*args)
-    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
-    name, *actions = args.flatten
-    runtime_options[:actions] = %w[index show new edit]
-    runtime_options[:test_stub_generator] = "merb_controller_test"
-    super( [name], runtime_options )
+    @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::")
   end
-
-  def self.superclass
-    RubiGen::Base
+  
+  def manifest
+    record do |m|
+      @m = m
+      
+      # Create the controller directory
+      m.directory File.join("app/controllers", controller_base_path) if controller_base_path
+      
+      # Create the helpers directory
+      m.directory File.join("app/helpers", controller_base_path) if controller_base_path
+      
+      @assigns =  {
+                    :controller_modules         => controller_modules,
+                    :controller_class_name      => controller_class_name,
+                    :controller_file_name       => controller_file_name,
+                    :controller_base_path       => controller_base_path,
+                    :full_controller_const      => full_controller_const,
+                    :model_class_name           => model_class_name,
+                    :singular_model             => singular_model,
+                    :plural_model               => plural_model
+                  }      
+      copy_dirs
+      copy_files
+      
+      m.dependency "merb_resource_controller_test", [@controller_class_name], @assigns
+    end
   end
   
   protected
   def banner
-        <<-EOS
-  Creates a Merb controller, views and specs using Active Record Models
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates a basic Merb resource controller.
 
-  USAGE: #{$0} #{spec.name} resource_name"
-  EOS
+      USAGE: #{spec.name} my_resource
+    EOS
   end
-  
 end

data/activerecord_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb

@@ -0,0 +1,68 @@
+<% counter = 0 -%>
+<% controller_modules.each_with_index do |mod, i| -%>
+<%= "  " * i %>module <%= mod %>
+<% counter = i -%>
+<% end -%>
+<% counter = counter == 0 ? 0 : (counter + 1) -%>
+<%= "  " * counter %>class <%= controller_class_name %> < Application
+<%= "  " * counter %>  # provides :xml, :yaml, :js
+
+<%= "  " * counter %>  def index
+<%= "  " * counter %>    @<%= plural_model %> = <%= model_class_name %>.find(:all)
+<%= "  " * counter %>    display @<%= plural_model %>
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def show
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    display @<%= singular_model %>
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def new
+<%= "  " * counter %>    only_provides :html
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+<%= "  " * counter %>    render
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def create
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+<%= "  " * counter %>    if @<%= singular_model %>.save
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      render :new
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def edit
+<%= "  " * counter %>    only_provides :html
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    render
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def update
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>])
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      raise BadRequest
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def destroy
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.find_by_id(params[:id])
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    if @<%= singular_model %>.destroy
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>s)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      raise BadRequest
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>end
+<% counter = counter == 0 ? 0 : (counter - 1) -%>
+<% controller_modules.reverse.each_with_index do |mod, i| -%>
+<%= "  " * counter %>end # <%= mod %>
+<% counter = counter - 1 -%>
+<% end -%>

data/activerecord_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb

@@ -0,0 +1,16 @@
+<% counter = 1 -%>
+module Merb
+<% controller_modules.each_with_index do |mod, i| -%>
+<%= "  " * i %>module <%= mod %>
+<% counter = i -%>
+<% end -%>
+<% counter = counter == 0 ? 0 : (counter + 1) -%>
+<%= "  " * counter %>module <%= controller_class_name %>Helper
+
+<%= "  " * counter %>end
+<% counter = counter == 0 ? 0 : (counter - 1) -%>
+<% controller_modules.reverse.each_with_index do |mod, i| -%>
+<%= "  " * counter %>end # <%= mod %>
+<% counter = counter - 1 -%>
+<% end -%>
+end

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, edit action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/edit.html.erb</tt></p>

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, index action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/index.html.erb</tt></p>

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, new action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/new.html.erb</tt></p>

data/activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, show action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/show.html.erb</tt></p>

data/lib/{merb/orms/active_record/tasks/databases.rb → active_record/merbtasks.rb}

@@ -1,20 +1,21 @@
-task :environment do
- Merb.environment = ( ENV['Merb.environment'] || Merb.environment ).to_sym
-end
-
 namespace :db do
+  
+  task :merb_start do
+    Merb.start :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'development', :log_file => Merb::Config[:log_file]
+  end
+  
   namespace :create do
     desc 'Create all the local databases defined in config/database.yml'
-    task :all => :environment do
-      ActiveRecord::Base.configurations.each_value do |config|
+    task :all => :merb_start do
+      Merb::Orms::ActiveRecord.configurations.each_value do |config|
         create_local_database(config)
       end
     end
   end
 
   desc 'Create the local database defined in config/database.yml for the current Merb.environment'
-  task :create => :environment do
-    create_local_database(ActiveRecord::Base.configurations[Merb.environment])
+  task :create => :merb_start do
+    create_local_database(Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym])
   end
 
   def create_local_database(config)
@@ -26,15 +27,15 @@ namespace :db do
       rescue
         case config[:adapter]
         when 'mysql'
-          #~ @charset   = ENV['CHARSET']   || 'utf8'
-          #~ @collation = ENV['COLLATION'] || 'utf8_general_ci'
+          @charset   = ENV['CHARSET']   || 'utf8'
+          @collation = ENV['COLLATION'] || 'utf8_general_ci'
           begin
             ActiveRecord::Base.establish_connection(config.merge({:database => nil}))
-            ActiveRecord::Base.connection.create_database(config[:database]) #, {:charset => @charset, :collation => @collation})
+            ActiveRecord::Base.connection.create_database(config[:database], {:charset => (config[:charset] || @charset), :collation => (config[:collation] || @collation)})
             ActiveRecord::Base.establish_connection(config)
-            p "MySQL #{config[:database]} database succesfully created"
+            puts "MySQL #{config[:database]} database successfully created"
           rescue
-            $stderr.puts "Couldn't create database for #{config.inspect}"
+            $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config[:charset] || @charset}, collation: #{config[:collation] || @collation} (if you set the charset manually, make sure you have a matching collation)"
           end
         when 'postgresql'
           `createdb "#{config[:database]}" -E utf8`
@@ -44,70 +45,131 @@ namespace :db do
           `sqlite3 "#{config[:database]}"`
         end
       else
-        p "#{config[:database]} already exists"
+        puts "#{config[:database]} already exists"
       end
     else
-      p "This task only creates local databases. #{config[:database]} is on a remote host."
+      puts "This task only creates local databases. #{config[:database]} is on a remote host."
     end
   end
-
-  desc 'Drops the database for the current environment'
-  task :drop => :environment do
-    config = ActiveRecord::Base.configurations[Merb.environment || :development]
-    p config
+  
+  def drop_database(config)
     case config[:adapter]
     when 'mysql'
       ActiveRecord::Base.connection.drop_database config[:database]
     when /^sqlite/
-      FileUtils.rm_f File.join(Merb.root, config[:database])
+      FileUtils.rm(File.join(RAILS_ROOT, config[:database]))
     when 'postgresql'
+      ActiveRecord::Base.clear_active_connections!    
       `dropdb "#{config[:database]}"`
     end
   end
+  
+  def local_database?(config, &block)
+    if %w( 127.0.0.1 localhost ).include?(config[:host]) || config[:host].blank?
+      yield
+    else
+      puts "This task only modifies local databases. #{config[:database]} is on a remote host."
+    end
+  end
+
+  namespace :drop do
+    desc 'Drops all the local databases defined in config/database.yml'
+    task :all => :merb_start do
+      Merb::Orms::ActiveRecord.configurations.each_value do |config|
+        # Skip entries that don't have a database key
+        next unless config[:database]
+        # Only connect to local databases
+        local_database?(config) { drop_database(config) }
+      end
+    end
+  end
 
+  desc 'Drops the database for the current environment (set MERB_ENV to target another environment)'
+  task :drop => :merb_start do
+    config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
+    begin
+      drop_database(config)
+    rescue Exception => e
+      puts "#{e.inspect} - #{config['database']} might have been already dropped"
+    end
+  end
+  
   desc "Migrate the database through scripts in schema/migrations. Target specific version with VERSION=x"
-  task :migrate => :environment do
+  task :migrate => :merb_start do
+    config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
+    ActiveRecord::Base.establish_connection(config)
     ActiveRecord::Migrator.migrate("schema/migrations/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
-  desc 'Drops, creates and then migrates the database for the current environment. Target specific version with VERSION=x'
-  task :reset => ['db:drop', 'db:create', 'db:migrate']
+  namespace :migrate do
+    desc  'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x'
+    task :redo => [ 'db:rollback', 'db:migrate' ]
 
-  # desc "Retrieves the charset for the current environment's database"
-  # task :charset => :environment do
-  #   config = ActiveRecord::Base.configurations[Merb.environment || :development]
-  #   case config[:adapter]
-  #   when 'mysql'
-  #     ActiveRecord::Base.establish_connection(config)
-  #     puts ActiveRecord::Base.connection.charset
-  #   else
-  #     puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
-  #   end
-  # end
+    desc 'Resets your database using your migrations for the current environment'
+    task :reset => ["db:drop", "db:create", "db:migrate"]
+  end
+  
+  desc 'Drops and recreates the database from db/schema.rb for the current environment.'
+  task :reset => ['db:drop', 'db:create', 'db:schema:load']
+
+  desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
+  task :rollback => :merb_start do
+    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+    version = ActiveRecord::Migrator.current_version - step
+    ActiveRecord::Migrator.migrate('schema/migrations/', version)
+  end
+  
+  desc "Raises an error if there are pending migrations"
+  task :abort_if_pending_migrations => :merb_start do
+    if defined? ActiveRecord
+      pending_migrations = ActiveRecord::Migrator.new(:up, 'schema/migrations').pending_migrations
+
+      if pending_migrations.any?
+        puts "You have #{pending_migrations.size} pending migrations:"
+        pending_migrations.each do |pending_migration|
+          puts '  %4d %s' % [pending_migration.version, pending_migration.name]
+        end
+        abort "Run `rake db:migrate` to update your database then try again."
+      end
+    end
+  end
+  
+  desc "Retrieves the charset for the current environment's database"
+  task :charset => :merb_start do
+    config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
+    case config[:adapter]
+    when 'mysql'
+      ActiveRecord::Base.establish_connection(config)
+      puts ActiveRecord::Base.connection.charset
+    else
+      puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+    end
+  end
 
-  # desc "Retrieves the collation for the current environment's database"
-  # task :collation => :environment do
-  #   config = ActiveRecord::Base.configurations[Merb.environment || :development]
-  #   case config[:adapter]
-  #   when 'mysql'
-  #     ActiveRecord::Base.establish_connection(config)
-  #     puts ActiveRecord::Base.connection.collation
-  #   else
-  #     puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
-  #   end
-  # end
+  desc "Retrieves the collation for the current environment's database"
+  task :collation => :merb_start do
+    config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
+    case config[:adapter]
+    when 'mysql'
+      ActiveRecord::Base.establish_connection(config)
+      puts ActiveRecord::Base.connection.collation
+    else
+      puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+    end
+  end
 
   desc "Retrieves the current schema version number"
-  task :version => :environment do
+  task :version => :merb_start do
     puts "Current version: #{ActiveRecord::Migrator.current_version}"
   end
 
   namespace :fixtures do
     desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-    task :load => :environment do
+    task :load => :merb_start do
       require 'active_record/fixtures'
-      ActiveRecord::Base.establish_connection(Merb.environment.to_sym)
+      config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
+      ActiveRecord::Base.establish_connection(config)
       (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Merb.root, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
         Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
       end
@@ -116,7 +178,7 @@ namespace :db do
 
   namespace :schema do
     desc 'Create a schema/schema.rb file that can be portably used against any DB supported by AR'
-    task :dump do
+    task :dump => :merb_start do
       require 'active_record/schema_dumper'
       File.open(ENV['SCHEMA'] || "schema/schema.rb", "w") do |file|
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
@@ -124,7 +186,9 @@ namespace :db do
     end
     
     desc "Load a schema.rb file into the database"
-    task :load do
+    task :load => :merb_start do
+      config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
+      ActiveRecord::Base.establish_connection(config)
       file = ENV['SCHEMA'] || "schema/schema.rb"
       load(file)
     end
@@ -132,11 +196,11 @@ namespace :db do
 
  namespace :structure do
     desc "Dump the database structure to a SQL file"
-    task :dump do
-      config = ActiveRecord::Base.configurations[Merb.environment.to_sym]
+    task :dump => :merb_start do
+      config = Merb::Orms::ActiveRecord.configurations[Merb.environment.to_sym]
       case config[:adapter]
         when "mysql", "oci", "oracle"
-          ActiveRecord::Base.establish_connection(config[Merb.environment])
+          ActiveRecord::Base.establish_connection(config)
           File.open("schema/#{Merb.environment}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
         when "postgresql"
           ENV['PGHOST']     = config[:host] if config[:host]
@@ -153,8 +217,8 @@ namespace :db do
           `scptxfr /s #{config[:host]} /d #{config[:database]} /I /f schema\\#{Merb.environment}_structure.sql /q /A /r`
           `scptxfr /s #{config[:host]} /d #{config[:database]} /I /F schema\ /q /A /r`
         when "firebird"
-          set_firebird_env(config[Merb.environment])
-          db_string = firebird_db_string(config[Merb.environment])
+          set_firebird_env(config)
+          db_string = firebird_db_string(config)
           sh "isql -a #{db_string} > schema/#{Merb.environment}_structure.sql"
         else
           raise "Task not supported by '#{config[:adapter]}'"
@@ -167,19 +231,21 @@ namespace :db do
   end
 
   namespace :test do
+    
     desc "Recreate the test database from the current environment's database schema"
     task :clone => %w(db:schema:dump db:test:purge) do
-      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[:test])
+      ActiveRecord::Base.establish_connection(Merb::Orms::ActiveRecord.configurations[:test])
       ActiveRecord::Schema.verbose = false
+      Merb.environment = 'test'
       Rake::Task["db:schema:load"].invoke
     end
 
     desc "Recreate the test databases from the development structure"
     task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
-      config = ActiveRecord::Base.configurations[:test]
+      config = Merb::Orms::ActiveRecord.configurations[:test]
       case config[:adapter]
         when "mysql"
-          ActiveRecord::Base.establish_connection(:test)
+          ActiveRecord::Base.establish_connection(config)
           ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
           IO.readlines("schema/#{Merb.environment}_structure.sql").join.split("\n\n").each do |table|
             ActiveRecord::Base.connection.execute(table)
@@ -209,11 +275,12 @@ namespace :db do
     end
     
     desc "Empty the test database"
-    task :purge do
-      config = ActiveRecord::Base.configurations[:test]
+    task :purge => :merb_start do
+      config = Merb::Orms::ActiveRecord.configurations[:test]
+      puts "config => #{config.inspect}"
       case config[:adapter]
         when "mysql"
-          ActiveRecord::Base.establish_connection(:test)
+          ActiveRecord::Base.establish_connection(config)
           ActiveRecord::Base.connection.recreate_database(config[:database])
         when "postgresql"
           ENV['PGHOST']     = config[:host] if config[:host]
@@ -241,7 +308,7 @@ namespace :db do
 
     desc "Prepare the test database and load the schema"
     task :prepare => ["db:test:clone_structure", "db:test:clone"] do
-      if defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
+      if defined?(ActiveRecord::Base) && !Merb::Orms::ActiveRecord.configurations.blank?
         Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke
       end
     end
@@ -257,7 +324,7 @@ namespace :db do
   #  end
 
     desc "Clear the sessions table"
-    task :clear => :environment do
+    task :clear => :merb_start do
       session_table = 'session'
       session_table = Inflector.pluralize(session_table) if ActiveRecord::Base.pluralize_table_names
       ActiveRecord::Base.connection.execute "DELETE FROM #{session_table}"

data/lib/merb/orms/active_record/connection.rb

@@ -4,31 +4,54 @@ require 'active_record'
 module Merb
   module Orms
     module ActiveRecord
+      
+      # Start a transaction.
+      #
+      # Used by Merb::Rack::Console#open_sandbox!
+      def self.open_sandbox!
+        ::ActiveRecord::Base.send :increment_open_transactions
+        ::ActiveRecord::Base.connection.begin_db_transaction
+      end
+      
+      # Rollback a transaction.
+      #
+      # Used by Merb::Rack::Console#open_sandbox!
+      def self.close_sandbox!
+        ::ActiveRecord::Base.connection.rollback_db_transaction
+        ::ActiveRecord::Base.send :decrement_open_transactions
+      end     
+      
       class << self
-        def config_file() Merb.root / "config" / "database.yml" end
-        def sample_dest() Merb.root / "config" / "database.sample.yml" end
-        def sample_source() File.dirname(__FILE__) / "database.sample.yml" end
+        def config_file() Merb.dir_for(:config) / "database.yml" end
+        def sample_dest() Merb.dir_for(:config) / "database.yml.sample" end
+        def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
       
         def copy_sample_config
           FileUtils.cp sample_source, sample_dest unless File.exists?(sample_dest)
         end
       
         def config
-          @config ||=
+          @config ||= (Merb::Plugins.config[:merb_active_record] = configurations[Merb.environment.to_sym])
+        end
+
+        def configurations
+          @configurations ||= 
             begin
-              # Convert string keys to symbols
-              full_config = Erubis.load_yaml_file(config_file)
-              config = (Merb::Plugins.config[:merb_active_record] = {})
-              (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each { |k, v| config[k.to_sym] = v }
-               ::ActiveRecord::Base.configurations= full_config
-              config
+              #A proc that will recursively intern(a.k.a symbolize) the keys of the hash
+              intern_keys = lambda { |x|
+                x.inject({}) do |y, (k,v)|
+                  y[k.to_sym || k] = v.is_a?(Hash) ? intern_keys.call(v) : v
+                  y
+                end
+              } 
+              intern_keys.call(Erubis.load_yaml_file(config_file))           
             end
         end
 
         # Database connects as soon as the gem is loaded
         def connect
           if File.exists?(config_file)
-            puts "Connecting to database..."
+            Merb.logger.info!("Connecting to database...")
 
             Thread.new{ loop{ sleep(60*60); ::ActiveRecord::Base.verify_active_connections! } }.priority = -10
 
@@ -37,8 +60,8 @@ module Merb
             ::ActiveRecord::Base.establish_connection config
           else
             copy_sample_config
-            puts "No database.yml file found in #{Merb.root}/config."
-            puts "A sample file was created called database.sample.yml for you to copy and edit."
+            Merb.logger.error! "No database.yml file found in #{Merb.root}/config."
+            Merb.logger.error! "A sample file was created called database.sample.yml for you to copy and edit."
             exit(1)
           end
         end
@@ -46,9 +69,9 @@ module Merb
         # Registering this ORM lets the user choose active_record as a session
         # in merb.yml's session_store: option.
         def register_session_type
-          Merb::BootLoader.register_session_type("activerecord",
-            "merb/session/active_record_session",
-            "Using ActiveRecord database sessions")
+          Merb.register_session_type("activerecord",
+          "merb/session/active_record_session",
+          "Using ActiveRecord database sessions")
         end
       end
     end

data/lib/merb/orms/active_record/{database.sample.yml → database.yml.sample}

@@ -7,6 +7,7 @@
   :password: secrets
   :host: localhost
   :socket: /tmp/mysql.sock
+  :encoding: utf8
 
 :test:
   <<: *defaults

data/lib/merb/session/active_record_session.rb

@@ -3,7 +3,6 @@ require "active_record"
 module Merb
   module SessionMixin
     def setup_session
-      Merb.logger.info("Setting up session")
       before = cookies[_session_id_key]
       request.session, cookies[_session_id_key] = Merb::ActiveRecordSession.persist(cookies[_session_id_key])
       @_fingerprint = Marshal.dump(request.session.data).hash
@@ -11,9 +10,12 @@ module Merb
     end
 
     def finalize_session
-      Merb.logger.info("Finalize session")
       request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
-      set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
+      set_cookie(_session_id_key, request.session.session_id, Time.now + _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
+    end
+    
+    def session_store_type
+      "activerecord"
     end
   end # ActiveRecordMixin
 
@@ -99,6 +101,10 @@ module Merb
     def each(&b)
       data.each(&b)
     end
+
+    def each_with_index(&b)
+      data.each_with_index(&b)
+    end
   
     def []=(key, val)
       data[key] = val

data/lib/merb_activerecord.rb

@@ -1,11 +1,17 @@
-# make sure we're running inside Merb
-if defined?(Merb::Plugins)
-  if Merb::BootLoader.app_loaded?
-    puts "Warning: The merb_active_record gem must be loaded before the application"
-  else
-    require "merb/orms/active_record/connection"
-    Merb::Orms::ActiveRecord.connect
-    Merb::Orms::ActiveRecord.register_session_type
+if defined?(Merb::Plugins)  
+  dependency "activerecord"
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection")
+  Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "active_record" / "merbtasks"))
+  
+  class Merb::Orms::ActiveRecord::Connect < Merb::BootLoader
+
+    after BeforeAppRuns
+
+    def self.run
+      Merb::Orms::ActiveRecord.connect
+      Merb::Orms::ActiveRecord.register_session_type
+    end
+
   end
-  Merb::Plugins.add_rakefiles "merb/orms/active_record/tasks/databases"
-end
+
+end

metadata

@@ -1,96 +1,112 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: merb_activerecord
 version: !ruby/object:Gem::Version 
-  version: "0.5"
-date: 2008-01-09 00:00:00 -08:00
-summary: Merb plugin that provides ActiveRecord support for Merb
-require_paths: 
-- lib
-email: canadaduane@gmail.com
-homepage: http://merbivore.com
-rubyforge_project: 
-description: Merb plugin that provides ActiveRecord support for Merb
-autorequire: merb_activerecord
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.9.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Duane Johnson
+autorequire: merb_activerecord
+bindir: bin
+cert_chain: []
+
+date: 2008-03-24 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: merb-core
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.2
+    version: 
+description: Merb plugin that provides ActiveRecord support for Merb
+email: canadaduane@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
+- lib/active_record
+- lib/active_record/merbtasks.rb
 - lib/merb
-- lib/merb_activerecord.rb
 - lib/merb/orms
-- lib/merb/session
 - lib/merb/orms/active_record
 - lib/merb/orms/active_record/connection.rb
-- lib/merb/orms/active_record/database.sample.yml
-- lib/merb/orms/active_record/tasks
-- lib/merb/orms/active_record/tasks/databases.rb
+- lib/merb/orms/active_record/database.yml.sample
+- lib/merb/session
 - lib/merb/session/active_record_session.rb
+- lib/merb_activerecord.rb
 - specs/merb_active_record_spec.rb
 - specs/spec_helper.rb
 - activerecord_generators/database_sessions_migration
-- activerecord_generators/migration
-- activerecord_generators/model
-- activerecord_generators/resource_controller
 - activerecord_generators/database_sessions_migration/database_sessions_migration_generator.rb
 - activerecord_generators/database_sessions_migration/templates
-- activerecord_generators/database_sessions_migration/USAGE
 - activerecord_generators/database_sessions_migration/templates/sessions_migration.erb
+- activerecord_generators/database_sessions_migration/USAGE
+- activerecord_generators/migration
 - activerecord_generators/migration/migration_generator.rb
 - activerecord_generators/migration/templates
+- activerecord_generators/migration/templates/schema
+- activerecord_generators/migration/templates/schema/migrations
+- activerecord_generators/migration/templates/schema/migrations/%migration_file_name%.rb
 - activerecord_generators/migration/USAGE
-- activerecord_generators/migration/templates/new_migration.erb
+- activerecord_generators/model
 - activerecord_generators/model/model_generator.rb
 - activerecord_generators/model/templates
+- activerecord_generators/model/templates/app
+- activerecord_generators/model/templates/app/models
+- activerecord_generators/model/templates/app/models/%model_file_name%.rb
 - activerecord_generators/model/USAGE
-- activerecord_generators/model/templates/new_model.erb
+- activerecord_generators/resource_controller
 - activerecord_generators/resource_controller/resource_controller_generator.rb
 - activerecord_generators/resource_controller/templates
+- activerecord_generators/resource_controller/templates/app
+- activerecord_generators/resource_controller/templates/app/controllers
+- activerecord_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
+- activerecord_generators/resource_controller/templates/app/helpers
+- activerecord_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
+- activerecord_generators/resource_controller/templates/app/views
+- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%
+- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
+- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
+- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
+- activerecord_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
 - activerecord_generators/resource_controller/USAGE
-- activerecord_generators/resource_controller/templates/controller.rb
-- activerecord_generators/resource_controller/templates/edit.html.erb
-- activerecord_generators/resource_controller/templates/helper.rb
-- activerecord_generators/resource_controller/templates/index.html.erb
-- activerecord_generators/resource_controller/templates/new.html.erb
-- activerecord_generators/resource_controller/templates/show.html.erb
-test_files: []
-
+has_rdoc: true
+homepage: http://merbivore.com
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- TODO
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.5"
-    version: 
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Merb plugin that provides ActiveRecord support for Merb
+test_files: []
+

data/activerecord_generators/migration/templates/new_migration.erb

@@ -1,15 +0,0 @@
-class <%= class_name.snake_case.camel_case %> < ActiveRecord::Migration
-  def self.up
-    <%= "create_table :#{table_name} do |t|" if table_name %>
-<% for attribute in table_attributes -%>
-      t.column :<%= attribute.name %>, :<%= attribute.type %> 
-<% end -%>
-    <%= "end" if table_name %>    
-  end
-
-  def self.down
-<% if table_name -%>
-    drop_table :<%= table_name %>
-<% end -%>
-  end
-end

data/activerecord_generators/model/templates/new_model.erb

@@ -1,2 +0,0 @@
-class <%= class_name %> < ActiveRecord::Base
-end

data/activerecord_generators/resource_controller/templates/controller.rb

@@ -1,54 +0,0 @@
-<% klass = class_name.singularize -%>
-<% ivar = class_name.snake_case.singularize -%>
-class <%= class_name %> < Application
-  provides :xml, :js, :yaml
-  
-  def index
-    @<%= ivar.pluralize %> = <%= klass %>.find(:all)
-    render @<%= ivar.pluralize %>
-  end
-  
-  def show
-    @<%= ivar %> = <%= klass %>.find(params[:id])
-    render @<%= ivar %>
-  end
-  
-  def new
-    only_provides :html
-    @<%= ivar %> = <%= klass %>.new(params[:<%= ivar %>])
-    render
-  end
-  
-  def create
-    @<%= ivar %> = <%= klass %>.new(params[:<%= ivar %>])
-    if @<%= ivar %>.save
-      redirect url(:<%= ivar %>, @<%= ivar %>)
-    else
-      render :action => :new
-    end
-  end
-  
-  def edit
-    only_provides :html
-    @<%= ivar %> = <%= klass %>.find(params[:id])
-    render
-  end
-  
-  def update
-    @<%= ivar %> = <%= klass %>.find(params[:id])
-    if @<%= ivar %>.update_attributes(params[:<%= ivar %>])
-      redirect url(:<%= ivar %>, @<%= ivar %>)
-    else
-      raise BadRequest
-    end
-  end
-  
-  def destroy
-    @<%= ivar %> = <%= klass %>.find(params[:id])
-    if @<%= ivar %>.destroy
-      redirect url(:<%= ivar %>s)
-    else
-      raise BadRequest
-    end
-  end
-end

data/activerecord_generators/resource_controller/templates/edit.html.erb

@@ -1 +0,0 @@
-Edit for <%= class_name %>

data/activerecord_generators/resource_controller/templates/helper.rb

@@ -1,5 +0,0 @@
-module Merb
-module <%= class_name %>Helper
-  
-  end
-end

data/activerecord_generators/resource_controller/templates/index.html.erb

@@ -1 +0,0 @@
-Index for <%= class_name %>

data/activerecord_generators/resource_controller/templates/new.html.erb

@@ -1 +0,0 @@
-New for <%= class_name %>

data/activerecord_generators/resource_controller/templates/show.html.erb

@@ -1 +0,0 @@
-Show for <%= class_name %>