tako 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b2c4e33550d99d32fba6703d7f4904bff9c2a4
-  data.tar.gz: a121f0faf4ccac973896d70de11fde63859b738c
+  metadata.gz: d8c09725ee3badc216ffb331810b51c2583e3136
+  data.tar.gz: c0c076d271e624f1ce71e023ff3c876b56df32ad
 SHA512:
-  metadata.gz: 47b3f5f903b7de5805d1a430da319722fe0f5a83b18ef6e6884f6b675ceed132c823fc05628301ef3dcc6373e2c06aa3d52fc0d00a11b93d7a5f1894e86dfb39
-  data.tar.gz: 58cd2e7a31e8d5bacba4a78e1744e595056d31724fbbba3b6f302dcefb7fb6ae985ea97c791e177b6829ef43597072d6e480982a837489ce23944240bf786696
+  metadata.gz: 68cb0d10411f90ccadeca75eba70a97a5dc9f17b750710f513f4a37ab146056ae841140530d299a08c40f76ba9e70823277a653d96858597667b3715fc1a71f6
+  data.tar.gz: 6e3570f94b6f0714252a24d3a6cd91b633f0fcf898e80d14c0d39cee2d9b3b6569e8278de975d5b03dc17920b8a6ba70ad86ce5c9c6b1a2640589fe326a1fb54

data/gemfiles/rails_42.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~> 4.2.0"
+gem "rails", "~> 4.2.0"
 gem "mysql2", ">= 0.3.13", "< 0.5"
 
 gemspec :path => "../"

data/gemfiles/rails_50.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.0.0"
+gem "rails", "~> 5.0.0"
 
 gemspec :path => "../"

data/gemfiles/rails_51.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.1.0"
+gem "rails", "~> 5.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_52.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.2.0"
+gem "rails", "~> 5.2.0"
 
 gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-gem "activerecord", :github => "rails/rails"
+gem "rails", :github => "rails/rails"
 
 gemspec :path => "../"

data/lib/tako/active_record_ext/connection_handling.rb

@@ -14,5 +14,6 @@ module Tako
 end
 
 ActiveRecord::ConnectionHandling.class_eval do
+  alias_method :connection_without_tako, :connection
   prepend Tako::ActiveRecordExt::ConnectionHandling
 end

data/lib/tako/railties/databases.rake

@@ -31,11 +31,12 @@ namespace :db do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
         revert = !!ENV["DOWN_MIGRATION"]
 
-        migrations = if version
-          ActiveRecord::Migrator.migrations(paths).select {|proxy| proxy.version == version }
+        migrations = if defined?(ActiveRecord::MigrationContext)
+          ActiveRecord::MigrationContext.new(paths).migrations
         else
           ActiveRecord::Migrator.migrations(paths)
         end
+        migrations.select! {|proxy| proxy.version == version } if version
         all_schema_migration_versions = ActiveRecord::SchemaMigration.pluck(:version)
         migrations = migrations.reject {|proxy| all_schema_migration_versions.include?(proxy.version.to_s) }
         migrations.each do |proxy|
@@ -49,7 +50,11 @@ namespace :db do
 
         if defined?(ActiveRecord::InternalMetadata)
           ActiveRecord::InternalMetadata.create_table
-          ActiveRecord::InternalMetadata[:environment] = ActiveRecord::Migrator.current_environment
+          ActiveRecord::InternalMetadata[:environment] = if defined?(ActiveRecord::MigrationContext)
+            ActiveRecord::MigrationContext.new(paths).current_environment
+          else
+            ActiveRecord::Migrator.current_environment
+          end
         end
       end
     end

data/lib/tako/repository.rb

@@ -5,17 +5,17 @@ module Tako
         @proxy_configs ||= {}
       end
 
-      def proxy_connections
-        @proxy_connections ||= {}
+      def proxy_classes
+        @proxy_classes ||= {}
       end
 
       def clear
-        proxy_connections.each do |shard_name, connection|
-          connection.disconnect!
+        proxy_classes.each do |shard_name, proxy_class|
+          proxy_class.connection.disconnect!
           remove_const("TAKO_AR_CLASS_#{shard_name.upcase}")
         end
         proxy_configs.clear
-        proxy_connections.clear
+        proxy_classes.clear
       end
 
       def add(shard_name, conf)
@@ -26,12 +26,12 @@ module Tako
         const_set("TAKO_AR_CLASS_#{shard_name.upcase}", temporary_class)
         temporary_class.establish_connection(conf)
 
-        proxy_connections[shard_name] = temporary_class.connection
+        proxy_classes[shard_name] = temporary_class
         proxy_configs[shard_name] = conf
       end
 
       def create_proxy(shard_name)
-        Proxy.new(shard_name, proxy_connections[shard_name.to_sym])
+        Proxy.new(shard_name, proxy_classes[shard_name.to_sym].connection_without_tako)
       end
 
       def shard_names

data/lib/tako/version.rb

@@ -1,3 +1,3 @@
 module Tako
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tako
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Masashi AKISUE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord