activerecord-turntable 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16165f8a33bac2fc2a458d17e3cdbe26661c5e4e
-  data.tar.gz: ae8c155b11f3998b574442e7041503eb0d0c905e
+  metadata.gz: d82829564262382156d47ab48a5331ee39507e2b
+  data.tar.gz: 2046ebf2f59a336a20d91df727c98da717a1b4f5
 SHA512:
-  metadata.gz: af05b917a26c42a549de736397b4736c729a61cb5baba9986398d00c188175c1d98354b073b08dfbe1051aae5719470e1401f44f2d4228abd8d0214a66c0ac23
-  data.tar.gz: b986e37ae2f98b4964bdea08d8358b36c73c8de2756362ae4bedfb6dc84c3fe3b189ce81920f14f2b53d878f80d4dbaea11dd6a5a172fe7b49d8fda11a2b740b
+  metadata.gz: a29ef422e6cbe7494c67c9480e541469ebbfc2773f48a0ef606c130ca7b6c791a6a8502cb23ce46f8fb739899b4ea4c438a46d348e3ca4d4e42b6cd93e9117ce
+  data.tar.gz: befc1adb93081acf2d9ba91c5cad860039b37530e484198334cec82935dc608719e8845dd83fe326d8da0c9add919222edfb5493033a2f8c69a256e712292a34

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## activerecord-turntable 2.0.6 ##
+
+### Bugfixes
+
+* Fixes migration dsl:`clusters` is not working (thx macks)
+* Fixes migration dsl:`shards` is not working
+
 ## activerecord-turntable 2.0.5 ##
 
 ### Bugfixes

data/gemfiles/rails4_2.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'activerecord', "= 4.2.0.beta4"
-gem 'activesupport', "= 4.2.0.beta4"
+gem 'activerecord', "= 4.2.0.rc1"
+gem 'activesupport', "= 4.2.0.rc1"
 
 gemspec :path => '../'

data/lib/active_record/turntable/migration.rb

@@ -13,7 +13,7 @@ module ActiveRecord::Turntable::Migration
   module ShardDefinition
     def clusters(*cluster_names)
       config = ActiveRecord::Base.turntable_config
-      (self.target_shards ||= []) <<
+      (self.target_shards ||= []).concat(
         if cluster_names.first == :all
           config['clusters'].map do |name, cluster_conf|
             cluster_conf["shards"].map {|shard| shard["connection"]}
@@ -23,12 +23,13 @@ module ActiveRecord::Turntable::Migration
             config['clusters'][cluster_name]["shards"].map do |shard|
               shard["connection"]
             end
-          end
+          end.flatten
         end
+      )
     end
 
     def shards(*connection_names)
-      (self.target_shards ||= []) << connection_names
+      (self.target_shards ||= []).concat connection_names
     end
   end
 

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.0.5"
+    VERSION = "2.0.6"
   end
 end

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe ActiveRecord::Turntable::Migration do
+  before(:all) do
+    reload_turntable!(File.join(File.dirname(__FILE__), "../../../config/turntable.yml"))
+  end
+
+  before(:each) do
+    establish_connection_to(:test)
+    truncate_shard
+  end
+
+  describe ".target_shards" do
+    subject { migration_class.new.target_shards }
+
+    context "With clusters definitions" do
+      let(:migration_class) {
+        klass = Class.new(ActiveRecord::Migration) {
+        clusters :user_cluster
+        }
+      }
+      let(:cluster_config) { ActiveRecord::Base.turntable_config["clusters"]["user_cluster"] }
+      let(:user_cluster_shards) { cluster_config["shards"].map { |s| s["connection"] } }
+
+      it { is_expected.to eq(user_cluster_shards) }
+    end
+
+    context "With shards definitions" do
+      let(:migration_class) {
+        klass = Class.new(ActiveRecord::Migration) {
+          shards :user_shard_01
+        }
+      }
+
+      it { is_expected.to eq([:user_shard_01]) }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -392,6 +392,7 @@ files:
 - 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/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/algorithm/range_algorithm_spec.rb
 - spec/active_record/turntable/algorithm/range_bsearch_algorithm_spec.rb
@@ -449,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activerecord-turntable
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord sharding extension
@@ -458,6 +459,7 @@ test_files:
 - 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/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/algorithm/range_algorithm_spec.rb
 - spec/active_record/turntable/algorithm/range_bsearch_algorithm_spec.rb
@@ -495,4 +497,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/matchers/be_saved_to.rb
 - spec/support/turntable_helper.rb
-has_rdoc: