makara 0.3.9 → 0.5.1

data/spec/support/deep_dup.rb

@@ -9,4 +9,4 @@ unless Hash.respond_to?(:deep_dup)
       duplicate
     end
   end
-end
+end

data/spec/support/helpers.rb

@@ -11,13 +11,17 @@ module SpecHelpers
 
   def config(masters = 1, slaves = 2)
     connections = []
-    masters.times{ connections << {:role => 'master'} }
-    slaves.times{ connections << {:role => 'slave'} }
+    masters.times{ connections << {role: 'master'} }
+    slaves.times{ connections << {role: 'slave'} }
     {
-      :makara => {
-        :blacklist_duration => 30,
-        :connections => connections
+      makara: {
+        # Defaults:
+        # :master_ttl => 5,
+        # :blacklist_duration => 30,
+        # :sticky => true
+        id: 'mock_mysql',
+        connections: connections
       }
     }
   end
-end
+end

data/spec/support/mock_objects.rb

@@ -1,7 +1,6 @@
 require 'active_record/connection_adapters/makara_abstract_adapter'
 
 class FakeConnection < Struct.new(:config)
-
   def ping
     'ping!'
   end
@@ -11,13 +10,17 @@ class FakeConnection < Struct.new(:config)
   end
 
   def query(content)
-    []
+    config[:name]
   end
 
   def active?
     true
   end
 
+  def open_transactions
+    (config || {}).fetch(:open_transactions, 0)
+  end
+
   def disconnect!
     true
   end
@@ -28,7 +31,6 @@ class FakeConnection < Struct.new(:config)
 end
 
 class FakeDatabaseAdapter < Struct.new(:config)
-
   def execute(sql, name = nil)
     []
   end
@@ -44,11 +46,9 @@ class FakeDatabaseAdapter < Struct.new(:config)
   def active?
     true
   end
-
 end
 
 class FakeProxy < Makara::Proxy
-
   send_to_all :ping
   hijack_method :execute
 
@@ -58,6 +58,7 @@ class FakeProxy < Makara::Proxy
 
   def needs_master?(method_name, args)
     return false if args.first =~ /^select/
+
     true
   end
 end

data/spec/support/mysql2_database.yml

@@ -1,9 +1,10 @@
 test:
   adapter: 'mysql2_makara'
   database: 'makara_test'
-  username: 'root'
+  host: <%= ENV["MYSQL_HOST"] %>
+  username: root
   password: ''
-
+  timeout: 5000
   connect_timeout: 1
   read_timeout: 1
   write_timeout: 2

data/spec/support/mysql2_database_with_custom_errors.yml

@@ -1,8 +1,13 @@
 test:
   adapter: 'mysql2_makara'
   database: 'makara_test'
-  username: 'root'
+  host: <%= ENV["MYSQL_HOST"] %>
+  username: root
   password: ''
+  timeout: 5000
+  connect_timeout: 1
+  read_timeout: 1
+  write_timeout: 2
 
   makara:
     blacklist_duration: 2

data/spec/support/pool_extensions.rb

@@ -1,5 +1,4 @@
 module PoolExtensions
-
   def connections
     @connections
   end
@@ -7,8 +6,6 @@ module PoolExtensions
   def connection_count
     @connections.length
   end
-
 end
 
-
 Makara::Pool.send(:include, PoolExtensions)

data/spec/support/postgis_database.yml

@@ -4,6 +4,8 @@ test:
   username: 'root'
   password: ''
 
+  timeout: 5000
+
   makara:
     blacklist_duration: 2
     master_ttl: 5

data/spec/support/postgis_schema.rb

@@ -1,8 +1,11 @@
+conn = ActiveRecord::Base.connection
 
-ActiveRecord::Schema.define(:version => 20160518161227) do
-  execute "create extension if not exists postgis"
+conn.execute "create extension if not exists postgis"
 
-  create_table "towns", :force => true do |t|
+if conn.table_exists? "towns"
+  conn.execute("TRUNCATE TABLE towns")
+else
+  conn.create_table "towns", force: true do |t|
     t.st_point "location"
   end
 end

data/spec/support/postgresql_database.yml

@@ -1,8 +1,8 @@
 test:
   adapter: 'postgresql_makara'
   database: 'makara_test'
-  username: 'root'
-  password: ''
+
+  timeout: 5000
 
   makara:
     blacklist_duration: 2

data/spec/support/proxy_extensions.rb

@@ -1,7 +1,6 @@
 module ProxyExtensions
+  attr_reader :master_pool, :slave_pool, :id
 
-  attr_reader :master_pool, :slave_pool, :master_context, :id
-  
   def master_for?(sql)
     pool_for(sql) == master_pool
   end
@@ -27,7 +26,6 @@ module ProxyExtensions
   def sticky=(s)
     @sticky = s
   end
-
 end
 
 Makara::Proxy.send(:include, ProxyExtensions)

data/spec/support/schema.rb

@@ -1,9 +1,9 @@
-ActiveRecord::Schema.define(:version => 20130628161227) do
+conn = ActiveRecord::Base.connection
 
-  drop_table "users" if table_exists? "users"
-
-  create_table "users" do |t|
-    t.string   "name"
+if conn.table_exists? "users"
+  conn.execute("TRUNCATE TABLE users")
+else
+  conn.create_table "users" do |t|
+    t.string "name"
   end
-
 end

data/spec/support/user.rb

@@ -0,0 +1,4 @@
+module Test
+  class User < ::ActiveRecord::Base
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makara
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.5.1
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,154 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: rack
+  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: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+- !ruby/object:Gem::Dependency
+  name: activerecord-postgis-adapter
+  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: 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'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  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: pg
+  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: rgeo
+  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: Read-write split your DB yo
 email:
 - mike@mikeonrails.com
@@ -31,24 +171,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/CI.yml"
+- ".github/workflows/gem-publish-public.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-gemset"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/ar-head.gemfile
-- gemfiles/ar30.gemfile
-- gemfiles/ar31.gemfile
-- gemfiles/ar32.gemfile
-- gemfiles/ar40.gemfile
-- gemfiles/ar41.gemfile
-- gemfiles/ar42.gemfile
-- gemfiles/ar50.gemfile
-- gemfiles/ar51.gemfile
+- gemfiles/activerecord_5.2.gemfile
+- gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_6.1.gemfile
+- gemfiles/activerecord_head.gemfile
 - lib/active_record/connection_adapters/jdbcmysql_makara_adapter.rb
 - lib/active_record/connection_adapters/jdbcpostgresql_makara_adapter.rb
 - lib/active_record/connection_adapters/makara_abstract_adapter.rb
@@ -61,14 +200,15 @@ files:
 - lib/active_record/connection_adapters/postgresql_makara_adapter.rb
 - lib/makara.rb
 - lib/makara/cache.rb
-- lib/makara/cache/memory_store.rb
-- lib/makara/cache/noop_store.rb
 - lib/makara/config_parser.rb
 - lib/makara/connection_wrapper.rb
 - lib/makara/context.rb
+- lib/makara/cookie.rb
 - lib/makara/error_handler.rb
 - lib/makara/errors/all_connections_blacklisted.rb
 - lib/makara/errors/blacklist_connection.rb
+- lib/makara/errors/blacklisted_while_in_transaction.rb
+- lib/makara/errors/invalid_shard.rb
 - lib/makara/errors/makara_error.rb
 - lib/makara/errors/no_connections_available.rb
 - lib/makara/logging/logger.rb
@@ -80,6 +220,7 @@ files:
 - lib/makara/strategies/abstract.rb
 - lib/makara/strategies/priority_failover.rb
 - lib/makara/strategies/round_robin.rb
+- lib/makara/strategies/shard_aware.rb
 - lib/makara/version.rb
 - makara.gemspec
 - spec/active_record/connection_adapters/makara_abstract_adapter_error_handling_spec.rb
@@ -91,12 +232,14 @@ files:
 - spec/config_parser_spec.rb
 - spec/connection_wrapper_spec.rb
 - spec/context_spec.rb
+- spec/cookie_spec.rb
 - spec/middleware_spec.rb
 - spec/pool_spec.rb
 - spec/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/strategies/priority_failover_spec.rb
 - spec/strategies/round_robin_spec.rb
+- spec/strategies/shard_aware_spec.rb
 - spec/support/deep_dup.rb
 - spec/support/helpers.rb
 - spec/support/mock_objects.rb
@@ -108,9 +251,12 @@ files:
 - spec/support/postgresql_database.yml
 - spec/support/proxy_extensions.rb
 - spec/support/schema.rb
-homepage: ''
-licenses: []
-metadata: {}
+- spec/support/user.rb
+homepage: https://github.com/instacart/makara
+licenses:
+- MIT
+metadata:
+  source_code_uri: https://github.com/instacart/makara
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -119,15 +265,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Read-write split your DB yo
@@ -141,12 +286,14 @@ test_files:
 - spec/config_parser_spec.rb
 - spec/connection_wrapper_spec.rb
 - spec/context_spec.rb
+- spec/cookie_spec.rb
 - spec/middleware_spec.rb
 - spec/pool_spec.rb
 - spec/proxy_spec.rb
 - spec/spec_helper.rb
 - spec/strategies/priority_failover_spec.rb
 - spec/strategies/round_robin_spec.rb
+- spec/strategies/shard_aware_spec.rb
 - spec/support/deep_dup.rb
 - spec/support/helpers.rb
 - spec/support/mock_objects.rb
@@ -158,3 +305,4 @@ test_files:
 - spec/support/postgresql_database.yml
 - spec/support/proxy_extensions.rb
 - spec/support/schema.rb
+- spec/support/user.rb