gauze 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527dae15f5adffa62ef1b3325a193b704a8894c2
-  data.tar.gz: 96b137d7878a66b32b8a52abddfd9ffb4bc178ab
+  metadata.gz: 714ba17d4effef3630da04ca15666c44c21b5012
+  data.tar.gz: a7c07c9cddb3a4664cff85eeec4fa52adcb4d302
 SHA512:
-  metadata.gz: 78c419437f8fa15ca7f28fbc26c690b26fac850841d26f8ee19a49f1f5c31cc1d4ad400e53b044294f871210dd7704061075a30821ea0f52c2200ee0c375e51b
-  data.tar.gz: 4257f394a2244ef6a9ef140aa9f7a275b018572fedbb055b91ed512b3e11554849d6ab6809edee3b050908aadf17bb2903813f06af8ed8cc9b8d1f926a3840e6
+  metadata.gz: d82d231d298f61324cdc3e50c36d9c4d44271af3620d6747bd960d56446977ee4654a4c856fbc7371c96e63df45e2629548aea2ba6effbfa762ea313ee7353d2
+  data.tar.gz: 1900ee37463aff73f5bfc5803f792cf7d6a910cbad977d38965c6d60c0174e646e63d6c99803446b4d7efa6acff20fe318066d94313152b0217b77e737db173b

data/lib/gauze/base.rb

@@ -22,6 +22,10 @@ module Gauze
       @sorters.push param_key: param_key, column: column
     end
 
+    def self.sort_direction(param_key, default, preprocessor = nil)
+      @sort_direction_param = {param_key: param_key, default: default, preprocessor: preprocessor}
+    end
+
     def self.build(resource, params = {})
       new(resource, params).build
     end
@@ -42,6 +46,8 @@ module Gauze
 
       if get_klass_var(:@sorters).present?
         _query = build_order_query(_query)
+      elsif get_klass_var(:@sort_direction_param).present?
+        _query = _query.order(get_klass_var(:@sort_direction_param)[:default])
       end
 
       return _query
@@ -53,21 +59,27 @@ module Gauze
 
       if filter_hash[:column].is_a?(Hash)
         arel_column_from_hash(filter_hash[:column]).method(filter_hash[:method]).call(filter_val)
+      elsif filter_hash[:column].is_a?(Array)
+        arel_column_from_array(filter_hash[:column], filter_hash[:method], filter_val)
       else
         @resource.arel_table[filter_hash[:column]].method(filter_hash[:method]).call(filter_val)
       end
     end
 
     def build_order_query(query)
-      return query unless @params[:sort].present?
+      return default_sort(query) unless @params[:sort].present?
+      
       sort_column = get_klass_var(:@sorters).find {|h| h[:param_key].to_s == @params[:sort].underscore}
-      return query unless sort_column.present?
+
+      return default_sort(query) unless sort_column.present?
 
       if sort_column[:column].is_a?(Hash)
-        query.order(arel_column_from_hash(sort_column[:column]))
+        _arel_column = arel_column_from_hash(sort_column[:column])
       else
-        query.order(sort_column[:column])
+        _arel_column = @resource.arel_table[sort_column[:column]]
       end
+
+      query.order(_arel_column.method(sort_direction).call).group(_arel_column)
     end
 
     private
@@ -75,6 +87,44 @@ module Gauze
       self.class.instance_variable_get(var)
     end
 
+    def default_sort(query)
+      if get_klass_var(:@sort_direction_param) && get_klass_var(:@sort_direction_param)[:default]
+        query.order(get_klass_var(:@sort_direction_param)[:default])
+      else
+        query.order(:created_at)
+      end
+    end
+
+    def sort_direction
+      sort_options = get_klass_var(:@sort_direction_param)
+
+      sort_direction = @params[sort_options[:param_key]]
+      sort_direction = sort_options[:preprocessor].call(sort_direction) if sort_options[:preprocessor]
+
+      return unless sort_direction.present?
+      sort_direction.to_sym
+    end
+
+    def arel_column_from_array(columns, method, value)
+      nodes = nil
+
+      columns.each do |column|
+        if column.is_a?(Hash)
+          arel_node = arel_column_from_hash(column)
+        else
+          arel_node = @resource.arel_table[column]
+        end
+
+        if nodes.present?
+          nodes = nodes.or(arel_node.method(method).call(value))
+        else
+          nodes = arel_node.method(method).call(value)
+        end
+      end
+
+      return nodes
+    end
+
     def arel_column_from_hash(hash_param)
       raise ArgumentError, "Hash can only have one key." if hash_param.length > 1
       _resource = hash_param.keys.first.to_s.classify.constantize

data/lib/gauze/version.rb

@@ -1,3 +1,3 @@
 module Gauze
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gauze
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Chris Ostrowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails