find_with_order 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8ac84fed8e09261dce7efef6fe2bae0702d7c026ca6188de2f6a49109da6c29
-  data.tar.gz: 28ae1da04f85c941705888c8d1f9310ed1729fed90d9e3527117b987baadd49f
+  metadata.gz: 015a48fca352ef1bb4b6aab8a206ad690dfea36462f5b33f7807bee6e786144a
+  data.tar.gz: beb3426fda4db3e29cb0ab0908ffcda2911f6564a6673699d468f6ea3e86a702
 SHA512:
-  metadata.gz: 6c4a224be2b0f44db2a666c987b9ad37d2d6b66efa38153027420b757882160900fe6cea1318a13c714bafbc7fbe91b3a774007bb3920c2a450e250863043dd5
-  data.tar.gz: 279b4902229e08b051ea971b82ff969d6b17ab25d065d3ca202ce3bbe8b768469a5df435bd80899e1122fc51ef54cf931100906a74bd61a7d90a1f2f85568db3
+  metadata.gz: 100044ac0115988577753964bea0b55b333943a688163caf36230a93ae06fccd27874d94cc0bd5b8644d946d33e0ac73c0f6427223a379824c548ca709d8b656
+  data.tar.gz: 0bc3c0bfa032cce6fad60a22e06f9ae3e3842f46054481eb3657a2b61ffb836af93771c15f7429f23548dd75cb0ad120361a0cdf2b97706c1889be007046e4ea

data/.github/workflows/ruby.yml

@@ -0,0 +1,98 @@
+name: Ruby
+
+on:
+  push:
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+  pull_request:
+    branches: [ master ]
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Test
+    if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    strategy:
+      fail-fast: false
+      matrix:
+        db:
+          - mysql
+          - pg
+        ruby:
+          # - 2.2 # skip Ruby 2.2 since mysql2 raises segmentation fault at 0x0000000000000000
+          # See: https://github.community/t/mysql2-segmentation-fault-at-0x0000000000000000/159283
+          - 2.6
+          - 2.7
+        gemfile:
+          - 3.2.gemfile
+          - 4.2.gemfile
+          - 5.0.gemfile
+          - 5.1.gemfile
+          - 5.2.gemfile
+          - 6.0.gemfile
+          - 6.1.gemfile
+        exclude:
+          - gemfile: 3.2.gemfile
+            ruby: 2.6
+          - gemfile: 3.2.gemfile
+            ruby: 2.7
+          - gemfile: 4.2.gemfile
+            ruby: 2.7
+          - gemfile: 6.0.gemfile
+            ruby: 2.2
+          - gemfile: 6.1.gemfile
+            ruby: 2.2
+    env:
+      BUNDLE_GEMFILE: "gemfiles/${{ matrix.gemfile }}"
+      DB: "${{ matrix.db }}"
+
+    services:
+      mysql:
+        image: mysql:5.6
+        env:
+          MYSQL_ROOT_PASSWORD: root_password
+          MYSQL_USER: developer
+          MYSQL_PASSWORD: developer_password
+          MYSQL_DATABASE: github_actions_test
+        ports:
+          - 3306:3306
+        # Set health checks to wait until mysql has started
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 3
+      postgres:
+        image: postgres:9.6
+        env:
+          POSTGRES_USER: developer
+          POSTGRES_PASSWORD: developer_password
+          POSTGRES_DB: github_actions_test
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 3
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake
+    - name: Publish code coverage
+      if: ${{ success() && env.CC_TEST_REPORTER_ID }}
+      uses: paambaati/codeclimate-action@v2.7.5
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gemfile.lock

data/CHANGELOG.md

@@ -1,24 +1,32 @@
-## Change Log
-
-### v1.2.1 2017/09/21
-- [#11](https://github.com/khiav223577/find_with_order/pull/11) ambiguous id when not specify table name (@khiav223577)
-
-### v1.2.0 2017/07/01
-- [#10](https://github.com/khiav223577/find_with_order/pull/10) Supports #with_order method (@khiav223577)
-
-### v1.1.1 2017/06/22
-- [#9](https://github.com/khiav223577/find_with_order/pull/9) Restrict dependency to activerecord (@khiav223577)
-- [#8](https://github.com/khiav223577/find_with_order/pull/8) try to fix travis (@khiav223577)
-
-### v1.1.0 2017/03/22
-- [#7](https://github.com/khiav223577/find_with_order/pull/7) Add PostgreSQL support (@khiav223577)
-
-### v1.0.1 2017/03/03
-- [#6](https://github.com/khiav223577/find_with_order/pull/6) Fix ambiguous id (@khiav223577)
-
-### v1.0.0 2017/02/23
-- [#3](https://github.com/khiav223577/find_with_order/pull/3) where with order (@khiav223577)
-
-### v0.0.2 2017/02/22
-- [#2](https://github.com/khiav223577/find_with_order/pull/2) Fix Rails 3 doesn't have #none method (@khiav223577)
-- [#1](https://github.com/khiav223577/find_with_order/pull/1) add find_with_order (@khiav223577)
+## Change Log
+
+### [v1.3.0](https://github.com/khiav223577/find_with_order/compare/v1.2.1...v1.3.0) 2019/05/12
+- [#18](https://github.com/khiav223577/find_with_order/pull/18) Support psql uuid type (@khiav223577)
+- [#17](https://github.com/khiav223577/find_with_order/pull/17) Remove deprecated codeclimate-test-reporter gem and update travis config (@khiav223577)
+- [#16](https://github.com/khiav223577/find_with_order/pull/16) Fix: broken test cases after bundler 2.0 was released (@khiav223577)
+- [#14](https://github.com/khiav223577/find_with_order/pull/14) test rails 5.2 (@khiav223577)
+- [#13](https://github.com/khiav223577/find_with_order/pull/13) should test both 5.0.x and 5.1.x (@khiav223577)
+- [#12](https://github.com/khiav223577/find_with_order/pull/12) test find_with_order in rails 5.1.x (@khiav223577)
+
+### [v1.2.1](https://github.com/khiav223577/find_with_order/compare/v1.2.0...v1.2.1) 2017/09/21
+- [#11](https://github.com/khiav223577/find_with_order/pull/11) ambiguous id when not specify table name (@khiav223577)
+
+### [v1.2.0](https://github.com/khiav223577/find_with_order/compare/v1.1.1...v1.2.0) 2017/07/01
+- [#10](https://github.com/khiav223577/find_with_order/pull/10) Supports #with_order method (@khiav223577)
+
+### [v1.1.1](https://github.com/khiav223577/find_with_order/compare/v1.1.0...v1.1.1) 2017/06/22
+- [#9](https://github.com/khiav223577/find_with_order/pull/9) Restrict dependency to activerecord (@khiav223577)
+- [#8](https://github.com/khiav223577/find_with_order/pull/8) try to fix travis (@khiav223577)
+
+### [v1.1.0](https://github.com/khiav223577/find_with_order/compare/v1.0.1...v1.1.0) 2017/03/22
+- [#7](https://github.com/khiav223577/find_with_order/pull/7) Add PostgreSQL support (@khiav223577)
+
+### [v1.0.1](https://github.com/khiav223577/find_with_order/compare/v1.0.0...v1.0.1) 2017/03/03
+- [#6](https://github.com/khiav223577/find_with_order/pull/6) Fix ambiguous id (@khiav223577)
+
+### [v1.0.0](https://github.com/khiav223577/find_with_order/compare/v0.0.2...v1.0.0) 2017/02/23
+- [#3](https://github.com/khiav223577/find_with_order/pull/3) where with order (@khiav223577)
+
+### [v0.0.2](https://github.com/khiav223577/find_with_order/compare/v0.0.1...v0.0.2) 2017/02/22
+- [#2](https://github.com/khiav223577/find_with_order/pull/2) Fix Rails 3 doesn't have #none method (@khiav223577)
+- [#1](https://github.com/khiav223577/find_with_order/pull/1) add find_with_order (@khiav223577)

data/README.md

@@ -2,13 +2,18 @@
 # FindWithOrder
 
 [![Gem Version](https://img.shields.io/gem/v/find_with_order.svg?style=flat)](https://rubygems.org/gems/find_with_order)
-[![Build Status](https://travis-ci.org/khiav223577/find_with_order.svg?branch=master)](https://travis-ci.org/khiav223577/find_with_order)
+[![Build Status](https://github.com/khiav223577/find_with_order/workflows/Ruby/badge.svg)](https://github.com/khiav223577/find_with_order/actions)
 [![RubyGems](http://img.shields.io/gem/dt/find_with_order.svg?style=flat)](https://rubygems.org/gems/find_with_order)
 [![Code Climate](https://codeclimate.com/github/khiav223577/find_with_order/badges/gpa.svg)](https://codeclimate.com/github/khiav223577/find_with_order)
 [![Test Coverage](https://codeclimate.com/github/khiav223577/find_with_order/badges/coverage.svg)](https://codeclimate.com/github/khiav223577/find_with_order/coverage)
 
 Find records in the same order of input array.
 
+## Supports
+- Ruby 2.2 ~ 2.7
+- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0
+- MySQL, PostgreSQL
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -32,21 +37,21 @@ Or install it yourself as:
 ids = [3, 1, 5]
 
 User.find(ids).map(&:id)
-# => [1, 3, 5] 
+# => [1, 3, 5]
 
 User.find_with_order(ids).map(&:id)
-# => [3, 1, 5] 
+# => [3, 1, 5]
 ```
 
 ### Support ordering by other columns: `where_with_order`
 ```rb
-names = %w(Pearl John Kathenrie)
+names = %w(Pearl John Doggy)
 
 User.where(name: names).pluck(:name)
-# => ['John', 'Pearl', 'Kathenrie']
+# => ['John', 'Pearl', 'Doggy']
 
 User.where_with_order(:name, names).pluck(:name)
-# => ['Pearl', 'John', 'Kathenrie']
+# => ['Pearl', 'John', 'Doggy']
 ```
 
 ### Support ordering only part of results: `with_order`
@@ -54,10 +59,10 @@ User.where_with_order(:name, names).pluck(:name)
 names = %w(Pearl John)
 
 User.leader.with_order(:name, names).pluck(:name)
-# => ['Pearl', 'John', 'Kathenrie']
+# => ['Pearl', 'John', 'Doggy']
 
 User.leader.with_order(:name, names, null_first: true).pluck(:name)
-# => ['Kathenrie', 'Pearl', 'John']
+# => ['Doggy', 'Pearl', 'John']
 ```
 
 

data/find_with_order.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.metadata    = {
+  spec.metadata      = {
     'homepage_uri'      => 'https://github.com/khiav223577/find_with_order',
     'changelog_uri'     => 'https://github.com/khiav223577/find_with_order/blob/master/CHANGELOG.md',
     'source_code_uri'   => 'https://github.com/khiav223577/find_with_order',
-    'documentation_uri' => 'http://www.rubydoc.info/gems/find_with_order',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/find_with_order',
     'bug_tracker_uri'   => 'https://github.com/khiav223577/find_with_order/issues',
   }
 

data/gemfiles/3.2.gemfile

@@ -4,10 +4,10 @@ gem "activerecord", "~> 3.2.0"
 
 group :test do
   case ENV['DB']
-  when "mysql"    ; gem 'mysql2' , '0.3.21'
-  when "postgres" ; gem 'pg', '~> 0.18'
+  when 'mysql' ; gem 'mysql2' , '0.4.10'
+  when 'pg'    ; gem 'pg', '~> 0.18'
   end
-  gem "simplecov"
+  gem "simplecov", '< 0.18'
 end
 
 gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -4,10 +4,10 @@ gem "activerecord", "~> 4.2.0"
 
 group :test do
   case ENV['DB']
-  when "mysql"    ; gem 'mysql2' , '0.3.21'
-  when "postgres" ; gem 'pg', '~> 0.18'
+  when 'mysql' ; gem 'mysql2' , '0.4.10'
+  when 'pg'    ; gem 'pg', '~> 0.18'
   end
-  gem "simplecov"
+  gem "simplecov", '< 0.18'
 end
 
 gemspec :path => "../"

data/gemfiles/5.0.gemfile

@@ -4,10 +4,10 @@ gem "activerecord", "~> 5.0.0"
 
 group :test do
   case ENV['DB']
-  when "mysql"    ; gem 'mysql2' , '0.3.21'
-  when "postgres" ; gem 'pg', '~> 0.18'
+  when 'mysql' ; gem 'mysql2' , '0.4.10'
+  when 'pg'    ; gem 'pg', '~> 0.18'
   end
-  gem "simplecov"
+  gem "simplecov", '< 0.18'
 end
 
 gemspec :path => "../"

data/gemfiles/5.1.gemfile

@@ -4,11 +4,10 @@ gem "activerecord", "~> 5.1.0"
 
 group :test do
   case ENV['DB']
-  when "mysql"    ; gem 'mysql2' , '0.3.21'
-  when "postgres" ; gem 'pg', '~> 0.18'
+  when 'mysql' ; gem 'mysql2' , '0.4.10'
+  when 'pg'    ; gem 'pg', '~> 0.18'
   end
-  gem "simplecov"
+  gem "simplecov", '< 0.18'
 end
 
 gemspec :path => "../"
-

data/gemfiles/5.2.gemfile

@@ -4,10 +4,10 @@ gem "activerecord", "~> 5.2.0"
 
 group :test do
   case ENV['DB']
-  when "mysql"    ; gem 'mysql2' , '0.5.1'
-  when "postgres" ; gem 'pg', '~> 0.18'
+  when 'mysql' ; gem 'mysql2' , '0.5.1'
+  when 'pg'    ; gem 'pg', '~> 0.18'
   end
-  gem "simplecov"
+  gem "simplecov", '< 0.18'
 end
 
 gemspec :path => "../"

data/gemfiles/6.0.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem "activerecord", "~> 6.0.0"
+
+group :test do
+  case ENV['DB']
+  when 'mysql' ; gem 'mysql2' , '0.5.1'
+  when 'pg'    ; gem 'pg', '~> 0.18'
+  end
+  gem "simplecov", '< 0.18'
+end
+
+gemspec :path => "../"
+

data/gemfiles/6.1.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1.4'
+
+group :test do
+  case ENV['DB']
+  when 'mysql' ; gem 'mysql2' , '0.5.1'
+  when 'pg'    ; gem 'pg', '~> 1.1'
+  end
+  gem "simplecov", '< 0.18'
+end
+
+gemspec :path => "../"
+

data/lib/find_with_order/mysql_support.rb

@@ -4,7 +4,7 @@ module FindWithOrder::MysqlSupport
   class << self
     def find_with_order(relation, ids)
       relation.where(id: ids)
-              .order("field(#{relation.table_name}.id, #{ids.join(',')})")
+              .order(Arel.sql("field(#{relation.table_name}.id, #{ids.join(',')})"))
               .to_a
     end
 
@@ -18,8 +18,8 @@ module FindWithOrder::MysqlSupport
       else
         column = column.to_s
       end
-      return relation.order("field(#{column}, #{ids.map(&:inspect).join(',')})") if null_first 
-      return relation.order("field(#{column}, #{ids.reverse.map(&:inspect).join(',')}) DESC")
+      return relation.order(Arel.sql("field(#{column}, #{ids.map(&:inspect).join(',')})")) if null_first
+      return relation.order(Arel.sql("field(#{column}, #{ids.reverse.map(&:inspect).join(',')}) DESC"))
     end
   end
 end

data/lib/find_with_order/version.rb

@@ -1,3 +1,3 @@
 module FindWithOrder
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: find_with_order
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,8 +108,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
@@ -123,6 +123,8 @@ files:
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/find_with_order.rb
 - lib/find_with_order/mysql_support.rb
 - lib/find_with_order/pg_support.rb
@@ -134,7 +136,7 @@ metadata:
   homepage_uri: https://github.com/khiav223577/find_with_order
   changelog_uri: https://github.com/khiav223577/find_with_order/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/khiav223577/find_with_order
-  documentation_uri: http://www.rubydoc.info/gems/find_with_order
+  documentation_uri: https://www.rubydoc.info/gems/find_with_order
   bug_tracker_uri: https://github.com/khiav223577/find_with_order/issues
 post_install_message: 
 rdoc_options: []
@@ -151,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.14
 signing_key: 
 specification_version: 4
 summary: A simple way to find records in the same order of input array.

data/.travis.yml

@@ -1,37 +0,0 @@
-sudo: false
-env:
-  global:
-    - CC_TEST_REPORTER_ID=6384ecacad280dc863595e6e369a43299e157c0e7588b636e025a1808a3f5581
-language: ruby
-rvm:
-  - 2.2
-  - 2.3
-env:
-  - DB=mysql
-  - DB=pg
-services:
-  - postgresql
-addons:
-  postgresql: "9.4"
-before_install:
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - gem install bundler -v 1.17.3
-  - gem --version
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-before_script:
-  - mysql -V
-  - mysql -u root -e 'CREATE DATABASE travis_ci_test;'
-  - psql -c "SELECT version();"
-  - psql -c 'create database travis_ci_test;' -U postgres
-gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.2.gemfile
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.1.gemfile
-  - gemfiles/5.2.gemfile
-script:
-  - bundle exec rake test
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT