activerecord-turntable 3.0.0.alpha3 → 3.0.0

data/lib/active_record/turntable/pool_proxy.rb

@@ -26,24 +26,30 @@ module ActiveRecord::Turntable
       end
     end
 
-    %w(active_connection?).each do |name|
-      define_method(name.to_sym) do |*_args|
-        @proxy.master.connection_pool.send(name.to_sym) ||
-          @proxy.seq.connection_pool.try(name.to_sym) if @proxy.respond_to?(:seq) ||
-                                                         @proxy.shards.values.any? do |pool|
-                                                           pool.connection_pool.send(name.to_sym)
-                                                         end
-      end
+    def active_connection?
+      connection_pools_list.any?(&:active_connection?)
     end
 
-    %w(disconnect! release_connection clear_all_connections! clear_active_connections! clear_reloadable_connections! clear_stale_cached_connections! verify_active_connections!).each do |name|
+    %w(disconnect!
+       release_connection
+       clear_all_connections!
+       clear_active_connections!
+       clear_reloadable_connections!
+       clear_stale_cached_connections!
+       verify_active_connections!).each do |name|
       define_method(name.to_sym) do
-        @proxy.master.connection_pool.send(name.to_sym)
-        @proxy.seq.connection_pool.try(name.to_sym) if @proxy.respond_to?(:seq)
-        @proxy.shards.values.each do |pool|
-          pool.connection_pool.send(name.to_sym)
-        end
+        connection_pools_list.each { |cp| cp.public_send(name.to_sym) }
       end
     end
+
+    private
+
+      def connection_pools_list
+        pools = []
+        pools << proxy.master.connection_pool
+        pools << proxy.seq.try(:connection_pool) if proxy.respond_to?(:seq)
+        pools.concat(proxy.shards.values.map(&:connection_pool))
+        pools.compact
+      end
   end
 end

data/lib/active_record/turntable/query_cache.rb

@@ -17,7 +17,7 @@ module ActiveRecord
       end
 
       def self.complete(enabled)
-        klasses =  ActiveRecord::Base.turntable_connections.values
+        klasses = ActiveRecord::Base.turntable_connections.values
         klasses.each do |k|
           k.connection.clear_query_cache
           k.connection.disable_query_cache! unless enabled

data/lib/active_record/turntable/railties/databases.rake

@@ -35,9 +35,9 @@ db_namespace = namespace :db do
       # TODO: implement schema:cache:xxxx
       task :dump do
         require "active_record/schema_dumper"
-        config = ActiveRecord::Base.configurations[Rails.env]
-        shard_configs = config["shards"]
-        shard_configs.merge!(config["seq"]) if config["seq"]
+        current_config = ActiveRecord::Base.configurations[Rails.env]
+        shard_configs = current_config["shards"]
+        shard_configs.merge!(current_config["seq"]) if current_config["seq"]
         if shard_configs
           shard_configs.each do |name, config|
             next unless config["database"]
@@ -48,15 +48,15 @@ db_namespace = namespace :db do
             end
           end
         end
-        ActiveRecord::Base.establish_connection(config)
+        ActiveRecord::Base.establish_connection(current_config)
         turntable_namespace["schema:dump"].reenable
       end
 
       desc "Load a schema.rb file into the database"
       task :load do
-        config = ActiveRecord::Base.configurations[Rails.env]
-        shard_configs = config["shards"]
-        shard_configs.merge!(config["seq"]) if config["seq"]
+        current_config = ActiveRecord::Base.configurations[Rails.env]
+        shard_configs = current_config["shards"]
+        shard_configs.merge!(current_config["seq"]) if current_config["seq"]
         if shard_configs
           shard_configs.each do |name, config|
             next unless config["database"]
@@ -69,7 +69,7 @@ db_namespace = namespace :db do
             end
           end
         end
-        ActiveRecord::Base.establish_connection(config)
+        ActiveRecord::Base.establish_connection(current_config)
       end
     end
 
@@ -116,16 +116,16 @@ db_namespace = namespace :db do
     namespace :test do
       # desc "Empty the test database"
       task :purge do
-        config = ActiveRecord::Base.configurations[Rails.env]
-        shard_configs = config["shards"]
-        shard_configs.merge!(config["seq"]) if config["seq"]
+        current_config = ActiveRecord::Base.configurations[Rails.env]
+        shard_configs = current_config["shards"]
+        shard_configs.merge!(current_config["seq"]) if current_config["seq"]
         if shard_configs
           shard_configs.each do |_name, config|
             next unless config["database"]
             ActiveRecord::Tasks::DatabaseTasks.purge config
           end
         end
-        ActiveRecord::Base.establish_connection(config)
+        ActiveRecord::Base.establish_connection(current_config)
       end
     end
   end

data/lib/active_record/turntable/seq_shard.rb

@@ -3,7 +3,7 @@ module ActiveRecord::Turntable
     private
 
       def create_connection_class
