activerecord-turntable 2.5.0 → 3.0.0.alpha1

data/spec/active_record/turntable_spec.rb

@@ -1,8 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ActiveRecord::Turntable do
   before(:all) do
-    ActiveRecord::Base.send(:include, ActiveRecord::Turntable)
+    ActiveRecord::Base.include(ActiveRecord::Turntable)
   end
 
   context "#config_file" do
@@ -16,7 +16,7 @@ describe ActiveRecord::Turntable do
 
   context "#config_file=" do
     it "should set config_file" do
-      ActiveRecord::Base.send(:include, ActiveRecord::Turntable)
+      ActiveRecord::Base.include(ActiveRecord::Turntable)
       filename = "hogefuga"
       ActiveRecord::Base.turntable_config_file = filename
       expect(ActiveRecord::Base.turntable_config_file).to eq(filename)

data/spec/migrations/002_create_user_statuses.rb

@@ -1,10 +1,10 @@
 class CreateUserStatuses < ActiveRecord::Migration
   def self.up
     create_table :user_statuses do |t|
-      t.belongs_to :user, :null => false
-      t.integer    :hp,   :null => false, :default => 0
-      t.integer    :mp,   :null => false, :default => 0
-      t.datetime   :deleted_at, :default => nil
+      t.belongs_to :user, null: false
+      t.integer    :hp,   null: false, default: 0
+      t.integer    :mp,   null: false, default: 0
+      t.datetime   :deleted_at, default: nil
 
       t.timestamps
     end

data/spec/migrations/003_create_cards.rb

@@ -1,9 +1,9 @@
 class CreateCards < ActiveRecord::Migration
   def self.up
     create_table :cards do |t|
-      t.string :name, :null => false
-      t.integer :hp,  :null => false, :default => 0
-      t.integer :mp,  :null => false, :default => 0
+      t.string :name, null: false
+      t.integer :hp,  null: false, default: 0
+      t.integer :mp,  null: false, default: 0
       t.timestamps
     end
   end

data/spec/migrations/004_create_cards_users.rb

@@ -1,8 +1,8 @@
 class CreateCardsUsers < ActiveRecord::Migration
   def self.up
     create_table :cards_users do |t|
-      t.belongs_to :card,    :null => false
-      t.belongs_to :user,    :null => false
+      t.belongs_to :card,    null: false
+      t.belongs_to :user,    null: false
       t.datetime :deleted_at
 
       t.timestamps

data/spec/models/user_status.rb

@@ -3,5 +3,4 @@ class UserStatus < ActiveRecord::Base
   turntable :user_cluster, :user_id
   sequencer :user_seq
   belongs_to :user
-  serialize :data, JSON
 end

data/spec/spec_helper.rb

@@ -1,29 +1,30 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec/its'
-require 'rspec/collection_matchers'
-require 'webmock/rspec'
-require 'pry'
+require "rubygems"
+require "bundler/setup"
+require "rspec/its"
+require "rspec/collection_matchers"
+require "webmock/rspec"
+require "pry"
+require "timecop"
 begin
-  require 'pry-byebug'
+  require "pry-byebug"
 rescue LoadError
 end
 
-require 'activerecord-turntable'
+require "activerecord-turntable"
 
-require 'coveralls'
+require "coveralls"
 Coveralls.wear!
 
-MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), 'migrations'))
+MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "migrations"))
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-ActiveRecord::Base.configurations = YAML.load_file(File.join(File.dirname(__FILE__), 'config/database.yml'))
+ActiveRecord::Base.configurations = YAML.load_file(File.join(File.dirname(__FILE__), "config/database.yml"))
 ActiveRecord::Base.establish_connection(:test)
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   include TurntableHelper
@@ -32,6 +33,6 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 
   config.before(:each) do
-    Dir[File.join(File.dirname(File.dirname(__FILE__)), 'spec/models/*.rb')].each { |f| require f }
+    Dir[File.join(File.dirname(File.dirname(__FILE__)), "spec/models/*.rb")].each { |f| require f }
   end
 end

data/spec/support/turntable_helper.rb

@@ -1,16 +1,16 @@
-require 'active_record'
+require "active_record"
 
 module TurntableHelper
   def reload_turntable!(config_file_name = nil)
-    ActiveRecord::Base.send(:include, ActiveRecord::Turntable)
+    ActiveRecord::Base.include(ActiveRecord::Turntable)
     ActiveRecord::Base.turntable_config_file = config_file_name
     ActiveRecord::Turntable::Config.load!(ActiveRecord::Base.turntable_config_file, :test)
   end
 
   def establish_connection_to(env = :test)
     silence_warnings {
-      Object.const_set('RAILS_ENV', env.to_s)
-      Object.const_set('Rails', Object.new)
+      Object.const_set("RAILS_ENV", env.to_s)
+      Object.const_set("Rails", Object.new)
       allow(Rails).to receive(:env) { ActiveSupport::StringInquirer.new(RAILS_ENV) }
       ActiveRecord::Base.logger = Logger.new("/dev/null")
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0.alpha1
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,40 +17,68 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: bsearch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sql_tree
   requirement: !ruby/object:Gem::Requirement
@@ -66,27 +94,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: bsearch
+  name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: barrage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -94,7 +122,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,7 +136,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: barrage
+  name: fabrication
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,7 +150,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,7 +164,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,35 +178,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: onkcop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -192,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -206,7 +234,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fabrication
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -220,7 +248,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,7 +262,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -248,7 +276,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -262,7 +304,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -276,7 +318,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -290,21 +332,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -318,7 +360,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: growl
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -344,6 +386,7 @@ files:
 - ".document"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -352,9 +395,7 @@ files:
 - README.md
 - Rakefile
 - activerecord-turntable.gemspec
-- gemfiles/rails4_0.gemfile
-- gemfiles/rails4_1.gemfile
-- gemfiles/rails4_2.gemfile
+- gemfiles/rails5_0.gemfile
 - lib/active_record/turntable.rb
 - lib/active_record/turntable/active_record_ext.rb
 - lib/active_record/turntable/active_record_ext/.gitkeep
@@ -401,9 +442,7 @@ files:
 - lib/active_record/turntable/mixer/fader/update_shards_merge_result.rb
 - lib/active_record/turntable/plugin.rb
 - lib/active_record/turntable/pool_proxy.rb
-- lib/active_record/turntable/rack.rb
-- lib/active_record/turntable/rack/connection_management.rb
-- lib/active_record/turntable/rack/query_cache.rb
+- lib/active_record/turntable/query_cache.rb
 - lib/active_record/turntable/railtie.rb
 - lib/active_record/turntable/railties/databases.rake
 - lib/active_record/turntable/seq_shard.rb
@@ -440,7 +479,7 @@ files:
 - spec/active_record/turntable/finder_spec.rb
 - spec/active_record/turntable/mixer/fader_spec.rb
 - spec/active_record/turntable/mixer_spec.rb
-- spec/active_record/turntable/rack/query_cache_spec.rb
+- spec/active_record/turntable/query_cache_spec.rb
 - spec/active_record/turntable/sequencer/api_spec.rb
 - spec/active_record/turntable/sequencer/barrage_spec.rb
 - spec/active_record/turntable/sequencer/mysql_spec.rb
@@ -479,15 +518,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: activerecord-turntable
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord sharding extension
@@ -512,7 +551,7 @@ test_files:
 - spec/active_record/turntable/finder_spec.rb
 - spec/active_record/turntable/mixer/fader_spec.rb
 - spec/active_record/turntable/mixer_spec.rb
-- spec/active_record/turntable/rack/query_cache_spec.rb
+- spec/active_record/turntable/query_cache_spec.rb
 - spec/active_record/turntable/sequencer/api_spec.rb
 - spec/active_record/turntable/sequencer/barrage_spec.rb
 - spec/active_record/turntable/sequencer/mysql_spec.rb

data/gemfiles/rails4_0.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.0.0"
-gem "activesupport", "~> 4.0.0"
-gem "mysql2", "~> 0.3.20"
-
-gemspec :path => "../"

data/gemfiles/rails4_1.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.0"
-gem "activesupport", "~> 4.1.0"
-gem "mysql2", "~> 0.3.20"
-
-gemspec :path => "../"

data/gemfiles/rails4_2.gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.2.0"
-gem "activesupport", "~> 4.2.0"
-gem "mysql2", "~> 0.3.20"
-
-gemspec :path => "../"

data/lib/active_record/turntable/rack/connection_management.rb

@@ -1,18 +0,0 @@
-module ActiveRecord::Turntable
-  module Rack
-    class ConnectionManagement
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        @app.call(env)
-      ensure
-        unless env.key?("rack.test")
-          ActiveRecord::Base.connection_handler.clear_all_connections!
-          ActiveRecord::Base.clear_all_connections!
-        end
-      end
-    end
-  end
-end

data/lib/active_record/turntable/rack/query_cache.rb

@@ -1,40 +0,0 @@
-require 'rack/body_proxy'
-require 'active_record/query_cache'
-
-module ActiveRecord
-  module Turntable
-    module Rack
-      class QueryCache < ActiveRecord::QueryCache
-        def call(env)
-          enabled       = ActiveRecord::Base.connection.query_cache_enabled
-          connection_id = ActiveRecord::Base.connection_id
-          klasses = ActiveRecord::Base.turntable_connections.values
-          klasses.each do |k|
-            k.connection.enable_query_cache!
-          end
-
-          response = @app.call(env)
-          response[2] = ::Rack::BodyProxy.new(response[2]) do
-            restore_query_cache_settings(connection_id, enabled)
-          end
-
-          response
-        rescue Exception => e
-          restore_query_cache_settings(connection_id, enabled)
-          raise e
-        end
-
-        private
-
-        def restore_query_cache_settings(connection_id, enabled)
-          klasses = ActiveRecord::Base.turntable_connections.values
-          klasses.each do |k|
-            ActiveRecord::Base.connection_id = connection_id
-            k.connection.clear_query_cache
-            k.connection.disable_query_cache! unless enabled
-          end
-        end
-      end
-    end
-  end
-end

data/lib/active_record/turntable/rack.rb

@@ -1,8 +0,0 @@
-module ActiveRecord::Turntable
-  module Rack
-    extend ActiveSupport::Autoload
-
-    autoload :ConnectionManagement
-    autoload :QueryCache
-  end
-end

data/spec/active_record/turntable/rack/query_cache_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe ActiveRecord::Turntable::Rack::QueryCache do
-  before(:all) do
-    reload_turntable!(File.join(File.dirname(__FILE__), "../../../config/turntable.yml"))
-  end
-
-  before do
-    establish_connection_to(:test)
-    truncate_shard
-  end
-
-  let(:mw) { ActiveRecord::Turntable::Rack::QueryCache.new lambda {|env| [200, {}]} }
-  subject { mw.call({}) }
-
-  it "should returns 200 response" do
-    expect(subject.first).to eq(200)
-  end
-end