gyroscope 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921456f0511457b6ac95020900184bbd72dda476
-  data.tar.gz: 58b80e30d3121376dc532814056305217c8fa6c9
+  metadata.gz: fa8748d31c73c8bff773acbfc2e9dbbbae9b9ce1
+  data.tar.gz: ce805aa11148b58ffc62e0f555ca801df0c793dd
 SHA512:
-  metadata.gz: 15335b433d70c5b3c3854269f7e3ad4f449d7b92164684572ac064478bde20812432b678b43847225fce13ce2d6127620868197b26939d605ae307d5c6bbd90f
-  data.tar.gz: 4e63ef51e2f8e1f302190215b71cb85f008ff7713cac02ffab9a19b016677baa8f4d6f5bea987e96312af5eba7d63a8cfb38c966cfdb28eb748f25046f27a763
+  metadata.gz: 018dcabf4fc922a448ebfed4d045405df0790118a432985b9997984b93f25b2d37bca1a58b64e3e30f9a511a1d2d5c7d61a6fe659b67d4dcd2d9a38419ec1b2d
+  data.tar.gz: 7e8a9b60dadc2b352b5d3372bc9710368777942f830fcc985f562cdc56596715aa161ee1412cb6110bbb4a284b4f808ec4aa6c65b4c28ead60f3f1726eb2aa9f

data/lib/gyroscope/search_base.rb

@@ -3,24 +3,6 @@ require "active_model"
 
 module Gyroscope
   class SearchBase
-    include Virtus.model strict: true, required: false
-    include ActiveModel::Validations
-
-    attribute :page,     Integer, default: 1
-    attribute :per_page, Integer, default: 30
-    attribute :order,    String
-
-    validate :validate_order
-
-    def initialize(*args)
-      super(*args)
-      normalize_order attributes[:order]
-    end
-
-    def target_model
-      "::#{self.class.name.demodulize}".constantize
-    end
-
     class ValidationError < StandardError
       attr_reader :searcher
 
@@ -37,27 +19,57 @@ module Gyroscope
       end
     end
 
+    include Virtus.model strict: true, required: false
+    include ActiveModel::Validations
+
+    attribute :page,     Integer, default: 1
+    attribute :per_page, Integer, default: 30
+    attribute :order,    String
+
+    validate :validate_order
+
+    def initialize(attrs)
+      super(normalize_order(attrs.dup))
+    end
+
+    def target_model
+      "::#{self.class.name.demodulize}".constantize
+    end
+
     def search
       # is there a more generic ActiveModel validation error?
       unless valid?
         Rails.logger.debug("the errors: #{errors.inspect}")
+
+        fail ValidationError.new(self)
       end
-      fail ValidationError.new(self) unless valid?
 
       build_search_scope
     end
 
-    def normalize_order(ordering)
-      return unless attributes[:order]
+    private
 
-      unless /\./.match ordering
-        self.order = "#{target_model.table_name}.#{ordering}"
+    def normalize_order(attrs)
+      order = attrs[:order] || attrs["order"]
+
+      return attrs unless order.present?
+
+      if order.is_a?(Hash)
+        attrs[:order] = order.map {|(column, direction)| tablize_order("#{column} #{direction}")}.join(",")
       else
-        self.order = ordering
+        attrs[:order] = tablize_order(order)
       end
+
+      attrs
     end
 
-    private
+    def tablize_order(ordering)
+      unless /\./.match ordering
+        "#{target_model.table_name}.#{ordering}"
+      else
+        ordering
+      end
+    end
 
     def base_scope
       scope = target_model
@@ -86,16 +98,16 @@ module Gyroscope
 
     def validate_order
       return unless attributes[:order]
-      split_order = attributes[:order].split(' ')
+      attributes[:order].split(",").each do |order|
+        key, direction = order.split(' ')
 
-      key, direction = split_order
-
-      errors.add(:order, 'Ordering on disallowed key') unless allowed_order_keys.include? key
-      errors.add(:order, 'Invalid sort direction') unless direction && %w(asc desc).include?(direction.downcase)
+        errors.add(:order, 'Ordering on disallowed key') unless allowed_order_keys.include? key
+        errors.add(:order, 'Invalid sort direction') unless direction && %w(asc desc).include?(direction.downcase)
+      end
     end
 
     def allowed_order_keys
-      target_model.new.attributes.keys.map do |key|
+      target_model.new.persistable_attribute_names.map do |key|
         "#{target_model.table_name}.#{key}"
       end
     end

data/lib/gyroscope/version.rb

@@ -1,3 +1,3 @@
 module Gyroscope
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyroscope
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Wilhelm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Build ActiveRecord search scopes from params hash