jinrai 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f90cbb057b2d8ed397a95afbd1be11e53f9a12ee
-  data.tar.gz: 262d9de132390d3eb80e4641f38372950ac02967
+SHA256:
+  metadata.gz: 2b26a6b9d12517eed97e97a11bb4550dad6cf03ab8712b3b56d3d40709cd2f5c
+  data.tar.gz: f13582e01a09ba49fe3e945b4f9f213537fcc8c9da6182669cc75215c7b2121d
 SHA512:
-  metadata.gz: 2bce5e4bc9d332e8d3e3921296d624622dd347cfbfc402b426396c15704a207622e378fc4b31af93232f1e458f29f233f19e34a619d9ce394d649cdeacecb436
-  data.tar.gz: 0141f31333eef1a456fe15edec0feaa0b761fe3d32310d996072aaed5c80bfe7cf28c9f503ccd77db8b0c9b23b522a2ff2718a5ecde409e019aae58503a5345c
+  metadata.gz: d044081459021b3352961f6aad68ae61c525ec57c512867327ae13011165224fdf8de8d1edc03371778f91f322baa196f38a2bccb5f8c0e6b72b2c3ec5943529
+  data.tar.gz: 44a3f8de879cab29dcded927d7202f247e66e56f1d8d36e33430c951292be19dfb43d27c029ce3ff37532f5d902dc548282b24c35c77907a43871e5880ea97ca

data/lib/jinrai/active_record/cursor_methods.rb

@@ -27,7 +27,8 @@ module Jinrai
 
       def encode_cursor(record)
         attributes = default_cursor_format.map do |attr|
-          record.send(attr)
+          value = record.send(attr)
+          value.respond_to?(:iso8601) ? value.iso8601 : value
         end
         Base64.urlsafe_encode64(attributes.join("_"))
       end

data/lib/jinrai/active_record/finder_methods.rb

@@ -9,9 +9,9 @@ module Jinrai
         include Jinrai::ConfigurationMethods
 
         def to_cursor
-          cursor_format = self.class.default_cursor_format
-          attributes = cursor_format.map do |attribute|
-            self.send(attribute)
+          attributes = self.class.default_cursor_format.map do |attr|
+            value = send(attr)
+            value.respond_to?(:iso8601) ? value.iso8601 : value
           end
           Base64.urlsafe_encode64(attributes.join("_"))
         end
@@ -57,12 +57,11 @@ module Jinrai
         def cursoring(rank, rank_for_primary, cursor, sort_at)
           sort_at ||= primary_key
           if cursor
-            attributes = HashWithIndifferentAccess.new(decode_cursor(cursor))
-            id = find_by(attributes).id
+            attributes = HashWithIndifferentAccess.new(default_attributes_from_cursor.call(decode_cursor(cursor)))
 
             if sort_at != primary_key
               condition_1 = arel_table[sort_at].send(rank, attributes[sort_at])
-              condition_2 = arel_table.grouping(arel_table[sort_at].eq(attributes[sort_at]).and(arel_table[primary_key].send(rank_for_primary, id)))
+              condition_2 = arel_table.grouping(arel_table[sort_at].eq(attributes[sort_at]).and(arel_table[primary_key].send(rank_for_primary, attributes[primary_key])))
               relation = where(condition_1.or(condition_2))
             else
               relation = where(arel_table[primary_key].send(rank, id))

data/lib/jinrai/config.rb

@@ -14,12 +14,14 @@ module Jinrai #:nodoc:
   class Config #:nodoc:
     attr_accessor :default_cursor_per,
                   :default_cursor_format,
-                  :default_cursor_sort_order
+                  :default_cursor_sort_order,
+                  :default_attributes_from_cursor
 
     def initialize
       @default_cursor_per = 20
       @default_cursor_format = %i[created_at id]
       @default_cursor_sort_order = :desc
+      @default_attributes_from_cursor = Proc.new { |decoded_cursor| decoded_cursor }
     end
   end
 end

data/lib/jinrai/configuration_methods.rb

@@ -16,6 +16,11 @@ module Jinrai #:nodoc:
         @_default_cursor_sort_order = rank.to_sym
       end
 
+      def attributes_from_cursor(&block)
+        @_default_attributes_from_cursor = block
+        
+      end
+
       def default_cursor_per
         @_default_cursor_per || Jinrai.config.default_cursor_per
       end
@@ -27,6 +32,10 @@ module Jinrai #:nodoc:
       def default_cursor_sort_order
         @_default_cursor_sort_order || Jinrai.config.default_cursor_sort_order
       end
+
+      def default_attributes_from_cursor
+        @_default_attributes_from_cursor || Jinrai.config.default_attributes_from_cursor
+      end
     end
   end
 end

data/lib/jinrai/version.rb

@@ -1,3 +1,3 @@
 module Jinrai
-  VERSION = '1.0.1'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jinrai
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - atomiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Jinrai is a awesome Cursor type pagination Link.
+description: Jinrai is a awesome Cursor based pagination Link.
 email:
 - akifumi.tomiyama@studyplus.jp
 executables: []
@@ -103,9 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
-summary: A cursor type pagination plugin for Rails
+summary: A cursor based pagination plugin for Rails
 test_files: []