arel-extensions 6.0.0 → 6.0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2e57daa4864ca189927f6f4197009f057ce83d6cc4a1f12d7fd12e20a63ac68
-  data.tar.gz: 39d7ab6d734005b482dd04f1e03c1e8b71b5a463d2c35b9cec3a71d46bf84b20
+  metadata.gz: 87c1e3d344cef64601be578c9efa5e05ca8a0fb2a0443cb81f586c06a3e1009f
+  data.tar.gz: 361a92b9257df496481556ccb63f78e399168dc021a5461f5a3b5b4e324a401e
 SHA512:
-  metadata.gz: 4fbf0b2cdd5c76f856b027495b46ca5084dbadd5e1e0a5bcad2ab62de4fa0915a1453ee63ee35b4de397aa9fd1cdc214d10a2586025be6656cc985ed43468996
-  data.tar.gz: d438b922e697b704c58a22734b647c7027defbf53cce02502ec52a3753fe8417cdf17976e1e956bc7c1e63eb7be0c7b2e8dbc4d5ca87ccd4cf4d1ce805567a03
+  metadata.gz: 4e83c72da829bf31e4113d777f4cede440c1ecb8d3ad7c552225978788956af72030c669b782aa935cc4945990bb02449c224e582643ed8e88694d4b439a1995
+  data.tar.gz: ade28f1b9fad88a81eeeb0d25a7a3608900c802858f0579a9f0713dd68a655433ce2c2f4504939c83600db20e77e4a28995feb2bd0db2573772c4ba762f00372

data/.gitignore

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

data/.travis.yml

@@ -8,14 +8,13 @@ cache:
     - /home/travis/.rvm/gems
 
 rvm:
-  - 2.5
   - 2.6
 
 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.0.3.1 GEM=activerecord:mysql2
+    - RAILS_VERSION=v6.0.3.1 GEM=activerecord:sqlite3
+    - RAILS_VERSION=v6.0.3.1 GEM=activerecord:postgresql
 
 services:
   - mysql
@@ -26,6 +25,7 @@ before_install:
   - unset BUNDLE_GEMFILE
   - gem update --system
   - gem update bundler
+  - gem install bundler -v 1.17.3
 
 install:
   - git clone https://github.com/rails/rails.git ~/build/rails
@@ -37,7 +37,7 @@ install:
   - "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
+  - bundle install --jobs=3 --retry=3 --full-index
   - popd
 
 script:

data/arel-extensions.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version = '6.0.0'
-  
+  gem.version       = '6.0.0.8'
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]
   gem.summary       = %q{Adds support for missing SQL operators and functions to Arel}
@@ -12,12 +11,14 @@ 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.0.0'
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'minitest-reporters'
+  gem.add_development_dependency "sunstone"
+  gem.add_development_dependency "webmock"
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'rgeo'
   

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/extensions.rb

@@ -9,6 +9,11 @@ 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 +31,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 +44,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/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/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,6 +8,26 @@ module Arel
         super
       end
       
+      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_Contains o, collector
         visit o.left, collector
         collector << ' @> '

data/lib/arel/visitors/sunstone_extensions.rb

@@ -2,7 +2,67 @@ module Arel
   module Visitors
     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
+        rvalue = {}
+        o.each do |key, value|
+          rvalue[visit(key, collector)] = visit(value, collector)
+        end
+        rvalue
+      end
       
+      alias :visit_String                :literal
+      
+      def visit_Symbol o, collector
+        o.to_s
+      end
+
       def visit_Arel_Nodes_Contains o, collector
         key = visit(o.left, collector)
         value = { contains: visit(o.right, collector) }
@@ -40,6 +100,30 @@ module Arel
         end
       end
       
+      def visit_Arel_Nodes_Overlaps o, collector
+        key = visit(o.left, collector)
+        value = { overlaps: o.left.type_cast_for_database(o.right) }
+        
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash_or_array(key, value)
+          key
+        else
+          {key => value}
+        end
+      end
+
+      def visit_Arel_Nodes_NotOverlaps o, collector
+        key = visit(o.left, collector)
+        value = { not_overlaps: o.left.type_cast_for_database(o.right) }
+        
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash_or_array(key, value)
+          key
+        else
+          {key => value}
+        end
+      end
+      
       def visit_Arel_Nodes_HasKey o, collector
         key = visit(o.left, collector)
         value = {has_key: (o.right.nil? ? nil : o.right.to_s)}
@@ -64,7 +148,7 @@ module Arel
       
       def visit_Arel_Nodes_HasAnyKey o, collector
         key = visit(o.left, collector)
-        value = {has_any_key: Array(o.right).map(&:to_s)}
+        value = { has_any_key: visit(Array(o.right), collector) }
         
         if key.is_a?(Hash)
           add_to_bottom_of_hash(key, value)

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

@@ -22,19 +22,30 @@ ActiveRecord::Migration.suppress_messages do
     create_table "properties", force: :cascade do |t|
       t.string   "name",                 limit: 255
       t.tsvector 'vector_col'
+      t.jsonb     'metadata'
     end
 
   end
 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', url: '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

@@ -0,0 +1,149 @@
+require 'test_helper'
+
+class SunstoneTest < ActiveSupport::TestCase
+
+  # schema do
+  #   create_table "properties", force: :cascade do |t|
+  #     t.jsonb     'metadata'
+  #   end
+  # end
+
+  # class Property < ActiveRecord::Base
+  # end
+
+  # test "::filter json_column: STRING throws an error" do
+  #   assert_raises(ActiveRecord::UnkownFilterError) do
+  #     Property.filter(metadata: 'string').load
+  #   end
+  # end
+  
+  # test "::filter json_column: {eq: JSON_HASH}" do
+  #   query = Property.where(metadata: {eq: {json: 'string'}})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" = '{\"json\":\"string\"}'
+  #   SQL
+  # end
+  
+  test "::filter json_column: {contains: JSON_HASH}" do
+    query = SunstoneProperty.where(SunstoneProperty.arel_attribute('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".*
+    #   FROM "properties"
+    #   WHERE "properties"."metadata" @> '{\"json\":\"string\"}'
+    # SQL
+  end
+
+  # test "::filter json_column: {contained_by: JSON_HASH}" do
+  #   query = Property.filter(metadata: {contained_by: {json: 'string'}})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" <@ '{\"json\":\"string\"}'
+  #   SQL
+  # end
+  
+  # test "::filter json_column: {has_key: STRING}" do
+  #   query = Property.filter(metadata: {has_key: 'string'})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" ? 'string'
+  #   SQL
+  # end
+  
+  # test "::filter json_column.subkey: {eq: JSON_HASH}" do
+  #   query = Property.filter("metadata.subkey" => {eq: 'string'})
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata"#>'{subkey}' = 'string'
+  #   SQL
+  # end
+  
+  # test "::filter json_column: BOOLEAN" do
+  #   query = Property.filter(metadata: true)
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NOT NULL
+  #   SQL
+    
+  #   query = Property.filter(metadata: "true")
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NOT NULL
+  #   SQL
+    
+  #   query = Property.filter(metadata: false)
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NULL
+  #   SQL
+    
+  #   query = Property.filter(metadata: "false")
+  #   assert_equal(<<-SQL.strip.gsub(/\s+/, ' '), query.to_sql.strip)
+  #     SELECT "properties".*
+  #     FROM "properties"
+  #     WHERE "properties"."metadata" IS NULL
+  #   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,7 +29,7 @@ $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)
@@ -54,6 +56,51 @@ class ActiveSupport::TestCase
       end
     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)
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.0.8
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2020-06-26 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.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,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: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !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 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - jonbracy@gmail.com
 executables: []
@@ -118,11 +146,13 @@ 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
@@ -138,6 +168,8 @@ files:
 - 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,14 +179,17 @@ 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
 homepage: https://github.com/malomalo/arel-extensions
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,11 +204,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+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)
-      activerecord (>= 6.0.0.rc1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.0.rc1)
-      activesupport (= 6.0.0.rc1)
-    activerecord (6.0.0.rc1)
-      activemodel (= 6.0.0.rc1)
-      activesupport (= 6.0.0.rc1)
-    activesupport (6.0.0.rc1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.4)
-    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.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  arel-extensions!
-  bundler
-  minitest
-  minitest-reporters
-  pg
-  rake
-  rgeo
-
-BUNDLED WITH
-   1.17.3