arel-extensions 6.0.0.4 → 6.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c6ce3898d57f105c59837161e36e1fe45f25afd4daa95d54916bef1c3782e5'
-  data.tar.gz: 1f2efc0c80e2b25c826421126eb8d963a7244b1c386a7a0f871b46fcad701c11
+  metadata.gz: 6499ad3b57ef7119b545163cecc1972913c494d57bbfd19c81aecbbf74219880
+  data.tar.gz: 576fb2e56d087957430ff9e8cc5ee3dc968c2f17ba3d2c617a4eae2f6664f340
 SHA512:
-  metadata.gz: d5610a339bd005e10ef756715bf25b0cc96dc471e6fec233a8f9735e6c4bb05f50425aaf0f465b6d4e57c0320949ed80a6e93d46b399e1975a4753185112fac3
-  data.tar.gz: a5fde1fd877f44e52bde43595d4eb1237742f85ea338ad1a00597d075c5d0f30320bac95b41d5b58bf1460784035d51f14728702e22dd4cc401293137b28b1fb
+  metadata.gz: df8347481c7c0d86903d7f0fe35850da0ac725325ab18f11191f6c04455d88515cd47306ab1fb972f5ca2e8a49e678cbfd242c12a0850575a5cdbde95bb41a9b
+  data.tar.gz: 52c2e805c1758594478b229c421ba301571c82d715be1904f8fd00359ab7b399919d2d6f74c8548078ad141c41a7bc687d7d311b33f79ac171ca38f95859623f

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.gem
+Gemfile.lock

data/.travis.yml

@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 language: ruby
 sudo: false
 
@@ -8,37 +8,60 @@ cache:
     - /home/travis/.rvm/gems
 
 rvm:
-  - 2.5
-  - 2.6
+  - 2.7
 
 env:
   matrix:
-    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:mysql2
-    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:sqlite3
-    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:postgresql
+    - RAILS_VERSION=v6.1.0 TASK='db:mysql:rebuild mysql2:test'
+    - RAILS_VERSION=v6.1.0 TASK='db:mysql:rebuild mysql2:isolated_test'
+    - RAILS_VERSION=v6.1.0 TASK='db:postgresql:rebuild postgresql:test'
+    - RAILS_VERSION=v6.1.0 TASK='db:postgresql:rebuild postgresql:isolated_test'
+    - RAILS_VERSION=v6.1.0 TASK='sqlite3:test'
+    - RAILS_VERSION=v6.1.0 TASK='sqlite3:isolated_test'
+    - RAILS_VERSION=v6.1.0 TASK='sqlite3_mem:test'
 
 services:
   - mysql
 addons:
-  postgresql: "10"
+  postgresql: "13"
+  apt:
+    packages:
+    - postgresql-13
+    - postgresql-client-13
 
 before_install:
+  - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/13/main/postgresql.conf
+  - sudo cp /etc/postgresql/{9.3,13}/main/pg_hba.conf
+  - sudo pg_ctlcluster 13 main restart
   - unset BUNDLE_GEMFILE
   - gem update --system
   - gem update bundler
+  - gem install bundler --version 1.17.3
+  - mysql -e "create user rails@localhost;"
+  - mysql -e "grant all privileges on activerecord_unittest.* to rails@localhost;"
+  - mysql -e "grant all privileges on activerecord_unittest2.* to rails@localhost;"
+  - mysql -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;"
+  - mysql -e "create database activerecord_unittest default character set utf8mb4;"
+  - mysql -e "create database activerecord_unittest2 default character set utf8mb4;"
 
 install:
-  - git clone https://github.com/rails/rails.git ~/build/rails
+  - git clone --branch $RAILS_VERSION https://github.com/rails/rails.git ~/build/rails
+
+before_script:
+  - sed -i "s/t.warning = true/t.warning = false/g" Rakefile
   - pushd ~/build/rails
-  - git checkout $RAILS_VERSION
+  - git status
   - sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/build/rails/activerecord/Rakefile
   - sed -i "s/t.warning = true/t.warning = false/g" ~/build/rails/activerecord/Rakefile
   - sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\('~\/build\/malomalo\/arel-extensions\/lib'\)\)\nrequire 'arel/extensions'" ~/build/rails/activerecord/test/cases/helper.rb
   - "sed -i \"/group :db do/a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\\('~\\/build\\/malomalo\\/arel-extensions'\\)\" ~/build/rails/Gemfile"
   - sed -i "/rb-inotify/d" ~/build/rails/Gemfile
   - cat ~/build/rails/Gemfile
-  - bundle install --jobs=3 --retry=3
+  - rm ~/build/rails/Gemfile.lock
+  - bundle update --jobs=3 --retry=3
   - popd
+  - bundle install --jobs=3 --retry=3
 
 script:
-  - cd ~/build/rails && ci/travis.rb
+  - bundle exec rake test
+  - cd ~/build/rails/activerecord && bundle exec rake $TASK

data/arel-extensions.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path("../lib/arel/extensions/version", __FILE__)
+
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version = '6.0.0.4'
+  gem.version       = Arel::Extensions::VERSION
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]
   gem.summary       = %q{Adds support for missing SQL operators and functions to Arel}
@@ -11,13 +13,16 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '>= 6.0.0.rc1'
+  gem.add_dependency 'activerecord', '>= 6.1.0'
 
   gem.add_development_dependency "bundler"
+  gem.add_development_dependency "byebug"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'minitest-reporters'
+  gem.add_development_dependency "sunstone", '>= 6.1.0.rc1'
+  gem.add_development_dependency "webmock"
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'rgeo'
-  
+
 end

data/ext/arel/nodes/ascending.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Nodes
+    class Ascending < Ordering
+
+      attr_accessor :nulls
+
+      def initialize expr, nulls=nil
+        super(expr)
+        @nulls = nulls
+      end
+
+    end
+  end
+end

data/ext/arel/nodes/descending.rb

@@ -0,0 +1,15 @@
+module Arel
+  module Nodes
+    class Descending < Ordering
+
+      attr_accessor :nulls
+
+      def initialize expr, nulls=nil
+        super(expr)
+        @nulls = nulls
+      end
+
+    end
+
+  end
+end

data/ext/arel/order_predications.rb

@@ -0,0 +1,14 @@
+# Ordering with :nulls_last, :nulls_first options
+module Arel
+  module OrderPredications
+
+    def asc(nulls=nil)
+      Nodes::Ascending.new self, nulls
+    end
+
+    def desc(nulls=nil)
+      Nodes::Descending.new self, nulls
+    end
+
+  end
+end

data/lib/arel/array_predications.rb

@@ -1,24 +1,14 @@
 module Arel
   module ArrayPredications
-    
-    # Used by both JSON and ARRAY so it doesn't try to cast to array
-    def contains(value)
-      Arel::Nodes::Contains.new(self, value)
-    end
-    
+
     # Used by both JSON and ARRAY so it doesn't try to cast to array
     def contained_by(value)
       Arel::Nodes::ContainedBy.new(self, value)
     end
-    
+
     def excludes(value)
       Arel::Nodes::Excludes.new(self, value)
     end
-    
-    def overlaps(*values)
-      values = values[0] if values.size == 1 && values[0].is_a?(Array)
-      Arel::Nodes::Overlaps.new(self, values)
-    end
-    
+
   end
-end
+end

data/lib/arel/extensions.rb

@@ -1,14 +1,17 @@
 require "arel"
 require File.expand_path('../nodes/hex_encoded_binary', __FILE__)
 
-require File.expand_path('../nodes/overlaps', __FILE__)
-require File.expand_path('../nodes/contains', __FILE__)
 require File.expand_path('../nodes/within', __FILE__)
 require File.expand_path('../nodes/excludes', __FILE__)
 require File.expand_path('../nodes/contained_by', __FILE__)
 require File.expand_path('../array_predications', __FILE__)
 Arel::Attributes::Attribute.include(Arel::ArrayPredications)
 
+require File.expand_path('../nodes/random', __FILE__)
+require File.expand_path(File.join(__FILE__, '../../../ext/arel/nodes/ascending'))
+require File.expand_path(File.join(__FILE__, '../../../ext/arel/nodes/descending'))
+require File.expand_path(File.join(__FILE__, '../../../ext/arel/order_predications'))
+
 
 require File.expand_path('../attributes/key', __FILE__)
 require File.expand_path('../attributes/cast', __FILE__)
@@ -26,6 +29,7 @@ require File.expand_path('../nodes/ts_rank_cd', __FILE__)
 require File.expand_path('../ts_predications', __FILE__)
 Arel::Attributes::Attribute.include(Arel::TSPredications)
 
+require File.expand_path('../nodes/relation', __FILE__)
 
 require File.expand_path('../gis_predications', __FILE__)
 Arel::Attributes::Attribute.include(Arel::GISPredications)
@@ -38,4 +42,8 @@ end
 
 if defined?(Arel::Visitors::Sunstone)
   require File.expand_path('../visitors/sunstone_extensions', __FILE__)
+end
+
+if defined?(Arel::Visitors::ToSql)
+  require File.expand_path('../visitors/to_sql_extensions', __FILE__)
 end

data/lib/arel/extensions/version.rb

@@ -0,0 +1,5 @@
+module Arel
+  module Extensions
+    VERSION = '6.1.0.rc1'
+  end
+end

data/lib/arel/nodes/random.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Nodes
+    class RandomOrdering < Arel::Nodes::Node
+
+    end
+  end
+end

data/lib/arel/nodes/relation.rb

@@ -0,0 +1,35 @@
+module Arel
+  module Attributes
+    class Relation < Attribute
+      
+      attr_accessor :collection, :for_write
+      
+      def initialize(relation, name, collection = false, for_write=false)
+        self[:relation] = relation
+        self[:name] = name
+        @collection = collection
+        @for_write = for_write
+      end
+      
+      def able_to_type_cast?
+        false
+      end
+      
+      def table_name
+        nil
+      end
+      
+      def eql? other
+        self.class == other.class &&
+          self.relation == other.relation &&
+          self.name == other.name &&
+          self.collection == other.collection
+      end
+
+      def type_cast_for_database(value)
+        relation.type_cast_for_database(value)
+      end
+
+    end
+  end
+end

data/lib/arel/nodes/ts_rank_cd.rb

@@ -2,11 +2,12 @@ module Arel
   module Nodes
     class TSRankCD < Arel::Nodes::Node
       
-      attr_reader :tsvector, :tsquery
+      attr_reader :tsvector, :tsquery, :normalization
       
-      def initialize(tsvector, tsquery)
+      def initialize(tsvector, tsquery, normalization=nil)
         @tsvector = tsvector
         @tsquery = tsquery
+        @normalization = normalization
       end
 
     end

data/lib/arel/ts_predications.rb

@@ -2,11 +2,11 @@ module Arel
   module TSPredications
     
     def ts_query(expression, language=nil)
-      vector = Arel::Nodes::TSVector.new(self, language)
-      query = Arel::Nodes::TSQuery.new(expression, language)
+      vector = Arel::Nodes::TSVector.new(self, language: language)
+      query = Arel::Nodes::TSQuery.new(expression, language: language)
       
       Arel::Nodes::TSMatch.new(vector, query)
     end
     
   end
-end
+end

data/lib/arel/visitors/postgresql_extensions.rb

@@ -8,11 +8,24 @@ module Arel
         super
       end
       
-      def visit_Arel_Nodes_Contains o, collector
-        visit o.left, collector
-        collector << ' @> '
-        collector << quote(o.left.type_cast_for_database(o.right))
-        collector
+      def visit_Arel_Nodes_Ascending o, collector
+        case o.nulls
+        when :nulls_first then visit(o.expr, collector) << ' ASC NULLS FIRST'
+        when :nulls_last  then visit(o.expr, collector) << ' ASC NULLS LAST'
+        else visit(o.expr, collector) << ' ASC'
+        end
+      end
+
+      def visit_Arel_Nodes_Descending o, collector
+        case o.nulls
+        when :nulls_first then visit(o.expr, collector) << ' DESC NULLS FIRST'
+        when :nulls_last  then visit(o.expr, collector) << ' DESC NULLS LAST'
+        else visit(o.expr, collector) << ' DESC'
+        end
+      end
+      
+      def visit_Arel_Nodes_RandomOrdering o, collector
+        collector << "RANDOM()"
       end
       
       def visit_Arel_Nodes_ContainedBy o, collector
