switch_point 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3044b7a1ae2a9a6e022a82440cfaeaaabe90da64
-  data.tar.gz: 7640bd6b1a38e93f84f54c2980d32848fa2260da
+  metadata.gz: 4afa0b36c03b080fc4800b6237d223dc185c9128
+  data.tar.gz: 5c06160f5c593b5b0798535af848e925d74b1d67
 SHA512:
-  metadata.gz: 641b875847d36f8878eb954d0a950384d770ecc4b779c36ddfd5d741c94f103c1d0422a823c8b03a1c2f610c540c8bf2aedbac9bfa423f119b0e7159c081d20d
-  data.tar.gz: 78da2c2d465bd5660946c7b74bf1ad23c00ca2deae3af478737dcbad716316bf4d2ffccd2333359816ae81d2bb8e1c996bcc54e91f3c0e1adfd04cdf918437e1
+  metadata.gz: d910ecf318574828396c4bfcf384dff8ee1f6282693ff19f000115ea92c3dea3df896271ea9b62e23ccbb5baab1ea8cd7337e337bbcbad5fb407bc019ef77195
+  data.tar.gz: 397bfbe529603a7f4d588c013e1e3ed75774559df8a377c33dd7330651e137741de7cd65337ca2d6b98a4276d02520f5cb5106d7ec75dc99f6f0521cdb7185a3

data/.rubocop.yml

@@ -1,8 +1,17 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  DisplayCopNames: true
+
+Performance/RedundantBlockCall:
+  Enabled: false
+
 Style/AlignParameters:
   Enabled: false
 
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
 Style/BlockDelimiters:
   Enabled: false
 
@@ -32,5 +41,8 @@ Style/RaiseArgs:
 Style/SignalException:
   Enabled: false
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
   Enabled: false

data/.travis.yml

@@ -1,14 +1,16 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.2.5
+  - 2.3.1
+  - jruby-9.1.0.0
+  - jruby-head
   - ruby-head
 gemfile:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_edge.gemfile
 sudo: false
 after_script:
@@ -16,10 +18,9 @@ after_script:
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: jruby-head
     - gemfile: gemfiles/rails_edge.gemfile
-  exclude:
-    # Rails 5 requires to run on Ruby 2.2.0 or newer.
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails_edge.gemfile
+    # Wait for activerecord-jdbcsqlite3-adapter's support
+    # https://github.com/jruby/activerecord-jdbc-adapter/labels/rails-5.x
+    - rvm: jruby-9.1.0.0
+      gemfile: gemfiles/rails_5.0.gemfile

data/Appraisals

@@ -1,22 +1,80 @@
 appraise 'rails-3.2' do
   gem 'activerecord', '~> 3.2'
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'json'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
 end
 
 appraise 'rails-4.0' do
   gem 'activerecord', '~> 4.0'
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'json'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
 end
 
 appraise 'rails-4.1' do
   gem 'activerecord', '~> 4.1'
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'json'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
 end
 
 appraise 'rails-4.2' do
   gem 'activerecord', '~> 4.2'
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'json'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
+end
+
+appraise 'rails-5.0' do
+  gem 'activerecord', '>= 5.0.0.rc1'
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'json'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  end
 end
 
 appraise 'rails-edge' do
   gem 'activerecord', git: 'https://github.com/rails/rails'
   gem 'arel', git: 'https://github.com/rails/arel'
+
+  platforms :ruby do
+    gem 'sqlite3'
+  end
+
+  platforms :jruby do
+    gem 'json'
+    gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+  end
 end
 
 # vim: set ft=ruby:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.8.0 (2016-06-06)
+- Drop Ruby 2.0.0 and 2.1 support
+- Add `AR::Base#with_readonly` and `AR::Base#with_writable`
+    - short-hand for `AR::Base.with_readonly` and `AR::Base.with_writable`
+- Add `AR::Base#transaction_with`
+    - short-hand for `AR::Base.transaction_with`
+- Fix warnings for Rails 5.0
+
 ## 0.7.0 (2015-10-16)
 - `Model.with_readonly` and `Model.with_writable` now raises error when the Model doesn't use switch_point
 

data/Gemfile

@@ -2,3 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in switch_point.gemspec
 gemspec
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'json'
+  gem 'activerecord-jdbcsqlite3-adapter'
+end

data/gemfiles/rails_3.2.gemfile

@@ -4,4 +4,13 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "json"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -4,4 +4,13 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "json"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -4,4 +4,13 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "json"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -4,4 +4,13 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "json"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", ">= 5.0.0.rc1"
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "json"
+  gem "activerecord-jdbcsqlite3-adapter"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -5,4 +5,13 @@ source "https://rubygems.org"
 gem "activerecord", :git => "https://github.com/rails/rails"
 gem "arel", :git => "https://github.com/rails/arel"
 
+platforms :ruby do
+  gem "sqlite3"
+end
+
+platforms :jruby do
+  gem "json"
+  gem "activerecord-jdbcsqlite3-adapter", :git => "https://github.com/jruby/activerecord-jdbc-adapter", :branch => "master"
+end
+
 gemspec :path => "../"

data/lib/switch_point.rb

@@ -66,9 +66,6 @@ ActiveSupport.on_load(:active_record) do
 
   ActiveRecord::Base.send(:include, SwitchPoint::Model)
   ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-    include SwitchPoint::Connection
-    SwitchPoint::Connection::DESTRUCTIVE_METHODS.each do |method_name|
-      alias_method_chain method_name, :switch_point
-    end
+    prepend SwitchPoint::Connection
   end
 end

data/lib/switch_point/connection.rb

@@ -4,20 +4,21 @@ require 'switch_point/proxy_repository'
 module SwitchPoint
   module Connection
     # See ActiveRecord::ConnectionAdapters::QueryCache
-    DESTRUCTIVE_METHODS = [:insert, :update, :delete]
+    DESTRUCTIVE_METHODS = [:insert, :update, :delete].freeze
 
     DESTRUCTIVE_METHODS.each do |method_name|
-      define_method(:"#{method_name}_with_switch_point") do |*args, &block|
-        parent_method = :"#{method_name}_without_switch_point"
+      define_method(method_name) do |*args, &block|
         if pool.equal?(ActiveRecord::Base.connection_pool)
-          Connection.handle_base_connection(self, parent_method, *args, &block)
+          Connection.handle_base_connection(self)
+          super(*args, &block)
         else
+          parent_method = method(method_name).super_method
           Connection.handle_generated_connection(self, parent_method, method_name, *args, &block)
         end
       end
     end
 
-    def self.handle_base_connection(conn, parent_method, *args, &block)
+    def self.handle_base_connection(conn)
       switch_points = conn.pool.spec.config[:switch_points]
       if switch_points
         switch_points.each do |switch_point|
@@ -28,7 +29,6 @@ module SwitchPoint
           purge_readonly_query_cache(proxy)
         end
       end
-      conn.send(parent_method, *args, &block)
     end
 
     def self.handle_generated_connection(conn, parent_method, method_name, *args, &block)
@@ -44,12 +44,12 @@ module SwitchPoint
           end
         when :writable
           purge_readonly_query_cache(proxy)
-          conn.send(parent_method, *args, &block)
+          parent_method.call(*args, &block)
         else
           raise Error.new("Unknown mode #{switch_point[:mode]} is given with #{name}")
         end
       else
-        conn.send(parent_method, *args, &block)
+        parent_method.call(*args, &block)
       end
     end
 

data/lib/switch_point/model.rb

@@ -4,39 +4,26 @@ require 'switch_point/proxy_repository'
 module SwitchPoint
   module Model
     def self.included(model)
+      super
       model.singleton_class.class_eval do
         include ClassMethods
-        alias_method_chain :connection, :switch_point
-        alias_method_chain :cache, :switch_point
-        alias_method_chain :uncached, :switch_point
+        prepend MonkeyPatch
       end
     end
 
-    module ClassMethods
-      def connection_with_switch_point
-        if switch_point_proxy
-          switch_point_proxy.connection
-        else
-          connection_without_switch_point
-        end
-      end
+    def with_readonly(&block)
+      self.class.with_readonly(&block)
+    end
 
-      def cache_with_switch_point(&block)
-        if switch_point_proxy
-          switch_point_proxy.cache(&block)
-        else
-          cache_without_switch_point(&block)
-        end
-      end
+    def with_writable(&block)
+      self.class.with_writable(&block)
+    end
 
-      def uncached_with_switch_point(&block)
-        if switch_point_proxy
-          switch_point_proxy.uncached(&block)
-        else
-          uncached_without_switch_point(&block)
-        end
-      end
+    def transaction_with(*models, &block)
+      self.class.transaction_with(*models, &block)
+    end
 
+    module ClassMethods
       def with_readonly(&block)
         if switch_point_proxy
           switch_point_proxy.with_readonly(&block)
