es-elasticity 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb560ae15568a614d3ee458f20feefdd5a2ac59
-  data.tar.gz: f19e9eaa49475de62ad69068b4fc210028520f32
+  metadata.gz: db223045f4a1f6c4550940c3a6a8ab31313e2641
+  data.tar.gz: 05c9d8c099afe031a5c603c0cd4ab54e1b8d6fb7
 SHA512:
-  metadata.gz: 78932ec63a5a18de6ddf9d94ce9f2f46af3e765f465a2078188e5e232d8c2b6dc67e11ea61c0b6f9dd1da7daed8b9bed3f1c051505cc432a4e9373b6289e9067
-  data.tar.gz: 46d3412bec0201ff96e4ff6106988da16c92e45c06a016506dbb5e5b73c173c84ec479386af2acf9c2941f0b795e8727391a75d90eaeae788ab6198dde0a6a6f
+  metadata.gz: 7722a0f30843c9236e8ed33eabd4ebeafe1bcd5ec04e4bfcfc74ff6c9cf6a1133b39ff5b45e603e8e6475e0b31fee082591d231ffff9e1b7aa2ee18bbe22306e
+  data.tar.gz: 05a92b3f0a31bcb87b758bd57c1cdaba037b57d36a0e97502db6b9072cb1c0712abde819d5d0fbac9a778b10eb2dbd2bc653e844d06fed37d8d4d390fcb78302

data/README.md

@@ -134,7 +134,7 @@ Search::User.bulk_index(users)
 If you you'd like to update a single attribute of the document instead of updating the entire document, you can use the `bulk_update` api.
 
 ```ruby
-document = [
+documents = [
   { _id: 1, attr_name: "attr_name", attr_vale: "attr_value" },
   { _id: 2, attr_name: "attr_name", attr_vale: "attr_value" }
 ]

data/lib/elasticity/search.rb

@@ -85,7 +85,7 @@ module Elasticity
       include Enumerable
 
       delegate :each, :size, :length, :[], :+, :-, :&, :|, :total, :per_page,
-        :total_pages, :current_page, :aggregations, to: :search_results
+        :total_pages, :current_page, :next_page, :previous_page, :aggregations, to: :search_results
 
       attr_accessor :search_definition
 
@@ -196,7 +196,8 @@ module Elasticity
 
       class Relation < ActiveSupport::ProxyObject
 
-        delegate :total, :per_page, :total_pages, :current_page, :aggregations, to: :@results
+        delegate :total, :per_page, :total_pages, :current_page, :next_page,
+          :previous_page, :aggregations, to: :@results
 
         def initialize(relation, search_definition, response)
           @relation = relation
@@ -300,29 +301,38 @@ module Elasticity
         @documents.each(&block)
       end
 
-      def total
-        @response["hits"]["total"]
-      end
-
       def aggregations
         @response["aggregations"] ||= {}
       end
 
-      # for pagination
-      def per_page
-        @body[:size] || DEFAULT_SIZE
+      def total
+        @response["hits"]["total"]
       end
+      alias_method :total_entries, :total
 
       # for pagination
       def total_pages
         (total.to_f / per_page.to_f).ceil
       end
 
+      # for pagination
+      def per_page
+        @body[:size] || DEFAULT_SIZE
+      end
+
       # for pagination
       def current_page
         return 1 if @body[:from].nil?
         @body[:from] / per_page + 1
       end
+
+      def next_page
+        current_page < total_pages ? (current_page + 1) : nil
+      end
+
+      def previous_page
+        current_page > 1 ? (current_page - 1) : nil
+      end
     end
   end
 end

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/units/search_spec.rb

@@ -152,6 +152,8 @@ RSpec.describe "Search" do
       expect(docs.per_page).to eq(10)
       expect(docs.total_pages).to eq(1)
       expect(docs.current_page).to eq(1)
+      expect(docs.next_page).to eq(nil)
+      expect(docs.previous_page).to eq(nil)
     end
 
     it "provides custom properties for pagination" do
@@ -160,20 +162,22 @@ RSpec.describe "Search" do
         Elasticity::Search::Definition.new(
           index_name,
           document_type,
-          { size: 14, from: 25, filter: {} }
+          { size: 15, from: 15, filter: {} }
         )
       )
       expect(client).to receive(:search).
         with(
           index: index_name,
           type: document_type,
-          body: { size: 14, from: 25, filter: {} }
+          body: { size: 15, from: 15, filter: {} }
         ).and_return({ "hits" => { "total" => 112, "hits" => [] } })
       docs = subject.documents(mapper)
 
-      expect(docs.per_page).to eq(14)
+      expect(docs.per_page).to eq(15)
       expect(docs.total_pages).to eq(8)
       expect(docs.current_page).to eq(2)
+      expect(docs.next_page).to eq(3)
+      expect(docs.previous_page).to eq(1)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveModel-based library for working with Elasticsearch