activeset 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f863b0e0436325554096d5b387ff337f833498f0
-  data.tar.gz: 88b9619be39f0cf578f4d93e453a5dce53eebaab
+  metadata.gz: a825246f73039a0fc8fa629354cc0d803eee7398
+  data.tar.gz: d8fdbef2dcc49e136d4f5b4aec3f1b708cc6b026
 SHA512:
-  metadata.gz: 5f1435bf42f919b9beb32c6f96359c2f0d3464ed9b0756450eefe8146cd7574b518196d86f486a8e8ec6165ee80e6562fa994873d568d4c89c0d821c7327cfde
-  data.tar.gz: f5d14ae25144cb6145fbe9a790489573c76ab60863abb26b3cc4407f069f19f44fba0d49013a3b53699fed7d29862ea4e3867d919f29d2990c6d892bb2648af4
+  metadata.gz: 696bb548f4bfe7d44b425fbbf39ed6e522ee4806629f96b2ad5f0bcbe7d34b5c96af41cd15a56d6bff6dda3d9690eb424886ed4b6a5f66a3efa7849e1e600187
+  data.tar.gz: 98dafa877023ef43d2d939ad3e23102a29ac85dc340ca39ca0076e355d767422bcae8c9bd01f39964f899383ab9927b19aa552835592a89d49054b4926e91d6a

data/CHANGELOG

@@ -1,3 +1,6 @@
+v 0.6.4
+  - Add multi-column sorting for ActiveRecord collections
+  - Fix the ActiveRecord `attribute_model` method to always return the class, and not an ActiveRecord::Relation object
 v 0.6.3
   - Fix a typo in the CSV transform adapter
 v 0.6.2

data/lib/active_set/adapter_activerecord.rb

@@ -51,8 +51,8 @@ class ActiveSet
                              .reduce(@set) do |obj, assoc|
                                obj.reflections[assoc.to_s]&.klass
                              end
-      # return tmp_model.klass if tmp_model.is_a?(ActiveRecord::Relation)
-      # tmp_model
+      return tmp_model.klass if tmp_model.is_a?(ActiveRecord::Relation)
+      tmp_model
     end
   end
 end

data/lib/active_set/instruction.rb

@@ -44,7 +44,9 @@ class ActiveSet
     def value_for(item:)
       resource_for(item: item).public_send(attribute)
     rescue
+      # :nocov:
       nil
+      # :nocov:
     end
 
     def resource_for(item:)
@@ -54,7 +56,9 @@ class ActiveSet
         resource.public_send(association)
       end
     rescue
+      # :nocov:
       nil
+      # :nocov:
     end
 
     private

data/lib/active_set/instructions.rb

@@ -17,13 +17,21 @@ class ActiveSet
       @instructions.each(&block)
     end
 
+    # :nocov:
     def method_missing(method_name, *args, &block)
       @instructions.send(method_name, *args, &block) || super
     end
+    # :nocov:
 
+    # :nocov:
     def respond_to_missing?(method_name, include_private = false)
       @instructions.respond_to?(method_name) || super
     end
+    # :nocov:
+
+    def associations_hash
+      @instructions.reduce({}) { |h, i| h.merge(i.associations_hash) }
+    end
 
     def get(key)
       @instructions.find do |instruction|

data/lib/active_set/processor_sort/active_record_adapter.rb

@@ -3,48 +3,25 @@
 require_relative '../adapter_activerecord'
 require_relative '../processor_base'
 require_relative '../../helpers/throws'
+require_relative './active_record_operation'
 
 class ActiveSet
   class Processor::Sort < Processor::Base
     class ActiveRecordAdapter < Adapter::ActiveRecord
       def process
-        @instructions.reduce(@set) do |set, _instruction|
-          # set Adapter::Base#instruction, which many methods depend on
-          self.instruction = _instruction
+        return false unless @set.respond_to?(:to_sql)
 
-          return false unless @set.respond_to?(:to_sql)
-          return false unless can_query_with_active_record?
+        @instructions.reduce(@set.eager_load(@instructions.associations_hash)) do |set, instruction|
+          ar_operation = ActiveRecordOperation.new(instruction, @set.klass)
+          return false unless ar_operation.attribute_is_field?
 
-          statement = arel_eager_load_associations
-                        .merge(arel_operation)
+          statement = set.merge(ar_operation.operation)
 
           return false if throws?(ActiveRecord::StatementInvalid) { statement.load }
 
           statement
         end
       end
-
-      private
-
-      def arel_operation
-        arel_direction = arel_direction(instruction.value)
-
-        attribute_model.order(arel_column.send(arel_direction))
-      end
-
-      def arel_column
-        case_insensitive? ? super.lower : super
-      end
-
-      def case_insensitive?
-        instruction.operator.to_s.downcase == 'i'
-      end
-
-      def arel_direction(direction)
-        return 'desc' if direction.to_s.downcase.start_with? 'desc'
-
-        'asc'
-      end
     end
   end
 end

data/lib/active_set/processor_sort/active_record_operation.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require_relative '../adapter_activerecord'
+require_relative '../processor_base'
+require_relative '../../helpers/throws'
+
+class ActiveSet
+  class Processor::Sort < Processor::Base
+    class ActiveRecordOperation
+      def initialize(instruction, klass)
+        @instruction = instruction
+        @klass = klass
+      end
+
+      def operation
+        attribute_model.order(column.send(validate_direction(@instruction.value)))
+      end
+
+      def attribute_is_field?
+        return false unless attribute_model
+
+        attribute_model.attribute_names
+                       .include?(@instruction.attribute)
+      end
+
+      def case_insensitive?
+        @instruction.operator.to_s.downcase == 'i'
+      end
+
+      def column
+        column = table[@instruction.attribute]
+        case_insensitive? ? column.lower : column
+      end
+
+      def table
+        Arel::Table.new(attribute_model.table_name)
+      end
+
+      def validate_direction(direction)
+        return 'desc' if direction.to_s.downcase.start_with? 'desc'
+
+        'asc'
+      end
+
+      def attribute_model
+        tmp_model = @instruction.associations_array
+                                .reduce(@klass) do |obj, assoc|
+                                  obj.reflections[assoc.to_s]&.klass
+                                end
+        # return tmp_model.klass if tmp_model.is_a?(ActiveRecord::Relation)
+        # tmp_model
+      end
+    end
+  end
+end

data/lib/active_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActiveSet
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeset
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Stephen Margheim
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,6 +187,7 @@ files:
 - lib/active_set/processor_paginate/enumerable_adapter.rb
 - lib/active_set/processor_sort.rb
 - lib/active_set/processor_sort/active_record_adapter.rb
+- lib/active_set/processor_sort/active_record_operation.rb
 - lib/active_set/processor_sort/enumerable_adapter.rb
 - lib/active_set/processor_transform.rb
 - lib/active_set/processor_transform/csv_adapter.rb