@@ -31,13 +44,6 @@ module Arel
         collector
       end
 
-      def visit_Arel_Nodes_Overlaps o, collector
-        visit o.left, collector
-        collector << ' && '
-        collector << quote(o.left.type_cast_for_database(o.right))
-        collector
-      end
-      
       def visit_Arel_Attributes_Key(o, collector, last_key = true)
         if o.relation.is_a?(Arel::Attributes::Key)
           visit_Arel_Attributes_Key(o.relation, collector, false)
@@ -133,6 +139,10 @@ module Arel
         visit(o.tsvector, collector) 
         collector << ', '
         visit(o.tsquery, collector)
+        if o.normalization
+          collector << ', '
+          visit(o.normalization, collector)
+        end
         collector << ')'
         collector
       end

data/lib/arel/visitors/sunstone_extensions.rb

@@ -3,12 +3,64 @@ module Arel
     class Sunstone
       private
 
+      def visit_Arel_Nodes_Ascending o, collector
+        hash = visit(o.expr, collector)
+        
+        value = case o.nulls
+        when :nulls_first
+          {asc: :nulls_first}
+        when :nulls_last
+          {asc: :nulls_last}
+        else
+          :asc
+        end
+        
+        if hash.is_a?(Hash)
+          add_to_bottom_of_hash_or_array(hash, value)
+        else
+          hash = { hash => value }
+        end
+
+        hash
+      end
+
+      def visit_Arel_Nodes_Descending o, collector
+        hash = visit(o.expr, collector)
+
+        value = case o.nulls
+        when :nulls_first
+          {desc: :nulls_first}
+        when :nulls_last
+          {desc: :nulls_last}
+        else
+          :desc
+        end
+
+        if hash.is_a?(Hash)
+          add_to_bottom_of_hash_or_array(hash, value)
+        else
+          hash = { hash => value }
+        end
+
+        hash
+      end
+      
+      def visit_Arel_Nodes_RandomOrdering o, collector
+        :random
+      end
+
       def visit_Hash o, collector
-        value = {}
+        rvalue = {}
         o.each do |key, value|
-          value[visit(key, collector)] = visit(value, collector)
+          rvalue[visit(key, collector)] = visit(value, collector)
         end
-        value
+        rvalue
+      end
+      
+      alias :visit_String                :literal
+      
+      def visit_Symbol o, collector
+        o.to_s
       end
 
       def visit_Arel_Nodes_Contains o, collector

data/lib/arel/visitors/to_sql_extensions.rb

@@ -0,0 +1,11 @@
+module Arel
+  module Visitors
+    class ToSql
+
+      def visit_Arel_Attributes_Relation(o, collector)
+        visit(o.relation, collector)
+      end
+
+    end
+  end
+end

data/test/database.rb

@@ -1,16 +1,14 @@
-task = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new({
-  'adapter' => 'postgresql',
-  'database' => "arel-extensions-test"
-})
-task.drop
-task.create
-
 ActiveRecord::Base.establish_connection({
   adapter:  "postgresql",
   database: "arel-extensions-test",
   encoding: "utf8"
 })
 
+db_config = ActiveRecord::Base.connection_db_config
+task = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(db_config)
+task.drop
+task.create
+
 ActiveRecord::Migration.suppress_messages do
   ActiveRecord::Schema.define do
 
@@ -18,7 +16,7 @@ ActiveRecord::Migration.suppress_messages do
       t.integer  "name"
       t.integer  "property_id"
     end
-    
+
     create_table "properties", force: :cascade do |t|
       t.string   "name",                 limit: 255
       t.tsvector 'vector_col'
@@ -29,13 +27,23 @@ ActiveRecord::Migration.suppress_messages do
 end
 
 class Address < ActiveRecord::Base
-  
   belongs_to :property
-
 end
 
 class Property < ActiveRecord::Base
