rails-sharding 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a47a8619575fe9128b549698d4afd396c0e66264
-  data.tar.gz: 62d25bc10fbfacfe86ca63a64fc715f65ec7f550
+  metadata.gz: 05fd12669243e14c2d6f1b1748acf461b8316dbb
+  data.tar.gz: d1508fddee17b0a5c7eb0203b8dd1c9b52b74c66
 SHA512:
-  metadata.gz: 6f7ba9c5adb59586c7c706d4d97ac3ac0eb95d6c449bd439787a6d4baa4f406c9eee338fdcb7926402f8451252b20d49dafa5371e08fa319eb170ee9d273cd8a
-  data.tar.gz: c9296adfc294e4395f1430e21e3cca83db9ba7de374c04e2da3ec48846fa5664249adb247410676774566847838a210b1ae950b2dd01adf99642336121af0315
+  metadata.gz: 5ea75e62463c090f6806baedfd648768007c192d4e3a9e162c162083eb015cacb8eb6dfbc8ed0ce739bb9cc17c9a3889abc6b0bd02bb24f3f76470478996e85c
+  data.tar.gz: 524dfe1e8c7ea123209746accfdb726ea0a6011f43c460cbcf2cff3c11531b2ee7afa99c26091d54ad8792dd05dca62aff2badaee5290babb1f72631ed0e94d0

data/.gitignore

@@ -10,3 +10,4 @@
 /spec/fixtures/schemas
 /tmp/
 .byebug_history
+rails-sharding-*.*.*.gem

data/README.md

