activerecord-sort 5.2.0 → 6.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58235a88e62a3f9c2fc6ae58f3a3e3c4acc84c53508488f532eb5ce440c3ff91
-  data.tar.gz: 319c9afce377837f7d09897f8eee1d72a01e61a391cf3924d9a004e322384164
+  metadata.gz: 24b933e7b9456dfe06da3a8da7a20ad8bf7b03043c81667021dbdafc8f6b9cf4
+  data.tar.gz: 77347b9a5f294de607d485598b2c41305e66b2932debec47da84ded5cca9772d
 SHA512:
-  metadata.gz: 6d277ba4d6d8e8f97b366d5ceff8a4604e256379e6f306c314df3b994867f31a5eb620b02ede5918f9c03cecd02110b17457d1cc497ae6930478225de0cb5eb7
-  data.tar.gz: 50c3ac9d655d7b823b7c2f7b2aeafa2ee32549d522d4c624eb3f17edba9fc00dc3bad5cabfc0494a1160be2542b37041bb4ebf498e8eb712925f8f0e63a926c5
+  metadata.gz: 41524ce760cfbf7f8bdb93bd5688c149e553a277b615d45c240939d8c51541c6d34660ccf8ad681ce78aeececcf86995b62ab20fd10797f5440115b88767acd6
+  data.tar.gz: f2098644c9201456b82899f1b621f8348a140bee47d6db7e4780ca4273b2ee47061771c535905d727a70195d4b20fc3da2c02181396bfcf84c1e645a739ef73c

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Jon Bracy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -1,46 +1,57 @@
-# ActiveRecord::sort
+# ActiveRecord::Sort
 
-`ActiveRecord::sort` provides and easy way to accept user input and order a query by the input.
+`ActiveRecord::Sort` provides and easy way to accept user input and order a query by the input.
 
-Installtion
------------
+Installation
+------------
 
-- Add `gem 'activerecord-sort', require: 'active_record/sort'
-- Run `bundle install`
+Add `sunstone` to your Gemfile and run `bundle`:
+
+```ruby
+gem 'activerecord-sort', require: 'active_record/sort'
+```
+
+Or install the gem and require it:
+
+```sh
+gem install activerecord-sort
+irb
+# => require('active_record/sort')
+```
 
 Examples
 --------
-`ActiveRecord::sort` supports the following cases:
+`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/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 = '5.2.0'
+    VERSION = '6.1.0.1'
   end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sort
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.1.0.1
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 - !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.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0.2
+- !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:
@@ -145,20 +187,15 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- LICENSE
 - 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
@@ -175,9 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A safe way to accept user parameters and order against your ActiveRecord
   Models

data/ext/active_record/base.rb

@@ -1,123 +0,0 @@
-require 'active_record'
-require 'active_record/relation'
-
-module ActiveRecord
-  module QueryMethods
-  # class << self
-
-    # ordering:
-    # :id
-    # :name, :id
-    # :id => :desc
-    # :id => {:desc => :nulls_last}
-    # :listings => :id
-    # :listings => {:id => {:asc => :nulls_first}}
-    # :random
-    def sort(*ordering)
-      resource = all
-      ordering.compact!
-      ordering.flatten!
-      return resource if ordering.size == 0
-      
-      ordering.each do |order|
-        order = Array(order)
-
-        order.each do |column_or_relation, options|
-          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)
-          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)
-          else
-            raise ActiveRecord::StatementInvalid.new("Unkown column #{column_or_relation}")
-          end
-        end
-      end
-
-      resource
-    end
-    
-    def random_sort
-      self.order(Arel::Nodes::RandomOrdering.new)
-    end
-
-    def sort_for_column(column, options)
-      column = self.arel_table[column.to_s.underscore]
-      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)
-      if direction == :desc
-        self.order(Arel::Nodes::Descending.new(column, nulls))
-      elsif direction == :asc || direction == :''
-        self.order(Arel::Nodes::Ascending.new(column, nulls))
-      else
-        raise ActiveRecord::StatementInvalid.new("Unkown ordering #{direction}")
-      end
-    end
-
-    def sort_for_relation(relation, options)
-      resource = self
-      relation = reflect_on_association(relation)
-
-      if relation.macro == :has_many
-        options = [options] if !options.is_a?(Array)
-
-        options.each do |order|
-          order = Array(order)
-          order.each do |column, options|
-            column = relation.klass.arel_table[column]
-            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)
-            if direction == :desc
-              # aggregation = Arel::Nodes::Max.new([column], "max_#{relation.name}_#{column.name}")
-              # order = Arel::Nodes::Descending.new(Arel::Nodes::SqlLiteral.new("max_#{relation.name}_#{column.name}"), nulls)
-
-              if relation.options[:through]
-                resource = resource.joins(relation.options[:through] => relation.source_reflection_name)
-              else
-                resource = resource.joins(relation.name)
-              end
-              # resource = resource.select(aggregation)
-              # resource = resource.order(order)
-              resource = resource.order(Arel::Nodes::Descending.new(column, nulls))
-            else
-              # aggregation = Arel::Nodes::Min.new([column], "min_#{relation.name}_#{column.name}")
-              order = Arel::Nodes::Ascending.new(Arel::Nodes::SqlLiteral.new("min_#{relation.name}_#{column.name}"), nulls)
-
-              resource = resource.joins(relation.name)
-              # resource = resource.select(aggregation)
-              # resource = resource.order(order)
-              resource = resource.order(Arel::Nodes::Ascending.new(column, nulls))
-            end
-          end
-        end
-      elsif relation.macro == :belongs_to || relation.macro == :has_one
-        options = [options] if !options.is_a?(Array)
-
-        options.each do |order|
-          order = Array(order)
-          order.each do |column, options|
-            column = relation.klass.arel_table[column]
-            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)
-            if direction == :asc
-              order = Arel::Nodes::Ascending.new(column, nulls)
-            else
-              order = Arel::Nodes::Descending.new(column, nulls)
-            end
-
-            resource = resource.joins(relation.name)
-            resource = resource.order(order)
-          end
-        end
-      end
-
-      resource
-    end
-
-  end
-end

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