ar-octopus 0.8.1 → 0.10.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Thiago Pradi
@@ -10,134 +10,154 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.18
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.3.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 1.3.6
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem allows you to use sharded databases with ActiveRecord. This
   also provides a interface for replication and for running migrations with multiples
   shards.
@@ -149,36 +169,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - README.mkdn
 - Rakefile
 - TODO.txt
 - ar-octopus.gemspec
-- gemfiles/rails32.gemfile
-- gemfiles/rails4.gemfile
-- init.rb
+- gemfiles/rails42.gemfile
+- gemfiles/rails5.gemfile
+- gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - lib/ar-octopus.rb
 - lib/octopus.rb
+- lib/octopus/abstract_adapter.rb
 - lib/octopus/association.rb
-- lib/octopus/association_collection.rb
-- lib/octopus/has_and_belongs_to_many_association.rb
+- lib/octopus/association_shard_tracking.rb
+- lib/octopus/collection_association.rb
+- lib/octopus/collection_proxy.rb
+- lib/octopus/exception.rb
+- lib/octopus/finder_methods.rb
+- lib/octopus/load_balancing.rb
+- lib/octopus/load_balancing/round_robin.rb
+- lib/octopus/log_subscriber.rb
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
+- lib/octopus/persistence.rb
 - lib/octopus/proxy.rb
-- lib/octopus/rails3/abstract_adapter.rb
-- lib/octopus/rails3/log_subscriber.rb
-- lib/octopus/rails3/persistence.rb
-- lib/octopus/rails3/singular_association.rb
+- lib/octopus/proxy_config.rb
+- lib/octopus/query_cache_for_shards.rb
 - lib/octopus/railtie.rb
+- lib/octopus/relation_proxy.rb
+- lib/octopus/result_patch.rb
 - lib/octopus/scope_proxy.rb
+- lib/octopus/shard_tracking.rb
+- lib/octopus/shard_tracking/attribute.rb
+- lib/octopus/shard_tracking/dynamic.rb
+- lib/octopus/singular_association.rb
+- lib/octopus/slave_group.rb
 - lib/octopus/version.rb
 - lib/tasks/octopus.rake
-- rails/init.rb
 - sample_app/.gitignore
 - sample_app/.rspec
 - sample_app/Gemfile
@@ -270,14 +304,20 @@ files:
 - spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
-- spec/octopus/association_spec.rb
+- spec/octopus/association_shard_tracking_spec.rb
+- spec/octopus/collection_proxy_spec.rb
+- spec/octopus/load_balancing/round_robin_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/query_cache_for_shards_spec.rb
+- spec/octopus/relation_proxy_spec.rb
+- spec/octopus/replicated_slave_grouped_spec.rb
 - spec/octopus/replication_spec.rb
 - spec/octopus/scope_proxy_spec.rb
+- spec/octopus/sharded_replicated_slave_grouped_spec.rb
 - spec/octopus/sharded_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record/connection_adapters/modify_config_adapter.rb
@@ -291,30 +331,26 @@ homepage: https://github.com/tchandy/octopus
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! 'Important: If you are upgrading from < Octopus 0.5.0 you
-  need to run:
-
+post_install_message: |-
+  Important: If you are upgrading from < Octopus 0.5.0 you need to run:
   $ rake octopus:copy_schema_versions
 
-
-  Octopus now stores schema version information in each shard and migrations will
-  not work properly unless this task is invoked.'
+  Octopus now stores schema version information in each shard and migrations will not work properly unless this task is invoked.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.10
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Easy Database Sharding for ActiveRecord
@@ -335,14 +371,20 @@ test_files:
 - spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
-- spec/octopus/association_spec.rb
+- spec/octopus/association_shard_tracking_spec.rb
+- spec/octopus/collection_proxy_spec.rb
+- spec/octopus/load_balancing/round_robin_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/query_cache_for_shards_spec.rb
+- spec/octopus/relation_proxy_spec.rb
+- spec/octopus/replicated_slave_grouped_spec.rb
 - spec/octopus/replication_spec.rb
 - spec/octopus/scope_proxy_spec.rb
+- spec/octopus/sharded_replicated_slave_grouped_spec.rb
 - spec/octopus/sharded_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record/connection_adapters/modify_config_adapter.rb

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init')

data/lib/octopus/association_collection.rb

@@ -1,49 +0,0 @@
-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
-      METHODS.each do |m|
-        alias_method_chain m.to_sym, :octopus
-      end
-    end
-  end
-
-  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
-
-end
-
-ActiveRecord::Associations::CollectionAssociation.send(:include, Octopus::AssociationCollection)

data/lib/octopus/has_and_belongs_to_many_association.rb

@@ -1,17 +0,0 @@
-module Octopus::HasAndBelongsToManyAssociation
-  def self.included(base)
-    base.instance_eval do
-      alias_method_chain :insert_record, :octopus
-    end
-  end
-
-  def insert_record_with_octopus(record, force = true, validate = true)
-    if should_wrap_the_connection?
-      Octopus.using(@owner.current_shard) { insert_record_without_octopus(record, force, validate) }
-    else
-      insert_record_without_octopus(record, force, validate)
-    end
-  end
-end
-
-ActiveRecord::Associations::HasAndBelongsToManyAssociation.send(:include, Octopus::HasAndBelongsToManyAssociation)

data/lib/octopus/rails3/persistence.rb

@@ -1,39 +0,0 @@
-module Octopus
-  module Rails3
-    module Persistence
-      def update_attribute(*args)
-        run_on_shard { super }
-      end
-
-      def update_attributes(*args)
-        run_on_shard { super }
-      end
-
-      def update_attributes!(*args)
-        run_on_shard { super }
-      end
-
-      def reload(*args)
-        run_on_shard { super }
-      end
-
-      def delete
-        run_on_shard { super }
-      end
-
-      def destroy
-        run_on_shard { super }
-      end
-
-      def touch(name=nil)
-        run_on_shard { super }
-      end
-
-      def update_column(*args)
-        run_on_shard { super }
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:include, Octopus::Rails3::Persistence)

data/lib/octopus/rails3/singular_association.rb

@@ -1,34 +0,0 @@
-module Octopus::SingularAssociation
-  def self.included(base)
-    base.instance_eval do
-      alias_method_chain :reader, :octopus
-      alias_method_chain :writer, :octopus
-      alias_method_chain :create, :octopus
-      alias_method_chain :create!, :octopus
-      alias_method_chain :build, :octopus
-    end
-  end
-
-  def reader_with_octopus(*args)
-    owner.run_on_shard { reader_without_octopus(*args) }
-  end
-
-  def writer_with_octopus(*args)
-    owner.run_on_shard { writer_without_octopus(*args) }
-  end
-
-  def create_with_octopus(*args)
-    owner.run_on_shard { create_without_octopus(*args) }
-  end
-
-  def create_with_octopus!(*args)
-    owner.run_on_shard { create_without_octopus!(*args) }
-  end
-
-  def build_with_octopus(*args)
-    owner.run_on_shard { build_without_octopus(*args) }
-  end
-
-end
-
-ActiveRecord::Associations::SingularAssociation.send(:include, Octopus::SingularAssociation)

data/rails/init.rb

@@ -1 +0,0 @@
-require "octopus"