Merge pull request #8 from cbdr/topic/535-pagination-helper

Adding support for new cortex pagination style caused by grape-kaminari

Author: kurtedelbrock

cortex-client-0.4.0.gem

@@ -19,16 +19,16 @@ def is_error?
     private
 
     def parse_headers(headers)
-      if headers['x-total-items']
-        @count = headers['x-total-items']
+      if headers['X-Total']
+        @count = headers['X-Total'].to_i
       end
-      if headers['content-range']
-        matches = headers['content-range'].match(/^(\w+) (\d+)\-(\d+):(\d+)\/\d+$/i)
-        @per_page = matches[4].to_i
-        @range_start = matches[2].to_i
-        @range_end = matches[3].to_i
+      if headers['X-Total']
+        @page = headers['X-Page'].to_i
+        @per_page = headers['X-Per-Page'].to_i
+        @range_start = (@page-1) * @per_page
+        @range_end = @per_page * @page - 1
         @range = "#{@range_start}-#{@range_end}"
-        @page = (@range_end / @per_page) + 1
+
       end
     end
 

lib/cortex/result.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Cortex::Result do
-  let(:result) { Cortex::Result.new('body', {'x-total-items' => 10, 'content-range' => "posts 0-9:10/200"}, 200) }
+  let(:result) { Cortex::Result.new('body', {'X-Total' => 10, 'X-Page' => "1", "X-Per-Page" => "10"}, 200) }
   let(:failed) { Cortex::Result.new('failed body', {}, 403) }
 
   it 'should construct' do
@@ -31,7 +31,7 @@
   end
 
   it 'should expose the headers' do
-    expect(result.raw_headers).to eq({ 'x-total-items' => 10, 'content-range' => "posts 0-9:10/200" })
+    expect(result.raw_headers).to eq({ 'X-Total' => 10, 'X-Page' => "1", "X-Per-Page" => "10" })
     expect(failed.raw_headers).to eq({})
   end
 
@@ -40,4 +40,4 @@
     expect(failed.status).to eq 403
   end
 
-end
+end