@@ -59,7 +46,7 @@ module SwitchPoint
       end
 
       def switch_point_proxy
-        if @switch_point_name
+        if defined?(@switch_point_name)
           ProxyRepository.checkout(@switch_point_name)
         elsif self == ActiveRecord::Base
           nil
@@ -97,5 +84,31 @@ module SwitchPoint
         writable_switch_points.uniq.size == 1
       end
     end
+
+    module MonkeyPatch
+      def connection
+        if switch_point_proxy
+          switch_point_proxy.connection
+        else
+          super
+        end
+      end
+
+      def cache(&block)
+        if switch_point_proxy
+          switch_point_proxy.cache(&block)
+        else
+          super
+        end
+      end
+
+      def uncached(&block)
+        if switch_point_proxy
+          switch_point_proxy.uncached(&block)
+        else
+          super
+        end
+      end
+    end
   end
 end

data/lib/switch_point/proxy.rb

@@ -4,7 +4,7 @@ module SwitchPoint
   class Proxy
     attr_reader :initial_name
 
-    AVAILABLE_MODES = [:writable, :readonly]
+    AVAILABLE_MODES = [:writable, :readonly].freeze
     DEFAULT_MODE = :readonly
 
     def initialize(name)

data/lib/switch_point/version.rb

@@ -1,3 +1,3 @@
 module SwitchPoint
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'.freeze
 end

data/spec/models.rb

@@ -85,7 +85,12 @@ class DerivedNanika2 < AbstractNanika
   use_switch_point :main2
 end
 
-base = { adapter: 'sqlite3' }
+base =
+  if RUBY_PLATFORM == 'java'
+    { adapter: 'jdbcsqlite3' }
+  else
+    { adapter: 'sqlite3' }
+  end
 ActiveRecord::Base.configurations = {
   'main_readonly' => base.merge(database: 'main_readonly.sqlite3'),
   'main_writable' => base.merge(database: 'main_writable.sqlite3'),

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'coveralls'
 require 'simplecov'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatters = [
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter,
 ]

data/spec/switch_point/model_spec.rb

@@ -242,6 +242,16 @@ RSpec.describe SwitchPoint::Model do
     end
   end
 
+  describe '#with_writable' do
+    it 'behaves like .with_writable' do
+      book = Book.with_writable { Book.create! }
+      book.with_writable do
+        expect(Book).to connect_to('main_writable.sqlite3')
+      end
+      expect(Book).to connect_to('main_readonly.sqlite3')
+    end
+  end
+
   describe '.with_readonly' do
     context 'when writable! is called globally' do
       before do
@@ -261,6 +271,24 @@ RSpec.describe SwitchPoint::Model do
     end
   end
 
+  describe '#with_readonly' do
+    before do
+      SwitchPoint.writable!(:main)
+    end
+
+    after do
+      SwitchPoint.readonly!(:main)
+    end
+
+    it 'behaves like .with_readonly' do
+      book = Book.create!
+      book.with_readonly do
+        expect(Book).to connect_to('main_readonly.sqlite3')
+      end
+      expect(Book).to connect_to('main_writable.sqlite3')
+    end
+  end
+
   describe '#with_mode' do
     it 'raises error if unknown mode is given' do
       expect { SwitchPoint::ProxyRepository.checkout(:main).with_mode(:typo) }.to raise_error(ArgumentError)
@@ -398,6 +426,20 @@ RSpec.describe SwitchPoint::Model do
     end
   end
 
+  describe '#transaction_with' do
+    it 'behaves like .transaction_with' do
+      book = Book.with_writable { Book.create! }
+      expect(Book.with_writable { Book.count }).to eq(1)
+      book.transaction_with(Book2) do
+        Book.create!
+        raise ActiveRecord::Rollback
+      end
+      expect(Book.with_writable { Book.count }).to eq(1)
+
+      expect { book.transaction_with(Book3) {} }.to raise_error(SwitchPoint::Error)
+    end
+  end
+
   describe '.cache' do
     it 'enables query cache for both readonly and writable' do
       Book.connection

data/switch_point.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'benchmark-ips'
@@ -25,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'rubocop', '>= 0.37.0'
+  spec.add_development_dependency 'simplecov', '>= 0.9.0'
   spec.add_dependency 'activerecord', '>= 3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switch_point
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.37.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/switch_point.rb
 - lib/switch_point/config.rb
@@ -202,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Switching database connection between readonly one and writable one.