-        klass = get_or_set_connection_class
+        klass = connection_class_instance
         klass.remove_connection
         klass.establish_connection ActiveRecord::Base.connection_pool.spec.config[:seq][name].with_indifferent_access
         klass

data/lib/active_record/turntable/sequencer/barrage.rb

@@ -1,7 +1,8 @@
 module ActiveRecord::Turntable
   class Sequencer
     class Barrage < Sequencer
-      @@unique_barrage_instance = {}
+      class_attribute :unique_barrage_instance
+      self.unique_barrage_instance = {}
 
       def initialize(klass, options = {})
         require "barrage"
@@ -20,7 +21,7 @@ module ActiveRecord::Turntable
       private
 
         def barrage
-          @@unique_barrage_instance[@options] ||= ::Barrage.new(@options)
+          self.unique_barrage_instance[@options] ||= ::Barrage.new(@options)
         end
     end
   end

data/lib/active_record/turntable/sequencer.rb

@@ -13,33 +13,48 @@ module ActiveRecord::Turntable
       autoload :Barrage
     end
 
-    @@sequence_types = {
+    class_attribute :sequence_types
+    class_attribute :sequences
+    class_attribute :tables
+
+    self.sequence_types = {
       api: Api,
       mysql: Mysql,
       barrage: Barrage,
     }
+    self.sequences = {}
+    self.tables = {}
 
-    @@sequences = {}
-    @@tables = {}
-    cattr_reader :sequences, :tables
+    class << self
+      def build(klass, sequence_name = nil, cluster_name = nil)
+        sequence_name ||= current_cluster_config_for(cluster_name || klass)[:seq].keys.first
+        seq_config = current_cluster_config_for(cluster_name || klass)[:seq][sequence_name]
+        seq_type = (seq_config[:seq_type] ? seq_config[:seq_type].to_sym : :mysql)
+        tables[klass.table_name] ||= (sequences[sequence_name(klass.table_name, klass.primary_key)] ||= sequence_types[seq_type].new(klass, seq_config))
+      end
 
-    def self.build(klass, sequence_name = nil, cluster_name = nil)
-      sequence_name ||= current_cluster_config_for(cluster_name || klass)[:seq].keys.first
-      seq_config = current_cluster_config_for(cluster_name || klass)[:seq][sequence_name]
-      seq_type = (seq_config[:seq_type] ? seq_config[:seq_type].to_sym : :mysql)
-      @@tables[klass.table_name] ||= (@@sequences[sequence_name(klass.table_name, klass.primary_key)] ||= @@sequence_types[seq_type].new(klass, seq_config))
-    end
+      def has_sequencer?(table_name)
+        !!tables[table_name]
+      end
 
-    def self.has_sequencer?(table_name)
-      !!@@tables[table_name]
-    end
+      def sequence_name(table_name, pk)
+        "#{table_name}_#{pk || 'id'}_seq"
+      end
 
-    def self.sequence_name(table_name, pk)
-      "#{table_name}_#{pk || 'id'}_seq"
-    end
+      def table_name(seq_name)
+        seq_name.split("_").first
+      end
+
+      private
 
-    def self.table_name(seq_name)
-      seq_name.split("_").first
+        def current_cluster_config_for(klass_or_name)
+          cluster_name = if klass_or_name.is_a?(Symbol)
+                           klass_or_name
+                         else
+                           klass_or_name.turntable_cluster_name.to_s
+                         end
+          ActiveRecord::Base.turntable_config[:clusters][cluster_name]
+        end
     end
 
     def next_sequence_value
@@ -49,16 +64,5 @@ module ActiveRecord::Turntable
     def current_sequence_value
       raise NotImplementedError
     end
-
-    private
-
-      def self.current_cluster_config_for(klass_or_name)
-        cluster_name = if klass_or_name.is_a?(Symbol)
-                         klass_or_name
-                       else
-                         klass_or_name.turntable_cluster_name.to_s
-                       end
-        ActiveRecord::Base.turntable_config[:clusters][cluster_name]
-      end
   end
 end

data/lib/active_record/turntable/shard.rb

@@ -33,7 +33,14 @@ module ActiveRecord::Turntable
         @connection_klass ||= create_connection_class
       end
 
-      def get_or_set_connection_class
+      def create_connection_class
+        klass = connection_class_instance
+        klass.remove_connection
+        klass.establish_connection ActiveRecord::Base.connection_pool.spec.config[:shards][name].with_indifferent_access
+        klass
+      end
+
+      def connection_class_instance
         if Connections.const_defined?(name.classify)
           klass = Connections.const_get(name.classify)
         else
@@ -43,12 +50,5 @@ module ActiveRecord::Turntable
         end
         klass
       end
-
-      def create_connection_class
-        klass = get_or_set_connection_class
-        klass.remove_connection
-        klass.establish_connection ActiveRecord::Base.connection_pool.spec.config[:shards][name].with_indifferent_access
-        klass
-      end
   end
 end

data/lib/active_record/turntable/sharding_condition.rb

@@ -2,22 +2,22 @@ module ActiveRecord::Turntable
   module ShardingCondition
     private
 
-    def foreign_shard_key
-      options[:foreign_shard_key] || foreign_target_model.turntable_shard_key
-    end
+      def foreign_shard_key
+        options[:foreign_shard_key] || foreign_target_model.turntable_shard_key
+      end
 
-    def foreign_target_model
-      respond_to?(:model) ? model : owner
-    end
+      def foreign_target_model
+        respond_to?(:model) ? model : owner
+      end
 
-    def should_use_shard_key?
-      sharded_by_same_key? || !!options[:foreign_shard_key]
-    end
+      def should_use_shard_key?
+        sharded_by_same_key? || !!options[:foreign_shard_key]
+      end
 
-    def sharded_by_same_key?
-      foreign_target_model.turntable_enabled? &&
-        klass.turntable_enabled? &&
-        foreign_shard_key == klass.turntable_shard_key
-    end
+      def sharded_by_same_key?
+        foreign_target_model.turntable_enabled? &&
+          klass.turntable_enabled? &&
+          foreign_shard_key == klass.turntable_shard_key
+      end
   end
 end

data/lib/active_record/turntable/sql_tree_patch.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/CaseEquality
 require "sql_tree"
 require "active_support/core_ext/kernel/reporting"
 
@@ -37,6 +38,7 @@ class SQLTree::Tokenizer
   end
 
   # @note Override to handle x'..' binary string
+  # rubocop:disable Lint/EmptyWhen:
   def each_token(&block) # :yields: SQLTree::Token
     while next_char
       case current_char
@@ -47,7 +49,7 @@ class SQLTree::Tokenizer
       when "," then            handle_token(SQLTree::Token::COMMA, &block)
       when /\d/ then           tokenize_number(&block)
       when "'" then            tokenize_quoted_string(&block)
-      when "E", "x", 'X' then  tokenize_possible_escaped_string(&block)
+      when "E", "x", "X" then  tokenize_possible_escaped_string(&block)
       when /\w/ then           tokenize_keyword(&block)
       when OPERATOR_CHARS then tokenize_operator(&block)
       when SQLTree.identifier_quote_char then tokenize_quoted_identifier(&block)
@@ -57,6 +59,7 @@ class SQLTree::Tokenizer
     # Make sure to yield any tokens that are still stashed on the queue.
     empty_keyword_queue!(&block)
   end
+  # rubocop:enable Lint/EmptyWhen:
   alias_method :each, :each_token
 
   def tokenize_possible_escaped_string(&block)
@@ -184,7 +187,7 @@ module SQLTree::Node
         end
         table_reference
       else
-        raise SQLTree::Parser::UnexpectedToken.new(tokens.current)
+        raise SQLTree::Parser::UnexpectedToken, tokens.current
       end
     end
   end
@@ -215,7 +218,7 @@ module SQLTree::Node
         tokens.consume(SQLTree::Token::RPAREN)
         self.new(hint_method, hint_key, index_list)
       else
-        raise SQLTree::Parser::UnexpectedToken.new(tokens.current)
+        raise SQLTree::Parser::UnexpectedToken, tokens.current
       end
     end
   end
@@ -350,3 +353,4 @@ module SQLTree::Node
     end
   end
 end
+# rubocop:enable Style/CaseEquality

data/lib/active_record/turntable/util.rb

@@ -1,7 +1,5 @@
 module ActiveRecord::Turntable
   module Util
-    extend self
-
     def ar_version_equals_or_later?(version)
       ar_version >= Gem::Version.new(version)
     end
@@ -13,5 +11,9 @@ module ActiveRecord::Turntable
     def ar_version
       ActiveRecord.gem_version
     end
+
+    module_function :ar_version_equals_or_later?,
+                    :ar_version_earlier_than?,
+                    :ar_version
   end
 end

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "3.0.0.alpha3".freeze
+    VERSION = "3.0.0".freeze
   end
 end

data/lib/active_record/turntable.rb

@@ -34,7 +34,6 @@ module ActiveRecord::Turntable
     autoload :SeqShard
     autoload :Sequencer
   end
-  autoload :Helpers
 
   included do
     include ActiveRecordExt
@@ -45,13 +44,15 @@ module ActiveRecord::Turntable
     DEFAULT_PATH = File.dirname(File.dirname(__FILE__))
 
     def turntable_config_file
-      @@turntable_config_file ||=
-        File.join(defined?(::Rails) ?
-                   ::Rails.root.to_s : DEFAULT_PATH, "config/turntable.yml")
+      @turntable_config_file ||= File.join(turntable_app_root_path, "config/turntable.yml")
     end
 
     def turntable_config_file=(filename)
-      @@turntable_config_file = filename
+      @turntable_config_file = filename
+    end
+
+    def turntable_app_root_path
+      defined?(::Rails.root) ? ::Rails.root.to_s : DEFAULT_PATH
     end
 
     def turntable_config

data/lib/activerecord-turntable.rb

@@ -1,2 +1,3 @@
+# rubocop:disable Style/FileName
 require "active_record"
 require "active_record/turntable"