api_me 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb083a8ae092dc1b2ddc5eb4315f5205abf99a1
-  data.tar.gz: 68083ea1ca7e8eb53649ee01fcdee436698bd074
+  metadata.gz: e70094d4fd7b9ae7f7cfddc4dbfe9cec2e94d3ef
+  data.tar.gz: 698e8957b40252211d1f6ee22ff5fa05ab19cb79
 SHA512:
-  metadata.gz: 7582d107d7106384ade98f43b4dc29c4195dc4fd9ac8a52c90b67bec936e3a1aecaef8199179a5d4c60f48d6c1c7157e68bcd0fd40e0b03a888158cf04c345f4
-  data.tar.gz: 2364f5da072045c31e308f3b3f3bb516fe51a1266d3d7b0f7305e3f352675bc52a7a05b12309adc1863a31d5b6609c481c12d3e9f92d43ba3da07062234b1e6c
+  metadata.gz: b75592dd259a25e71a5ed7af2ff43be82aa51afb939c79ced4f249b76da2954c8c0bfd5ae4881cf748984ce50760935e5294a4f8466a9a143752e491057273b2
+  data.tar.gz: e04298b570816de02a33a062241f234b0da3421d89bf6bad9668fd04bd083b5285c53c538c52ea3cadc4f8bb60d218388dfdd6c5ae7bc47f94ade02be659de07

data/lib/api_me.rb

@@ -65,13 +65,9 @@ module ApiMe
   # the top level ids array param. Would eventually like
   # to move to support the jsonapi.org standard closer.
   def index
-    ids_filter_hash = params[:ids] ? { ids: params[:ids] } : {}
-    @scoped_objects = policy_scope(resource_scope)
-    @filter_object = filter_klass.new(
-        scope: @scoped_objects,
-        filters: (filter_params || {}).merge(ids_filter_hash)
-    )
-    @pagination_object = ApiMe::Pagination.new(scope: @filter_object.results, page_params: params[:page])
+    @policy_scope = policy_scope(resource_scope)
+    @filter_scope = filter_scope(@policy_scope)
+    @pagination_object = ApiMe::Pagination.new(scope: @filter_scope, page_params: params[:page])
 
     render json: @pagination_object.results, each_serializer: serializer_klass, meta: { page: @pagination_object.page_meta }
   end
@@ -151,10 +147,22 @@ module ApiMe
   def resource_scope
     model_klass.all
   end
+  
+  def filter_scope(scope)
+    filter_klass.new(
+        scope: scope,
+        filters: filters_hash
+    ).results
+  end
 
   def params_klass_symbol
     model_klass.name.demodulize.underscore.to_sym
   end
+  
+  def filters_hash
+    ids_filter_hash = params[:ids] ? { ids: params[:ids] } : {}
+    (filter_params || {}).merge(ids_filter_hash)
+  end
 
   def filter_params
     params[:filters]

data/lib/api_me/version.rb

@@ -1,3 +1,3 @@
 module ApiMe
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_me
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord