apill 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f049c1119333765ceb81d8028a413f65f24c5fd2
-  data.tar.gz: c580f77b5f02d714e1f922139a057cc34fdf18b2
+  metadata.gz: 7f324072e0e5b2dc28efc2d33cf00ce77c9bc00e
+  data.tar.gz: 31d46fd191eefced883cf03c2b632fc6269c3e30
 SHA512:
-  metadata.gz: 38ab4b7bb671d868810d635dcfcba8d334d7e1e6782969ed5b06c46a8156bc07498877adc61bd6a6ded85761208fe193ebc67ad0e6f43d8a915f02dc5384d9f1
-  data.tar.gz: 2753cbefe2316d02c93c7bcd6b9e9452bd2548ff3cfd264cfb4b8d51e09e66d7c0633bc09c782b377f0ef3d61acd113fdce9a019e957d904c90b278319155c3a
+  metadata.gz: 0e7b1a2c44c2534765be9ba23129ae85bb125e272fff333ffd9c8b650e9c37d247c336d9584139f821979158f5d553920e10f91906de9b2b58f9af6a221692a6
+  data.tar.gz: db6b498df64503368495b5533b49fe8eeb6aa010ee4541bde0b996b5c7985ce5f1a8d9f528522fbf67522e57d836bf53ca2fa42298badea5011bb171b7a460ea

data/lib/apill/resource/processors/indexing.rb

@@ -21,9 +21,15 @@ class  Indexing
   end
 
   def processed
-    return resource unless parameters.present?
+    return resource unless parameters.present? || force_query
 
-    resource.for_query(parameters.query)
+    resource.for_query(parameters.query || Parameters::Index::DEFAULT_QUERY)
+  end
+
+  private
+
+  def force_query
+    resource.class.name.include? 'Index'
   end
 end
 end

data/lib/apill/resource/processors/paging.rb

@@ -31,10 +31,10 @@ class   Paging
     return {} unless parameters.present?
 
     {
-      'total-pages'   => processed.total_pages,
-      'current-page'  => processed.current_page,
-      'previous-page' => processed.prev_page,
-      'next-page'     => processed.next_page,
+      'total-pages'   => resource.total_pages,
+      'current-page'  => resource.current_page,
+      'previous-page' => resource.prev_page,
+      'next-page'     => resource.next_page,
     }
   end
 end

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/spec/apill/resource/model_spec.rb

@@ -39,19 +39,16 @@ describe  Model do
     allow(resource).to receive(:for_query).
                        with('my_query').
                        and_return(processed_resource)
-    allow(resource).to receive(:total_pages).
+
+    allow(processed_resource).to receive(:total_pages).
                        and_return(10)
-    allow(resource).to receive(:current_page).
+    allow(processed_resource).to receive(:current_page).
                        and_return(5)
-    allow(resource).to receive(:prev_page).
+    allow(processed_resource).to receive(:prev_page).
                        and_return(4)
-    allow(resource).to receive(:next_page).
+    allow(processed_resource).to receive(:next_page).
                        and_return(6)
 
-    allow(processed_resource).to receive(:page).
-                                 with(10).
-                                 and_return(resource)
-
     expect(model.processed).to eql processed_resource
     expect(model.meta).to      eql(
       'current-page'  => 5,

data/spec/apill/resource/processors/indexing_spec.rb

@@ -1,6 +1,13 @@
 require 'rspectacular'
 require 'apill/resource/processors/indexing'
 
+module Apill
+class  TestIndexClass
+  def for_query(_param)
+  end
+end
+end
+
 module    Apill
 module    Resource
 module    Processors
@@ -12,6 +19,17 @@ describe  Indexing do
 
     expect(indexing.processed).to eql indexing_resource
   end
+
+  it 'forces a query even if no parameters were passed in' do
+    indexing_resource = TestIndexClass.new
+    indexing          = Indexing.new(indexing_resource)
+
+    allow(indexing_resource).to receive(:for_query).
+                                with('*').
+                                and_return('blah')
+
+    expect(indexing.processed).to eql 'blah'
+  end
 end
 end
 end

data/spec/apill/resource/processors/paging_spec.rb

@@ -14,10 +14,10 @@ describe  Paging do
                           'size' => 10,
                         })
 
-    allow(processed_resource).to receive(:total_pages).and_return  10
-    allow(processed_resource).to receive(:current_page).and_return 1
-    allow(processed_resource).to receive(:prev_page).and_return    nil
-    allow(processed_resource).to receive(:next_page).and_return    nil
+    allow(paging_resource).to receive(:total_pages).and_return  10
+    allow(paging_resource).to receive(:current_page).and_return 1
+    allow(paging_resource).to receive(:prev_page).and_return    nil
+    allow(paging_resource).to receive(:next_page).and_return    nil
 
     allow(paging_resource).to receive(:page).
                               with(1).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - jfelchner