activerecord-sort 6.0.0.2 → 6.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff1abfec5ff89217d35624be89876e6f88943250f3da263d39caf520fa20b9b
-  data.tar.gz: 7ce1af43d5e20dea32de13d1b542b6efa6f43b6a94a18bfabffb319740fedba4
+  metadata.gz: 1845764483eacf7b3cce0ee2b9b7f3d1cff6d3d1211518f12e54be59a7cccf9f
+  data.tar.gz: d4072a886aaeed64c12d01a5ede815db50efe30823731c0e8fb6c0c69fd8e762
 SHA512:
-  metadata.gz: 8ef79654a460ec5c1a7f134aa3faba1c49793a51bbc93909b928e56c23b9157393a9f7e328318301069f75d2fa36c00999d87e400544db76a37c8a2a5efb134f
-  data.tar.gz: e78df6d8a039c2036c054d44eb422388847aea6a0bd34022d6964a70c0c8de38cb43d69100892416e81b43e4fcc099b6b4a8cb0494baafd35d322748ebb2e312
+  metadata.gz: 4356863599576c5a49c4a720eb6fd1be043235532d606cde9a1592d562ea643d1fe1abe906dcdc6c5fa6ef65155917605904ec780fdabb24858e0171364e4971
+  data.tar.gz: 104bdf59db87f9781f002af1faf40834373fa07fda6887f666f5d9324c25ee74b31f48b4f3d4ba2819d2f259907a89eede04f3e3ce61f8ebd7db0e234d050b78

data/README.md

@@ -13,34 +13,34 @@ Examples
 `ActiveRecord::sort` supports the following cases:
 
 ```ruby
-Property.order(:id).to_sql
+Property.sort(:id).to_sql
 # => "...ORDER BY properties.id ASC"
 
-Property.order(:id, :name).to_sql
+Property.sort(:id, :name).to_sql
 # => "...ORDER BY properties.id ASC, properties.name ASC"
 
-Property.order(:id => :desc).to_sql
+Property.sort(id: :desc).to_sql
 # => "...ORDER BY properties.id DESC"
 
-Property.order(:id => {:asc => :nulls_first})
+Property.sort(id: {asc: :nulls_first})
 # => "...ORDER BY properties.id ASC NULLS FIRST"
 
-Property.order(:id => {:asc => :nulls_last})
+Property.sort(id: {asc: :nulls_last})
 # => "...ORDER BY properties.id ASC NULLS LAST"
 ```
 
 It can also sort on relations:
 
 ```ruby
-Property.order(:addresses => :id).to_sql
+Property.sort(addresses: :id).to_sql
 # => "...INNER JOIN addresses ON addresses.property_id = properties.id
 # => "   ORDER BY addresses.id ASC"
 
-Property.order(:addresses => {:id => :desc}).to_sql
+Property.sort(addresses: {id: :desc}).to_sql
 # => "...INNER JOIN addresses ON addresses.property_id = properties.id
 # => "   ORDER BY addresses.id DESC"
 
-Property.order(:addresses => {:id => {:asc => :nulls_frist}}).to_sql
+Property.sort(addresses: {id: {asc: :nulls_frist}}).to_sql
 # => "...INNER JOIN addresses ON addresses.property_id = properties.id
 # => "   ORDER BY addresses.id ASC NULLS FIRST"
 ```

data/ext/active_record/base.rb

@@ -26,7 +26,7 @@ module ActiveRecord
           if column_or_relation.to_sym == :random
             resource = resource.random_sort
           elsif self.column_names.include?(column_or_relation.to_s)
-            resource = resource.sort_for_column(column_or_relation, options)
+            resource = resource.sort_for_column(self.arel_table[column_or_relation.to_s], options)
           elsif reflect_on_association(column_or_relation.to_sym)
             resource = resource.select(resource.klass.arel_table[Arel::Nodes::SqlLiteral.new('*')])
             resource = resource.sort_for_relation(column_or_relation.to_sym, options)
@@ -45,8 +45,7 @@ module ActiveRecord
 
     # TODO: probably don't need to cast to sym
     def sort_for_column(column, options)
-      column = self.arel_table[column.to_s.underscore]
-      direction = (options.is_a?(Hash) || options.is_a?(ActionController::Parameters) ? options.keys.first.to_sym : options.to_s.downcase.to_sym)
+      direction = (options.is_a?(Hash) || options.class.name == "ActionController::Parameters" ? options.keys.first.to_sym : options.to_s.downcase.to_sym)
 
       nulls = (options.is_a?(Hash) ? options.values.first.to_sym : nil)
       if direction == :desc
@@ -68,7 +67,7 @@ module ActiveRecord
         options.each do |order|
           order = Array(order)
           order.each do |column, options|
-            column = relation.klass.arel_table[column]
+            column = Arel::Attributes::Relation.new(relation.klass.arel_table[column], relation.name)
             direction = (options.is_a?(Hash) ? options.keys.first.to_sym : options.to_s.downcase.to_sym)
 
             nulls = (options.is_a?(Hash) ? options.values.first.to_sym : nil)
@@ -111,7 +110,7 @@ module ActiveRecord
               order = Arel::Nodes::Descending.new(column, nulls)
             end
 
-            resource = resource.joins(relation.name)
+            resource = resource.left_outer_joins(relation.name)
             resource = resource.order(order)
           end
         end
@@ -121,4 +120,4 @@ module ActiveRecord
     end
 
   end
-end
+end

data/lib/active_record/sort.rb

@@ -1,10 +1,6 @@
 require 'active_record'
+require 'arel/extensions'
 
-require File.expand_path(File.join(__FILE__, '../../../ext/arel/order_predications'))
-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/nodes/random'))
-require File.expand_path(File.join(__FILE__, '../../../ext/arel/visitors/postgresql'))
 require File.expand_path(File.join(__FILE__, '../../../ext/active_record/base'))
 
 ActiveRecord::Querying.delegate :sort, to: :all

data/lib/active_record/sort/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Sort
-    VERSION = '6.0.0.2'
+    VERSION = '6.1.0.rc1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sort
 version: !ruby/object:Gem::Version
-  version: 6.0.0.2
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: arel-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0.rc2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,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'
 description: A safe way to accept user parameters and order against your ActiveRecord
   Models
 email:
@@ -147,18 +189,13 @@ extra_rdoc_files:
 files:
 - README.md
 - ext/active_record/base.rb
-- ext/arel/nodes/ascending.rb
-- ext/arel/nodes/descending.rb
-- ext/arel/nodes/random.rb
-- ext/arel/order_predications.rb
-- ext/arel/visitors/postgresql.rb
 - lib/active_record/sort.rb
 - lib/active_record/sort/version.rb
 homepage: https://github.com/malomalo/activerecord-sort
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -171,12 +208,12 @@ 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: A safe way to accept user parameters and order against your ActiveRecord
   Models

data/ext/arel/nodes/ascending.rb

@@ -1,14 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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/nodes/random.rb

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

data/ext/arel/order_predications.rb

@@ -1,14 +0,0 @@
-# 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/ext/arel/visitors/postgresql.rb

@@ -1,28 +0,0 @@
-module Arel
-  module Visitors
-    class PostgreSQL
-      private
-      
-      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
-      
-    end
-  end
-end