data_fabric 1.2.3 → 1.2.4

data/CHANGELOG

@@ -1,6 +1,12 @@
 DataFabric changelog
 
-v1.2.3 - 2008-02-05
+v1.2.4 - 2009-03-09
+
+- Add FiveRuns Dash recipe for data_fabric.  See http://dash.fiveruns.com for details.
+- Fixed incorrect remove_connection method signature.
+- The official data_fabric repository is now http://github.com/mperham/data_fabric.
+
+v1.2.3 - 2009-02-05
 
 - Release connections at the end of each Rails action.  If you see 5 second
   pauses in your application, it's because the connection pool is timing out
@@ -32,4 +38,4 @@ v1.1.0 - 2008-11-22
 
 Detailed commit history:
 
-http://github.com/fiveruns/data_fabric/commits/master
+http://github.com/mperham/data_fabric/commits/master

data/Manifest

@@ -105,6 +105,7 @@ init.rb
 lib/data_fabric/ar20.rb
 lib/data_fabric/ar22.rb
 lib/data_fabric/version.rb
+lib/data_fabric/dash.rb
 lib/data_fabric.rb
 Manifest
 Rakefile

data/Rakefile

@@ -9,7 +9,7 @@ Echoe.new 'data_fabric' do |p|
   p.email  = 'mperham@gmail.com'
   p.project = 'fiveruns'
   p.summary = 'Sharding and replication support for ActiveRecord 2.x'
-  p.url = "http://github.com/fiveruns/data_fabric"
+  p.url = "http://github.com/mperham/data_fabric"
   p.development_dependencies = []
   p.rubygems_version = nil
   p.include_rakefile = true
@@ -90,8 +90,8 @@ def create_mysql(create, db_name)
 end
 
 # Test coverage
-gem 'spicycode-rcov' rescue nil
 begin
+  gem 'spicycode-rcov' rescue nil
   require 'rcov/rcovtask'
 
   desc "Generate coverage numbers for all locally installed versions of ActiveRecord"

data/data_fabric.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{data_fabric}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Perham"]
-  s.date = %q{2009-02-05}
+  s.date = %q{2009-03-09}
   s.description = %q{Sharding and replication support for ActiveRecord 2.x}
   s.email = %q{mperham@gmail.com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/data_fabric/ar20.rb", "lib/data_fabric/ar22.rb", "lib/data_fabric/version.rb", "lib/data_fabric.rb", "README.rdoc"]
-  s.files = ["CHANGELOG", "example/app/controllers/accounts_controller.rb", "example/app/controllers/application.rb", "example/app/controllers/figments_controller.rb", "example/app/helpers/accounts_helper.rb", "example/app/helpers/application_helper.rb", "example/app/helpers/figments_helper.rb", "example/app/models/account.rb", "example/app/models/figment.rb", "example/app/views/accounts/index.html.erb", "example/app/views/layouts/application.html.erb", "example/config/boot.rb", "example/config/database.yml", "example/config/environment.rb", "example/config/environments/development.rb", "example/config/environments/production.rb", "example/config/environments/test.rb", "example/config/initializers/inflections.rb", "example/config/initializers/mime_types.rb", "example/config/initializers/new_rails_defaults.rb", "example/config/routes.rb", "example/db/migrate/20080702154628_create_accounts.rb", "example/db/migrate/20080702154820_create_figments.rb", "example/db/schema.rb", "example/public/404.html", "example/public/422.html", "example/public/500.html", "example/public/dispatch.cgi", "example/public/dispatch.fcgi", "example/public/dispatch.rb", "example/public/favicon.ico", "example/public/images/rails.png", "example/public/robots.txt", "example/Rakefile", "example/script/about", "example/script/console", "example/script/dbconsole", "example/script/destroy", "example/script/generate", "example/script/performance/benchmarker", "example/script/performance/profiler", "example/script/performance/request", "example/script/plugin", "example/script/process/inspector", "example/script/process/reaper", "example/script/process/spawner", "example/script/runner", "example/script/server", "example/test/fixtures/accounts.yml", "example/test/functional/accounts_controller_test.rb", "example/test/integration/account_figments_test.rb", "example/test/test_helper.rb", "example22/app/controllers/accounts_controller.rb", "example22/app/controllers/application.rb", "example22/app/controllers/figments_controller.rb", "example22/app/helpers/application_helper.rb", "example22/app/models/account.rb", "example22/app/models/figment.rb", "example22/app/views/accounts/index.html.erb", "example22/app/views/layouts/application.html.erb", "example22/config/boot.rb", "example22/config/database.yml", "example22/config/environment.rb", "example22/config/environments/development.rb", "example22/config/environments/production.rb", "example22/config/environments/test.rb", "example22/config/initializers/inflections.rb", "example22/config/initializers/mime_types.rb", "example22/config/initializers/new_rails_defaults.rb", "example22/config/locales/en.yml", "example22/config/routes.rb", "example22/db/migrate/20080702154628_create_accounts.rb", "example22/db/migrate/20080702154820_create_figments.rb", "example22/public/404.html", "example22/public/422.html", "example22/public/500.html", "example22/public/dispatch.cgi", "example22/public/dispatch.fcgi", "example22/public/dispatch.rb", "example22/public/favicon.ico", "example22/public/images/rails.png", "example22/public/index.html", "example22/public/robots.txt", "example22/Rakefile", "example22/script/about", "example22/script/console", "example22/script/dbconsole", "example22/script/destroy", "example22/script/generate", "example22/script/performance/benchmarker", "example22/script/performance/profiler", "example22/script/performance/request", "example22/script/plugin", "example22/script/process/inspector", "example22/script/process/reaper", "example22/script/process/spawner", "example22/script/runner", "example22/script/server", "example22/test/fixtures/accounts.yml", "example22/test/functional/accounts_controller_test.rb", "example22/test/integration/account_figments_test.rb", "example22/test/performance/browsing_test.rb", "example22/test/test_helper.rb", "init.rb", "lib/data_fabric/ar20.rb", "lib/data_fabric/ar22.rb", "lib/data_fabric/version.rb", "lib/data_fabric.rb", "Manifest", "Rakefile", "README.rdoc", "test/connection_test.rb", "test/database.yml", "test/database.yml.mysql", "test/database_test.rb", "test/shard_test.rb", "test/test_helper.rb", "test/thread_test.rb", "TESTING.rdoc", "data_fabric.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/data_fabric/ar20.rb", "lib/data_fabric/ar22.rb", "lib/data_fabric/version.rb", "lib/data_fabric/dash.rb", "lib/data_fabric.rb", "README.rdoc"]
+  s.files = ["CHANGELOG", "example/app/controllers/accounts_controller.rb", "example/app/controllers/application.rb", "example/app/controllers/figments_controller.rb", "example/app/helpers/accounts_helper.rb", "example/app/helpers/application_helper.rb", "example/app/helpers/figments_helper.rb", "example/app/models/account.rb", "example/app/models/figment.rb", "example/app/views/accounts/index.html.erb", "example/app/views/layouts/application.html.erb", "example/config/boot.rb", "example/config/database.yml", "example/config/environment.rb", "example/config/environments/development.rb", "example/config/environments/production.rb", "example/config/environments/test.rb", "example/config/initializers/inflections.rb", "example/config/initializers/mime_types.rb", "example/config/initializers/new_rails_defaults.rb", "example/config/routes.rb", "example/db/migrate/20080702154628_create_accounts.rb", "example/db/migrate/20080702154820_create_figments.rb", "example/db/schema.rb", "example/public/404.html", "example/public/422.html", "example/public/500.html", "example/public/dispatch.cgi", "example/public/dispatch.fcgi", "example/public/dispatch.rb", "example/public/favicon.ico", "example/public/images/rails.png", "example/public/robots.txt", "example/Rakefile", "example/script/about", "example/script/console", "example/script/dbconsole", "example/script/destroy", "example/script/generate", "example/script/performance/benchmarker", "example/script/performance/profiler", "example/script/performance/request", "example/script/plugin", "example/script/process/inspector", "example/script/process/reaper", "example/script/process/spawner", "example/script/runner", "example/script/server", "example/test/fixtures/accounts.yml", "example/test/functional/accounts_controller_test.rb", "example/test/integration/account_figments_test.rb", "example/test/test_helper.rb", "example22/app/controllers/accounts_controller.rb", "example22/app/controllers/application.rb", "example22/app/controllers/figments_controller.rb", "example22/app/helpers/application_helper.rb", "example22/app/models/account.rb", "example22/app/models/figment.rb", "example22/app/views/accounts/index.html.erb", "example22/app/views/layouts/application.html.erb", "example22/config/boot.rb", "example22/config/database.yml", "example22/config/environment.rb", "example22/config/environments/development.rb", "example22/config/environments/production.rb", "example22/config/environments/test.rb", "example22/config/initializers/inflections.rb", "example22/config/initializers/mime_types.rb", "example22/config/initializers/new_rails_defaults.rb", "example22/config/locales/en.yml", "example22/config/routes.rb", "example22/db/migrate/20080702154628_create_accounts.rb", "example22/db/migrate/20080702154820_create_figments.rb", "example22/public/404.html", "example22/public/422.html", "example22/public/500.html", "example22/public/dispatch.cgi", "example22/public/dispatch.fcgi", "example22/public/dispatch.rb", "example22/public/favicon.ico", "example22/public/images/rails.png", "example22/public/index.html", "example22/public/robots.txt", "example22/Rakefile", "example22/script/about", "example22/script/console", "example22/script/dbconsole", "example22/script/destroy", "example22/script/generate", "example22/script/performance/benchmarker", "example22/script/performance/profiler", "example22/script/performance/request", "example22/script/plugin", "example22/script/process/inspector", "example22/script/process/reaper", "example22/script/process/spawner", "example22/script/runner", "example22/script/server", "example22/test/fixtures/accounts.yml", "example22/test/functional/accounts_controller_test.rb", "example22/test/integration/account_figments_test.rb", "example22/test/performance/browsing_test.rb", "example22/test/test_helper.rb", "init.rb", "lib/data_fabric/ar20.rb", "lib/data_fabric/ar22.rb", "lib/data_fabric/version.rb", "lib/data_fabric/dash.rb", "lib/data_fabric.rb", "Manifest", "Rakefile", "README.rdoc", "test/connection_test.rb", "test/database.yml", "test/database.yml.mysql", "test/database_test.rb", "test/shard_test.rb", "test/test_helper.rb", "test/thread_test.rb", "TESTING.rdoc", "data_fabric.gemspec"]
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/fiveruns/data_fabric}
+  s.homepage = %q{http://github.com/mperham/data_fabric}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Data_fabric", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fiveruns}

data/lib/data_fabric/ar22.rb

@@ -30,8 +30,8 @@ module DataFabric
             @proxy.connected?
           end
 
-          def remove_connection(klass)
-            DataFabric.log(Logger::ERROR) { "remove_connection not implemented by data_fabric" }
+          def remove_connection(klass=self)
+            DataFabric.log(Logger::WARN) { "remove_connection not implemented by data_fabric" }
           end
 
           def connection_pool

data/lib/data_fabric/dash.rb

@@ -0,0 +1,20 @@
+# A data_fabric recipe for use with the FiveRuns Dash metrics service at 
+# http://dash.fiveruns.com.
+#
+# Hook into your Rails application by adding the recipe in your 
+# config/initializers/dash.rb, like so:
+#
+# require 'data_fabric/dash'
+# Fiveruns::Dash::Rails.start :production => 'your-token' do |config|
+#   config.add_recipe :data_fabric, :url => 'http://mikeperham.com'
+# end
+#
+raise ArgumentError, "The Dash recipe for DataFabric is only supported on ActiveRecord 2.2 and greater" if ActiveRecord::VERSION::STRING < '2.2.0'
+
+Fiveruns::Dash.register_recipe :data_fabric, :url => 'http://mikeperham.com' do |recipe|
+  recipe.absolute :open_connections, 'Open Connections' do
+    DataFabric::ConnectionProxy.shard_pools.values.map do |pool|
+      (pool.instance_variable_get(:@checked_out) || []).size
+    end.sum
+  end
+end

data/lib/data_fabric/version.rb

@@ -1,5 +1,5 @@
 module DataFabric
 	module Version
-		STRING = "1.2.3"
+		STRING = "1.2.4"
 	end
 end

data/test/connection_test.rb

@@ -43,7 +43,9 @@ end
 class ConnectionTest < Test::Unit::TestCase
 
   def test_should_install_into_arbase
-    assert PrefixModel.methods.include?('data_fabric')
+    # Ruby 1.8 vs 1.9 difference
+    meth = PrefixModel.methods.first.is_a?(Symbol) ? :data_fabric : 'data_fabric'
+    assert PrefixModel.methods.include?(meth)
   end
   
   def test_prefix_connection_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_fabric
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Mike Perham
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -06:00
+date: 2009-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files:
 - lib/data_fabric/ar20.rb
 - lib/data_fabric/ar22.rb
 - lib/data_fabric/version.rb
+- lib/data_fabric/dash.rb
 - lib/data_fabric.rb
 - README.rdoc
 files: 
@@ -134,6 +135,7 @@ files:
 - lib/data_fabric/ar20.rb
 - lib/data_fabric/ar22.rb
 - lib/data_fabric/version.rb
+- lib/data_fabric/dash.rb
 - lib/data_fabric.rb
 - Manifest
 - Rakefile
@@ -148,7 +150,7 @@ files:
 - TESTING.rdoc
 - data_fabric.gemspec
 has_rdoc: true
-homepage: http://github.com/fiveruns/data_fabric
+homepage: http://github.com/mperham/data_fabric
 post_install_message: 
 rdoc_options: 
 - --line-numbers