-  
   has_many :addresses
+end
+
+class SunstoneRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
+
+class SunstoneAddress < SunstoneRecord
+  belongs_to :property, class_name: 'SunstoneProperty'
+end
+
+class SunstoneProperty < SunstoneRecord
+  has_many :addresses, class_name: 'SunstoneAddress'
+end
 
-end
+SunstoneRecord.establish_connection(adapter: 'sunstone', endpoint: 'http://example.com')

data/test/order_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class OrderTest < ActiveSupport::TestCase
+
+  test '::order(column.asc)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].asc))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" ASC
+    SQL
+  end
+
+  test '::order(column1.asc, column2.asc)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].asc, Property.arel_table[:name].asc))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" ASC, "properties"."name" ASC
+    SQL
+  end
+
+  test '::order(column.desc)' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].desc))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" DESC
+    SQL
+  end
+
+  test '::order(column.asc(:nulls_first))' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].asc(:nulls_first)))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" ASC NULLS FIRST
+    SQL
+  end
+  
+  test '::order(column.asc(:nulls_last))' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].asc(:nulls_last)))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" ASC NULLS LAST
+    SQL
+  end
+
+  test '::order(column.desc(:nulls_first))' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].desc(:nulls_first)))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" DESC NULLS FIRST
+    SQL
+  end
+  
+  test '::order(column.desc(:nulls_last))' do
+    assert_sql(<<~SQL, Property.order(Property.arel_table[:id].desc(:nulls_last)))
+      SELECT "properties".* FROM "properties" ORDER BY "properties"."id" DESC NULLS LAST
+    SQL
+  end
+
+end

data/test/sunstone_test.rb

@@ -27,8 +27,11 @@ class SunstoneTest < ActiveSupport::TestCase
   # end
   
   test "::filter json_column: {contains: JSON_HASH}" do
-    query = Property.where(Property.arel_attribute('metadata').contains({json: 'string'}))
-    assert_equal '', query.to_sar.path
+    query = SunstoneProperty.where(SunstoneProperty.arel_table['metadata'].contains({json: 'string'}))
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      where: {metadata: {contains: { json: 'string' }}}
+    })
+    
     # query = Property.where(metadata: {contains: {json: 'string'}})
     # assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
     #   SELECT "properties".*
@@ -94,5 +97,53 @@ class SunstoneTest < ActiveSupport::TestCase
   #   SQL
   # end
 
+  test '::order(column.asc)' do
+    query = SunstoneProperty.order(SunstoneProperty.arel_table[:id].asc)
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      order: [{ id: :asc }]
+    })
+  end
+
+  test '::order(column1.asc, column2.asc)' do
+    query = SunstoneProperty.order(SunstoneProperty.arel_table[:id].asc, SunstoneProperty.arel_table[:name].asc)
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      order: [{ id: :asc }, { name: :asc }]
+    })
+  end
+
+  test '::order(column.desc)' do
+    query = SunstoneProperty.order(SunstoneProperty.arel_table[:id].desc)
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      order: [{ id: :desc }]
+    })
+  end
+
+  test '::order(column.asc(:nulls_first))' do
+    query = SunstoneProperty.order(SunstoneProperty.arel_table[:id].asc(:nulls_first))
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      order: [{ id: { asc: :nulls_first } }]
+    })
+  end
+  
+  test '::order(column.asc(:nulls_last))' do
+    query = SunstoneProperty.order(SunstoneProperty.arel_table[:id].asc(:nulls_last))
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      order: [{ id: { asc: :nulls_last } }]
+    })
+  end
+
+  test '::order(column.desc(:nulls_first))' do
+    query = SunstoneProperty.order(SunstoneProperty.arel_table[:id].desc(:nulls_first))
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      order: [{ id: { desc: :nulls_first } }]
+    })
+  end
+  
+  test '::order(column.desc(:nulls_last))' do
+    query = SunstoneProperty.order(SunstoneProperty.arel_table[:id].desc(:nulls_last))
+    assert_sar(query, 'GET', '/sunstone_properties', {
+      order: [{ id: { desc: :nulls_last } }]
+    })
+  end
 
 end

