makara 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d07deed98a5cc668ea6621fe741b4fbbcb210e9b
-  data.tar.gz: 1f849bf4f2eb6a38c5a6253ed64348e9d60e76cd
+  metadata.gz: a43f7871351a95b0291a4624bdfded3e1e4bccf3
+  data.tar.gz: feaf04905d1a7293abd47cf32a0f69f23575c609
 SHA512:
-  metadata.gz: 837a1140206708c09ca4ba72f3febe76d00ebc9e10161c114f7ca80d6f749476d9b8bd0b5e4505394c9229d80a12c7c973967e1430dd42c2038b4b236c21d531
-  data.tar.gz: 21dca3b441fae6bb6f438566e3e2d5d2fa0acfa7e0637475f26215486277b225805206200b5c3150f6ac79cc17ae8f0bcfd379feb1e090ec25f3d6aee996d1a9
+  metadata.gz: 06ce4185196b043f4129039a18a55db3f18816ab8af517372193ac28e2cf8517b4dd0abee9970ab012b0a0f2214fd56e42fcd3fce5643d077a8aa3537bbd4635
+  data.tar.gz: a45e25f35d71242f954d4a5fdeafeb0907399b496d19c9122e227ad04bd0486986ce37e2390877f191a2adc0e7295a37ecade58278c57991b57f6152da3123b1

data/.travis.yml

@@ -1,8 +1,22 @@
+sudo: false
 language: ruby
+cache: bundler
+
+services:
+  - mysql
+  - postgresql
+
+before_script:
+  - mysql -e 'create database makara_test;'
+  - psql -c 'create database makara_test;' -U postgres
 
 rvm:
-  - 2.0.0
-  - 2.1.1
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - ruby-head
   - jruby
 
 gemfile:
@@ -12,17 +26,44 @@ gemfile:
   - gemfiles/ar40.gemfile
   - gemfiles/ar41.gemfile
   - gemfiles/ar42.gemfile
+  - gemfiles/ar50.gemfile
+  - gemfiles/ar51.gemfile
+  - gemfiles/ar-head.gemfile
 
-sudo: false
-
-services:
-  - mysql
-  - postgresql
-
-before_script:
-  - mysql -e 'create database makara_test;'
-  - psql -c 'create database makara_test;' -U postgres
+env:
+  global:
+    - "JRUBY_OPTS='--dev -J-Xmx1024M'"
 
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
+matrix:
+  exclude:
+    - gemfile: gemfiles/ar30.gemfile
+      rvm: 2.2
+    - gemfile: gemfiles/ar30.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/ar30.gemfile
+      rvm: 2.4
+    - gemfile: gemfiles/ar30.gemfile
+      rvm: ruby-head
+    - gemfile: gemfiles/ar50.gemfile
+      rvm: 2.0
+    - gemfile: gemfiles/ar50.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/ar50.gemfile
+      rvm: 2.2
+    - gemfile: gemfiles/ar51.gemfile
+      rvm: 2.0
+    - gemfile: gemfiles/ar51.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/ar51.gemfile
+      rvm: 2.2
+    - gemfile: gemfiles/ar-head.gemfile
+      rvm: 2.0
+    - gemfile: gemfiles/ar-head.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/ar-head.gemfile
+      rvm: 2.2
+  allow_failures:
+    - gemfile: gemfiles/ar-head.gemfile
+    - rvm: ruby-head
+    - rvm: jruby
+  fast_finish: true

data/CHANGELOG.md

@@ -1,9 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## v0.3.7.rc - 2016-09-16
+## v0.3.7 - 2016-09-22
 
-[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.6...v0.3.7.rc)
+[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.6...v0.3.7)
 
 Changed
 

data/gemfiles/ar-head.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in makara.gemspec
+gemspec :path => '../'
+
+
+gem 'rake'
+gem 'activerecord', :git => 'https://github.com/rails/rails'
+gem 'rspec'
+gem 'rack'
+gem 'timecop'
+gem 'mysql2', :platform => :ruby
+gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+gem 'pg', :platform => :ruby
+gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby

data/gemfiles/ar50.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in makara.gemspec
+gemspec :path => '../'
+
+
+gem 'rake'
+gem 'activerecord', '~> 5.0.0'
+gem 'rspec'
+gem 'rack'
+gem 'timecop'
+gem 'mysql2', :platform => :ruby
+gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+gem 'pg', :platform => :ruby
+gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby

data/gemfiles/ar51.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in makara.gemspec
+gemspec :path => '../'
+
+
+gem 'rake'
+gem 'activerecord', '~> 5.1.0'
+gem 'rspec'
+gem 'rack'
+gem 'timecop'
+gem 'mysql2', :platform => :ruby
+gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+gem 'pg', :platform => :ruby
+gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby

data/lib/active_record/connection_adapters/makara_abstract_adapter.rb

@@ -165,27 +165,36 @@ module ActiveRecord
 
 
       def should_stick?(method_name, args)
-        sql = args.first.to_s
+        sql = coerce_query_to_sql_string(args.first)
         return false if sql_skip_stickiness_matchers.any?{|m| sql =~ m }
         super
       end
 
 
       def needed_by_all?(method_name, args)
-        sql = args.first.to_s
+        sql = coerce_query_to_sql_string(args.first)
         return true if sql_all_matchers.any?{|m| sql =~ m }
         false
       end
 
 
       def needs_master?(method_name, args)
-        sql = args.first.to_s
+        sql = coerce_query_to_sql_string(args.first)
         return true if sql_master_matchers.any?{|m| sql =~ m }
         return false if sql_slave_matchers.any?{|m| sql =~ m }
         true
       end
 
 
+      def coerce_query_to_sql_string(sql_or_arel)
+        if sql_or_arel.respond_to?(:to_sql)
+          sql_or_arel.to_sql
+        else
+          sql_or_arel.to_s
+        end
+      end
+
+
       def connection_for(config)
         config = Makara::ConfigParser.merge_and_resolve_default_url_config(config)
         active_record_connection_for(config)

data/lib/makara.rb

@@ -12,6 +12,7 @@ module Makara
   autoload :Proxy,              'makara/proxy'
 
   module Errors
+    autoload :MakaraError,                'makara/errors/makara_error'
     autoload :AllConnectionsBlacklisted,  'makara/errors/all_connections_blacklisted'
     autoload :BlacklistConnection,        'makara/errors/blacklist_connection'
     autoload :NoConnectionsAvailable,     'makara/errors/no_connections_available'

data/lib/makara/connection_wrapper.rb

@@ -37,7 +37,7 @@ module Makara
 
     # has this node been blacklisted?
     def _makara_blacklisted?
-      @blacklisted_until.to_i > Time.now.to_i
+      @blacklisted_until.present? && @blacklisted_until.to_i > Time.now.to_i
     end
 
     # blacklist this node for @config[:blacklist_duration] seconds

data/lib/makara/context.rb

@@ -13,32 +13,69 @@ module Makara
       end
 
       def get_previous
-        get_current_thread_local_for(:makara_context_previous)
+        fetch(:makara_context_previous) { generate }
       end
 
       def set_previous(context)
-        set_current_thread_local(:makara_context_previous,context)
+        previously_sticky.clear
+        set(:makara_context_previous,context)
       end
 
       def get_current
-        get_current_thread_local_for(:makara_context_current)
+        fetch(:makara_context_current) { generate }
       end
 
       def set_current(context)
-        set_current_thread_local(:makara_context_current,context)
+        set(:makara_context_current,context)
+      end
+
+      def previously_stuck?(config_id)
+        previously_sticky.fetch(config_id) do
+          stuck?(Makara::Context.get_previous, config_id)
+        end
+      end
+
+      # Called by `Proxy#stick_to_master!` to stick subsequent requests to
+      # master. They'll see the current context as their previous context
+      # when they're asking whether they should be stuck to master.
+      def stick(context, config_id, ttl)
+        Makara::Cache.write(cache_key_for(context, config_id), '1', ttl)
+      end
+
+      def stuck?(context, config_id)
+        !!Makara::Cache.read(cache_key_for(context, config_id))
       end
 
       protected
 
-      def get_current_thread_local_for(type)
-        t = Thread.current
-        current = t.respond_to?(:thread_variable_get) ? t.thread_variable_get(type) : t[type]
-        current ||= set_current_thread_local(type,generate)
+      def previously_sticky
+        fetch(:makara_previously_sticky) { Hash.new }
       end
 
-      def set_current_thread_local(type,context)
-        t = Thread.current
-        t.respond_to?(:thread_variable_set) ? t.thread_variable_set(type,context) : t[type]=context
+      def cache_key_for(context, config_id)
+        "makara::#{context}-#{config_id}"
+      end
+
+      def fetch(key)
+        get(key) || set(key,yield)
+      end
+
+      if Thread.current.respond_to?(:thread_variable_get)
+        def get(key)
+          Thread.current.thread_variable_get(key)
+        end
+
+        def set(key,value)
+          Thread.current.thread_variable_set(key,value)
+        end
+      else
+        def get(key)
+          Thread.current[key]
+        end
+
+        def set(key,value)
+          Thread.current[key]=value
+        end
       end
 
     end

data/lib/makara/error_handler.rb

@@ -11,7 +11,7 @@ module Makara
 
     rescue Exception => e
 
-      if e.class.name =~ /^Makara::/
+      if e.is_a?(Makara::Errors::MakaraError)
         harshly(e)
       else
         gracefully(connection, e)

data/lib/makara/errors/all_connections_blacklisted.rb

@@ -1,6 +1,6 @@
 module Makara
   module Errors
-    class AllConnectionsBlacklisted < StandardError
+    class AllConnectionsBlacklisted < MakaraError
 
       def initialize(pool, errors)
         errors = [*errors]

data/lib/makara/errors/blacklist_connection.rb

@@ -1,6 +1,6 @@
 module Makara
   module Errors
-    class BlacklistConnection < ::StandardError
+    class BlacklistConnection < MakaraError
 
       attr_reader :original_error
 

data/lib/makara/errors/makara_error.rb

@@ -0,0 +1,7 @@
+module Makara
+  module Errors
+    class MakaraError < ::ActiveRecord::ActiveRecordError
+
+    end
+  end
+end

data/lib/makara/errors/no_connections_available.rb

@@ -1,6 +1,6 @@
 module Makara
   module Errors
-    class NoConnectionsAvailable < ::StandardError
+    class NoConnectionsAvailable < MakaraError
 
       attr_reader :role
 

data/lib/makara/middleware.rb

@@ -10,9 +10,15 @@ module Makara
 
     IDENTIFIER = '_mkra_ctxt'
 
+    DEFAULT_COOKIE = {
+      :path => '/',
+      :http_only => true,
+      :max_age => '5'
+    }
 
-    def initialize(app)
+    def initialize(app, cookie_options = {})
       @app = app
+      @cookie = DEFAULT_COOKIE.merge(cookie_options)
     end
 
 
@@ -37,7 +43,7 @@ module Makara
     # ignore asset paths
     # consider allowing a filter proc to be provided in an initializer
     def ignore_request?(env)
-      if defined?(Rails)
+      if defined?(Rails) && Rails.try(:application).try(:config).try(:assets).try(:prefix)
         if env['PATH_INFO'].to_s =~ /^#{Rails.application.config.assets.prefix}/
           return true
         end
@@ -94,16 +100,9 @@ module Makara
     # it should always be for the same path, only
     # accessible via http and live for a short amount
     # of time
-    def store_context(status, header)
-
-      cookie_value = {
-        :path => '/',
-        :value => "#{Makara::Context.get_current}--#{status}",
-        :http_only => true,
-        :max_age => '5'
-      }
-
-      Rack::Utils.set_cookie_header!(header, IDENTIFIER, cookie_value)
+    def store_context(status, headers)
+      cookie = @cookie.merge(:value => "#{Makara::Context.get_current}--#{status}")
+      Rack::Utils.set_cookie_header! headers, IDENTIFIER, cookie
     end
   end
 end

data/lib/makara/proxy.rb

@@ -74,18 +74,26 @@ module Makara
 
     def stick_to_master!(write_to_cache = true)
       @master_context = Makara::Context.get_current
-      Makara::Cache.write("makara::#{@master_context}-#{@id}", '1', @ttl) if write_to_cache
+      Makara::Context.stick(@master_context, @id, @ttl) if write_to_cache
     end
 
     def strategy_for(role)
-      strategy_name = @config_parser.makara_config["#{role}_strategy".to_sym]
+      strategy_class_for(strategy_name_for(role)).new(self)
+    end
+
+    def strategy_name_for(role)
+      @config_parser.makara_config["#{role}_strategy".to_sym]
+    end
+
+    def strategy_class_for(strategy_name)
       case strategy_name
       when 'round_robin', 'roundrobin', nil, ''
-        strategy_name = "::Makara::Strategies::RoundRobin"
+        ::Makara::Strategies::RoundRobin
       when 'failover'
-        strategy_name = "::Makara::Strategies::PriorityFailover"
+        ::Makara::Strategies::PriorityFailover
+      else
+        strategy_name.constantize
       end
-      strategy_name.constantize.new(self)
     end
 
     def method_missing(m, *args, &block)
@@ -198,7 +206,6 @@ module Makara
       elsif Makara::Context.get_current == @master_context
         @master_pool
 
-      # the previous context stuck us to master
       elsif previously_stuck_to_master?
 
         # we're only on master because of the previous context so
@@ -242,8 +249,7 @@ module Makara
 
 
     def previously_stuck_to_master?
-      return false unless @sticky
-      !!Makara::Cache.read("makara::#{Makara::Context.get_previous}-#{@id}")
+      @sticky && Makara::Context.previously_stuck?(@id)
     end
 
 

data/lib/makara/version.rb

@@ -3,7 +3,7 @@ module Makara
 
     MAJOR = 0
     MINOR = 3
-    PATCH = 7
+    PATCH = 8
     PRE = nil
 
     def self.to_s

data/spec/active_record/connection_adapters/makara_mysql2_adapter_spec.rb

@@ -20,50 +20,12 @@ describe 'MakaraMysql2Adapter' do
   context "unconnected" do
 
     it 'should allow a connection to be established' do
-      ActiveRecord::Base.establish_connection(config)
+      establish_connection(config)
       expect(ActiveRecord::Base.connection).to be_instance_of(ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter)
     end
 
-    it 'should not blow up if a connection fails' do
-      wrong_config = config.deep_dup
-      wrong_config['makara']['connections'].select{|h| h['role'] == 'slave' }.each{|h| h['username'] = 'other'}
-
-      original_method = ActiveRecord::Base.method(:mysql2_connection)
-
-      allow(ActiveRecord::Base).to receive(:mysql2_connection) do |config|
-        if config[:username] == 'other'
-          raise "could not connect"
-        else
-          original_method.call(config)
-        end
-      end
-
-      ActiveRecord::Base.establish_connection(wrong_config)
-      ActiveRecord::Base.connection
-
-      load(File.dirname(__FILE__) + '/../../support/schema.rb')
-      Makara::Context.set_current Makara::Context.generate
-
-      allow(ActiveRecord::Base).to receive(:mysql2_connection) do |config|
-        config[:username] = db_username
-        original_method.call(config)
-      end
-
-      ActiveRecord::Base.connection.slave_pool.connections.each(&:_makara_whitelist!)
-      ActiveRecord::Base.connection.slave_pool.provide do |con|
-        res = con.execute('SELECT count(*) FROM users')
-        if defined?(JRUBY_VERSION)
-          expect(res[0]).to eq('count(*)' => 0)
-        else
-          expect(res.to_a[0][0]).to eq(0)
-        end
-      end
-
-      ActiveRecord::Base.remove_connection
-    end
-
     it 'should execute a send_to_all against master even if no slaves are connected' do
