apill 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c80e6572755af69fbfa5998dabbf1231921a72c9
-  data.tar.gz: 2727edeb979c451907dbd1e3ef15cc1bf4fb98b5
+  metadata.gz: a558c6cac08ed3bcb8cc545d2ed9285ab1f2278b
+  data.tar.gz: 6cc7aa252c0083c9061bee710d27f492269e0a20
 SHA512:
-  metadata.gz: a92ed1e2312cfca05317328b48c3e5e5b8bd93c2c246aefed7f479775744b9ab1ca31ea24d74d7a4de0c4421ac31848b50838089449f3ce503f80da441963ca1
-  data.tar.gz: 5c6262450fcbd115923654bd86658e0378d566c98bdb46620df70f45129827e40aab6f74f86aba553217c1f8d56eb181a1e70614f4670be050e28c7d0ace3004
+  metadata.gz: cc80c8b5df352226353478a073a7a884c9c7198f414e453448966da1a7d746d4415581547f6cca70548ca27eeaa6ca428959e1793c6138abed4e4b45e1305162
+  data.tar.gz: 9100abadfc8420a9a22e37309ccb0c583f1e9916ad697158e70f07061c12331fb9382436108d677273b89374f42deb3a4f5ed4c5ba2b1e3074045c2d3a92ca17

data/lib/apill/mixins/queryable.rb

@@ -15,6 +15,29 @@ module Queryable
 
   private
 
+  def query_params
+    @query_params ||= params.fetch(:query_params, {})
+  end
+
+  def sanitized_query_params
+    query_attrs = if defined?(:queryable_attributes)
+                    queryable_attributes
+                  else
+                    []
+                  end
+
+    query_params.
+    slice(*query_attrs)
+  end
+
+  def query_method_name_for(query_item, resource)
+    if resource.respond_to? "for_#{query_item}"
+      "for_#{query_item}"
+    elsif resource.respond_to? query_item
+      query_item
+    end
+  end
+
   def filtered_resource
     @filtered_resource ||= begin
       resource = if defined? super
@@ -31,23 +54,14 @@ module Queryable
     end
   end
 
-  def query_params
-    @query_params ||= params.fetch(:query_params, {})
-  end
-
-  def sanitized_query_params
-    query_attrs = respond_to?(:queryable_attributes) ? queryable_attributes : {}
+  def filter_data
+    filter_data = defined?(super) ? super : {}
 
-    query_params.
-    slice(*query_attrs)
+    filter_data.merge(querying_data)
   end
 
-  def query_method_name_for(query_item, resource)
-    if resource.respond_to? "for_#{query_item}"
-      "for_#{query_item}"
-    elsif resource.respond_to? query_item
-      query_item
-    end
+  def querying_data
+    {}
   end
 end
 end

data/lib/apill/mixins/sortable.rb

@@ -15,6 +15,10 @@ module  Sortable
 
   private
 
+  def sorting_arguments
+    sorting_data.values.join(' ')
+  end
+
   def filtered_resource
     @filtered_resource ||= begin
       resource = if defined? super
@@ -28,10 +32,6 @@ module  Sortable
     end
   end
 
-  def sorting_arguments
-    sorting_data.values.join(' ')
-  end
-
   def filter_data
     filter_data = defined?(super) ? super : {}
 

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error