arel-extensions 6.0.0.5 → 6.0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77163aa72e10eb31450da65c1b1df14a021e5b4075fb4593d5fef7bcc99b5601
-  data.tar.gz: 6f3c923426a618ff4cab75573a9249f5ff96f03ce270fa4f70218815df617fed
+  metadata.gz: b8b1c993b347393ad06a933f8ab1c8b1e315d7f39c5921ad21c995538a3fc64c
+  data.tar.gz: 32e7728efa400fd618557a39ddabdb4b4e2ec01fbb8e220053d2e6f228a103c2
 SHA512:
-  metadata.gz: 6b4ba6222a1324e349ee69e4f6463f5fa964b4f965291db74712876749af64ddc77fe957c38fd2081cfcbf7263440989aa5230708a69ce6562a76417a131eef3
-  data.tar.gz: 448a6441598e3a7648df5f9e261b52840988ad1d0ac2836eecfbd45110a1d2918033622702261efd7cf9b6ca604e9d130cc878e6f34dc5a20032e21700c3e610
+  metadata.gz: 7d35be931c9fa7e39f1265b11851d034da64d49f8e2c30d457208dcc4d66991bec244590087bd20ff0127cb8a12966fa654a7cf78ad881280031215f0baa1c7d
+  data.tar.gz: 0eb34be84a36821aaa96ef5a15e0de64d703194c1764c37981fb862952683cfb56218c12ce4be81bdf977c118dcc6560a40fce9be68413cb99385ed057730f52

data/.travis.yml

@@ -13,12 +13,9 @@ rvm:
 
 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.0.rc2 GEM=activerecord:mysql2
-    - RAILS_VERSION=v6.0.0.rc2 GEM=activerecord:sqlite3
-    - RAILS_VERSION=v6.0.0.rc2 GEM=activerecord:postgresql
+    - RAILS_VERSION=v6.0.0 GEM=activerecord:mysql2
+    - RAILS_VERSION=v6.0.0 GEM=activerecord:sqlite3
+    - RAILS_VERSION=v6.0.0 GEM=activerecord:postgresql
 
 services:
   - mysql

data/Gemfile.lock

@@ -18,9 +18,15 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     builder (3.2.3)
     concurrent-ruby (1.1.5)
+    cookie_store (0.1.4)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    hashdiff (1.0.0)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
@@ -29,13 +35,24 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    msgpack (1.3.1)
     pg (1.1.4)
+    public_suffix (4.0.1)
     rake (12.3.3)
     rgeo (2.1.0)
     ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
+    sunstone (6.0.0.5)
+      activerecord (>= 6.0.0.rc1)
+      cookie_store
+      msgpack
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    webmock (3.7.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     zeitwerk (2.1.10)
 
 PLATFORMS
@@ -49,6 +66,8 @@ DEPENDENCIES
   pg
   rake
   rgeo
+  sunstone
+  webmock
 
 BUNDLED WITH
    1.17.3

data/arel-extensions.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version       = '6.0.0.5'
+  gem.version       = '6.0.0.6'
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]
   gem.summary       = %q{Adds support for missing SQL operators and functions to Arel}
@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   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__)

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/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

@@ -3,12 +3,52 @@ module Arel
     class Sunstone
       private
 
+      def visit_Arel_Nodes_Ascending o, collector
+        hash = visit(o.expr, collector)
+        
+        case o.nulls
+        when :nulls_first
+          add_to_bottom_of_hash_or_array(hash, {asc: :nulls_first})
+        when :nulls_last
+          add_to_bottom_of_hash_or_array(hash, {asc: :nulls_last})
+        else
+          add_to_bottom_of_hash_or_array(hash, :asc)
+        end
+        
+        hash
+      end
+
+      def visit_Arel_Nodes_Descending o, collector
+        hash = visit(o.expr, collector)
+        
+        case o.nulls
+        when :nulls_first
+          add_to_bottom_of_hash_or_array(hash, {desc: :nulls_first})
+        when :nulls_last
+          add_to_bottom_of_hash_or_array(hash, {desc: :nulls_last})
+        else
+          add_to_bottom_of_hash_or_array(hash, :desc)
+        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/test/database.rb

@@ -29,13 +29,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', 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

@@ -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_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".*

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,33 @@ 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))
+    assert_equal body, sar.body
+  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.5
+  version: 6.0.0.6
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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
@@ -123,6 +151,9 @@ files:
 - 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 +169,7 @@ 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
@@ -150,6 +182,7 @@ files:
 - 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
@@ -178,6 +211,7 @@ 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