@@ -2,7 +2,8 @@
 
 [![Build Status](https://travis-ci.org/hsgubert/rails-sharding.svg?branch=master)](https://travis-ci.org/hsgubert/rails-sharding)
 [![Code Climate](https://codeclimate.com/github/hsgubert/rails-sharding/badges/gpa.svg)](https://codeclimate.com/github/hsgubert/rails-sharding)
-
+[![Test Coverage](https://codeclimate.com/github/hsgubert/rails-sharding/badges/coverage.svg)](https://codeclimate.com/github/hsgubert/rails-sharding/coverage)
+[![Gem Version](https://badge.fury.io/rb/rails-sharding.svg)](https://badge.fury.io/rb/rails-sharding)
 
 Simple and robust sharding for Rails, including Migrations and ActiveRecord extensions
 

data/lib/rails/sharding/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sharding
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/tasks/rails-sharding.rake

@@ -81,15 +81,11 @@ shards_namespace = namespace :shards do
       Rails::Sharding.configurations.each do |shard_group, shards_configurations|
         next if ENV["SHARD_GROUP"] && ENV["SHARD_GROUP"] != shard_group.to_s
 
-        # configures path for schemas of this shard group and creates dir if necessary
-        shard_group_schemas_dir = File.join(Rails::Sharding::Config.shards_schemas_dir, shard_group.to_s)
-        FileUtils.mkdir_p(shard_group_schemas_dir)
-
         shards_configurations.each do |shard, configuration|
           next if ENV["SHARD"] && ENV["SHARD"] != shard.to_s
           puts "== Dumping schema of #{shard_group}:#{shard}"
 
-          schema_filename = File.join(shard_group_schemas_dir, shard + "_schema.rb")
+          schema_filename = shard_schema_path(shard_group, shard)
           File.open(schema_filename, "w:utf-8") do |file|
             Rails::Sharding.using_shard(shard_group, shard) do
               ActiveRecord::SchemaDumper.dump(Rails::Sharding::ConnectionHandler.retrieve_connection(shard_group, shard), file)
@@ -108,16 +104,13 @@ shards_namespace = namespace :shards do
       Rails::Sharding.configurations.each do |shard_group, shards_configurations|
         next if ENV["SHARD_GROUP"] && ENV["SHARD_GROUP"] != shard_group.to_s
 
-        # configures path for schemas of this shard group
-        shard_group_schemas_path = 'db/shards_schemas/' + shard_group.to_s
-        Rails.application.paths.add shard_group_schemas_path
-        shard_group_schemas_dir = Rails.application.paths[shard_group_schemas_path].to_a.first
+        setup_migrations_path(shard_group)
 
         shards_configurations.each do |shard, configuration|
           next if ENV["SHARD"] && ENV["SHARD"] != shard.to_s
           puts "== Loading schema of #{shard_group}:#{shard}"
 
-          schema_filename = File.join(shard_group_schemas_dir, shard + "_schema.rb")
+          schema_filename = shard_schema_path(shard_group, shard)
           ActiveRecord::Tasks::DatabaseTasks.check_schema_file(schema_filename)
           Rails::Sharding.using_shard(shard_group, shard) do
             load(schema_filename)
@@ -154,10 +147,7 @@ shards_namespace = namespace :shards do
       Rails::Sharding.configurations.each do |shard_group, shards_configurations|
         next if ENV["SHARD_GROUP"] && ENV["SHARD_GROUP"] != shard_group.to_s
 
-        # configures path for migrations of this shard group
-        shard_group_migrations_path = 'db/shards_migrations/' + shard_group.to_s
-        Rails.application.paths.add shard_group_migrations_path
-        ActiveRecord::Tasks::DatabaseTasks.migrations_paths = Rails.application.paths[shard_group_migrations_path].to_a
+        setup_migrations_path(shard_group)
 
         shards_configurations.each do |shard, configuration|
           next if ENV["SHARD"] && ENV["SHARD"] != shard.to_s
@@ -179,10 +169,7 @@ shards_namespace = namespace :shards do
       Rails::Sharding.configurations.each do |shard_group, shards_configurations|
         next if ENV["SHARD_GROUP"] && ENV["SHARD_GROUP"] != shard_group.to_s
 
-        # configures path for migrations of this shard group
-        shard_group_migrations_path = 'db/shards_migrations/' + shard_group.to_s
-        Rails.application.paths.add shard_group_migrations_path
-        ActiveRecord::Tasks::DatabaseTasks.migrations_paths = Rails.application.paths[shard_group_migrations_path].to_a
+        setup_migrations_path(shard_group)
 
         shards_configurations.each do |shard, configuration|
           next if ENV["SHARD"] && ENV["SHARD"] != shard.to_s
@@ -203,10 +190,7 @@ shards_namespace = namespace :shards do
     Rails::Sharding.configurations.each do |shard_group, shards_configurations|
       next if ENV["SHARD_GROUP"] && ENV["SHARD_GROUP"] != shard_group.to_s
 
-      # configures path for migrations of this shard group
-      shard_group_migrations_path = 'db/shards_migrations/' + shard_group.to_s
-      Rails.application.paths.add shard_group_migrations_path
-      ActiveRecord::Tasks::DatabaseTasks.migrations_paths = Rails.application.paths[shard_group_migrations_path].to_a
+      setup_migrations_path(shard_group)
 
       shards_configurations.each do |shard, configuration|
         next if ENV["SHARD"] && ENV["SHARD"] != shard.to_s
@@ -242,10 +226,7 @@ shards_namespace = namespace :shards do
       Rails::Sharding.test_configurations.each do |shard_group, shards_configurations|
         next if ENV["SHARD_GROUP"] && ENV["SHARD_GROUP"] != shard_group.to_s
 
-        # configures path for schemas of this shard group
-        shard_group_schemas_path = 'db/shards_schemas/' + shard_group.to_s
-        Rails.application.paths.add shard_group_schemas_path
-        shard_group_schemas_dir = Rails.application.paths[shard_group_schemas_path].to_a.first
+        setup_migrations_path(shard_group)
 
         shards_configurations.each do |shard, configuration|
           next if ENV["SHARD"] && ENV["SHARD"] != shard.to_s
@@ -256,7 +237,7 @@ shards_namespace = namespace :shards do
             should_reconnect = Rails::Sharding::ConnectionHandler.connection_pool(shard_group, shard).active_connection?
             Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard, 'test')
 
-            schema_filename = File.join(shard_group_schemas_dir, shard + "_schema.rb")
+            schema_filename = shard_schema_path(shard_group, shard)
             ActiveRecord::Tasks::DatabaseTasks.check_schema_file(schema_filename)
             Rails::Sharding.using_shard(shard_group, shard) do
               ActiveRecord::Schema.verbose = false
@@ -306,4 +287,21 @@ shards_namespace = namespace :shards do
       end
     end
   end
+
+  # Configures path for migrations of this shard group and creates dir if necessary
+  # We need this to run migrations (so we can find them)
+  # We need this load schemas (se we can build the schema_migrations table)
+  def setup_migrations_path(shard_group)
+    shard_group_migrations_dir = File.join(Rails::Sharding::Config.shards_migrations_dir, shard_group.to_s)
+    ActiveRecord::Tasks::DatabaseTasks.migrations_paths = [shard_group_migrations_dir]
+    ActiveRecord::Migrator.migrations_paths = [shard_group_migrations_dir]
+    FileUtils.mkdir_p(shard_group_migrations_dir)
+  end
+
+  # configures path for schemas of this shard group and creates dir if necessary
+  def shard_schema_path(shard_group, shard_name)
+    shard_group_schemas_dir = File.join(Rails::Sharding::Config.shards_schemas_dir, shard_group.to_s)
+    FileUtils.mkdir_p(shard_group_schemas_dir)
+    File.join(shard_group_schemas_dir, shard_name + "_schema.rb")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-sharding
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Henrique Gubert