data/test/test_helper.rb

@@ -12,11 +12,13 @@ require 'rgeo'
 require "minitest/autorun"
 require 'minitest/unit'
 require 'minitest/reporters'
-# require 'webmock/minitest'
+require 'webmock/minitest'
 # require 'mocha/minitest'
 require 'active_record'
+require 'sunstone'
 require 'arel/extensions'
 
+
 # Setup the test db
 ActiveSupport.test_order = :random
 require File.expand_path('../database', __FILE__)
@@ -27,8 +29,8 @@ $debugging = false
 
 # File 'lib/active_support/testing/declarative.rb', somewhere in rails....
 class ActiveSupport::TestCase
-  # include WebMock::API
-  
+  include WebMock::API
+
   # File 'lib/active_support/testing/declarative.rb'
   def self.test(name, &block)
     test_name = "test_#{name.gsub(/\s+/, '_')}".to_sym
@@ -42,7 +44,7 @@ class ActiveSupport::TestCase
       end
     end
   end
-  
+
   def webmock(method, path, query=nil)
     query = deep_transform_query(query) if query
 
@@ -55,6 +57,51 @@ class ActiveSupport::TestCase
     end
   end
 
+  def setup
+    sunstone_schema = {
+      addresses: {
+        columns: {
+          id: { type: :integer, primary_key: true, null: false, array: false },
+          name: { type: :string, primary_key: false, null: true, array: false },
+          property_id: { type: :integer, primary_key: false, null: true, array: false }
+        }
+      },
+      properties: {
+        columns: {
+          id: { type: :integer, primary_key: true, null: false, array: false },
+          name: { type: :string, primary_key: false, null: true, array: false },
+          metadata: { type: :json, primary_key: false, null: true, array: false }
+        }
+      }
+    }
+
+    req_stub = stub_request(:get, /^http:\/\/example.com/).with do |req|
+      case req.uri.path
+      when '/tables'
+        true
+      when /^\/\w+\/schema$/i
+        true
+      else
+        false
+      end
+    end
+
+    req_stub.to_return do |req|
+      case req.uri.path
+      when '/tables'
+        {
+          body: sunstone_schema.keys.to_json,
+          headers: { 'StandardAPI-Version' => '5.0.0.5' }
+        }
+      when /^\/(\w+)\/schema$/i
+        {
+          body: sunstone_schema[$1.to_sym].to_json,
+          headers: { 'StandardAPI-Version' => '5.0.0.5' }
+        }
+      end
+    end
+  end
+
   def debug
     ActiveRecord::Base.logger = Logger.new(STDOUT)
     $debugging = true
@@ -104,7 +151,7 @@ class ActiveSupport::TestCase
       unless ignore =~ sql
         if $debugging
         puts caller.select { |l| l.starts_with?(File.expand_path('../../lib', __FILE__)) }
-        puts "\n\n" 
+        puts "\n\n"
         end
       end
       self.class.log << sql unless ignore =~ sql
@@ -112,6 +159,37 @@ class ActiveSupport::TestCase
   end
   ActiveSupport::Notifications.subscribe('sql.active_record', SQLLogger.new)
 
+  def deep_transform_query(object)
+    case object
+    when Hash
+      object.each_with_object({}) do |(key, value), result|
+        result[key.to_s] = deep_transform_query(value)
+      end
+    when Array
+      object.map {|e| deep_transform_query(e) }
+    when Symbol
+      object.to_s
+    else
+      object
+    end
+  end
+
+  def assert_sar(query, method, path, query_params = {}, body = nil)
+    sar = query.to_sar
+
+    assert_equal method, sar.method
+    assert_equal path, sar.path.split('?').first
+    assert_equal deep_transform_query(query_params), MessagePack.unpack(CGI::unescape(sar.path.split('?').last))
+    if body.nil?
+      assert_nil sar.body
+    else
+      assert_equal body, sar.body
+    end
+  end
+
+  def assert_sql(expected, query)
+    assert_equal expected.strip, query.to_sql.strip.gsub(/\s+/, ' ')
+  end
   # test/unit backwards compatibility methods
   alias :assert_raise :assert_raises
   alias :assert_not_empty :refute_empty
@@ -127,5 +205,5 @@ class ActiveSupport::TestCase
   alias :assert_not_predicate :refute_predicate
   alias :assert_not_respond_to :refute_respond_to
   alias :assert_not_same :refute_same
-  
-end
+
+end

data/test/ts_test.rb

@@ -133,4 +133,19 @@ class TSTest < ActiveSupport::TestCase
     SQL
   end
 
+  test 'ts_rank_cd(tsvector, tsquery, normalization)' do
+    query = Property.where(
+      Arel::Nodes::TSRankCD.new(
+        Arel::Nodes::TSVector.new(Property.arel_table[:name]),
+        Arel::Nodes::TSQuery.new('query'),
+        5
+      )
+    )
+    
+    assert_equal(<<~SQL.gsub(/( +|\n)/, ' ').strip, query.to_sql)
+      SELECT "properties".* FROM "properties"
+      WHERE ts_rank_cd(to_tsvector("properties"."name"), to_tsquery('query'), 5)
+    SQL
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 6.0.0.4
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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
@@ -80,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sunstone
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0.rc1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0.rc1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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: pg
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - jonbracy@gmail.com
 executables: []
@@ -118,26 +160,29 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - arel-extensions.gemspec
+- ext/arel/nodes/ascending.rb
+- ext/arel/nodes/descending.rb
+- ext/arel/order_predications.rb
 - lib/active_record/query_methods.rb
 - lib/arel/array_predications.rb
 - lib/arel/attributes/cast.rb
 - lib/arel/attributes/key.rb
 - lib/arel/extensions.rb
+- lib/arel/extensions/version.rb
 - lib/arel/gis_predications.rb
 - lib/arel/json_predications.rb
 - lib/arel/nodes/contained_by.rb
-- lib/arel/nodes/contains.rb
 - lib/arel/nodes/excludes.rb
 - lib/arel/nodes/has_any_key.rb
 - lib/arel/nodes/has_key.rb
 - lib/arel/nodes/has_keys.rb
 - lib/arel/nodes/hex_encoded_binary.rb
-- lib/arel/nodes/overlaps.rb
+- lib/arel/nodes/random.rb
+- lib/arel/nodes/relation.rb
 - lib/arel/nodes/ts_match.rb
 - lib/arel/nodes/ts_query.rb
 - lib/arel/nodes/ts_rank.rb
@@ -147,7 +192,9 @@ files:
 - lib/arel/ts_predications.rb
 - lib/arel/visitors/postgresql_extensions.rb
 - lib/arel/visitors/sunstone_extensions.rb
+- lib/arel/visitors/to_sql_extensions.rb
 - test/database.rb
+- test/order_test.rb
 - test/sunstone_test.rb
 - test/test_helper.rb
 - test/ts_test.rb
@@ -155,7 +202,7 @@ homepage: https://github.com/malomalo/arel-extensions
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,16 +213,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Adds support for missing SQL operators and functions to Arel
 test_files:
 - test/database.rb
+- test/order_test.rb
 - test/sunstone_test.rb
 - test/test_helper.rb
 - test/ts_test.rb

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    arel-extensions (6.0.0.2)
-      activerecord (>= 6.0.0.rc1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
-    activerecord (6.0.0.rc2)
-      activemodel (= 6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
-    activesupport (6.0.0.rc2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    ansi (1.5.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    minitest-reporters (1.3.5)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    pg (1.1.3)
-    rake (12.3.1)
-    rgeo (1.0.0)
-    ruby-progressbar (1.10.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.1.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  arel-extensions!
-  bundler
-  minitest
-  minitest-reporters
-  pg
-  rake
-  rgeo
-
-BUNDLED WITH
-   1.17.3

data/lib/arel/nodes/contains.rb

@@ -1,6 +0,0 @@
-module Arel
-  module Nodes
-    class Contains < Binary
-    end
-  end
-end

data/lib/arel/nodes/overlaps.rb

@@ -1,6 +0,0 @@
-module Arel
-  module Nodes
-    class Overlaps < Binary
-    end
-  end
-end