replidog 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb2c9700cd4d59f081d362c08eac02be9943b8cc
-  data.tar.gz: 33f1819e45ec2d9ebd7bcdf7a76186b552fe72a5
+  metadata.gz: 8ec8e3d8618bb810ace3ee9be783e4166d82c992
+  data.tar.gz: 0f017082c512b0f7dd2c47d4ed977ff13397cc58
 SHA512:
-  metadata.gz: 2b0ea44389e81fb76b256d77658bf1557f7198308f23a7735b012ff3405d99496f8d52ad7a166c4f235fe9338cd338cc4c2ed07c5f1b1a79faafca5c6259ce7c
-  data.tar.gz: af3bf2d9607c49327c52878fae02bde825db827124d702f96934dd1561866aabaf7bb20bbec95146383e7151cf7b239a15080f802175043bab53275f8531a715
+  metadata.gz: c3eaa6a06b93046965dff10ad76fda903da270e5f51a825de7a6336d0a4fc13183e32367f1fb5ef2b8a3b2463beb9255e862fdba2160f6d7f941b3b9486578b0
+  data.tar.gz: 5243365c8633fbdab2bf922bade51136d7623f956a913c1cbe4bb684bbc2f78a2ab8f1b9a1f73066bdb0a26cc53ce1967464b887297656fe9415df8c205f3a06

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+before_script:
+  - "rake db:prepare"
+rvm:
+  - 2.2.2
+  - 2.3.1
+gemfile:
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails4.gemfile
+  - gemfiles/rails41.gemfile
+  - gemfiles/rails42.gemfile
+  - gemfiles/rails5.gemfile

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.1
+- Support locking
+
 ## 1.1.0
 - Support multithread
 

data/README.md

@@ -181,8 +181,17 @@ List of overridden methods
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/replidog/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+```
+# setup gems
+bundle install
+appraisal install
+
+# setup databases
+rake db:prepare
+
+# run tests for current gemfile
+rake
+
+# run tests for all appraisals
+appraisal rake
+```

data/Rakefile

@@ -1,2 +1,46 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new
+task :default => [:spec]
+
+namespace :db do
+  task :prepare do
+    require File.expand_path("spec/dummy/config/application", File.dirname(__FILE__))
+    Dummy::Application.load_tasks
+
+    orig_env = ENV["RAILS_ENV"]
+    begin
+      Rails.env = "test_db_migration"
+      Rake::Task["db:create"].invoke
+      Rake::Task["db:schema:load"].invoke
+    ensure
+      ENV["RAILS_ENV"] = orig_env
+    end
+
+    file = File.expand_path('spec/dummy/config/database.yml', File.dirname(__FILE__))
+    config = YAML.load_file(file)
+
+    case config["test"]["adapter"]
+    when "mysql2"
+      3.times do |i|
+        system("mysql -u root -e 'drop database replidog_test_slave#{i + 1}' > /dev/null 2> /dev/null")
+        system("mysql -u root -e 'create database replidog_test_slave#{i + 1}'")
+        system("mysqldump -u root replidog_test | mysql -u root replidog_test_slave#{i + 1}")
+      end
+      system("mysql -u root -e 'drop database replidog_test_user' > /dev/null 2> /dev/null")
+      system("mysql -u root -e 'drop database replidog_test_user_slave' > /dev/null 2> /dev/null")
+      system("mysql -u root -e 'create database replidog_test_user'")
+      system("mysql -u root -e 'create database replidog_test_user_slave'")
+      system("mysqldump -u root replidog_test | mysql -u root replidog_test_user")
+      system("mysqldump -u root replidog_test | mysql -u root replidog_test_user_slave")
+    when "sqlite"
+      3.times do |i|
+        FileUtils.copy("#{Rails.root}/db/test.sqlite3", "#{Rails.root}/db/test_slave#{i + 1}.sqlite3")
+      end
+      FileUtils.copy("#{Rails.root}/db/test.sqlite3", "#{Rails.root}/db/test_user.sqlite3")
+      FileUtils.copy("#{Rails.root}/db/test.sqlite3", "#{Rails.root}/db/test_user_slave.sqlite3")
+    end
+  end
+end

data/lib/replidog/model.rb

@@ -1,4 +1,3 @@
-require "active_support/core_ext/module/aliasing"
 require "active_support/core_ext/class/attribute"
 
 module Replidog
@@ -6,16 +5,14 @@ module Replidog
     def self.extended(base)
       base.class_attribute :proxy_handler, instance_writer: false
       base.proxy_handler = Replidog::ProxyHandler.new
+      base.prepend InstanceMethodsWithReplidogSupport
 
       class << base
-        alias_method :connected_without_replidog?, :connected?
-        alias_method :connection_without_replidog, :connection
-
-        prepend BaseWithReplidogSupport
+        prepend ClassMethodsWithReplidogSupport
       end
     end
 
