ar-octopus-ruby-3 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45148ba25887b36967a31b5b152fca794127f8aed6c9cbe6e510afb9e46a394b
-  data.tar.gz: 90e3f6c6a6d5df3c596c6e6c7187ac8cd12d0564cdbbc52b257034f0080a1328
+  metadata.gz: f9363f5411d262101a505bcc38e95ca6a3cd404d034c03102bf9e21fdaf01877
+  data.tar.gz: 8335ef51d85e315c96491d306e22b11e56996b07fee8825c4bc91aedf2c98b1e
 SHA512:
-  metadata.gz: 492e656e572b5ce6d402e48bd7210ff305c00c8d61bc1d0fe71a0f9d8e30a590e2aba80bfc3b9a74011bf7ac8b48b83cd197867a1d29d41d4d044179a9196166
-  data.tar.gz: 27e3f7c9fbdacf8c1e05e7bc6f78f444b53f850b4d18898bf2d29d05cdf70aca2077da772c67bf040357c3f6556fb82399ddb2d7f7dfba5bc848bdf74f17a309
+  metadata.gz: 456bcbf510933fec3fd46680ea84c721567b6e2f83ecac7743a8d5e243d3de8e8757136d2033da42af494ee99d9652e78526e568690bd22e0ee013c09388e823
+  data.tar.gz: a03cfe1be9d2eac1c13b7b440746ce841fae58e4cfd56638ac605e67d218ec9bd11894035553a50b16e223bd720febbadd232a2a3c79f2def4a9137d924ccc11

data/.gitignore

