ar-octopus 0.8.0 → 0.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWQzNDQ0MzMzZWViNTFiYjY5MWRlODZjN2M2MGFlNDMwM2RjMTY2Mw==
+    MTRmYWZkMTg0YzU4MTM4YmNjYTM3MDE3MDVjZjQ1MjdiYmE2NDkwMg==
   data.tar.gz: !binary |-
-    YmUzNzY2YzQ0ZWUwOWVjZDI4ZWQwOGEyMGZmOWY3NDg1MzA0MjNhZg==
+    ODhhZTJjNDQzZDVhMWZhYzc1NzRjYWNjOTdlYTQ5MTNlYzk5YWJkMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODcyN2VkMDQ3Zjk4MjVlYTEyMGMxYmU4NmFhMmI1ZmM0OGFkMDc5Mzk1MWRk
-    OWIyYzMwMTY5MjVhYjE1MDljOTlkMjI4N2E3OTYyMGY4YzIyMGUwZGVjZTM4
-    ZTI3ZGRiZWU2NjkyNGQzNDcwNTM3Y2FlNjM3MWIwNGI4MGIzMWY=
+    Y2JiNmI0MjEzYWRjYTFhYjMwN2IyYWQwMTQyMDI1M2UyYTdiNzU3NGY4ZDlm
+    MGYwNDQ2NGViMjhjOGRjMTZiNjdjN2VhODZiOGQ3ZWQ2Njg5OTFjZWE1ZDQ5
+    ZThjNjUxOTNhYzYyNTMwMjk3MjkwYmYzNmU3YjA0Y2MzMjMyZmE=
   data.tar.gz: !binary |-
-    M2M5MDVjNGU4NWU3MTcxYzljOTJmNTVlMGI5NzY5ZTliYzBmODIxZjIzNTE3
-    NGVlZWU3MmNkNDIwYzYxNDVhMzM1NmVlZmFkZGNkZmYwM2Y2NzY0OThhMTBm
-    NjYzMWM0NDAyNDMxN2ZmNzY0ZWFhNmYwN2M5NWIwNmE3MDdjNWE=
+    MjU1YzZlNzczNGM2OGQ2YzMxYmZhMWE4M2QzYTQ5ZjM1NjEwYTQ4MDJiMDY5
+    YzM0Mjg4OTc4MmI4ZGYxMTlhNDJmYWMxMzA3MjU5ZDdmNjIwNmNmNmNlMmY3
+    OWZjY2RkNTViY2MzOTdjMjU5NTg2NjFkNDcyZmRiMWU5NDA2MWM=

data/README.mkdn

@@ -27,7 +27,7 @@ When using replication, all writes queries will be sent to master, and read quer
 
 Add this line to Gemfile:
 
-    gem 'ar-octopus', :require => 'octopus'
+    gem 'ar-octopus'
 
 Currently, Octopus doesn't support Rails 2. If you need support for rails 2, please use the version 0.5.0.
 
@@ -107,6 +107,13 @@ You also could send a migration to a group of shards.  This migration will be se
       end
     end
 
+You can specify a `default_migration_group` for migrations, so that modifications to each individual migration file are not needed:
+
+    octopus:
+      default_migration_group: europe_databases
+
+There is no need for a corresponding `default_migration_shard` - simply define that database to be your master. You might want this setting if all of your databases have identical schemas, but are not replicated.
+
 ### Rails Controllers
 
 If you want to send a specified action, or all actions from a controller, to a specific shard,  use this syntax:
@@ -157,7 +164,7 @@ If you are having issues running the octopus spec suite, verify your database us
 
 ## Thanks
 
-This project is sponsored by the <a href="http://www.rubysoc.org">Ruby Summer of Code</a>,
+This project is sponsored by the <a href="http://www.rubysoc.org">Ruby Summer of Code</a>, Rapid River Software,
 and my mentors <a href="http://github.com/mperham">Mike Perham</a> and <a href="http://github.com/amitagarwal">Amit Agarwal</a>.
 
 ## Copyright

data/ar-octopus.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mysql2', '> 0.3'
   s.add_development_dependency 'pg', '>= 0.11.0'
   s.add_development_dependency 'sqlite3', '>= 1.3.4'
-  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-debugger'
   s.add_development_dependency 'appraisal', '>= 0.3.8'
 
   s.license = 'MIT'

data/lib/octopus/association.rb

@@ -3,6 +3,39 @@ module Octopus::Association
     base.send(:include, InstanceMethods)
   end
 
+  module QueryOnCurrentShard
+
+    METHODS= %w[
+      all
+      average
+      count
+      empty?
+      exists?
+      find
+      find_by_sql
+      first
+      last
+      maximum
+      minimum
+      pluck
+      scoping
+      size
+      sum
+      to_a
+    ]
+
+    METHODS.each do |m|
+      define_method m.to_sym do |*args,&block|
+        if self.respond_to?(:proxy_association) and self.proxy_association
+          self.proxy_association.owner.run_on_shard { super(*args, &block) }
+        else
+          super(*args, &block)
+        end
+      end
+    end
+
+  end
+
   module InstanceMethods
     def set_connection_on_association(record)
       return unless ::Octopus.enabled?
@@ -64,6 +97,8 @@ module Octopus::Association
     else
       options[:before_remove] = :set_connection_on_association
     end
+
+    options[:extend] = [ Octopus::Association::QueryOnCurrentShard, options[:extend] ].flatten.compact
   end
 end
 

data/lib/octopus/association_collection.rb

@@ -1,63 +1,49 @@
 module Octopus::AssociationCollection
 
+  METHODS = %w[
+    reader
+    writer
+    ids_reader
+    ids_writer
+    create
+    create!
+    build
+    any?
+    count
+    empty?
+    first
+    include?
+    last
+    length
+    load_target
+    many?
+    size
+    select
+    uniq
+  ]
+
   def self.included(base)
     base.instance_eval do
-      alias_method_chain :reader, :octopus
-      alias_method_chain :writer, :octopus
-      alias_method_chain :ids_reader, :octopus
-      alias_method_chain :ids_writer, :octopus
-      alias_method_chain :create, :octopus
-      alias_method_chain :create!, :octopus
-      alias_method_chain :build, :octopus
+      METHODS.each do |m|
+        alias_method_chain m.to_sym, :octopus
+      end
     end
   end
 
-  def build_with_octopus(*args, &block)
-    owner.reload_connection
-    build_without_octopus(*args, &block)
-  end
-
-  def reader_with_octopus(*args)
-    owner.reload_connection
-    reader_without_octopus(*args)
-  end
-
-  def writer_with_octopus(*args)
-    owner.reload_connection
-    writer_without_octopus(*args)
-  end
-
-  def ids_reader_with_octopus(*args)
-    owner.reload_connection
-    ids_reader_without_octopus(*args)
-  end
-
-  def ids_writer_with_octopus(*args)
-    owner.reload_connection
-    ids_writer_without_octopus(*args)
-  end
-
-  def create_with_octopus(*args, &block)
-    owner.reload_connection
-    create_without_octopus(*args, &block)
-  end
-
-  def create_with_octopus!(*args, &block)
-    owner.reload_connection
-    create_without_octopus!(*args, &block)
+  METHODS.each do |m|
+    m =~ /([^!?]+)([!?])?/
+    method, punctuation = [ $1, $2 ]
+    with = :"#{method}_with_octopus#{punctuation}"
+    without = :"#{method}_without_octopus#{punctuation}"
+    define_method with do |*args, &block|
+      @owner.run_on_shard { send(without, *args, &block) }
+    end
   end
 
   def should_wrap_the_connection?
     @owner.respond_to?(:current_shard) && @owner.current_shard != nil
   end
 
-  def count(*args)
-    if should_wrap_the_connection?
-      Octopus.using(@owner.current_shard) { super }
-    else
-      super
-    end
-  end
 end
 
 ActiveRecord::Associations::CollectionAssociation.send(:include, Octopus::AssociationCollection)

data/lib/octopus/migration.rb

@@ -16,10 +16,10 @@ module Octopus::Migration
   include InstanceOrClassMethods
 
   def self.included(base)
-    base.send(:extend, ClassMethods)
+    base.extend(ClassMethods)
 
     base.alias_method_chain :announce, :octopus
-    base.class_attribute :current_shard, :current_group, :instance_reader => false, :instance_writer => false
+    base.class_attribute :current_shard, :current_group, :current_group_specified, :instance_reader => false, :instance_writer => false
   end
 
   module ClassMethods
@@ -34,13 +34,14 @@ module Octopus::Migration
       return self unless connection.is_a?(Octopus::Proxy)
 
       self.current_group = groups
+      self.current_group_specified = true
       self
     end
 
     def shards
       shards = Set.new
 
-      if groups = current_group
+      if groups = (current_group_specified ? current_group : Octopus.config[:default_migration_group])
         Array.wrap(groups).each do |group|
           group_shards = connection.shards_for_group(group)
           shards.merge(group_shards) if group_shards
@@ -56,7 +57,7 @@ end
 
 module Octopus::Migrator
   def self.included(base)
-    base.send(:extend, ClassMethods)
+    base.extend(ClassMethods)
 
     base.class_eval do
       class << self

data/lib/octopus/model.rb

@@ -31,7 +31,7 @@ module Octopus::Model
 
     def hijack_initializer()
       attr_accessor :current_shard
-      before_save :reload_connection
+      around_save :run_on_shard
 
       def set_current_shard
         return unless Octopus.enabled?
@@ -72,9 +72,36 @@ module Octopus::Model
         end
       end
 
+      def self.clear_active_connections_with_octopus!
+        if should_use_normal_connection?
+          clear_active_connections_without_octopus!
+        else
+          connection_proxy.clear_active_connections!
+        end
+      end
+
+      def self.clear_all_connections_with_octopus!
+        if should_use_normal_connection?
+          clear_all_connections_without_octopus!
+        else
+          connection_proxy.clear_all_connections!
+        end
+      end
+
+      def self.connected_with_octopus?
+        if should_use_normal_connection?
+          connected_without_octopus?
+        else
+          connection_proxy.connected?
+        end
+      end
+
       class << self
         alias_method_chain :connection, :octopus
         alias_method_chain :connection_pool, :octopus
+        alias_method_chain :clear_all_connections!, :octopus
+        alias_method_chain :clear_active_connections!, :octopus
+        alias_method_chain :connected?, :octopus
       end
     end
   end
@@ -93,18 +120,12 @@ module Octopus::Model
       self.respond_to?(:current_shard) && !self.current_shard.nil?
     end
 
-    def reload_connection_safe(&block)
-      return yield unless should_set_current_shard?
-      original = self.class.connection_proxy.current_shard
-      self.class.connection_proxy.current_shard = self.current_shard
-      result = yield
-      self.class.connection_proxy.current_shard = original
-      result
-    end
-
-    def reload_connection()
-      return unless should_set_current_shard?
-      self.class.connection_proxy.current_shard = self.current_shard
+    def run_on_shard(&block)
+      if self.current_shard
+        self.class.connection_proxy.run_queries_on_shard(self.current_shard, &block)
+      else
+        yield
+      end
     end
 
     def equality_with_octopus(comparison_object)

data/lib/octopus/proxy.rb

@@ -12,7 +12,6 @@ class Octopus::Proxy
     @shards = HashWithIndifferentAccess.new
     @groups = {}
     @adapters = Set.new
-    @shards[:master] = ActiveRecord::Base.connection_pool_without_octopus()
     @config = ActiveRecord::Base.connection_pool_without_octopus.connection.instance_variable_get(:@config)
 
     if !config.nil?
@@ -23,7 +22,7 @@ class Octopus::Proxy
     shards_config ||= []
 
     shards_config.each do |key, value|
-      if value.is_a?(String) 
+      if value.is_a?(String)
         value = resolve_string_connection(value).merge(:octopus_shard => key)
         initialize_adapter(value['adapter'])
         @shards[key.to_sym] = connection_pool_for(value, "#{value['adapter']}_connection")
@@ -45,6 +44,8 @@ class Octopus::Proxy
         end
       end
     end
+
+    @shards[:master] ||= ActiveRecord::Base.connection_pool_without_octopus()
   end
 
   def initialize_replication(config)
