activerecord-turntable 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93edb726b99bdd459ea374868a9454b6517adcfb
-  data.tar.gz: 9b48a0dee236417ace3df3982dadf96cd2466558
+  metadata.gz: 7a4bd6cbf61673b4f11bba18e22ff888a694f09a
+  data.tar.gz: b94e9d04efa41f8b58f5b65bdcc51bd4cb2a890c
 SHA512:
-  metadata.gz: 90def0476116ac0dce790fadc78d182a82d9211dd10ceb71d68ffee33473b829492c54ffea76b46887fda18d97f09053f6898ea0ac3d0027083600d427082f3f
-  data.tar.gz: 65de6cddde8f9c708b55f190efcc8648119114cc3a87b1bc64500968861186e7bbd09eda6a860051cbf847964d4614e7c7718b7c02eaaa4d10501ff4ee8bb605
+  metadata.gz: 4c41774f64e47dde724ecd71b6eabe913c165d40ed159d73b867e0447ae64313437f0db4a4dcb98fb0e85f467ba3985b8a1974c6c97b558a9b793f115e093071
+  data.tar.gz: 63184562e69d48c2b2ae73b70878d1b01e850c1caf5ff11fd7a21ebe3c5e157b12f4a84e79da4cb94b198fa82193aa86328f7b493078aaf5ac7644c9f59345c5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## activerecord-turntable 2.1.1 ##
+
+### Bugfixes
+
+* Fix `ActiveRecord::Fixtures` doesn't working
+* Fix `ActiveRecord::Base.clear_active_connections!` to release connections established by turntable at development env
+
 ## activerecord-turntable 2.1.0 ##
 
 Support activerecord 4.2.0

data/lib/active_record/turntable/active_record_ext/fixtures.rb

@@ -2,11 +2,18 @@
 # force TestFixtures to begin transaction with all shards.
 #
 require 'active_record/fixtures'
+
 module ActiveRecord
   class FixtureSet
+    extend ActiveRecord::Turntable::Util
+
     def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}, config = ActiveRecord::Base)
       fixture_set_names = Array(fixture_set_names).map(&:to_s)
-      class_names = ClassCache.new class_names, config
+      class_names = if ar41_or_later?
+                      ClassCache.new class_names, config
+                    else
+                      class_names = class_names.stringify_keys
+                    end
 
       # FIXME: Apparently JK uses this.
       connection = block_given? ? yield : ActiveRecord::Base.connection
@@ -20,8 +27,12 @@ module ActiveRecord
           fixtures_map = {}
 
           fixture_sets = files_to_read.map do |fs_name|
-            klass = class_names[fs_name]
-            conn = klass ? klass.connection : connection
+            klass = if ar41_or_later?
+                      class_names[fs_name]
+                    else
+                      class_names[fs_name] || default_fixture_model_name(fs_name)
+                    end
+            conn = klass.is_a?(String) ? connection : klass.connection
             fixtures_map[fs_name] = new( # ActiveRecord::FixtureSet.new
               conn,
               fs_name,
@@ -29,9 +40,13 @@ module ActiveRecord
               ::File.join(fixtures_directory, fs_name))
           end
 
-          update_all_loaded_fixtures fixtures_map
+          if ar42_or_later?
+            update_all_loaded_fixtures fixtures_map
+          else
+            all_loaded_fixtures.update(fixtures_map)
+          end
 
-          ActiveRecord::Turntable::Base.force_transaction_all_shards!(:requires_new => true) do
+          ActiveRecord::Base.force_transaction_all_shards!(:requires_new => true) do
             fixture_sets.each do |fs|
               conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
               table_rows = fs.table_rows
@@ -63,7 +78,7 @@ module ActiveRecord
   end
 
   module TestFixtures
-    extend ActiveRecord::Turntable::Util
+    include ActiveRecord::Turntable::Util
 
     def setup_fixtures(config = ActiveRecord::Base)
       return unless !ActiveRecord::Base.configurations.blank?

data/lib/active_record/turntable/pool_proxy.rb

@@ -38,6 +38,16 @@ 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
+    end
+
     %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)

data/lib/active_record/turntable/shard.rb

@@ -1,48 +1,46 @@
 module ActiveRecord::Turntable
   class Shard
+    module Connections; end
+
     DEFAULT_CONFIG = {
       "connection" => (defined?(Rails) ? Rails.env : "development")
     }.with_indifferent_access
 
+    attr_reader :name
+
     def initialize(shard_spec)
       @config = DEFAULT_CONFIG.merge(shard_spec)
       @name = @config["connection"]
+      ActiveRecord::Base.turntable_connections[name] = connection_pool
     end
 
     def connection_pool
-      @connection_pool ||= retrieve_connection_pool
+      connection_klass.connection_pool
     end
 
     def connection
-      connection = connection_pool.connection
-      connection.turntable_shard_name = name
-      connection
-    end
-
-    def name
-      @name
+      connection_pool.connection.tap do |conn|
+        conn.turntable_shard_name ||= name
+      end
     end
 
     private
 
-    def retrieve_connection_pool
-      ActiveRecord::Base.turntable_connections[name] ||=
-        begin
-          config = ActiveRecord::Base.configurations[Rails.env]["shards"][name]
-          raise ArgumentError, "Unknown database config: #{name}, have #{ActiveRecord::Base.configurations.inspect}" unless config
-          ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec_for(config))
-        end
+    def connection_klass
+      @connection_klass ||= create_connection_class
     end
 
-    def spec_for(config)
-      begin
-        require "active_record/connection_adapters/#{config['adapter']}_adapter"
-      rescue LoadError => e
-        raise "Please install the #{config['adapter']} adapter: `gem install activerecord-#{config['adapter']}-adapter` (#{e})"
+    def create_connection_class
+      if Connections.const_defined?(name.classify)
+        klass = Connections.const_get(name.classify)
+      else
+        klass = Class.new(ActiveRecord::Base)
+        Connections.const_set(name.classify, klass)
+        klass.abstract_class = true
       end
-      adapter_method = "#{config['adapter']}_connection"
-
-      ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(config, adapter_method)
+      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/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/spec/active_record/turntable/active_record_ext/fixture_set_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+require 'active_record'
+require 'active_record/turntable/active_record_ext/fixtures'
+
+describe ActiveRecord::FixtureSet do
+  before(:all) do
+    reload_turntable!(File.join(File.dirname(__FILE__), "../../../config/turntable.yml"))
+  end
+
+  before do
+    establish_connection_to(:test)
+    truncate_shard
+  end
+
+  let(:fixtures_root) { File.join(File.dirname(__FILE__), "../../../fixtures") }
+  let(:fixture_file) { File.join(fixtures_root, "cards.yml") }
+  let(:cards) { YAML.load(ERB.new(IO.read(fixture_file)).result) }
+
+  describe ".create_fixtures" do
+    subject { ActiveRecord::FixtureSet.create_fixtures(fixtures_root, "cards") }
+    it { is_expected.to be_instance_of(Array) }
+    it "creates card records" do
+      expect {subject}.to change {Card.count}.from(0).to(cards.size)
+    end
+  end
+end

data/spec/active_record/turntable/active_record_ext/test_fixtures_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+require 'active_record'
+require 'active_record/turntable/active_record_ext/fixtures'
+
+describe ActiveRecord::TestFixtures do
+  before(:all) do
+    reload_turntable!(File.join(File.dirname(__FILE__), "../../../config/turntable.yml"))
+  end
+
+  before do
+    establish_connection_to(:test)
+    truncate_shard
+  end
+
+  let(:fixtures_root) { File.join(File.dirname(__FILE__), "../../../fixtures") }
+  let(:fixture_file) { File.join(fixtures_root, "cards.yml") }
+  let(:test_fixture_class) { Class.new(ActiveSupport::TestCase) { include ActiveRecord::TestFixtures } }
+  let(:test_fixture) { test_fixture_class.new("test") }
+  let(:cards) { YAML.load(ERB.new(IO.read(fixture_file)).result) }
+
+  before do
+    test_fixture_class.fixture_path = fixtures_root
+  end
+
+  describe "#setup_fixtures" do
+    after do
+      test_fixture.teardown_fixtures
+    end
+
+    subject { test_fixture.setup_fixtures }
+    it { expect { subject }.not_to raise_error }
+  end
+end

data/spec/fixtures/cards.yml

@@ -0,0 +1,11 @@
+card_1:
+  id: 1
+  name: card_1
+  hp: 10
+  mp: 10
+
+card_2:
+  id: 2
+  name: card_2
+  hp: 20
+  mp: 20

data/spec/support/turntable_helper.rb

@@ -19,6 +19,7 @@ module TurntableHelper
 
   def truncate_shard
     ActiveRecord::Base.descendants.each do |klass|
+      next if klass.abstract_class?
       klass.delete_all
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -407,9 +407,11 @@ files:
 - spec/active_record/turntable/active_record_ext/association_preloader_spec.rb
 - spec/active_record/turntable/active_record_ext/association_spec.rb
 - spec/active_record/turntable/active_record_ext/clever_load_spec.rb
+- spec/active_record/turntable/active_record_ext/fixture_set_spec.rb
 - spec/active_record/turntable/active_record_ext/locking_optimistic_spec.rb
 - spec/active_record/turntable/active_record_ext/migration_spec.rb
 - spec/active_record/turntable/active_record_ext/persistence_spec.rb
+- spec/active_record/turntable/active_record_ext/test_fixtures_spec.rb
 - spec/active_record/turntable/algorithm/range_algorithm_spec.rb
 - spec/active_record/turntable/algorithm/range_bsearch_algorithm_spec.rb
 - spec/active_record/turntable/algorithm_spec.rb
@@ -432,6 +434,7 @@ files:
 - spec/config/turntable.yml
 - spec/fabricators/.gitkeep
 - spec/fabricators/turntable_fabricator.rb
+- spec/fixtures/cards.yml
 - spec/migrations/.gitkeep
 - spec/migrations/001_create_users.rb
 - spec/migrations/002_create_user_statuses.rb
@@ -474,9 +477,11 @@ test_files:
 - spec/active_record/turntable/active_record_ext/association_preloader_spec.rb
 - spec/active_record/turntable/active_record_ext/association_spec.rb
 - spec/active_record/turntable/active_record_ext/clever_load_spec.rb
+- spec/active_record/turntable/active_record_ext/fixture_set_spec.rb
 - spec/active_record/turntable/active_record_ext/locking_optimistic_spec.rb
 - spec/active_record/turntable/active_record_ext/migration_spec.rb
 - spec/active_record/turntable/active_record_ext/persistence_spec.rb
+- spec/active_record/turntable/active_record_ext/test_fixtures_spec.rb
 - spec/active_record/turntable/algorithm/range_algorithm_spec.rb
 - spec/active_record/turntable/algorithm/range_bsearch_algorithm_spec.rb
 - spec/active_record/turntable/algorithm_spec.rb
@@ -499,6 +504,7 @@ test_files:
 - spec/config/turntable.yml
 - spec/fabricators/.gitkeep
 - spec/fabricators/turntable_fabricator.rb
+- spec/fixtures/cards.yml
 - spec/migrations/.gitkeep
 - spec/migrations/001_create_users.rb
 - spec/migrations/002_create_user_statuses.rb