nazrin 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c48ed17749fd3c28a0f1ebd4315b47668bce58d
-  data.tar.gz: 2ce59a71ce80485057764d0972dafde18fd817d8
+  metadata.gz: 4ee0cd5215a23ea2f245801bf4802248c2ebca11
+  data.tar.gz: bac5d1685ff2d1590cfc18780faecd869c382e58
 SHA512:
-  metadata.gz: 80bb877b98842567bee0dc6c265f9543fda945a27facd3666fd4d021de5df619362098fbc638b952c7f27fafa67354ea91eeaf5477c5aa5bbc61b15ab5028acb
-  data.tar.gz: 7d5834c17d9df1d79dfa804eff2f7077a1efa597fb00113a22c1c403394ef0d695b940e84379fc869c80b339a0c3e9b87f2dfa1cc1a6f7a78bcabb44a63126fa
+  metadata.gz: 9348020250c407fc833f22a39446bef81965cf3cbe26de457b18fd5e1d07ff73fcbeada5120b0c6e120e1bc369debb2c5e31475e03708ca98b47585d8a76db1f
+  data.tar.gz: 92c0a290d2e5631eb24dc1b7cd74ed52ba43dd7f5456174648552c584420a2f626f94300adc27155cf120d4b9d3f492b66bee76e4feda08acdd55d8f3e776f06

data/README.md

@@ -31,7 +31,7 @@ Or install it yourself as:
 ```ruby
 $ bundle exec rails g nazrin:config
 
-Nazrin.config do |config|
+Nazrin.configure do |config|
   config.debug_mode = false
   config.search_endpoint = ''
   config.document_endpoint = ''
@@ -44,7 +44,7 @@ end
 ```
 
 ```ruby
-class Post
+class Post < ActiveRecord::Base
   include Nazrin::ActiveRecord::Searchable
 
   searchable do
@@ -52,13 +52,14 @@ class Post
     field(:created_at) { created_at.utc.iso8601 }
   end
 
-  after_create :update_in_index
+  after_create :add_to_index
+  after_update :update_in_index
   after_destroy :delete_from_index
 end
 ```
 
 ```ruby
-Post.search.size(1).start(0).query("(and 'content')").query_parser('structured').execute
+Post.search(where: :foo, includes: :bar).size(1).start(0).query("(and 'content')").query_parser('structured').execute
 => [#<Post id: 1, content: "content">]
 ```
 

data/lib/generators/nazrin/templates/nazrin_config.rb

@@ -5,6 +5,6 @@ Nazrin.configure do |config|
   config.region = ''
   config.access_key_id = ''
   config.secret_access_key = ''
-  # currently support kaminari
-  # config.pagination = 'kaminari'
+  # currently support 'kaminari', 'will_paginate' or 'nazrin'
+  config.pagination = 'kaminari'
 end

data/lib/nazrin.rb

@@ -6,5 +6,6 @@ require 'nazrin/active_record/data_accessor'
 require 'nazrin/config'
 require 'nazrin/search_client'
 require 'nazrin/document_client'
+require 'nazrin/pagination_generator'
 require 'nazrin/paginated_array'
 require 'nazrin/version'

data/lib/nazrin/active_record/data_accessor.rb

@@ -17,7 +17,7 @@ module Nazrin
         if @client.parameters[:size] && @client.parameters[:start]
           round_correct_page
 
-          Nazrin.paginated_array(
+          Nazrin::PaginationGenerator.generate(
             collections,
             current_page: @current_page,
             per_page: @client.parameters[:size],

data/lib/nazrin/paginated_array.rb

@@ -2,11 +2,11 @@ module Nazrin
   class PaginatedArray < Array
     attr_reader :current_page, :per_page, :total_count
 
-    def initialize(collections, page, per_page, total_count)
+    def initialize(collection, page, per_page, total_count)
       @current_page = page
       @per_page = per_page
       @total_count = total_count
-      replace collections
+      replace collection
     end
 
     # first page of the collections?
@@ -39,25 +39,4 @@ module Nazrin
       current_page > total_pages
     end
   end
-
-  # create paginated collection
-  def self.paginated_array(collections, options = {})
-    if Nazrin.config.pagination == 'kaminari'
-      begin
-        require 'kaminari'
-      rescue LoadError
-        abort "Missing dependency 'kaminari' for pagination"
-      end
-      Kaminari.config.max_pages = options[:last_page]
-      Kaminari.paginate_array(collections, total_count: options[:total_count])
-        .page(options[:current_page])
-        .per(options[:per_page])
-    else
-      Nazrin::PaginatedArray.new(
-        collections,
-        options[:current_page],
-        options[:per_page],
-        options[:total_count])
-    end
-  end
 end

data/lib/nazrin/pagination_generator.rb

@@ -0,0 +1,20 @@
+module Nazrin
+  module PaginationGenerator
+    SUPPORTED_PAGINATION_GEMS = %w(nazrin kaminari will_paginate)
+
+    class << self
+      def generate(collection, options = {})
+        abort "#{Nazrin.config.pagination} is not supported gem of pagination" unless SUPPORTED_PAGINATION_GEMS.include?(Nazrin.config.pagination.to_s)
+
+        retreive_generator_module.call(collection, options)
+      end
+
+      private
+
+      def retreive_generator_module
+        require "nazrin/pagination_generator/#{Nazrin.config.pagination}_generator"
+        Nazrin::PaginationGenerator.const_get("#{Nazrin.config.pagination.to_s.camelize}Generator")
+      end
+    end
+  end
+end

data/lib/nazrin/pagination_generator/kaminari_generator.rb

@@ -0,0 +1,17 @@
+module Nazrin
+  module PaginationGenerator
+    module KaminariGenerator
+      def self.call(collection, options)
+        begin
+          require 'kaminari'
+        rescue LoadError
+          abort "Missing dependency 'kaminari' for pagination"
+        end
+        Kaminari.config.max_pages = options[:last_page]
+        Kaminari.paginate_array(collection, total_count: options[:total_count])
+          .page(options[:current_page])
+          .per(options[:per_page])
+      end
+    end
+  end
+end

data/lib/nazrin/pagination_generator/nazrin_generator.rb

@@ -0,0 +1,13 @@
+module Nazrin
+  module PaginationGenerator
+    module NazrinGenerator
+      def self.call(collection, options)
+        Nazrin::PaginatedArray.new(
+          collection,
+          options[:current_page],
+          options[:per_page],
+          options[:total_count])
+      end
+    end
+  end
+end

data/lib/nazrin/pagination_generator/will_paginate_generator.rb

@@ -0,0 +1,17 @@
+module Nazrin
+  module PaginationGenerator
+    module WillPaginateGenerator
+      def self.call(collection, options)
+        begin
+          require 'will_paginate/collection'
+        rescue LoadError
+          abort "Missing dependency 'will_paginate' for pagination"
+        end
+
+        WillPaginate::Collection.create(options[:current_page], options[:per_page], options[:total_count]) do |pager|
+          pager.replace collection[pager.offset, pager.per_page].to_a
+        end
+      end
+    end
+  end
+end

data/lib/nazrin/version.rb

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

data/nazrin.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'kaminari'
+  spec.add_development_dependency 'will_paginate'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nazrin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomohiro Suwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +188,10 @@ files:
 - lib/nazrin/config.rb
 - lib/nazrin/document_client.rb
 - lib/nazrin/paginated_array.rb
+- lib/nazrin/pagination_generator.rb
+- lib/nazrin/pagination_generator/kaminari_generator.rb
+- lib/nazrin/pagination_generator/nazrin_generator.rb
+- lib/nazrin/pagination_generator/will_paginate_generator.rb
 - lib/nazrin/search_client.rb
 - lib/nazrin/version.rb
 - nazrin.gemspec