find_with_order 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db2431c776b7124cdaa2e01efd6ec12bfdc1d513
-  data.tar.gz: 68f959361cc19eb381f94eb82028502f09b6f0f9
+  metadata.gz: 4b55d8a4b8781f20d1a7d637f7d0c1ff0a71f802
+  data.tar.gz: 95b37ac957f5fce50237e4869ce4702aa3a524a2
 SHA512:
-  metadata.gz: bbe7b8e24e8afe6f51869f3dbac286f6361485b10229aa436ac395e69b6882291486747c6ea8d560650dff25e79bb59c0de577c20b49f12862f1c0caabc913da
-  data.tar.gz: 65080703b7bc52021f0e8096af1a591360afb238858761debc0e368b54e761c7061b36b23a7ec54ea53a8e51b81be166955a9d79d67df7232d66014d52f62ac3
+  metadata.gz: e4bfb50a7c782f329b8834ac21cac0dfe78e4dd7b3d027c7d0ac479f27cde0e51c2cbbec240a8f8b2cb72e7e49d421ea47e1992a4debf77f7896e0ebdfe5546c
+  data.tar.gz: 8a02ff25f68581747bd2a641ae147e900fe9e26e6d95269a02e1e7504caf04644d260e986cce0d2904a41af79787ac2c0c3025f686f378f08cbaa39cadab7ff4

data/.travis.yml

@@ -4,12 +4,18 @@ rvm:
   - 2.3
 sudo: required
 dist: trusty
+env: 
+  - DB=mysql
+  - DB=pg
+services:
+  - postgresql
 before_install: 
   - gem install bundler
   - gem update --system
   - gem --version
 before_script:
-  - mysql -u root -e 'CREATE DATABASE test;'
+  - mysql -u root -e 'CREATE DATABASE travis_ci_test;'
+  - psql -c 'create database travis_ci_test;' -U postgres
 gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.2.gemfile

data/README.md

@@ -1,11 +1,12 @@
+
+# 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)
 [![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)
 
-# FindWithOrder
-
 Find records in the same order of input array.
 
 ## Installation
@@ -55,7 +56,7 @@ Find then sort by hash mapping     1.120000   0.010000   1.130000 (  1.192891)
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test DB=mysql` / `rake test DB=pg` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/find_with_order.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "mysql2", ">= 0.3"
+  spec.add_development_dependency "pg", "~> 0.18"
 
   spec.add_dependency "rails", ">= 3"
-  spec.add_dependency "mysql2", ">= 0.3"
 
 end

data/gemfiles/3.2.gemfile

@@ -5,7 +5,10 @@ source 'https://rubygems.org'
 gem "activerecord", "~> 3.2"
 
 group :test do
-  gem 'mysql2' , '0.3.21'
+  case ENV['DB']
+  when "mysql"    ; gem 'mysql2' , '0.3.21'
+  when "postgres" ; gem 'pg', '~> 0.18'
+  end
   gem "simplecov"
   gem "codeclimate-test-reporter", "~> 1.0.0"
 end

data/gemfiles/4.2.gemfile

@@ -5,7 +5,10 @@ source 'https://rubygems.org'
 gem "activerecord", "~> 4.2"
 
 group :test do
-  gem 'mysql2' , '0.3.21'
+  case ENV['DB']
+  when "mysql"    ; gem 'mysql2' , '0.3.21'
+  when "postgres" ; gem 'pg', '~> 0.18'
+  end
   gem "simplecov"
   gem "codeclimate-test-reporter", "~> 1.0.0"
 end

data/gemfiles/5.0.gemfile

@@ -5,7 +5,10 @@ source 'https://rubygems.org'
 gem "activerecord", "~> 5.0"
 
 group :test do
-  gem 'mysql2' , '0.3.21'
+  case ENV['DB']
+  when "mysql"    ; gem 'mysql2' , '0.3.21'
+  when "postgres" ; gem 'pg', '~> 0.18'
+  end
   gem "simplecov"
   gem "codeclimate-test-reporter", "~> 1.0.0"
 end

data/lib/find_with_order.rb

@@ -1,16 +1,20 @@
 require "find_with_order/version"
+require "find_with_order/mysql_support"
+require "find_with_order/pg_support"
 require 'active_record'
 
 class << ActiveRecord::Base
   def find_with_order(ids)
     return none if ids.blank?
     ids = ids.uniq
-    return where(id: ids).order("field(#{table_name}.id, #{ids.join(',')})").to_a
+    return FindWithOrder::PGSupport.find_with_order(self, ids) if defined?(PG)
+    return FindWithOrder::MysqlSupport.find_with_order(self, ids)
   end
   def where_with_order(column, ids)
     return none if ids.blank?
     ids = ids.uniq
-    return where(column => ids).order("field(#{column}, #{ids.map(&:inspect).join(',')})")
+    return FindWithOrder::PGSupport.where_with_order(self, column, ids) if defined?(PG)
+    return FindWithOrder::MysqlSupport.where_with_order(self, column, ids)
   end
 end
 unless ActiveRecord::Base.respond_to?(:none) # extend only if not implement yet

data/lib/find_with_order/mysql_support.rb

@@ -0,0 +1,10 @@
+module FindWithOrder
+  module MysqlSupport
+    def self.find_with_order(relation, ids)
+      return relation.where(id: ids).order("field(#{relation.table_name}.id, #{ids.join(',')})").to_a
+    end
+    def self.where_with_order(relation, column, ids)
+      return relation.where(column => ids).order("field(#{column}, #{ids.map(&:inspect).join(',')})")
+    end
+  end
+end

data/lib/find_with_order/pg_support.rb

@@ -0,0 +1,26 @@
+module FindWithOrder
+  module PGSupport
+    def self.find_with_order(relation, ids)
+      # return relation.where(id: ids).order("array_position(ARRAY[#{ids.join(',')}], #{relation.table_name}.id)").to_a #array_position is only support in PG >= 9.5
+      return relation.where(id: ids)
+                     .joins("JOIN (SELECT id.val, row_number() over() FROM (VALUES(#{ids.join('),(')})) AS id(val)) AS id ON (#{relation.table_name}.id = id.val)")
+                     .order('row_number')
+    end
+    def self.where_with_order(relation, column, ids)
+      relation = relation.where(column => ids)
+      case ids.first
+      when Numeric
+        # return relation.order("array_position(ARRAY[#{ids.join(',')}], #{column})") #array_position is only support in PG >= 9.5
+        return relation.joins("JOIN (SELECT id.val, row_number() over() FROM (VALUES(#{ids.join('),(')})) AS id(val)) AS id ON (#{column} = id.val)")
+                       .order('row_number')
+      when String
+        ids.map!{|s| ActiveRecord::Base.connection.quote_string(s) }
+        # return relation.order("array_position(ARRAY['#{ids.join("','")}']::varchar[], #{column})") #array_position is only support in PG >= 9.5
+        return relation.joins("JOIN (SELECT id.val, row_number() over() FROM (VALUES('#{ids.join("'),('")}')) AS id(val)) AS id ON (#{column} = id.val)")
+                       .order('row_number')
+      else
+        raise "not support type: #{ids.first.class}"
+      end
+    end
+  end
+end

data/lib/find_with_order/version.rb

@@ -1,3 +1,3 @@
 module FindWithOrder
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: find_with_order
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,33 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
+        version: '0.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '3'
 description: A simple way to find records in the same order of input array. Has better
   performance than manually sorting. Supports Rails 3+.
 email:
@@ -101,6 +115,8 @@ files:
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - lib/find_with_order.rb
+- lib/find_with_order/mysql_support.rb
+- lib/find_with_order/pg_support.rb
 - lib/find_with_order/version.rb
 homepage: https://github.com/khiav223577/find_with_order
 licenses:
@@ -122,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple way to find records in the same order of input array.