makara 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43f7871351a95b0291a4624bdfded3e1e4bccf3
-  data.tar.gz: feaf04905d1a7293abd47cf32a0f69f23575c609
+  metadata.gz: 2285d0c3c177997ec9e9d8568225f3a1ed1bdf28
+  data.tar.gz: 953d024813b8bd5bae579665a3988c5770f63d38
 SHA512:
-  metadata.gz: 06ce4185196b043f4129039a18a55db3f18816ab8af517372193ac28e2cf8517b4dd0abee9970ab012b0a0f2214fd56e42fcd3fce5643d077a8aa3537bbd4635
-  data.tar.gz: a45e25f35d71242f954d4a5fdeafeb0907399b496d19c9122e227ad04bd0486986ce37e2390877f191a2adc0e7295a37ecade58278c57991b57f6152da3123b1
+  metadata.gz: dc7a2f84b22a57f83d1eb3ef4e615975e405f97b150b6b8d6c4e39b4833b4daa28036f7d838cd2062e64c4cc1ca015f519cf0d91c6c3a8f5f25ea85229e4e3e6
+  data.tar.gz: 528f91cff15ebd34a460d4f79f01679dd457641904df4834ae8179d735a461d23e8dfdae59971bffb019e62aaaabacb8aa36f440bd2165e5ca2835e58a69f8e4

data/.travis.yml

@@ -9,6 +9,7 @@ services:
 before_script:
   - mysql -e 'create database makara_test;'
   - psql -c 'create database makara_test;' -U postgres
+  - psql -c 'create extension postgis;' -U postgres
 
 rvm:
   - 2.0

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## v0.3.8 - 2016-07-11
+
+[Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.7...v0.3.8) 
+
+Changed
+- Rails 5.1 compatibility [#150](https://github.com/taskrabbit/makara/pull/150) Jeremy Daer
+- Minimize redundant context cache requests [#157](https://github.com/taskrabbit/makara/issues/157) Greg Patrick
+- thread-local cache for previous context stickiness [#158](https://github.com/taskrabbit/makara/issues/158)  Jeremy Daer
+- Configurable cookie options [#159](https://github.com/taskrabbit/makara/pull/159) Jeremy Daer
+- Test against Rails 5.x and Ruby 2.x [#160](https://github.com/taskrabbit/makara/pull/160) Jeremy Daer
+
 ## v0.3.7 - 2016-09-22
 
 [Full Changelog](https://github.com/taskrabbit/makara/compare/v0.3.6...v0.3.7)

data/Gemfile

@@ -12,7 +12,8 @@ gem 'rack', '1.6.0'
 
 gem 'mysql2', :platform => :ruby
 gem 'pg', :platform => :ruby
+gem 'activerecord-postgis-adapter', :platform => :ruby
+gem 'rgeo', :platform => :ruby
 
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-

data/gemfiles/ar30.gemfile

@@ -12,6 +12,8 @@ gem 'i18n', '~> 0.5.0'
 gem 'mysql2', '0.2.11', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+gem 'activerecord-postgis-adapter', :platform => :ruby
+gem 'rgeo', :platform => :ruby
 
 
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)

data/gemfiles/ar31.gemfile

@@ -12,6 +12,8 @@ gem 'i18n', '~> 0.6.0'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+gem 'activerecord-postgis-adapter', :platform => :ruby
+gem 'rgeo', :platform => :ruby
 
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
 

data/gemfiles/ar32.gemfile

@@ -12,6 +12,8 @@ gem 'i18n', '~> 0.6.0'
 gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+gem 'activerecord-postgis-adapter', :platform => :ruby
+gem 'rgeo', :platform => :ruby
 
 rmajor, rminor, rpatch = RUBY_VERSION.split(/[^\d]/)[0..2].map(&:to_i)
 

data/gemfiles/ar40.gemfile

@@ -13,3 +13,5 @@ gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'pg', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+gem 'activerecord-postgis-adapter', :platform => :ruby
+gem 'rgeo', :platform => :ruby

data/gemfiles/ar41.gemfile

@@ -13,3 +13,5 @@ gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'pg', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+gem 'activerecord-postgis-adapter', :platform => :ruby
+gem 'rgeo', :platform => :ruby

data/gemfiles/ar42.gemfile

@@ -13,3 +13,5 @@ gem 'mysql2', '~> 0.3.10', :platform => :ruby
 gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
 gem 'pg', :platform => :ruby
 gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+gem 'activerecord-postgis-adapter', :platform => :ruby
+gem 'rgeo', :platform => :ruby

data/lib/active_record/connection_adapters/makara_postgis_adapter.rb

@@ -0,0 +1,41 @@
+require 'active_record/connection_adapters/makara_abstract_adapter'
+require 'active_record/connection_adapters/postgis_adapter'
+
+if ActiveRecord::VERSION::MAJOR >= 4
+
+  module ActiveRecord
+    module ConnectionHandling
+      def makara_postgis_connection(config)
+        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
+      end
+    end
+  end
+
+else
+
+  module ActiveRecord
+    class Base
+      def self.makara_postgis_connection(config)
+        ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter.new(config)
+      end
+    end
+  end
+
+end
+
+
+module ActiveRecord
+  module ConnectionAdapters
+    class MakaraPostgisAdapter < ActiveRecord::ConnectionAdapters::MakaraAbstractAdapter
+      def self.visitor_for(*args)
+        ActiveRecord::ConnectionAdapters::PostGISAdapter.visitor_for(*args)
+      end
+
+      protected
+
+      def active_record_connection_for(config)
+        ::ActiveRecord::Base.postgis_connection(config)
+      end
+    end
+  end
+end

data/lib/makara/version.rb

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

data/spec/active_record/connection_adapters/makara_postgis_adapter_spec.rb

@@ -0,0 +1,150 @@
+# RGeo doesn't play well with JRuby and to avoid complicated test setup
+# we're only testing ActiveRecord version ~> 4.2
+if RUBY_ENGINE == 'ruby' &&
+    ActiveRecord::VERSION::MAJOR == 4 &&
+    ActiveRecord::VERSION::MINOR >= 2
+
+  require 'spec_helper'
+  require 'rgeo'
+  require 'activerecord-postgis-adapter'
+  require 'active_record/connection_adapters/postgis_adapter'
+
+  describe 'MakaraPostgisAdapter' do
+    let(:db_username){ ENV['TRAVIS'] ? 'postgres' : `whoami`.chomp }
+
+    let(:config) do
+      base = YAML.load_file(File.expand_path('spec/support/postgis_database.yml'))['test']
+      base['username'] = db_username
+      base
+    end
+
+    let(:connection) { ActiveRecord::Base.connection }
+
+    before :each do
+      ActiveRecord::Base.clear_all_connections!
+      change_context
+    end
+
+    it 'should allow a connection to be established' do
+      ActiveRecord::Base.establish_connection(config)
+      expect(ActiveRecord::Base.connection)
+        .to be_instance_of(ActiveRecord::ConnectionAdapters::MakaraPostgisAdapter)
+    end
+
+    context 'with the connection established and schema loaded' do
+      before do
+        ActiveRecord::Base.establish_connection(config)
+        load(File.dirname(__FILE__) + '/../../support/schema.rb')
+        load(File.dirname(__FILE__) + '/../../support/postgis_schema.rb')
+        change_context
+        RGeo::ActiveRecord::SpatialFactoryStore.instance.tap do |config|
+          # By default, use the GEOS implementation for spatial columns.
+          config.default = RGeo::Geos.factory_generator
+
+          # But use a geographic implementation for point columns.
+          config.register(RGeo::Geographic.spherical_factory(srid: 4326), geo_type: "point")
+        end
+      end
+
+      let(:town_class) do
+        Class.new(ActiveRecord::Base) do
+          self.table_name = :towns
+        end
+      end
+
+      it 'should have one master and two slaves' do
+        expect(connection.master_pool.connection_count).to eq(1)
+        expect(connection.slave_pool.connection_count).to eq(2)
+      end
+
+      it 'should allow real queries to work' do
+        connection.execute('INSERT INTO users (name) VALUES (\'John\')')
+
+        connection.master_pool.connections.each do |master|
+          expect(master).to receive(:execute).never
+        end
+
+        change_context
+        res = connection.execute('SELECT name FROM users ORDER BY id DESC LIMIT 1')
+
+        expect(res.to_a[0]['name']).to eq('John')
+      end
+
+      it 'should send SET operations to each connection' do
+        connection.master_pool.connections.each do |con|
+          expect(con).to receive(:execute).with("SET TimeZone = 'UTC'").once
+        end
+
+        connection.slave_pool.connections.each do |con|
+          expect(con).to receive(:execute).with("SET TimeZone = 'UTC'").once
+        end
+        connection.execute("SET TimeZone = 'UTC'")
+      end
+
+      it 'should send reads to the slave' do
+        # ensure the next connection will be the first one
+        connection.slave_pool
+                  .strategy
+                  .instance_variable_set('@current_idx',
+                                         connection.slave_pool.connections.length)
+
+        con = connection.slave_pool.connections.first
+        expect(con).to receive(:execute).with('SELECT * FROM users').once
+
+        connection.execute('SELECT * FROM users')
+      end
+
+      it 'should send writes to master' do
+        con = connection.master_pool.connections.first
+        expect(con).to receive(:execute).with('UPDATE users SET name = "bob" WHERE id = 1')
+        connection.execute('UPDATE users SET name = "bob" WHERE id = 1')
+      end
+
+      it 'should interpret points correctly' do
+        town_class.create!(location: 'Point(1 2)')
+        town = town_class.last
+        expect(town.location.x).to eq 1
+        expect(town.location.y).to eq 2
+      end
+    end
+
+    context 'without live connections' do
+      it 'should raise errors on read or write' do
+        allow(ActiveRecord::Base).to receive(:postgis_connection).and_raise(StandardError.new('could not connect to server: Connection refused'))
+
+        ActiveRecord::Base.establish_connection(config)
+        expect { connection.execute('SELECT * FROM users') }.to raise_error(Makara::Errors::NoConnectionsAvailable)
+        expect { connection.execute('INSERT INTO users (name) VALUES (\'John\')') }.to raise_error(Makara::Errors::NoConnectionsAvailable)
+      end
+    end
+
+    context 'with only master connection' do
+      it 'should not raise errors on read and write' 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)
+        load(File.dirname(__FILE__) + '/../../support/schema.rb')
+
+        connection.execute('SELECT * FROM users')
+        connection.execute('INSERT INTO users (name) VALUES (\'John\')')
+      end
+    end
+
+    context 'with only slave connection' do
+      it 'should raise error only on write' do
+        ActiveRecord::Base.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)
+
+        connection.execute('SELECT * FROM users')
+        expect { connection.execute('INSERT INTO users (name) VALUES (\'John\')') }.to raise_error(Makara::Errors::NoConnectionsAvailable)
+      end
+    end
+  end
+end

data/spec/active_record/connection_adapters/makara_postgresql_adapter_spec.rb

@@ -5,11 +5,11 @@ describe 'MakaraPostgreSQLAdapter' do
 
   let(:db_username){ ENV['TRAVIS'] ? 'postgres' : `whoami`.chomp }
 
-  let(:config){
+  let(:config) do
     base = YAML.load_file(File.expand_path('spec/support/postgresql_database.yml'))['test']
     base['username'] = db_username
     base
-  }
+  end
 
   let(:connection) { ActiveRecord::Base.connection }
 

data/spec/config_parser_spec.rb

@@ -97,8 +97,7 @@ describe Makara::ConfigParser do
           :top_level => 'value',
           :sticky => true,
           :blacklist_duration => 30,
-          :master_ttl => 5,
-          :sticky => true
+          :master_ttl => 5
         }
       ])
       expect(parser.slave_configs).to eq([
@@ -107,16 +106,14 @@ describe Makara::ConfigParser do
           :top_level => 'value',
           :sticky => true,
           :blacklist_duration => 30,
-          :master_ttl => 5,
-          :sticky => true
+          :master_ttl => 5
         },
         {
           :name => 'slave2',
           :top_level => 'value',
           :sticky => true,
           :blacklist_duration => 30,
-          :master_ttl => 5,
-          :sticky => true
+          :master_ttl => 5
         }
       ])
     end
@@ -133,8 +130,7 @@ describe Makara::ConfigParser do
           :top_level => 'value',
           :sticky => true,
           :blacklist_duration => 456,
-          :master_ttl => 5,
-          :sticky => true
+          :master_ttl => 5
         }
       ])
       expect(parser.slave_configs).to eq([
@@ -143,16 +139,14 @@ describe Makara::ConfigParser do
           :top_level => 'slave value',
           :sticky => true,
           :blacklist_duration => 123,
-          :master_ttl => 5,
-          :sticky => true
+          :master_ttl => 5
         },
         {
           :name => 'slave2',
           :top_level => 'value',
           :sticky => true,
           :blacklist_duration => 123,
-          :master_ttl => 5,
-          :sticky => true
+          :master_ttl => 5
         }
       ])
     end

data/spec/support/postgis_database.yml

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

data/spec/support/postgis_schema.rb

@@ -0,0 +1,8 @@
+
+ActiveRecord::Schema.define(:version => 20160518161227) do
+  execute "create extension if not exists postgis"
+
+  create_table "towns", :force => true do |t|
+    t.st_point "location"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makara
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -55,6 +55,7 @@ files:
 - 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
@@ -84,6 +85,7 @@ 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
@@ -101,6 +103,8 @@ files:
 - 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
@@ -131,6 +135,7 @@ 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
@@ -148,6 +153,8 @@ test_files:
 - 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