activerecord-sort 6.1.0.rc1 → 6.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1845764483eacf7b3cce0ee2b9b7f3d1cff6d3d1211518f12e54be59a7cccf9f
-  data.tar.gz: d4072a886aaeed64c12d01a5ede815db50efe30823731c0e8fb6c0c69fd8e762
+  metadata.gz: 24b933e7b9456dfe06da3a8da7a20ad8bf7b03043c81667021dbdafc8f6b9cf4
+  data.tar.gz: 77347b9a5f294de607d485598b2c41305e66b2932debec47da84ded5cca9772d
 SHA512:
-  metadata.gz: 4356863599576c5a49c4a720eb6fd1be043235532d606cde9a1592d562ea643d1fe1abe906dcdc6c5fa6ef65155917605904ec780fdabb24858e0171364e4971
-  data.tar.gz: 104bdf59db87f9781f002af1faf40834373fa07fda6887f666f5d9324c25ee74b31f48b4f3d4ba2819d2f259907a89eede04f3e3ce61f8ebd7db0e234d050b78
+  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,16 +1,27 @@
-# ActiveRecord::sort [![Travis CI](https://travis-ci.org/malomalo/activerecord-sort.svg?branch=master)](https://travis-ci.org/malomalo/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.sort(:id).to_sql

data/lib/active_record/sort/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sort
 version: !ruby/object:Gem::Version
-  version: 6.1.0.rc1
+  version: 6.1.0.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc1
+        version: 6.1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc1
+        version: 6.1.0.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -187,8 +187,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- LICENSE
 - README.md
-- ext/active_record/base.rb
 - lib/active_record/sort.rb
 - lib/active_record/sort/version.rb
 homepage: https://github.com/malomalo/activerecord-sort
@@ -208,11 +208,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A safe way to accept user parameters and order against your ActiveRecord

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(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)
-          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
-
-    # TODO: probably don't need to cast to sym
-    def sort_for_column(column, options)
-      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
-        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 = 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)
-            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.left_outer_joins(relation.name)
-            resource = resource.order(order)
-          end
-        end
-      end
-
-      resource
-    end
-
-  end
-end