nazrin 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee0cd5215a23ea2f245801bf4802248c2ebca11
-  data.tar.gz: bac5d1685ff2d1590cfc18780faecd869c382e58
+  metadata.gz: 99559990894751321599905a57f89c390caae175
+  data.tar.gz: ddaafea268c27f3601084c64e4a324a367c8ab13
 SHA512:
-  metadata.gz: 9348020250c407fc833f22a39446bef81965cf3cbe26de457b18fd5e1d07ff73fcbeada5120b0c6e120e1bc369debb2c5e31475e03708ca98b47585d8a76db1f
-  data.tar.gz: 92c0a290d2e5631eb24dc1b7cd74ed52ba43dd7f5456174648552c584420a2f626f94300adc27155cf120d4b9d3f492b66bee76e4feda08acdd55d8f3e776f06
+  metadata.gz: 96ccde2bb3cc1b56925d96d9e81caaddef0725d875fe2cffa39e86ab33f691fcc9ea82841a62ec48db836f70af084598b1def681d790052cc6e13c5d54db2589
+  data.tar.gz: 0e6e4559327bc764ec29eeb9f818baaf5fdd148ea4da19767656eeea6f541c3962366f5071b152eeb8eb41019d989650e61cc7b0e6b6809459d002a033150e58

data/README.md

@@ -29,7 +29,7 @@ Or install it yourself as:
 ### in Ruby on Rails
 
 ```ruby
-$ bundle exec rails g nazrin:config
+$ bundle exec rails g nazrin:config # execute before including nazrin to model
 
 Nazrin.configure do |config|
   config.debug_mode = false
@@ -38,7 +38,7 @@ Nazrin.configure do |config|
   config.region = ''
   config.access_key_id = ''
   config.secret_access_key = ''
-  # currently support kaminari gem
+  # currently support 'kaminari', 'will_paginate' or 'nazrin'
   config.pagination = 'kaminari'
 end
 ```
@@ -63,6 +63,11 @@ Post.search(where: :foo, includes: :bar).size(1).start(0).query("(and 'content')
 => [#<Post id: 1, content: "content">]
 ```
 
+If you want to use other pagination gem, in your Gemfile
+```ruby
+gem 'kaminari' # or 'will_paginate'
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/nazrin/active_record/data_accessor.rb

@@ -1,8 +1,6 @@
 module Nazrin
   module ActiveRecord
     class DataAccessor
-      MAX_LIMIT = 10_000
-
       def initialize(model, options)
         @model = model
         @options = options
@@ -13,18 +11,19 @@ module Nazrin
         @client = client
 
         res = @client.search
-        collections = load_all(res.data.hits.hit.map(&:id))
+        collection = load_all(res.data.hits.hit.map(&:id))
+
         if @client.parameters[:size] && @client.parameters[:start]
-          round_correct_page
+          total_count = res.data.hits.found
 
           Nazrin::PaginationGenerator.generate(
-            collections,
-            current_page: @current_page,
+            collection,
+            current_page: current_page,
             per_page: @client.parameters[:size],
-            total_count: res.data.hits.found,
-            last_page: @last_page)
+            total_count: total_count,
+            last_page: last_page(total_count))
         else
-          collections
+          collection
         end
       end
 
@@ -44,54 +43,12 @@ module Nazrin
 
       private
 
-      def round_correct_page
-        res = search_for_set_correct_page
-        total_count = res.data.hits.found
-        if over_max_limit_request?
-          if total_count > MAX_LIMIT
-            @current_page = @last_page = get_last_page(MAX_LIMIT)
-          else
-            @current_page = @last_page = get_last_page(total_count)
-          end
-          @client.start(get_start_position(@current_page))
-        elsif res.data.hits.found > 0 && !res.data.hits.hit.present?
-          @current_page = @last_page = get_last_page(total_count)
-          @client.start(get_start_position(@current_page))
-        else
-          @current_page = (
-            @client.parameters[:start] / @client.parameters[:size].to_f
-          ).ceil + 1
-          @last_page = get_last_page(total_count)
-        end
-      end
-
-      def search_for_set_correct_page
-        if over_max_limit_request?
-          tmp_start = @client.parameters[:start]
-          res = @client.start(0).search
-          @client.start(tmp_start)
-        else
-          res = @client.search
-        end
-        res
-      end
-
-      def over_max_limit_request?
-        return false unless @client.parameters[:start].present?
-        return false unless @client.parameters[:size].present?
-        if @client.parameters[:start] + @client.parameters[:size] > MAX_LIMIT
-          true
-        else
-          false
-        end
-      end
-
-      def get_last_page(total_count)
+      def last_page(total_count)
         (total_count / @client.parameters[:size].to_f).ceil
       end
 
-      def get_start_position(current_page)
-        (current_page - 1) * @client.parameters[:size]
+      def current_page
+        (@client.parameters[:start] / @client.parameters[:size].to_f).ceil + 1
       end
     end
   end

data/lib/nazrin/search_client.rb

@@ -1,5 +1,9 @@
 module Nazrin
+  class SearchClientError < StandardError; end
+
   class SearchClient
+    CLOUD_SEARCH_MAX_LIMIT = 10_000
+
     attr_accessor :data_accessor
     attr_reader :parameters
 
@@ -104,6 +108,7 @@ module Nazrin
     end
 
     def search
+      fail SearchClientError if deep_page?
       @client.search(@parameters)
     end
 
@@ -114,5 +119,18 @@ module Nazrin
         search
       end
     end
+
+    private
+
+    def deep_page?
+      if parameters[:start].present? && parameters[:size].present?
+        return true if parameters[:start] + parameters[:size] > CLOUD_SEARCH_MAX_LIMIT
+      elsif parameters[:start].present?
+        return true if parameters[:start] > CLOUD_SEARCH_MAX_LIMIT
+      elsif parameters[:size].present?
+        return true if parameters[:size] > CLOUD_SEARCH_MAX_LIMIT
+      end
+      false
+    end
   end
 end

data/lib/nazrin/version.rb

@@ -1,3 +1,3 @@
 module Nazrin
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nazrin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tomohiro Suwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk