proximal_records 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDEwZmY4ZGVhMTNmZWQ5Mzk0ZDk3NTZhNTk0NzdjN2FkYjNlNGI0MQ==
+    ZGQwNTNhY2Q5MWZjZDE5NWM2NzhhYTdlODJmMTVlY2MwMTEyZmU1Yg==
   data.tar.gz: !binary |-
-    OGYwYTQ1MWM0OTQ5NzhlNjhlYmNhYTkwNjU1ZWM2ZTMwNzljNWIxNA==
+    MGYzNjBlNzlhZmViMDljODQwODc1YjA5MTVlZTUyMWE0MmM0NTIxNg==
 SHA512:
   metadata.gz: !binary |-
-    YTcwNGZkZWIxM2Q0NDhkNGYyY2MzOTI4NmUyMjhjMTNhYzViMzQyMzMxMDU4
-    MTliZDAyNzY2MzQ2NzgyMzEwMDBiMmU4NDM4ZWU3MDJhNTk3YmY1MTE4OGZj
-    ZDRmMDBhNjU4MmRmMmUwZTgzZDE3ZDFhZWIzNzYwNjg1MTg5NDI=
+    N2I4YTI4YjQwMTRjZWQyNzUzNDJkMDc1ODlhNjUyMGU0YTczNzYwZjUwNDRi
+    ZmI4YTIyYWEzNjA5ZDQ3ODNkNzY0YTJhMDAwNWYwNjFkMDFmZTBjZWY5Yjk1
+    NDZhZWJlZDZlODZiMDAxN2JjYTc1MGVjZDJhNDJlZGVmYTg1NDg=
   data.tar.gz: !binary |-
-    NDljZDRlMWJiMGE1ZWNmYTU2NTg3MTQ5NGFmMjBiYmE2NjVmN2ExNGJjYzZi
-    YmFmMjcxODg5Y2Q3NDNiZjA4NmNmYTVhOWVmYTdkOWQxMWQ2ZDM3ZTI0OWRl
-    ZDM3NTNkNDI1NDE2ZGZjM2MwOTVhMmU5YzllOWYxMWUzNzA5ZTE=
+    MmEzNjdlMTYyZjRlOTA3NWNjMTM1NzIzMDkxOTYxN2U4NDA1MDQxZTMzNjA1
+    M2NkMTNkMGEzYjlmNmFlMTEzMDkyMTRmYWQ3NjcxMWY1YzEwMzJiZjhjMDIz
+    ZjM5MDM3ZmNkZDI3NjZjMGI4NzRiYTA3MDA3ZmY1ZmFlODlhNTA=

data/README.md

@@ -1,4 +1,4 @@
-# ProximalRecords
+# ProximalRecords 0.0.2
 
 ActiveRecord extension to find out near by (proximal) records (previous and next) from the ActiveRelation scopes (using AREL).
 
@@ -34,10 +34,17 @@ Or install it yourself as:
 
 ## Usage
 
+Include `ProximalRecords` module into your ActiveRecord model and use it with `proximal_records` method, that returns previous and next records in the array. If previous or next records didn't found, then returns nil.
+
 ```ruby
-    scope = Article.title_like('proximal').order('created_at DESC, title ASC')
-    current_record = Article.find(20) # it's part of the scope
-    p, n = current_record.proximal_records(scope)
+class Article < ActiveRecord::Base
+  include ProximalRecords
+end
+
+
+scope = Article.title_like('proximal').order('created_at DESC, title ASC')
+current_record = Article.find(20) # it's part of the scope
+p, n = current_record.proximal_records(scope)
 ```
 
 After that you will get `previous` and `next` records, that are proximal (near by) records of current_record.
@@ -48,9 +55,10 @@ After that you will get `previous` and `next` records, that are proximal (near b
 - https://github.com/charly/nexter
 - https://github.com/glebm/order_query
 
+
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/proximal_records/fork )
+1. Fork it ( http://github.com/dmitry/proximal_records/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/proximal_records/adapters/postgresql.rb

@@ -2,18 +2,19 @@ module ProximalRecords
   module Adapters
     module Postgresql
       def proximal_records(scope)
+        klass = self.class
+
         orders = scope.orders.join(', ')
 
         orders = "OVER(#{"ORDER BY #{orders}" if orders.present?})"
-        with_near_by = scope.select("articles.*, LAG(articles.id) #{orders} AS previous_id, LEAD(articles.id) #{orders} AS next_id")
+        primary_key = "#{klass.table_name}.#{klass.primary_key}"
+        with_near_by = scope.select("#{klass.table_name}.*, LAG(#{primary_key}) #{orders} AS previous_id, LEAD(#{primary_key}) #{orders} AS next_id")
 
         table = with_near_by.arel
-        as = table.as(Arel.sql('articles'))
-        a = self.class.from(as.to_sql).where(articles: {id: id}).limit(1)
+        as = table.as(Arel.sql('z'))
+        a = klass.select('z.*').from(as.to_sql).where(z: {klass.primary_key => id}).limit(1)[0]
 
-        a = a.first
-        previous_id, next_id = a.previous_id, a.next_id
-        [(self.class.find_by_id(previous_id)), (self.class.find_by_id(next_id))]
+        [(klass.find_by_id(a.previous_id)), (klass.find_by_id(a.next_id))]
       end
     end
   end

data/lib/proximal_records/version.rb

@@ -1,3 +1,3 @@
 module ProximalRecords
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proximal_records
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dmitry Polushkin