@@ -10,3 +10,4 @@ tmp/*
 .*.sw[a-z]
 database.log
 .byebug_history
+.env

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.6

data/Gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: .
+  specs:
+    ar-octopus-ruby-3 (0.11.2)
+      activerecord (~> 6.0.6.1)
+      activesupport (~> 6.0.6.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activesupport (6.0.6.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    method_source (1.0.0)
+    minitest (5.18.0)
+    mysql2 (0.5.5)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    pg (0.21.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    racc (1.7.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.52.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.3)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    sqlite3 (1.6.3-x86_64-linux)
+    thor (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+    unicode-display_width (2.4.2)
+    zeitwerk (2.6.8)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal (>= 0.3.8)
+  ar-octopus-ruby-3!
+  mysql2 (~> 0.5)
+  pg (~> 0.18)
+  pry-byebug
+  rake
+  rspec (>= 3)
+  rubocop
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.4.13

data/Rakefile

@@ -16,7 +16,6 @@ namespace :db do
       :host     => 'localhost',
       :username => (ENV['POSTGRES_USER'] || 'postgres'),
       :encoding => 'utf8',
-      :password => ''
     }
 
     mysql_spec = {
@@ -24,7 +23,6 @@ namespace :db do
       :host     => 'localhost',
       :username => (ENV['MYSQL_USER'] || 'root'),
       :encoding => 'utf8',
-      :password => ''
     }
 
     ` rm -f /tmp/database.sqlite3 `

data/ar-octopus.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord', "~> 6.0.6.1"
   s.add_dependency 'activesupport', "~> 6.0.6.1"
-  # s.add_dependency 'pg', "~> 1.1.0"
 
   s.add_development_dependency 'appraisal', '>= 0.3.8'
   # To install the mysql2 gem its necessary execute the following command before run bundle

data/lib/octopus/proxy.rb

@@ -213,17 +213,11 @@ module Octopus
     def legacy_method_missing_logic(method, *args, &block)
       if should_clean_connection_proxy?(method)
         clean_connection_proxy
-        preparable = check_preparable_arg(args)
+        args, preparable = handle_args(args)
 
-        args.pop unless preparable.nil?
-
-        if args.present?
-          val = select_connection.send(method, *args, **preparable, &block)
-        else
-          val = select_connection.send(method, *args, &block)
-        end
-
-        # conn.send(method, *args, &block)
+        val = preparable.nil? ?
+          select_connection.send(method, *args, &block) :
+          select_connection.send(method, *args, **preparable, &block)
       elsif should_send_queries_to_shard_slave_group?(method)
         send_queries_to_shard_slave_group(method, *args, &block)
       elsif should_send_queries_to_slave_group?(method)
@@ -231,15 +225,11 @@ module Octopus
       elsif should_send_queries_to_replicated_databases?(method)
         send_queries_to_selected_slave(method, *args, &block)
       else
-        preparable = check_preparable_arg(args)
-
-        args.pop unless preparable.nil?
+        args, preparable = handle_args(args)
 
-        if args.present?
-          val = select_connection.send(method, *args, **preparable, &block)
-        else
-          val = select_connection.send(method, *args, &block)
-        end
+        val = preparable.nil? ?
+          select_connection.send(method, *args, &block) :
+          select_connection.send(method, *args, **preparable, &block)
 
         if val.instance_of? ActiveRecord::Result
           val.current_shard = shard_name
@@ -249,14 +239,6 @@ module Octopus
       end
     end
 
-    def check_preparable_arg(args)
-      selected_hashs = args.select{ |arg| arg.is_a? Hash }.first
-
-      return selected_hashs if selected_hashs.present?
-
-      {preparable: nil}
-    end
-
     # Ensure that a single failing slave doesn't take down the entire application
     def with_each_healthy_shard
       shards.each do |shard_name, v|
@@ -334,15 +316,11 @@ module Octopus
     # while preserving `current_shard`
     def send_queries_to_slave(slave, method, *args, &block)
       using_shard(slave) do
-        preparable = check_preparable_arg(args)
-
-        args.pop unless preparable.nil?
+        args, preparable = handle_args(args)
 
-        if args.present?
-          val = select_connection.send(method, *args, **preparable, &block)
-        else
-          val = select_connection.send(method, *args, &block)
-        end
+        val = preparable.nil? ?
+          select_connection.send(method, *args, &block) :
+          select_connection.send(method, *args, **preparable, &block)
 
         if val.instance_of? ActiveRecord::Result
           val.current_shard = slave
@@ -395,5 +373,17 @@ module Octopus
         self.current_group = older_group
       end
     end
+
+    private
+
+    def handle_args(args)
+      return [[], nil] if args.empty?
+
+      preparable_args = args.select{ |arg| arg.is_a?(Hash) && arg.key?(:preparable)}
+      return [args, nil] if preparable_args.empty?
+
+      args -= preparable_args
+      return [args, preparable_args.first]
+    end
   end
 end

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.11.2'
+  VERSION = '0.11.3'
 end

data/sample_app/config/database.yml

@@ -2,27 +2,27 @@
 #   gem install sqlite3-ruby (not necessary on OS X Leopard)
 development:
   adapter: postgresql
-  username: daniel
-  password: '1234'
+  username: postgres
+  password:
   database: octopus_sample_app_development
   encoding: unicode
-  host: ''
+  host: localhost
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test: &test
   adapter: postgresql
-  username: daniel
-  password: '1234'
+  username: postgres
+  password:
   database: octopus_sample_app_test
   encoding: unicode
-  host: ''
+  host: localhost
 
-# production:
-#   adapter: postgresql
-#   username: postgres
-#   password:
-#   database: octopus_sample_app_production
-#   encoding: unicode
-#   host: localhost
+production:
+  adapter: postgresql
+  username: postgres
+  password:
+  database: octopus_sample_app_production
+  encoding: unicode
+  host: localhost

data/spec/config/shards.yml

@@ -2,14 +2,12 @@ mysql: &mysql
   adapter: mysql2
   username: <%= ENV['MYSQL_USER'] || 'root' %>
   host: localhost
-  password: '1234'
 
 mysql_unavailable: &mysql_unavailable
   adapter: mysql2
   username: <%= ENV['MYSQL_USER'] || 'root' %>
   host: 192.0.2.1
   connect_timeout: 3
-  password: '1234'
 
 octopus: &octopus
   shards:
@@ -19,11 +17,11 @@ octopus: &octopus
 
     postgresql_shard:
       adapter: postgresql
-      username: <%= ENV['POSTGRES_USER'] || 'daniel' %>
-      password: '1234'
+      username: <%= ENV['POSTGRES_USER'] || 'postgres' %>
+      password:
       database: octopus_shard_1
       encoding: unicode
-      host: ''
+      host: localhost
 
     sqlite_shard:
       adapter: sqlite3

data/spec/octopus/octopus_spec.rb

@@ -40,7 +40,7 @@ describe Octopus, :shards => [] do
       expect { User.using(:crazy_shard).create!(:name => 'Joaquim') }.to raise_error(RuntimeError)
 
       Octopus.setup do |config|
-        config.shards = { :crazy_shard => { :adapter => 'mysql2', :database => 'octopus_shard_5', :username => "#{ENV['MYSQL_USER'] || 'root'}", :password => ENV['MYSQL_PASSWORD'] } }
+        config.shards = { :crazy_shard => { :adapter => 'mysql2', :database => 'octopus_shard_5', :username => "#{ENV['MYSQL_USER'] || 'root'}", :password => '' } }
       end
 
       expect { User.using(:crazy_shard).create!(:name => 'Joaquim')  }.not_to raise_error

data/spec/octopus/proxy_spec.rb

@@ -30,7 +30,7 @@ describe Octopus::Proxy do
       config = proxy.config
       expect(config[:adapter]).to eq('mysql2')
       expect(config[:database]).to eq('octopus_shard_1')
-      expect(config[:username]).to eq("#{ENV['MYSQL_USER'] || 'root'}")
+      expect(config[:username]).to eq("#{ENV['MYSQL_USER'] || 'daniel'}")
     end
 
     unless Octopus.rails50? || Octopus.rails51?|| Octopus.rails52? || Octopus.rails60?

data/spec/support/database_models.rb

@@ -28,7 +28,7 @@ end
 # This class sets its own connection
 class CustomConnection < ActiveRecord::Base
   self.table_name = 'custom'
-  octopus_establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_2', :username => "#{ENV['MYSQL_USER'] || ''}", :password => '')
+  octopus_establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_2', :username => "#{ENV['MYSQL_USER'] || ''}", :password => '1234')
 end
 
 # This items belongs to a client

data/spec/support/octopus_helper.rb

@@ -39,15 +39,10 @@ module OctopusHelper
   end
 
   def self.migrate_to_version(direction, root, version)
+    schema = ActiveRecord::SchemaMigration
+    migrations = ActiveRecord::MigrationContext.new(root, schema).migrations.select {|mig| version == mig.version }
 
-    if Octopus.atleast_rails52?
-      migrations = ActiveRecord::MigrationContext.new(root).migrations.select {|mig| version == mig.version }
-      ActiveRecord::Migrator.new(direction, migrations, version).run
-    else
-      schema     = ActiveRecord::SchemaMigration
-      migrations = ActiveRecord::MigrationContext.new(root, schema).migrations.select {|mig| version == mig.version }
-      ActiveRecord::Migrator.new(direction, migrations, schema, version).run
-    end
+    ActiveRecord::Migrator.new(direction, migrations, schema, version).run
   end
 
   def self.using_environment(environment, &_block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus-ruby-3
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Thiago Pradi
@@ -167,9 +167,11 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tool-versions"
 - ".travis.yml"
 - Appraisals
 - Gemfile
+- Gemfile.lock
 - README.mkdn
 - Rakefile
 - TODO.txt