@@ -137,7 +138,7 @@ class Octopus::Proxy
   # Rails 3.1 sets automatic_reconnect to false when it removes
   # connection pool.  Octopus can potentially retain a reference to a closed
   # connection pool.  Previously, that would work since the pool would just
-  # reconnect, but in Rails 3.1 the flag prevents this.  
+  # reconnect, but in Rails 3.1 the flag prevents this.
   def safe_connection(connection_pool)
     connection_pool.automatic_reconnect ||= true
     connection_pool.connection()
@@ -219,19 +220,28 @@ class Octopus::Proxy
   end
 
   def enable_query_cache!
-    @shards.each do |k, v|
-      c = safe_connection(v)
-      c.clear_query_cache_without_octopus
-      c.enable_query_cache!
-    end
+    clear_query_cache
+    @shards.each { |k, v| safe_connection(v).enable_query_cache! }
   end
 
   def disable_query_cache!
     @shards.each { |k, v| safe_connection(v).disable_query_cache! }
   end
 
-  def clear_all_query_caches!
-    @shards.each { |k, v| safe_connection(v).clear_query_cache_without_octopus }
+  def clear_query_cache
+    @shards.each { |k, v| safe_connection(v).clear_query_cache }
+  end
+
+  def clear_active_connections!
+    @shards.each { |k, v| v.release_connection }
+  end
+
+  def clear_all_connections!
+    @shards.each { |k, v| v.disconnect! }
+  end
+
+  def connected?
+    @shards.any? { |k, v| v.connected? }
   end
 
   protected

data/lib/octopus/rails3/abstract_adapter.rb

@@ -26,7 +26,6 @@ module Octopus
 
       def self.included(base)
         base.alias_method_chain :initialize, :octopus_shard
-        base.alias_method_chain :clear_query_cache, :octopus
       end
 
       def octopus_shard
@@ -38,16 +37,6 @@ module Octopus
         @instrumenter = InstrumenterDecorator.new(self, @instrumenter)
       end
 
-      # Intercept calls to clear_query_cache and make sure that all
-      # query caches on all shards are invalidated, just to be safe.
-      def clear_query_cache_with_octopus
-        if Octopus.enabled?
-          ActiveRecord::Base.connection_proxy.clear_all_query_caches!
-        else
-          clear_query_cache_without_octopus
-        end
-      end
-
     end
   end
 end

data/lib/octopus/rails3/persistence.rb

@@ -2,43 +2,35 @@ module Octopus
   module Rails3
     module Persistence
       def update_attribute(*args)
-        reload_connection()
-        super
+        run_on_shard { super }
       end
 
       def update_attributes(*args)
-        reload_connection()
-        super
+        run_on_shard { super }
       end
 
       def update_attributes!(*args)
-        reload_connection()
-        super
+        run_on_shard { super }
       end
 
       def reload(*args)
-        reload_connection()
-        super
+        run_on_shard { super }
       end
 
       def delete
-        reload_connection()
-        super
+        run_on_shard { super }
       end
 
       def destroy
-        reload_connection()
-        super
+        run_on_shard { super }
       end
 
       def touch(name=nil)
-        reload_connection()
-        super
+        run_on_shard { super }
       end
 
       def update_column(*args)
-        reload_connection()
-        super
+        run_on_shard { super }
       end
     end
   end

data/lib/octopus/rails3/singular_association.rb

@@ -10,23 +10,23 @@ module Octopus::SingularAssociation
   end
 
   def reader_with_octopus(*args)
-    owner.reload_connection_safe { reader_without_octopus(*args) }
+    owner.run_on_shard { reader_without_octopus(*args) }
   end
 
   def writer_with_octopus(*args)
-    owner.reload_connection_safe { writer_without_octopus(*args) }
+    owner.run_on_shard { writer_without_octopus(*args) }
   end
 
   def create_with_octopus(*args)
-    owner.reload_connection_safe { create_without_octopus(*args) }
+    owner.run_on_shard { create_without_octopus(*args) }
   end
 
   def create_with_octopus!(*args)
-    owner.reload_connection_safe { create_without_octopus!(*args) }
+    owner.run_on_shard { create_without_octopus!(*args) }
   end
 
   def build_with_octopus(*args)
-    owner.reload_connection_safe { build_without_octopus(*args) }
+    owner.run_on_shard { build_without_octopus(*args) }
   end
 
 end

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/spec/config/shards.yml

@@ -3,7 +3,7 @@ mysql: &mysql
   username: <%= ENV['MYSQL_USER'] || 'root' %>
   host: localhost
 
-octopus:
+octopus: &octopus
   shards:
     alone_shard:
       database: octopus_shard_5
@@ -45,6 +45,10 @@ octopus:
 
     protocol_shard: postgres://<%= ENV['POSTGRES_USER'] || 'postgres' %>@localhost:5432/octopus_shard_2
 
+octopus_with_default_migration_group:
+   <<: *octopus
+   default_migration_group: country_shards
+
 production_raise_error:
   shards:
     history_shards:

data/spec/migrations/15_create_user_on_shards_of_default_group_with_versions.rb

@@ -0,0 +1,9 @@
+class CreateUserOnShardsOfDefaultGroupWithVersions < ActiveRecord::Migration
+  def self.up
+    User.create!(:name => "Default Group")
+  end
+
+  def self.down
+    User.delete_all()
+  end
+end

data/spec/octopus/association_spec.rb

@@ -53,7 +53,7 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
       c.save()
       k.save()
 
-      Computer.includes(:keyboard).find(c.id).should == c
+      Computer.using(:brazil).includes(:keyboard).find(c.id).should == c
     end
   end
 
@@ -71,11 +71,17 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
     it "should find all models in the specified shard" do
       @brazil_role.permission_ids().should == [@permission_brazil.id]
       @brazil_role.permissions().should == [@permission_brazil]
+
+      @brazil_role.permissions.first.should eq(@permission_brazil)
+      @brazil_role.permissions.last.should eq(@permission_brazil)
     end
 
     it "should finds the client that the item belongs" do
       @permission_brazil.role_ids.should == [@brazil_role.id]
       @permission_brazil.roles.should == [@brazil_role]
+
+      @permission_brazil.roles.first.should eq(@brazil_role)
+      @permission_brazil.roles.last.should eq(@brazil_role)
     end
 
     it "should update the attribute for the item" do
@@ -226,8 +232,11 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
     end
 
     it "should find all models in the specified shard" do
-      @programmer.project_ids().should == [ @project.id]
-      @programmer.projects().should == [@project]
+      @programmer.project_ids().should eq([@project.id])
+      @programmer.projects().should eq([@project])
+
+      @programmer.projects.first.should eq(@project)
+      @programmer.projects.last.should eq(@project)
     end
 
 
@@ -379,8 +388,11 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
     end
 
     it "should find all models in the specified shard" do
-      @brazil_client.item_ids.should == [@item_brazil.id]
-      @brazil_client.items().should == [@item_brazil]
+      @brazil_client.item_ids.should eq([@item_brazil.id]) 
+      @brazil_client.items().should eq([@item_brazil])
+
+      @brazil_client.items.last.should eq(@item_brazil)
+      @brazil_client.items.first.should eq(@item_brazil)
     end
 
     it "should finds the client that the item belongs" do
@@ -412,6 +424,25 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
       c.items().should == [item2]
     end
 
+    context "when calling methods on a collection generated by an association" do
+      let(:collection) { @brazil_client.items }
+      before :each do
+        @brazil_client.items.create(:name => 'Brazil Item #2')
+      end
+
+      it "can call collection indexes directly without resetting the collection's current_shard" do
+        last_item = collection[1]
+        collection.length.should == 2
+        collection.should eq([ collection[0], last_item ])
+      end
+
+      it "can call methods on the collection without resetting the collection's current_shard" do
+        last_item = collection[collection.size-1]
+        collection.length.should == 2
+        collection.should eq([ collection[0], last_item ])
+      end
+    end
+
     describe "it should works when using" do
       before(:each) do
         @item_brazil_2 = Item.using(:brazil).create!(:name => "Brazil Item 2")
@@ -434,6 +465,14 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
         @brazil_client.items.to_set.should == [@item_brazil, @item_brazil_2].to_set
       end
 
+      it "all" do
+        item = @brazil_client.items.build(:name => "Builded Item")
+        item.save()
+        i = @brazil_client.items
+        i.to_set.should == [@item_brazil, item].to_set
+        i.reload.all.to_set.should == [@item_brazil, item].to_set
+      end
+
       it "build" do
         item = @brazil_client.items.build(:name => "Builded Item")
         item.save()
@@ -570,6 +609,14 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
         @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
       end
 
+      it "all" do
+        comment = @brazil_client.comments.build(:name => "Builded Comment")
+        comment.save()
+        c = @brazil_client.comments
+        c.to_set.should == [@comment_brazil, comment].to_set
+        c.reload.all.to_set.should == [@comment_brazil, comment].to_set
+      end
+
       it "build" do
         comment = @brazil_client.comments.build(:name => "Builded Comment")
         comment.save()

data/spec/octopus/migration_spec.rb

@@ -98,4 +98,18 @@ describe Octopus::Migration do
       Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }.should include(14)
     end
   end
+
+  describe "when using a default_migration_group" do
+    it "should run migrations on all shards in the default_migration_group" do
+      OctopusHelper.using_environment :octopus_with_default_migration_group do
+        OctopusHelper.migrating_to_version 15 do
+          Octopus.using(:master) { ActiveRecord::Migrator.get_all_versions }.should_not include(15)
+          Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }.should include(15)
+          Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }.should include(15)
+          Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }.should include(15)
+        end
+      end
+    end
+  end
+
 end

data/spec/octopus/proxy_spec.rb

@@ -263,4 +263,37 @@ describe Octopus::Proxy do
       end
     end
   end
+
+  describe "connection reuse" do
+    before :each do
+      @item_brazil_conn = Item.using(:brazil).new(:name => 'Brazil Item').connection.select_connection
+      @item_canada_conn = Item.using(:canada).new(:name => 'Canada Item').connection.select_connection
+    end
+
+    it "reuses connections" do
+      Item.using(:brazil).new(:name => 'Another Brazil Item').connection.select_connection.should eq(@item_brazil_conn)
+      Item.using(:canada).new(:name => 'Another Canada Item').connection.select_connection.should eq(@item_canada_conn)
+    end
+
+    it "reuses connections after clear_active_connections! is called" do
+      Item.using(:brazil).new(:name => 'Another Brazil Item').connection.select_connection.should eq(@item_brazil_conn)
+      Item.using(:canada).new(:name => 'Another Canada Item').connection.select_connection.should eq(@item_canada_conn)
+    end
+
+    it "creates new connections after clear_all_connections! is called" do
+      Item.clear_all_connections!
+      Item.using(:brazil).new(:name => 'Another Brazil Item').connection.select_connection.should_not eq(@item_brazil_conn)
+      Item.using(:canada).new(:name => 'Another Canada Item').connection.select_connection.should_not eq(@item_canada_conn)
+    end
+
+    it "is consistent with connected?" do
+      Item.connected?.should be_true
+      ActiveRecord::Base.connected?.should be_true
+
+      Item.clear_all_connections!
+
+      Item.connected?.should be_false
+      ActiveRecord::Base.connected?.should be_false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Thiago Pradi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -111,7 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.4
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -260,6 +260,7 @@ files:
 - spec/migrations/12_create_users_using_block.rb
 - spec/migrations/13_create_users_using_block_and_using.rb
 - spec/migrations/14_create_users_on_shards_of_a_group_with_versions.rb
+- spec/migrations/15_create_user_on_shards_of_default_group_with_versions.rb
 - spec/migrations/1_create_users_on_master.rb
 - spec/migrations/2_create_users_on_canada.rb
 - spec/migrations/3_create_users_on_both_shards.rb
@@ -324,6 +325,7 @@ test_files:
 - spec/migrations/12_create_users_using_block.rb
 - spec/migrations/13_create_users_using_block_and_using.rb
 - spec/migrations/14_create_users_on_shards_of_a_group_with_versions.rb
+- spec/migrations/15_create_user_on_shards_of_default_group_with_versions.rb
 - spec/migrations/1_create_users_on_master.rb
 - spec/migrations/2_create_users_on_canada.rb
 - spec/migrations/3_create_users_on_both_shards.rb