arel-extensions 6.0.0.6 → 6.0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b1c993b347393ad06a933f8ab1c8b1e315d7f39c5921ad21c995538a3fc64c
-  data.tar.gz: 32e7728efa400fd618557a39ddabdb4b4e2ec01fbb8e220053d2e6f228a103c2
+  metadata.gz: 87c1e3d344cef64601be578c9efa5e05ca8a0fb2a0443cb81f586c06a3e1009f
+  data.tar.gz: 361a92b9257df496481556ccb63f78e399168dc021a5461f5a3b5b4e324a401e
 SHA512:
-  metadata.gz: 7d35be931c9fa7e39f1265b11851d034da64d49f8e2c30d457208dcc4d66991bec244590087bd20ff0127cb8a12966fa654a7cf78ad881280031215f0baa1c7d
-  data.tar.gz: 0eb34be84a36821aaa96ef5a15e0de64d703194c1764c37981fb862952683cfb56218c12ce4be81bdf977c118dcc6560a40fce9be68413cb99385ed057730f52
+  metadata.gz: 4e83c72da829bf31e4113d777f4cede440c1ecb8d3ad7c552225978788956af72030c669b782aa935cc4945990bb02449c224e582643ed8e88694d4b439a1995
+  data.tar.gz: ade28f1b9fad88a81eeeb0d25a7a3608900c802858f0579a9f0713dd68a655433ce2c2f4504939c83600db20e77e4a28995feb2bd0db2573772c4ba762f00372

data/.gitignore

@@ -1,2 +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 GEM=activerecord:mysql2
-    - RAILS_VERSION=v6.0.0 GEM=activerecord:sqlite3
-    - RAILS_VERSION=v6.0.0 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,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version       = '6.0.0.6'
+  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}

data/lib/arel/nodes/relation.rb

@@ -25,7 +25,11 @@ module Arel
           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/sunstone_extensions.rb

@@ -6,30 +6,42 @@ module Arel
       def visit_Arel_Nodes_Ascending o, collector
         hash = visit(o.expr, collector)
         
-        case o.nulls
+        value = case o.nulls
         when :nulls_first
-          add_to_bottom_of_hash_or_array(hash, {asc: :nulls_first})
+          {asc: :nulls_first}
         when :nulls_last
-          add_to_bottom_of_hash_or_array(hash, {asc: :nulls_last})
+          {asc: :nulls_last}
         else
-          add_to_bottom_of_hash_or_array(hash, :asc)
+          :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)
-        
-        case o.nulls
+
+        value = case o.nulls
         when :nulls_first
-          add_to_bottom_of_hash_or_array(hash, {desc: :nulls_first})
+          {desc: :nulls_first}
         when :nulls_last
-          add_to_bottom_of_hash_or_array(hash, {desc: :nulls_last})
+          {desc: :nulls_last}
         else
-          add_to_bottom_of_hash_or_array(hash, :desc)
+          :desc
         end
-        
+
+        if hash.is_a?(Hash)
+          add_to_bottom_of_hash_or_array(hash, value)
+        else
+          hash = { hash => value }
+        end
+
         hash
       end
       

data/test/sunstone_test.rb

@@ -97,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

@@ -180,7 +180,11 @@ class ActiveSupport::TestCase
     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
+    if body.nil?
+      assert_nil sar.body
+    else
+      assert_equal body, sar.body
+    end
   end
   
   def assert_sql(expected, query)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 6.0.0.6
+  version: 6.0.0.8
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - jonbracy@gmail.com
 executables: []
@@ -146,7 +146,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -190,7 +189,7 @@ homepage: https://github.com/malomalo/arel-extensions
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,8 +204,8 @@ 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:

data/Gemfile.lock

@@ -1,73 +0,0 @@
-PATH
-  remote: .
-  specs:
-    arel-extensions (6.0.0.5)
-      activerecord (>= 6.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      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)
-    minitest-reporters (1.3.8)
-      ansi
-      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
-  ruby
-
-DEPENDENCIES
-  arel-extensions!
-  bundler
-  minitest
-  minitest-reporters
-  pg
-  rake
-  rgeo
-  sunstone
-  webmock
-
-BUNDLED WITH
-   1.17.3