merb_activerecord 0.9.2 → 0.9.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb_activerecord"
 NAME = "merb_activerecord"
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 AUTHOR = "Duane Johnson"
 EMAIL = "canadaduane@gmail.com"
 HOMEPAGE = "http://merbivore.com"
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency("merb-core", ">= 0.9.2")
+  s.add_dependency("merb-core", ">= 0.9.3")
   s.require_path = "lib"
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,activerecord_generators}/**/*")

data/lib/active_record/merbtasks.rb

@@ -284,8 +284,8 @@ namespace :db do
           ActiveRecord::Base.connection.recreate_database(config[:database])
         when "postgresql"
           ENV['PGHOST']     = config[:host] if config[:host]
-          ENV['PGPORT']     = configs[:port].to_s if config[:port]
-          ENV['PGPASSWORD'] = configs[:password].to_s if config[:password]
+          ENV['PGPORT']     = config[:port].to_s if config[:port]
+          ENV['PGPASSWORD'] = config[:password].to_s if config[:password]
           enc_option = "-E #{config[:encoding]}" if config[:encoding]
           ActiveRecord::Base.clear_active_connections!
           `dropdb -U "#{config[:username]}" #{config[:database]}`
@@ -307,7 +307,7 @@ namespace :db do
     end
 
     desc "Prepare the test database and load the schema"
-    task :prepare => ["db:test:clone_structure", "db:test:clone"] do
+    task :prepare  do
       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

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

@@ -4,7 +4,7 @@ require 'active_record'
 module Merb
   module Orms
     module ActiveRecord
-      
+
       # Start a transaction.
       #
       # Used by Merb::Rack::Console#open_sandbox!
@@ -12,30 +12,30 @@ module Merb
         ::ActiveRecord::Base.send :increment_open_transactions
         ::ActiveRecord::Base.connection.begin_db_transaction
       end
-      
+
       # Rollback a transaction.
       #
-      # Used by Merb::Rack::Console#open_sandbox!
+      # Used by Merb::Rack::Console#close_sandbox!
       def self.close_sandbox!
         ::ActiveRecord::Base.connection.rollback_db_transaction
         ::ActiveRecord::Base.send :decrement_open_transactions
-      end     
-      
+      end
+
       class << self
         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 ||= (Merb::Plugins.config[:merb_active_record] = configurations[Merb.environment.to_sym])
         end
 
         def configurations
-          @configurations ||= 
+          @configurations ||=
             begin
               #A proc that will recursively intern(a.k.a symbolize) the keys of the hash
               intern_keys = lambda { |x|
@@ -43,8 +43,8 @@ module Merb
                   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))           
+              }
+              intern_keys.call(Erubis.load_yaml_file(config_file))
             end
         end
 
@@ -57,6 +57,7 @@ module Merb
 
             ::ActiveRecord::Base.verification_timeout = 14400
             ::ActiveRecord::Base.logger = Merb.logger
+            ::ActiveRecord::Base.configurations = configurations
             ::ActiveRecord::Base.establish_connection config
           else
             copy_sample_config
@@ -65,7 +66,7 @@ module Merb
             exit(1)
           end
         end
-        
+
         # Registering this ORM lets the user choose active_record as a session
         # in merb.yml's session_store: option.
         def register_session_type
@@ -76,4 +77,4 @@ module Merb
       end
     end
   end
-end
+end

data/specs/merb_active_record_spec.rb

@@ -1,7 +1,67 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "merb_active_record" do
-  it "should do nothing" do
-    true.should == true
+describe Merb::Orms::ActiveRecord::Connect do
+  it "is loaded at plugin bootstrap" do
+    defined?(Merb::Orms::ActiveRecord::Connect).should == "constant"
   end
-end
+
+  it "is a merb bootloader" do
+    Merb::Orms::ActiveRecord::Connect.superclass.should == Merb::BootLoader
+  end
+end
+
+
+
+describe "Merb ActiveRecord extension" do
+  before :all do
+    @wd = Dir.pwd
+    Merb.stub!(:dir_for).with(:config).and_return(@wd)
+    @config_file_path = @wd / "database.yml"
+    @sample_file_path = @wd / "database.yml.sample"
+
+    @sample_source = Merb::Orms::ActiveRecord.sample_source
+    @config_sample = Erubis.load_yaml_file(@sample_source)
+  end
+
+  it "is loaded at plugin booststrap" do
+    defined?(Merb::Orms::ActiveRecord).should == "constant"
+  end
+
+  it "loads config from Merb configurations directory" do
+    Merb::Orms::ActiveRecord.config_file.should == @config_file_path
+  end
+
+  it "loads config sample from Merb configurations directory" do
+    Merb::Orms::ActiveRecord.sample_dest.should == @sample_file_path
+  end
+
+  it "provides a sample database.yml with development environment" do
+    @config_sample[:development].should be_an_instance_of(Hash)
+  end
+
+  it "provides a sample database.yml with test environment" do
+    @config_sample[:test].should be_an_instance_of(Hash)
+  end
+
+  it "provides a sample database.yml with production environment" do
+    @config_sample[:production].should be_an_instance_of(Hash)
+  end
+
+  it "uses Unicode and localhost in sample" do
+    @config_sample[:development][:host].should == "localhost"
+    @config_sample[:development][:encoding].should == "utf8"
+  end
+
+  it "stores configurations from config file" do
+    Erubis.should_receive(:load_yaml_file).with(@config_file_path).and_return(@config_sample)
+    Merb::Orms::ActiveRecord.configurations[:development][:database].should == "sample_development"
+  end
+
+  it "provides Rack with a way to start a transcantion" do
+    Merb::Orms::ActiveRecord.should respond_to(:open_sandbox!)
+  end
+
+  it "provides Rack with a way to stop a transcantion" do
+    Merb::Orms::ActiveRecord.should respond_to(:close_sandbox!)
+  end
+end

data/specs/spec_helper.rb

@@ -1,2 +1,5 @@
-$TESTING=true
+$TESTING = true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require 'merb-core'
+require 'merb_activerecord'
+require 'merb/test/model_helper/active_record'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Duane Johnson
@@ -9,7 +9,7 @@ autorequire: merb_activerecord
 bindir: bin
 cert_chain: []
 
-date: 2008-03-24 00:00:00 -05:00
+date: 2008-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
     version: 
 description: Merb plugin that provides ActiveRecord support for Merb
 email: canadaduane@gmail.com