-    module BaseWithReplidogSupport
+    module ClassMethodsWithReplidogSupport
       def establish_connection(spec = ENV["DATABASE_URL"])
         super
         proxy_handler.remove_connection(self)
@@ -56,6 +53,16 @@ module Replidog
       end
     end
 
+    module InstanceMethodsWithReplidogSupport
+      def lock!
+        old_connection_name = self.class.connection.current_connection_name
+        self.class.connection.current_connection_name ||= :master
+        super
+      ensure
+        self.class.connection.current_connection_name = old_connection_name
+      end
+    end
+
     def replicated?
       connection_config[:replications].present?
     end

data/lib/replidog/proxy.rb

@@ -34,15 +34,23 @@ module Replidog
     end
 
     def transaction(options = {}, &block)
-      old = current_connection_name
+      old_connection_name = current_connection_name
       self.current_connection_name ||= :master
       current_connection.transaction(options, &block)
     ensure
-      self.current_connection_name = old
+      self.current_connection_name = old_connection_name
+    end
+
+    def lock(locks = true)
+      old_connection_name = current_connection_name
+      self.current_connection_name ||= :master
+      current_connection.lock(locks)
+    ensure
+      self.current_connection_name = old_connection_name
     end
 
     def connected?
-      current_model.connected_without_replidog? && slave_connection_pool_table.values.any?(&:connected?)
+      current_model.connection_handler.connected?(current_model) && slave_connection_pool_table.values.any?(&:connected?)
     end
 
     def clear_active_slave_connections!
@@ -121,7 +129,7 @@ module Replidog
     end
 
     def master_connection
-      current_model.connection_without_replidog
+      current_model.retrieve_connection
     end
 
     def slave_connection

data/lib/replidog/version.rb

@@ -1,3 +1,3 @@
 module Replidog
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/replidog.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "coffee-rails", ">= 3.2.0"
-  spec.add_development_dependency "database_rewinder"
+  spec.add_development_dependency "database_rewinder", "~> 0.6.0"
   spec.add_development_dependency "jquery-rails"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-rails"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rails", ">= 3.2.0"
   spec.add_development_dependency "rspec", ">= 3"
   spec.add_development_dependency "rspec-rails", ">= 3"

data/spec/dummy/config/database.yml

@@ -3,19 +3,19 @@
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
-development:
+default: &default
   adapter: mysql2
-  database: dummy_development
   username: root
   pool: 5
   timeout: 5000
 
+development:
+  <<: *default
+  database: replidog_development
+
 test_default: &test_default
-  adapter: mysql2
-  database: dummy_test
-  username: root
-  pool: 5
-  timeout: 5000
+  <<: *default
+  database: replidog_test
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -23,15 +23,15 @@ test_default: &test_default
 
 test_slave1: &test_slave1
   <<: *test_default
-  database: dummy_test_slave1
+  database: replidog_test_slave1
 
 test_slave2: &test_slave2
   <<: *test_default
-  database: dummy_test_slave2
+  database: replidog_test_slave2
 
 test_slave3: &test_slave3
   <<: *test_default
-  database: dummy_test_slave3
+  database: replidog_test_slave3
 
 test:
   <<: *test_default
@@ -45,11 +45,11 @@ test:
 
 test_user_slave: &test_user_slave
   <<: *test_default
-  database: dummy_test_user_slave
+  database: replidog_test_user_slave
 
 test_user:
   <<: *test_default
-  database: dummy_test_user
+  database: replidog_test_user
   replications:
     slave:
       <<: *test_user_slave
@@ -57,9 +57,9 @@ test_user:
 test_admin:
   <<: *test_default
 
+test_db_migration:
+  <<: *test_default
+
 production:
-  adapter: mysql2
-  database: dummy_test
-  username: root
-  pool: 5
-  timeout: 5000
+  <<: *default
+  database: replidog_production

data/spec/dummy/db/schema.rb

@@ -31,14 +31,14 @@ ActiveRecord::Schema.define(version: 0) do
     t.datetime "updated_at"
   end
 
-  create_table "profile", force: true do |t|
+  create_table "profiles", force: true do |t|
     t.integer  "user_id", null: false
     t.string   "nickname", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "admin", force: true do |t|
+  create_table "admins", force: true do |t|
     t.string   "name", null: false
     t.datetime "created_at"
     t.datetime "updated_at"

data/spec/replidog/model_spec.rb

@@ -24,13 +24,13 @@ describe Replidog::Model do
   describe ".establish_connection" do
     context "with no args" do
       it 'establishes connection' do
-        expect(Recipe.connection.current_database).to eq "dummy_test"
+        expect(Recipe.connection.current_database).to eq "replidog_test"
       end
     end
 
     context "with args" do
       it 'establishes connection' do
-        expect(User.connection.current_database).to eq "dummy_test_user"
+        expect(User.connection.current_database).to eq "replidog_test_user"
       end
     end
   end
@@ -223,28 +223,6 @@ describe Replidog::Model do
     end
   end
 
-  describe "#transaction" do
-    context "without using" do
-      it "executes SQL query on master connection" do
-        Recipe.using(:slave1).create(title: "test")
-        Recipe.using(:slave2).create(title: "test")
-        Recipe.using(:slave3).create(title: "test")
-        Recipe.transaction do
-          expect(Recipe.first).to be_nil
-        end
-      end
-    end
-
-    context "with using slave name" do
-      it "executes SQL query on slave connection" do
-        Recipe.using(:slave1).create(title: "test")
-        Recipe.using(:slave1).transaction do
-          expect(Recipe.first).not_to be_nil
-        end
-      end
-    end
-  end
-
   describe ".clear_active_connections!" do
     before do
       activate_connection_pools
@@ -306,4 +284,24 @@ describe Replidog::Model do
       end
     end
   end
+
+  describe "#lock!" do
+    context "without using" do
+      it "executes SQL query on master connection" do
+        Recipe.using(:slave1).create(title: "test")
+        Recipe.using(:slave2).create(title: "test")
+        Recipe.using(:slave3).create(title: "test")
+        expect{ Recipe.first.lock! }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context "with using slave name" do
+      it "executes SQL query on slave connection" do
+        Recipe.using(:slave1).create(title: "test")
+        Recipe.using(:slave1) do
+          expect(Recipe.first.lock!).to eq Recipe.first
+        end
+      end
+    end
+  end
 end

data/spec/replidog/proxy_spec.rb

@@ -6,6 +6,50 @@ describe Replidog::Proxy do
     UserTable.establish_connection :test_user
   end
 
+  describe "#transaction" do
+    context "without using" do
+      it "executes SQL query on master connection" do
+        Recipe.using(:slave1).create(title: "test")
+        Recipe.using(:slave2).create(title: "test")
+        Recipe.using(:slave3).create(title: "test")
+        Recipe.transaction do
+          expect(Recipe.first).to be_nil
+        end
+      end
+    end
+
+    context "with using slave name" do
+      it "executes SQL query on slave connection" do
+        Recipe.using(:slave1).create(title: "test")
+        Recipe.using(:slave1).transaction do
+          expect(Recipe.first).not_to be_nil
+        end
+      end
+    end
+  end
+
+  describe "#lock" do
+    context "without using" do
+      it "executes SQL query on master connection" do
+        Recipe.using(:slave1).create(title: "test")
+        Recipe.using(:slave2).create(title: "test")
+        Recipe.using(:slave3).create(title: "test")
+        Recipe.lock do
+          expect(Recipe.first).to be_nil
+        end
+      end
+    end
+
+    context "with using slave name" do
+      it "executes SQL query on slave connection" do
+        Recipe.using(:slave1).create(title: "test")
+        Recipe.using(:slave1).lock do
+          expect(Recipe.first).not_to be_nil
+        end
+      end
+    end
+  end
+
   describe "#enable_query_cache!" do
     it "enables query cache of all connections" do
       expect{ Recipe.connection.enable_query_cache! }

data/spec/spec_helper.rb

@@ -8,28 +8,6 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 require "rspec/rails"
 
 RSpec.configure do |config|
-  copy_master_to_slave = proc do |adapter|
-    case adapter
-    when :mysql2
-      3.times do |i|
-        system("mysql -u root -e 'drop database dummy_test_slave#{i + 1}' > /dev/null 2> /dev/null")
-        system("mysql -u root -e 'create database dummy_test_slave#{i + 1}'")
-        system("mysqldump -u root dummy_test | mysql -u root dummy_test_slave#{i + 1}")
-      end
-      system("mysql -u root -e 'drop database dummy_test_user' > /dev/null 2> /dev/null")
-      system("mysql -u root -e 'drop database dummy_test_user_slave' > /dev/null 2> /dev/null")
-      system("mysql -u root -e 'create database dummy_test_user'")
-      system("mysql -u root -e 'create database dummy_test_user_slave'")
-      system("mysqldump -u root dummy_test | mysql -u root dummy_test_user")
-      system("mysqldump -u root dummy_test | mysql -u root dummy_test_user_slave")
-    when :sqlite3
-      3.times do |i|
-        FileUtils.copy("#{Rails.root}/db/test.sqlite3", "#{Rails.root}/db/test_slave#{i + 1}.sqlite3")
-      end
-      FileUtils.copy("#{Rails.root}/db/test.sqlite3", "#{Rails.root}/db/test_user.sqlite3")
-      FileUtils.copy("#{Rails.root}/db/test.sqlite3", "#{Rails.root}/db/test_user_slave.sqlite3")
-    end
-  end
 
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
@@ -42,7 +20,6 @@ RSpec.configure do |config|
     DatabaseRewinder["test_user"]
     DatabaseRewinder["test_user_slave"]
     DatabaseRewinder.clean_all
-    copy_master_to_slave.call(:mysql2)
   end
 
   config.after(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: replidog
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Manabu Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -104,16 +104,16 @@ dependencies:
   name: database_rewinder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -160,16 +160,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +290,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile