arel-mysql-index-hint 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd3ea13829125be3b801b2bd5efd82ff211ad836
-  data.tar.gz: 23697becdb7e827f158be683b9aa1ccd227b8f4c
+  metadata.gz: 4c394a75c7e804ce2a5310c2d82990542448f7da
+  data.tar.gz: 1aa537b4cfc0a6428c9009939be6904dc18faddc
 SHA512:
-  metadata.gz: 5bdfff196ec5cce732a4efe3e260f03fd65228fb18b3998d8789968048f624112e08ecd11e8bdd1fc5e411592470537e4b8312cf8a20df2723aab612142f1973
-  data.tar.gz: 3b97674afac1b123ec5e3ffdbd6e566d9fbc55ae2a23fab2db60dac6fbf3904fcb3a77e2fc4b6c6c1d1a4f06edf5a0a3532b30f9d420f21bbebe38209849d75b
+  metadata.gz: 457533a884cba18970f34048a2e43922a77136ef8d4d5e0a11752c605004e592dbfb4891380f0708fa2d821a3894e59ff6cc7e6d7098f9da87d22c7019605df0
+  data.tar.gz: 0ef7776f7604d29260d499a40963860de4a7933d557ba0aa58c28f93f0be2a43beaac0799f4c03fc9372f3ad4dd51660c7e42847d2b9b96f9b07c3babb47c9e9

data/.travis.yml

@@ -1,8 +1,17 @@
+dist: trusty
+sudo: required
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+before_install:
+  - gem install bundler
+before_script:
+  - docker-compose up -d
+  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
+  - for i in {1..60}; do mysql_ping && break; sleep 1; done
 script:
   - bundle install
   - bundle exec rake
@@ -10,3 +19,9 @@ gemfile:
   - gemfiles/activerecord_4.0.gemfile
   - gemfiles/activerecord_4.1.gemfile
   - gemfiles/activerecord_4.2.gemfile
+services:
+  - docker
+addons:
+  apt:
+    packages:
+      - mysql-client-5.6

data/Appraisals

@@ -1,11 +1,13 @@
 appraise "activerecord-4.0" do
-  gem "activerecord", "4.0.13"
+  gem "activerecord", "~> 4.0.0"
+  gem "mysql2", "~> 0.3.10"
 end
 
 appraise "activerecord-4.1" do
-  gem "activerecord", "4.1.10"
+  gem "activerecord", "~> 4.1.0"
+  gem "mysql2", "~> 0.3.10"
 end
 
 appraise "activerecord-4.2" do
-  gem "activerecord", "4.2.1"
+  gem "activerecord", "~> 4.2.0"
 end

data/README.md

@@ -41,6 +41,27 @@ Article.joins(:comments).hint(comments: {force: :idx_comment})
 #=> "SELECT `articles`.* FROM `articles` INNER JOIN `comments` FORCE INDEX (`idx_comment`) ON `comments"
 ```
 
+## Running tests
+
+```sh
+docker-compose up -d
+bundle install
+bundle exec appraisal install
+bundle exec appraisal activerecord-4.0 rake
+bundle exec appraisal activerecord-4.1 rake
+bundle exec appraisal activerecord-4.2 rake
+```
+
+**Notice:** mysql-client is required.
+
+### on OS X (docker-machine & VirtualBox)
+
+Port forwarding is required.
+
+```sh
+VBoxManage controlvm default natpf1 "mysql,tcp,127.0.0.1,3306,,3306"
+```
+
 ## Related Links
 
 * [MySQL::MySQL 5.6 Reference Manual::13.2.9.3 Index Hint Syntax](https://dev.mysql.com/doc/refman/5.6/en/index-hints.html)

data/arel-mysql-index-hint.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.0.0"
+  spec.add_dependency "activerecord", ">= 4.0.0", "< 5"
   spec.add_dependency "arel", ">= 4.0.0"
 
   spec.add_development_dependency "bundler"

data/docker-compose.yml

@@ -0,0 +1,6 @@
+mysql:
+  image: "mysql:5.6"
+  ports:
+    - "3306:3306"
+  environment:
+    MYSQL_ROOT_PASSWORD: password

data/gemfiles/activerecord_4.0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "4.0.13"
+gem "activerecord", "~> 4.0.0"
+gem "mysql2", "~> 0.3.10"
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "4.1.10"
+gem "activerecord", "~> 4.1.0"
+gem "mysql2", "~> 0.3.10"
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.2.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "4.2.1"
+gem "activerecord", "~> 4.2.0"
 
 gemspec :path => "../"

data/lib/arel-mysql-index-hint.rb

@@ -7,7 +7,7 @@ ActiveSupport.on_load :active_record do
   require "arel-mysql-index-hint/arel-visitors-mysql"
 
   ActiveRecord::Relation.class_eval do
-    include ArelMysqlIndexHint::ActiveRecordHintMethods
+    prepend ArelMysqlIndexHint::ActiveRecordHintMethods
   end
 
   ActiveRecord::Querying.class_eval do
@@ -15,10 +15,10 @@ ActiveSupport.on_load :active_record do
   end
 
   Arel::Table.class_eval do
-    include ArelMysqlIndexHint::ArelTable
+    prepend ArelMysqlIndexHint::ArelTable
   end
 
   Arel::Visitors::MySQL.class_eval do
-    include ArelMysqlIndexHint::ArelVisitorsMySQL
+    prepend ArelMysqlIndexHint::ArelVisitorsMySQL
   end
 end

data/lib/arel-mysql-index-hint/active_record-hint_methods.rb

@@ -1,11 +1,5 @@
 module ArelMysqlIndexHint
   module ActiveRecordHintMethods
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :build_arel, :mysql_index_hint
-    end
-
     def mysql_index_hint_value=(value)
       @values[:mysql_index_hint] = value
     end
@@ -20,8 +14,8 @@ module ArelMysqlIndexHint
       self
     end
 
-    def build_arel_with_mysql_index_hint
-      arel = build_arel_without_mysql_index_hint
+    def build_arel
+      arel = super
 
       if mysql_index_hint_value.present?
         if mysql_index_hint_value.values.any? {|i| i.is_a?(Hash) }

data/lib/arel-mysql-index-hint/arel-visitors-mysql.rb

@@ -1,13 +1,7 @@
 module ArelMysqlIndexHint
   module ArelVisitorsMySQL
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :visit_Arel_Table, :mysql_index_hint
-    end
-
-    def visit_Arel_Table_with_mysql_index_hint(o, a)
-      sql = visit_Arel_Table_without_mysql_index_hint(o, a)
+    def visit_Arel_Table(o, a)
+      sql = super
 
       if o.index_hint
         append_index_hint(sql, o.index_hint)

data/lib/arel-mysql-index-hint/version.rb

@@ -1,3 +1,3 @@
 module ArelMysqlIndexHint
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/spec_helper.rb

@@ -15,6 +15,12 @@ require "models"
 
 $__arel_mysql_index_hint_sql_log__ = []
 
+TEST_MYSQL_HOST = '127.0.0.1'
+TEST_MYSQL_PORT = 3306
+TEST_MYSQL_USER = 'root'
+TEST_MYSQL_PASS = 'password'
+MYSQL_CLI = "MYSQL_PWD=#{TEST_MYSQL_PASS} mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER}"
+
 ActiveSupport::Notifications.subscribe('sql.active_record') do |name, start, finish, id, payload|
   sql = payload[:sql]
   $__arel_mysql_index_hint_sql_log__ << sql.gsub(/\s+/, " ") if sql
@@ -26,7 +32,11 @@ RSpec.configure do |config|
 
     ActiveRecord::Base.establish_connection(
       adapter: 'mysql2',
-      database: 'arel_mysql_index_hint_test'
+      database: 'arel_mysql_index_hint_test',
+      host: TEST_MYSQL_HOST,
+      port: TEST_MYSQL_PORT,
+      username: TEST_MYSQL_USER,
+      password: TEST_MYSQL_PASS,
     )
   end
 
@@ -37,7 +47,7 @@ end
 
 def init_database
   sql_file = File.expand_path('../init.sql', __FILE__)
-  system("mysql -uroot < #{sql_file}")
+  system("#{MYSQL_CLI} < #{sql_file}")
 end
 
 def sql_log

metadata

@@ -1,139 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: arel-mysql-index-hint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Add index hint to MySQL query in Arel.
@@ -143,16 +149,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- Schemafile
 - arel-mysql-index-hint.gemspec
+- docker-compose.yml
 - gemfiles/activerecord_4.0.gemfile
 - gemfiles/activerecord_4.1.gemfile
 - gemfiles/activerecord_4.2.gemfile
@@ -180,17 +186,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Add index hint to MySQL query in Arel.

data/Schemafile

@@ -1,33 +0,0 @@
-  create_table "microposts", force: true do |t|
-    t.string   "content"
-    t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "microposts", ["user_id", "created_at"], name: "index_microposts_on_user_id_and_created_at"
-
-  create_table "relationships", force: true do |t|
-    t.integer  "follower_id"
-    t.integer  "followed_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "relationships", ["followed_id"], name: "index_relationships_on_followed_id"
-  add_index "relationships", ["follower_id", "followed_id"], name: "index_relationships_on_follower_id_and_followed_id", unique: true
-  add_index "relationships", ["follower_id"], name: "index_relationships_on_follower_id"
-
-  create_table "users", force: true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "password_digest"
-    t.string   "remember_token"
-    t.boolean  "admin"
-  end
-
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["remember_token"], name: "index_users_on_remember_token"
-