-      ActiveRecord::Base.establish_connection(config)
+      establish_connection(config)
       connection = ActiveRecord::Base.connection
 
       connection.slave_pool.connections.each do |c|
@@ -82,7 +44,7 @@ describe 'MakaraMysql2Adapter' do
     end
 
     it 'should execute a send_to_all and raise a NoConnectionsAvailable error' do
-      ActiveRecord::Base.establish_connection(config)
+      establish_connection(config)
       connection = ActiveRecord::Base.connection
 
       (connection.slave_pool.connections | connection.master_pool.connections).each do |c|
@@ -97,12 +59,56 @@ describe 'MakaraMysql2Adapter' do
 
     end
 
+    context "unconnect afterwards" do
+      after :each do
+        ActiveRecord::Base.clear_all_connections!
+      end
+
+      it 'should not blow up if a connection fails' do
+        wrong_config = config.deep_dup
+        wrong_config['makara']['connections'].select{|h| h['role'] == 'slave' }.each{|h| h['username'] = 'other'}
+
+        original_method = ActiveRecord::Base.method(:mysql2_connection)
+
+        allow(ActiveRecord::Base).to receive(:mysql2_connection) do |config|
+          if config[:username] == 'other'
+            raise "could not connect"
+          else
+            original_method.call(config)
+          end
+        end
+
+        establish_connection(wrong_config)
+        ActiveRecord::Base.connection
+
+        load(File.dirname(__FILE__) + '/../../support/schema.rb')
+        Makara::Context.set_current Makara::Context.generate
+
+        allow(ActiveRecord::Base).to receive(:mysql2_connection) do |config|
+          config[:username] = db_username
+          original_method.call(config)
+        end
+
+        ActiveRecord::Base.connection.slave_pool.connections.each(&:_makara_whitelist!)
+        ActiveRecord::Base.connection.slave_pool.provide do |con|
+          res = con.execute('SELECT count(*) FROM users')
+          if defined?(JRUBY_VERSION)
+            expect(res[0]).to eq('count(*)' => 0)
+          else
+            expect(res.to_a[0][0]).to eq(0)
+          end
+        end
+
+        ActiveRecord::Base.remove_connection
+      end
+    end
+
   end
 
   context 'with the connection established and schema loaded' do
 
     before do
-      ActiveRecord::Base.establish_connection(config)
+      establish_connection(config)
       load(File.dirname(__FILE__) + '/../../support/schema.rb')
       change_context
     end
@@ -183,7 +189,7 @@ describe 'MakaraMysql2Adapter' do
   describe 'transaction support' do
     shared_examples 'a transaction supporter' do
       before do
-        ActiveRecord::Base.establish_connection(config)
+        establish_connection(config)
         load(File.dirname(__FILE__) + '/../../support/schema.rb')
         change_context
 

data/spec/active_record/connection_adapters/makara_postgresql_adapter_spec.rb

@@ -20,15 +20,14 @@ describe 'MakaraPostgreSQLAdapter' do
 
 
   it 'should allow a connection to be established' do
-    ActiveRecord::Base.establish_connection(config)
+    establish_connection(config)
     expect(ActiveRecord::Base.connection).to be_instance_of(ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter)
   end
 
   context 'with the connection established and schema loaded' do
 
     before do
-          puts config
-      ActiveRecord::Base.establish_connection(config)
+      establish_connection(config)
       load(File.dirname(__FILE__) + '/../../support/schema.rb')
       change_context
     end
@@ -95,7 +94,7 @@ describe 'MakaraPostgreSQLAdapter' do
       custom_config = config.deep_dup
       custom_config['makara']['connections'].select{|h| h['role'] == 'slave' }.each{|h| h['port'] = '1'}
 
-      ActiveRecord::Base.establish_connection(custom_config)
+      establish_connection(custom_config)
       load(File.dirname(__FILE__) + '/../../support/schema.rb')
 
       connection.execute('SELECT * FROM users')
@@ -105,14 +104,14 @@ describe 'MakaraPostgreSQLAdapter' do
 
   context 'with only slave connection' do
     it 'should raise error only on write' do
-      ActiveRecord::Base.establish_connection(config)
+      establish_connection(config)
       load(File.dirname(__FILE__) + '/../../support/schema.rb')
       ActiveRecord::Base.clear_all_connections!
 
       custom_config = config.deep_dup
       custom_config['makara']['connections'].select{|h| h['role'] == 'master' }.each{|h| h['port'] = '1'}
 
-      ActiveRecord::Base.establish_connection(custom_config)
+      establish_connection(custom_config)
 
       connection.execute('SELECT * FROM users')
       expect { connection.execute('INSERT INTO users (name) VALUES (\'John\')') }.to raise_error(Makara::Errors::NoConnectionsAvailable)
@@ -122,7 +121,7 @@ describe 'MakaraPostgreSQLAdapter' do
   describe 'transaction support' do
     shared_examples 'a transaction supporter' do
       before do
-        ActiveRecord::Base.establish_connection(config)
+        establish_connection(config)
         load(File.dirname(__FILE__) + '/../../support/schema.rb')
         change_context
 

data/spec/connection_wrapper_spec.rb

@@ -22,12 +22,19 @@ describe Makara::ConnectionWrapper do
     expect(subject._makara_weight).to eq(1)
   end
 
-  it 'should store the blacklist status' do
-    expect(subject._makara_blacklisted?).to eq(false)
-    subject._makara_blacklist!
-    expect(subject._makara_blacklisted?).to eq(true)
-    subject._makara_whitelist!
-    expect(subject._makara_blacklisted?).to eq(false)
+  context '#_makara_blacklisted?' do
+    it 'should store the blacklist status' do
+      expect(subject._makara_blacklisted?).to eq(false)
+      subject._makara_blacklist!
+      expect(subject._makara_blacklisted?).to eq(true)
+      subject._makara_whitelist!
+      expect(subject._makara_blacklisted?).to eq(false)
+    end
+
+    it 'should handle frozen pre-epoch dates' do
+      Timecop.freeze(Date.new(1900)) do
+        expect(subject._makara_blacklisted?).to eq(false)
+      end
+    end
   end
-
 end

data/spec/context_spec.rb

@@ -101,7 +101,46 @@ describe Makara::Context do
       threads.map(&:join)
       expect(uniq_curret_contexts.uniq.count).to eq(3)
     end
+
+    it 'clears config sticky cache' do
+      Makara::Cache.store = :memory
+
+      Makara::Context.set_previous('a')
+      Makara::Context.stick('a', 1, 10)
+      expect(Makara::Context.previously_stuck?(1)).to be_truthy
+
+      Makara::Context.set_previous('b')
+      expect(Makara::Context.previously_stuck?(1)).to be_falsey
+    end
+  end
+
+  describe 'stick' do
+    it 'sticks a config to master for subsequent requests' do
+      Makara::Cache.store = :memory
+
+      expect(Makara::Context.stuck?('context', 1)).to be_falsey
+
+      Makara::Context.stick('context', 1, 10)
+      expect(Makara::Context.stuck?('context', 1)).to be_truthy
+      expect(Makara::Context.stuck?('context', 2)).to be_falsey
+    end
   end
 
+  describe 'previously_stuck?' do
+    it 'checks whether a config was stuck to master in the previous context' do
+      Makara::Cache.store = :memory
+      Makara::Context.set_previous 'previous'
+
+      # Emulate sticking the previous web request to master.
+      Makara::Context.stick 'previous', 1, 10
+
+      # Emulate handling the subsequent web request with a previous context
+      # cookie that is stuck to master.
+      expect(Makara::Context.previously_stuck?(1)).to be_truthy
+
+      # Other configs should not be stuck to master, though.
+      expect(Makara::Context.previously_stuck?(2)).to be_falsey
+    end
+  end
 end
 

data/spec/middleware_spec.rb

@@ -11,7 +11,7 @@ describe Makara::Middleware do
 
   let(:env){ {} }
   let(:proxy){ FakeProxy.new(config(1,2)) }
-  let(:middleware){ described_class.new(app) }
+  let(:middleware){ described_class.new(app, :secure => true) }
 
   let(:key){ Makara::Middleware::IDENTIFIER }
 
@@ -56,7 +56,7 @@ describe Makara::Middleware do
 
     status, headers, body = middleware.call(env)
 
-    expect(headers['Set-Cookie']).to eq("#{key}=#{Makara::Context.get_current}--200; path=/; max-age=5; HttpOnly")
+    expect(headers['Set-Cookie']).to eq("#{key}=#{Makara::Context.get_current}--200; path=/; max-age=5; secure; HttpOnly")
   end
 
   it 'should preserve the same context if the previous request was a redirect' do

data/spec/spec_helper.rb

@@ -19,13 +19,13 @@ RSpec.configure do |config|
 
   config.order = 'random'
 
+  require "#{File.dirname(__FILE__)}/support/helpers"
   require "#{File.dirname(__FILE__)}/support/proxy_extensions"
   require "#{File.dirname(__FILE__)}/support/pool_extensions"
-  require "#{File.dirname(__FILE__)}/support/configurator"
   require "#{File.dirname(__FILE__)}/support/mock_objects"
   require "#{File.dirname(__FILE__)}/support/deep_dup"
 
-  config.include Configurator
+  config.include SpecHelpers
 
   config.before :each do
     Makara::Cache.store = :memory

data/spec/support/helpers.rb

@@ -0,0 +1,23 @@
+module SpecHelpers
+  def establish_connection(config)
+    connection = ActiveRecord::Base.establish_connection(config)
+
+    # make sure these are all reset to not be blacklisted
+    ActiveRecord::Base.connection.slave_pool.connections.each(&:_makara_whitelist!)
+    ActiveRecord::Base.connection.master_pool.connections.each(&:_makara_whitelist!)
+
+    ActiveRecord::Base.connection
+  end
+
+  def config(masters = 1, slaves = 2)
+    connections = []
+    masters.times{ connections << {:role => 'master'} }
+    slaves.times{ connections << {:role => 'slave'} }
+    {
+      :makara => {
+        :blacklist_duration => 30,
+        :connections => connections
+      }
+    }
+  end
+end

data/spec/support/schema.rb

@@ -1,6 +1,8 @@
 ActiveRecord::Schema.define(:version => 20130628161227) do
 
-  create_table "users", :force => true do |t|
+  drop_table "users" if table_exists? "users"
+
+  create_table "users" do |t|
     t.string   "name"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makara
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -34,19 +34,21 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
-- ".ruby-version"
 - ".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
 - 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
@@ -66,6 +68,7 @@ files:
 - lib/makara/error_handler.rb
 - lib/makara/errors/all_connections_blacklisted.rb
 - lib/makara/errors/blacklist_connection.rb
+- lib/makara/errors/makara_error.rb
 - lib/makara/errors/no_connections_available.rb
 - lib/makara/logging/logger.rb
 - lib/makara/logging/subscriber.rb
@@ -92,8 +95,8 @@ files:
 - spec/spec_helper.rb
 - spec/strategies/priority_failover_spec.rb
 - spec/strategies/round_robin_spec.rb
-- spec/support/configurator.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
@@ -120,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Read-write split your DB yo
@@ -139,8 +142,8 @@ test_files:
 - spec/spec_helper.rb
 - spec/strategies/priority_failover_spec.rb
 - spec/strategies/round_robin_spec.rb
-- spec/support/configurator.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
@@ -148,4 +151,3 @@ test_files:
 - spec/support/postgresql_database.yml
 - spec/support/proxy_extensions.rb
 - spec/support/schema.rb
-has_rdoc: 

data/.ruby-version

@@ -1 +0,0 @@
-2.1.5

data/spec/support/configurator.rb

@@ -1,13 +0,0 @@
-module Configurator
-  def config(masters = 1, slaves = 2)
-    connections = []
-    masters.times{ connections << {:role => 'master'} }
-    slaves.times{ connections << {:role => 'slave'} }
-    {
-      :makara => {
-        :blacklist_duration => 30,
-        :connections => connections
-      }
-    }
-  end
-end