makara 0.3.8 → 0.5.0

data/spec/support/mysql2_database.yml

@@ -4,6 +4,7 @@ test:
   username: 'root'
   password: ''
 
+  timeout: 5000
   connect_timeout: 1
   read_timeout: 1
   write_timeout: 2

data/spec/support/mysql2_database_with_custom_errors.yml

@@ -4,6 +4,11 @@ test:
   username: 'root'
   password: ''
 
+  timeout: 5000
+  connect_timeout: 1
+  read_timeout: 1
+  write_timeout: 2
+
   makara:
     blacklist_duration: 2
     master_ttl: 5

data/spec/support/postgis_database.yml

@@ -0,0 +1,15 @@
+test:
+  adapter: 'makara_postgis'
+  database: 'makara_test'
+  username: 'root'
+  password: ''
+
+  timeout: 5000
+
+  makara:
+    blacklist_duration: 2
+    master_ttl: 5
+    connections:
+      - role: master
+      - role: slave
+      - role: slave

data/spec/support/postgis_schema.rb

@@ -0,0 +1,11 @@
+conn = ActiveRecord::Base.connection
+
+conn.execute "create extension if not exists postgis"
+
+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

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

data/spec/support/proxy_extensions.rb

@@ -1,6 +1,6 @@
 module ProxyExtensions
 
-  attr_reader :master_pool, :slave_pool, :master_context, :id
+  attr_reader :master_pool, :slave_pool, :id
   
   def master_for?(sql)
     pool_for(sql) == master_pool

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|
+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,5 @@
+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.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-publish-public.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
@@ -49,25 +50,29 @@ files:
 - gemfiles/ar42.gemfile
 - gemfiles/ar50.gemfile
 - gemfiles/ar51.gemfile
+- gemfiles/ar52.gemfile
+- gemfiles/ar60.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
 - lib/active_record/connection_adapters/makara_jdbcmysql_adapter.rb
 - lib/active_record/connection_adapters/makara_jdbcpostgresql_adapter.rb
 - lib/active_record/connection_adapters/makara_mysql2_adapter.rb
+- lib/active_record/connection_adapters/makara_postgis_adapter.rb
 - lib/active_record/connection_adapters/makara_postgresql_adapter.rb
 - lib/active_record/connection_adapters/mysql2_makara_adapter.rb
 - 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
@@ -79,34 +84,43 @@ 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
 - spec/active_record/connection_adapters/makara_abstract_adapter_spec.rb
 - spec/active_record/connection_adapters/makara_mysql2_adapter_spec.rb
+- spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb
 - spec/active_record/connection_adapters/makara_postgresql_adapter_spec.rb
 - spec/cache_spec.rb
 - 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
 - spec/support/mysql2_database.yml
 - spec/support/mysql2_database_with_custom_errors.yml
 - spec/support/pool_extensions.rb
+- spec/support/postgis_database.yml
+- spec/support/postgis_schema.rb
 - 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/taskrabbit/makara
+licenses:
+- MIT
+metadata:
+  source_code_uri: https://github.com/taskrabbit/makara
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -122,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Read-write split your DB yo
@@ -131,23 +144,29 @@ test_files:
 - spec/active_record/connection_adapters/makara_abstract_adapter_error_handling_spec.rb
 - spec/active_record/connection_adapters/makara_abstract_adapter_spec.rb
 - spec/active_record/connection_adapters/makara_mysql2_adapter_spec.rb
+- spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb
 - spec/active_record/connection_adapters/makara_postgresql_adapter_spec.rb
 - spec/cache_spec.rb
 - 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
 - spec/support/mysql2_database.yml
 - spec/support/mysql2_database_with_custom_errors.yml
 - spec/support/pool_extensions.rb
+- spec/support/postgis_database.yml
+- spec/support/postgis_schema.rb
 - spec/support/postgresql_database.yml
 - spec/support/proxy_extensions.rb
 - spec/support/schema.rb
+- spec/support/user.rb

data/lib/makara/cache/memory_store.rb

@@ -1,28 +0,0 @@
-module Makara
-  module Cache
-    class MemoryStore
-
-      def initialize
-        @data = {}
-      end
-
-      def read(key)
-        clean
-        @data[key].try(:[], 0)
-      end
-
-      def write(key, value, options = {})
-        clean
-        @data[key] = [value, Time.now.to_i + (options[:expires_in] || 5).to_i]
-        true
-      end
-
-      protected
-
-      def clean
-        @data.delete_if{|k,v| v[1] <= Time.now.to_i }
-      end
-
-    end
-  end
-end

data/lib/makara/cache/noop_store.rb

@@ -1,15 +0,0 @@
-module Makara
-  module Cache
-    class NoopStore
-
-      def read(key)
-        nil
-      end
-
-      def write(key, value, options = {})
-        nil
-      end
-
-    end
-  end
-end