stretchy 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d19628e7bb3b4177002806dee9ae3cd41e67340
-  data.tar.gz: cdb6536ac2450f5f8f01a6efab5071c0bb88e9f8
+  metadata.gz: f6b9494adc6453711289b4e3c5321c683d190ab7
+  data.tar.gz: 0d8832b4787080dff61db37429c7cf8d021a0074
 SHA512:
-  metadata.gz: 1fb125ae7d1763bd44c2fef081d3a1ab2d3ae4e5a9289341e32b98617bd26dd667a387333b38d97ae6942da519d980ac380b28b738c12c80345e174c19b6f1d4
-  data.tar.gz: 1aa29437d28d4dcd4e85840d161f068f09569b2b3f4c008886cdebc1dc005eb50fc9d4aca120c21611b777721bfe971fa3daa4b7da3a116d006a6d54fbcd9960
+  metadata.gz: 5b3bb35dcdeec2eb3745b29c4adfa127e6055c02ed3273a8c308f25135f1dd5a9498b0f3de3c1684934b78f60687a2c56caed3bac45da8a7a0b127f8d7b299cf
+  data.tar.gz: aa4e00a5abda4a8ca7e581ecc5b84a513283deeacc8b295412d4bc561c388c3895562612a0b9a041d9938ab99fa8e8f53cfcefa7ae1c1cdce403b40fe71eef37

data/lib/stretchy/clauses/base.rb

@@ -23,7 +23,7 @@ module Stretchy
                     :aggregate_builder, :inverse, :type, :index_name
 
       delegate [:request, :response, :results, :ids, :hits, 
-                :took, :shards, :total, :max_score] => :query_results
+                :took, :shards, :total, :max_score, :total_pages] => :query_results
       delegate [:range, :geo] => :where
 
       #
@@ -59,7 +59,7 @@ module Stretchy
           @match_builder      = Stretchy::Builders::MatchBuilder.new
           @where_builder      = Stretchy::Builders::WhereBuilder.new
           @boost_builder      = Stretchy::Builders::BoostBuilder.new
-          @aggregate_builder  = nil
+          @aggregate_builder  = {}
           @inverse            = options[:inverse]
           @limit              = DEFAULT_LIMIT
           @offset             = DEFAULT_OFFSET
@@ -87,6 +87,7 @@ module Stretchy
       def get_limit
         @limit
       end
+      alias :limit_value :get_limit
 
       # 
       # Sets the offset to start returning results at.
@@ -101,6 +102,7 @@ module Stretchy
         @offset = num
         self
       end
+      alias :per_page :offset
 
       # 
       # Accessor for `@offset`
@@ -110,6 +112,27 @@ module Stretchy
         @offset
       end
 
+      # 
+      # Allows pagination via Kaminari-like accessor
+      # @param num [Integer] Page number. Natural numbers only, **this is not zero-indexed**
+      # @option per_page [Integer] :per_page (DEFAULT_LIMIT) Number of results per page
+      # 
+      # @return [self] Allows continuing the query chain
+      def page(num, options = {})
+        @limit  = options[:limit] || options[:per_page] || @limit
+        @offset = [(num - 1), 0].max.ceil * @limit
+        self
+      end
+
+      # 
+      # Accessor for current page
+      # 
+      # @return [Integer] (offset / limit).ceil
+      def get_page
+        (@offset.to_f / @limit).ceil + 1
+      end
+      alias :current_page :get_page
+
       # 
       # Tells the search to explain the scoring
       # mechanism for each document.
@@ -222,6 +245,23 @@ module Stretchy
         end
       end
 
+      # 
+      # Allows adding raw aggregation JSON to your
+      # query
+      # @param opts = {} [Hash] JSON to aggregate on
+      # 
+      # @return [self] Allows continuing the query chain
+      def aggregations(opts = {})
+        @aggregate_builder = @aggregate_builder.merge(opts)
+        self
+      end
+      alias :aggs :aggregations
+
+      def get_aggregations
+        @aggregate_builder
+      end
+      alias :get_aggs :get_aggregations
+
       # 
       # Accessor for `@inverse`
       # 

data/lib/stretchy/results/base.rb

@@ -6,7 +6,7 @@ module Stretchy
 
       attr_reader :clause, :index_name
 
-      delegate [:type] => :clause
+      delegate [:type, :current_page, :limit_value] => :clause
 
       def initialize(clause)
         @clause     = clause
@@ -16,13 +16,26 @@ module Stretchy
       def limit
         clause.get_limit
       end
+      alias :per_page :limit
+      alias :limit_value :limit
 
       def offset
         clause.get_offset
       end
 
+      def page
+        clause.get_page
+      end
+
+      def total_pages
+        [(total.to_f / limit).ceil, 1].max
+      end
+
       def request
-        @request ||= {query: clause.to_search}
+        return @request if @request
+        @request        = {query: clause.to_search}
+        @request[:aggs] = clause.get_aggregations if clause.get_aggregations.any?
+        @request
       end
 
       def response
@@ -32,7 +45,7 @@ module Stretchy
           from: offset,
           size: limit
         }
-        params[:explain] = true if clause.get_explain
+        params[:explain] = true                 if clause.get_explain
         @response ||= Stretchy.search(params)
       end
 
@@ -60,6 +73,10 @@ module Stretchy
         end]
       end
 
+      def aggregations
+        @aggregations ||= response['aggregations']
+      end
+
       def took
         @took ||= response['took']
       end

data/lib/stretchy/version.rb

@@ -1,3 +1,3 @@
 module Stretchy
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stretchy
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - agius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch