jinrai 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b26a6b9d12517eed97e97a11bb4550dad6cf03ab8712b3b56d3d40709cd2f5c
-  data.tar.gz: f13582e01a09ba49fe3e945b4f9f213537fcc8c9da6182669cc75215c7b2121d
+  metadata.gz: '0178eeb57c5a6f97b36376989e7c3e5081b870d400ef538f9365798345448313'
+  data.tar.gz: 249497a66a0678e1060d13c952885d12c6228fa6536d36eb4da59e6870e22b93
 SHA512:
-  metadata.gz: d044081459021b3352961f6aad68ae61c525ec57c512867327ae13011165224fdf8de8d1edc03371778f91f322baa196f38a2bccb5f8c0e6b72b2c3ec5943529
-  data.tar.gz: 44a3f8de879cab29dcded927d7202f247e66e56f1d8d36e33430c951292be19dfb43d27c029ce3ff37532f5d902dc548282b24c35c77907a43871e5880ea97ca
+  metadata.gz: 6565143154e30649171225464f6c283190f581fccb31950f75a7aa49656e3f6f6de33a0e1a0c132741900e3391a6a27edcecfbdc633d3d59373116e9a70f0a5b
+  data.tar.gz: 363deba13720ccdfcf144a07478c1d7410d97be4113b887c22fe4d97a3f2ea6b9f3fbd8662ec5fa43af8b7d83ede8a1a01d3ceb281c91988fc59e06a9685dfb6

data/lib/jinrai/active_record/core.rb

@@ -2,6 +2,9 @@ require 'jinrai/active_record/finder_methods'
 
 module Jinrai
   module ActiveRecord
+    RecordNotFound   = Class.new(::ActiveRecord::RecordNotFound)
+    StatementInvalid = Class.new(::ActiveRecord::StatementInvalid)
+
     module Core
       extend ActiveSupport::Concern
 

data/lib/jinrai/active_record/cursor_methods.rb

@@ -6,10 +6,12 @@ module Jinrai
       include Jinrai::ConfigurationMethods
 
       def since_cursor
+        return unless first
         encode_cursor(first)
       end
 
       def till_cursor
+        return unless last
         encode_cursor(last)
       end
 

data/lib/jinrai/active_record/finder_methods.rb

@@ -7,43 +7,37 @@ module Jinrai
 
       included do
         include Jinrai::ConfigurationMethods
-
-        def to_cursor
-          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
       end
 
       module ClassMethods
-
         def cursor(**options)
+          sort_order = options[:sort_order] || default_cursor_sort_order
           relation =
-            if default_cursor_sort_order == :desc
+            if sort_order == :desc
               cursoring(:lt, :gt, options[:since], options[:sort_at]).cursoring(:gt, :lt, options[:till], options[:sort_at])
-            elsif default_cursor_sort_order == :asc
+            elsif sort_order == :asc
               cursoring(:gt, :lt, options[:since], options[:sort_at]).cursoring(:lt, :gt, options[:till], options[:sort_at])
             end
           relation.extending_cursor
         end
 
         def after(cursor, **options)
+          sort_order = options[:sort_order] || default_cursor_sort_order
           relation =
-            if default_cursor_sort_order == :desc
+            if sort_order == :desc
               cursoring(:lt, :gt, cursor, options[:sort_at])
-            elsif default_cursor_sort_order == :asc
+            elsif sort_order == :asc
               cursoring(:gt, :lt, cursor, options[:sort_at])
             end
           relation.extending_cursor
         end
 
         def before(cursor, **options)
+          sort_order = options[:sort_order] || default_cursor_sort_order
           relation =
-            if default_cursor_sort_order == :desc
+            if sort_order == :desc
               cursoring(:gt, :lt, cursor, options[:sort_at])
-            elsif default_cursor_sort_order == :asc
+            elsif sort_order == :asc
               cursoring(:lt, :gt, cursor, options[:sort_at])
             end
           relation.extending_cursor
@@ -57,26 +51,33 @@ module Jinrai
         def cursoring(rank, rank_for_primary, cursor, sort_at)
           sort_at ||= primary_key
           if cursor
-            attributes = HashWithIndifferentAccess.new(default_attributes_from_cursor.call(decode_cursor(cursor)))
+            attributes = default_attributes_from_cursor.call(decode_cursor(cursor))
+            pointed = find_by!(attributes)
 
             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, attributes[primary_key])))
+              condition_1 = arel_table[sort_at].send(rank, pointed[sort_at])
+              condition_2 = arel_table.grouping(arel_table[sort_at].eq(pointed[sort_at]).and(arel_table[primary_key].send(rank_for_primary, pointed[primary_key])))
               relation = where(condition_1.or(condition_2))
             else
-              relation = where(arel_table[primary_key].send(rank, id))
+              relation = where(arel_table[primary_key].send(rank, pointed[primary_key]))
             end
           else
             relation = all
           end
           relation.order(sort_at => default_cursor_sort_order)
+        rescue ::ActiveRecord::StatementInvalid => e
+          # TODO: modify error message
+          raise Jinrai::ActiveRecord::StatementInvalid, e
+        rescue ::ActiveRecord::RecordNotFound
+          raise Jinrai::ActiveRecord::RecordNotFound,
+            "Could not find record cursor pointing, Check cursor_format settings."
         end
 
         private
 
         def decode_cursor(cursor)
           attributes = Base64.urlsafe_decode64(cursor).split("_")
-          default_cursor_format.zip(attributes).to_h
+          HashWithIndifferentAccess.new(default_cursor_format.zip(attributes).to_h)
         end
       end
     end

data/lib/jinrai/configuration_methods.rb

@@ -8,19 +8,15 @@ module Jinrai #:nodoc:
         @_default_cursor_per = num.to_i
       end
 
-      def cursor_format(*attributes)
+      def cursor_format(*attributes, &block)
         @_default_cursor_format = attributes
+        @_default_attributes_from_cursor = block
       end
 
       def cursor_sort_order(rank)
         @_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

data/lib/jinrai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jinrai
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - atomiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  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: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
 description: Jinrai is a awesome Cursor based pagination Link.
 email:
 - akifumi.tomiyama@studyplus.jp