seamless_database_pool 1.0.4 → 1.0.5

data/Rakefile

@@ -1,15 +1,20 @@
 require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
 
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test seamless_database_pool.'
-Spec::Rake::SpecTask.new(:test) do |t|
-  t.spec_files = 'spec/**/*_spec.rb'
+begin
+  require 'spec/rake/spectask'
+  desc 'Test seamless_database_pool.'
+  Spec::Rake::SpecTask.new(:test) do |t|
+    t.spec_files = FileList.new('spec/**/*_spec.rb')
+  end
+rescue LoadError
+  tast :test do
+    STDERR.puts "You must have rspec >= 1.2.9 to run the tests"
+  end
 end
 
 desc 'Generate documentation for seamless_database_pool.'
@@ -20,25 +25,20 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-spec = Gem::Specification.new do |s| 
-  s.name = "seamless_database_pool"
-  s.version = "1.0.4"
-  s.author = "Brian Durand"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "Support for master/slave database clusters in ActiveRecord"
-  s.description = "Add support for master/slave database clusters in ActiveRecord to improve performance."
-  s.files = FileList["lib/**/*", "init.rb", "MIT-LICENSE", 'Rakefile'].to_a
-  s.require_path = "lib"
-  s.test_files = FileList["{spec}/**/*_spec.rb"].to_a
-  s.has_rdoc = true
-  s.rdoc_options << '--title' << 'Seamless Database Pool' << '--line-numbers' << '--inline-source' << '--main' << 'README'
-  s.extra_rdoc_files = ["README"]
-  s.homepage = "http://seamlessdbpool.rubyforge.org"
-  s.rubyforge_project = "seamlessdbpool"
-  s.email = 'brian@embellishedvisions.com'
-  s.requirements = 'rspec 1.0.8 or higher is needed to run the tests'
-end
- 
-Rake::GemPackageTask.new(spec) do |pkg| 
-  pkg.need_tar = true 
-end
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "seamless_database_pool"
+    gem.summary = "Add support for master/slave database clusters in ActiveRecord to improve performance."
+    gem.email = "brian@embellishedvisions.com"
+    gem.homepage = "http://github.com/bdurand/seamless_database_pool"
+    gem.authors = ["Brian Durand"]
+  
+    gem.add_dependency('activerecord', '>= 2.2.2')
+    gem.add_development_dependency('rspec', '>= 1.2.9')
+    gem.add_development_dependency('jeweler')
+  end
+
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+end

data/VERSION

@@ -0,0 +1 @@
+1.0.5

data/lib/active_record/connection_adapters/seamless_database_pool_adapter.rb

@@ -1,5 +1,3 @@
-require 'seamless_database_pool/connect_timeout'
-
 module ActiveRecord
   class Base
     def self.seamless_database_pool_connection (config)

data/lib/seamless_database_pool.rb

@@ -1,3 +1,8 @@
+require File.join(File.dirname(__FILE__), 'seamless_database_pool', 'connect_timeout')
+require File.join(File.dirname(__FILE__), 'seamless_database_pool', 'connection_statistics')
+require File.join(File.dirname(__FILE__), 'seamless_database_pool', 'controller_filter')
+require File.join(File.dirname(__FILE__), 'active_record', 'connection_adapters', 'seamless_database_pool_adapter')
+
 # This module allows setting the read pool connection type. Generally you will use one of
 #
 #   - use_random_read_connection

data/seamless_database_pool.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{seamless_database_pool}
+  s.version = "1.0.5"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Brian Durand"]
+  s.date = %q{2010-02-07}
+  s.email = %q{brian@embellishedvisions.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "init.rb",
+     "lib/active_record/connection_adapters/seamless_database_pool_adapter.rb",
+     "lib/seamless_database_pool.rb",
+     "lib/seamless_database_pool/connect_timeout.rb",
+     "lib/seamless_database_pool/connection_statistics.rb",
+     "lib/seamless_database_pool/controller_filter.rb",
+     "seamless_database_pool.gemspec",
+     "spec/connection_statistics_spec.rb",
+     "spec/filter_spec.rb",
+     "spec/seamless_database_pool_adapter_spec.rb",
+     "spec/seamless_database_pool_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/test_models.rb"
+  ]
+  s.homepage = %q{http://github.com/bdurand/seamless_database_pool}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Add support for master/slave database clusters in ActiveRecord to improve performance.}
+  s.test_files = [
+    "spec/connection_statistics_spec.rb",
+     "spec/filter_spec.rb",
+     "spec/seamless_database_pool_adapter_spec.rb",
+     "spec/seamless_database_pool_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/test_models.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.2.2"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 2.2.2"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 2.2.2"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+  end
+end
+

data/spec/connection_statistics_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
-describe "SeamlessDatabasePool::ConnectionStatistics" do
+describe SeamlessDatabasePool::ConnectionStatistics do
   
   module SeamlessDatabasePool
     class ConnectionStatisticsTester
@@ -23,7 +23,7 @@ describe "SeamlessDatabasePool::ConnectionStatistics" do
         "SELECT #{sql}/#{name}"
       end
       
-      include ConnectionStatistics
+      include ::SeamlessDatabasePool::ConnectionStatistics
     end
   end
   

data/spec/filter_spec.rb

@@ -22,21 +22,21 @@ describe "SeamlessDatabasePool::ControllerFilter" do
       end
       
       def base_action
-        SeamlessDatabasePool.read_only_connection_type
+        ::SeamlessDatabasePool.read_only_connection_type
       end
     end
     
     class TestBaseController < TestApplicationController
-      include SeamlessDatabasePool::ControllerFilter
+      include ::SeamlessDatabasePool::ControllerFilter
 
       use_database_pool :read => :persistent
       
       def read
-        SeamlessDatabasePool.read_only_connection_type
+        ::SeamlessDatabasePool.read_only_connection_type
       end
       
       def other
-        SeamlessDatabasePool.read_only_connection_type
+        ::SeamlessDatabasePool.read_only_connection_type
       end
     end
     
@@ -44,11 +44,11 @@ describe "SeamlessDatabasePool::ControllerFilter" do
       use_database_pool :all => :random, [:edit, :save, :redirect_master_action] => :master
       
       def edit
-        SeamlessDatabasePool.read_only_connection_type
+        ::SeamlessDatabasePool.read_only_connection_type
       end
 
       def save
-        SeamlessDatabasePool.read_only_connection_type
+        ::SeamlessDatabasePool.read_only_connection_type
       end
       
       def redirect_master_action

data/spec/seamless_database_pool_adapter_spec.rb

@@ -363,32 +363,13 @@ end
 
 describe "Reload extensions" do
   before(:all) do
-    ActiveRecord::Migration.suppress_messages do
-      class SeamlessDatabasePoolTestThing < ActiveRecord::Base
-        ActiveRecord::Migration.create_table(:seamless_database_pool_test_things) do |t|
-          t.column :name, :string
-          t.column :seamless_database_pool_test_model_id, :integer
-        end unless table_exists?
-        belongs_to :seamless_database_pool_test_model
-      end
-      
-      class SeamlessDatabasePoolTestModel < ActiveRecord::Base
-        ActiveRecord::Migration.create_table(:seamless_database_pool_test_models) do |t|
-          t.column :name, :string
-        end unless table_exists?
-        has_many :seamless_database_pool_test_things
-      end
-    end
-    
-    @record =  SeamlessDatabasePoolTestModel.create(:name => 'test')
-    @thing = SeamlessDatabasePoolTestThing.create(:name => 'thing', :seamless_database_pool_test_model_id => @record.id)
+    SeamlessDatabasePool::Test.create_tables
+    @record =  SeamlessDatabasePool::Test::Model.create(:name => 'test')
+    @thing = SeamlessDatabasePool::Test::Thing.create(:name => 'thing', :model_id => @record.id)
   end
   
   after(:all) do
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.drop_table(:seamless_database_pool_test_models) if SeamlessDatabasePoolTestModel.table_exists?
-      ActiveRecord::Migration.drop_table(:seamless_database_pool_test_things) if SeamlessDatabasePoolTestThing.table_exists?
-    end
+    SeamlessDatabasePool::Test.drop_tables
   end
   
   it "should force the master connection on reload" do

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+
+active_record_version = ENV["ACTIVE_RECORD_VERSION"] || [">= 2.2.2", "< 3.0"]
+active_record_version = [active_record_version] unless active_record_version.is_a?(Array)
+gem 'activerecord', *active_record_version
+
+require 'spec'
+require 'active_record'
+puts "Testing Against ActiveRecord #{ActiveRecord::VERSION::STRING}" if defined?(ActiveRecord::VERSION)
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'seamless_database_pool'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_models'))

data/spec/test_models.rb

@@ -0,0 +1,35 @@
+module SeamlessDatabasePool
+  class Test < ActiveRecord::Base
+    def self.create_tables
+      db_dir = File.expand_path(File.join(__FILE__, '..', 'tmp'))
+      Dir.mkdir(db_dir) unless File.exist?(db_dir)
+      db = File.join(db_dir, 'test_SeamlessDatabasePool.sqlite3')
+      establish_connection("adapter" => "sqlite3", "database" => db)
+      
+      connection.create_table(Thing.table_name) do |t|
+        t.column :name, :string
+        t.column :model_id, :integer
+      end unless Thing.table_exists?
+      
+      connection.create_table(Model.table_name) do |t|
+        t.column :name, :string
+      end unless Model.table_exists?
+    end
+ 
+    def self.drop_tables
+      db_dir = File.expand_path(File.join(__FILE__, '..', 'tmp'))
+      db = File.join(db_dir, 'test_SeamlessDatabasePool.sqlite3')
+      connection.disconnect!
+      File.delete(db) if File.exist?(db)
+      Dir.delete(db_dir) if File.exist?(db_dir) and Dir.entries(db_dir).reject{|f| f.match(/^\.+$/)}.empty?
+    end
+    
+    class Thing < Test
+      belongs_to :model, :class_name => "SeamlessDatabasePool::Test::Model"
+    end
+    
+    class Model < Test
+      has_many :things, :class_name => "SeamlessDatabasePool::Test::Thing"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seamless_database_pool
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,40 +9,72 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -05:00
+date: 2010-02-07 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
-description: Add support for master/slave database clusters in ActiveRecord to improve performance.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.2.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: 
 email: brian@embellishedvisions.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- init.rb
 - lib/active_record/connection_adapters/seamless_database_pool_adapter.rb
+- lib/seamless_database_pool.rb
 - lib/seamless_database_pool/connect_timeout.rb
 - lib/seamless_database_pool/connection_statistics.rb
 - lib/seamless_database_pool/controller_filter.rb
-- lib/seamless_database_pool.rb
-- init.rb
-- MIT-LICENSE
-- Rakefile
-- README
+- seamless_database_pool.gemspec
+- spec/connection_statistics_spec.rb
+- spec/filter_spec.rb
+- spec/seamless_database_pool_adapter_spec.rb
+- spec/seamless_database_pool_spec.rb
+- spec/spec_helper.rb
+- spec/test_models.rb
 has_rdoc: true
-homepage: http://seamlessdbpool.rubyforge.org
+homepage: http://github.com/bdurand/seamless_database_pool
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --title
-- Seamless Database Pool
-- --line-numbers
-- --inline-source
-- --main
-- README
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -57,15 +89,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: 
-- rspec 1.0.8 or higher is needed to run the tests
-rubyforge_project: seamlessdbpool
+requirements: []
+
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Support for master/slave database clusters in ActiveRecord
+summary: Add support for master/slave database clusters in ActiveRecord to improve performance.
 test_files: 
 - spec/connection_statistics_spec.rb
 - spec/filter_spec.rb
 - spec/seamless_database_pool_adapter_spec.rb
 - spec/seamless_database_pool_spec.rb
+- spec/spec_helper.rb
+- spec/test_models.rb