activerecord_sortable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613d759c2916cce58672ebb809ec631dca683e89
-  data.tar.gz: 7be47af550dbad1df795c595bb30696c3662f0d2
+  metadata.gz: 5640a5dd9f693339206e48b5ab9b3a5da3f147ff
+  data.tar.gz: 308004a4966b8cf43fd8918461b36dda03ad75ef
 SHA512:
-  metadata.gz: 91a3f787693635e7527af979644d2773c285a9bf986907bb7da51a713eb005c74ba7085dd041799545dabd5e6c2d5a77a3302b2e096e4b20182a9013d0859e78
-  data.tar.gz: 337d2017ddcfd2574820a21a7fa9207378be3c6a8043d8e74b3726db996367ad43ef0161fb0b26a20bda382f8569c4851662c9e6673f6dddb1d39d1f31807195
+  metadata.gz: 29d9883a543f1e643b1fa44f2631afd345f4d38a648180432b1fd6ac914c6c93c67b262e090935a063acfe6a451523b95d07e146161e9a3b7ed3fb9bf8ddf1a4
+  data.tar.gz: 50e11bb35d513717b964f06a4496f06f2b4b8c12ce17f28920f50a59df4654b66083433f6d065b652f5e6b1f5316266af5d49a51ff4f4e2e98a38d01c90e8e25

data/lib/activerecord_sortable/association_relation.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+module ActiveRecord
+  class AssociationRelation
+
+    alias_method :original_to_a, :to_a
+
+    def to_a
+      if proxy_association.reflection.sortable? and order_values.empty?
+        sortable_table_name = (proxy_association.try(:through_reflection) || proxy_association.reflection).table_name
+        order("#{sortable_table_name}.#{proxy_association.reflection.sortable_field} ASC").to_a
+      else
+        original_to_a
+      end
+    end
+
+  end
+end

data/lib/activerecord_sortable/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveRecordSortable
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/activerecord_sortable.rb

@@ -1,7 +1,6 @@
 require 'activerecord_sortable/association'
 require 'activerecord_sortable/association_reflection'
-require 'activerecord_sortable/through_reflection'
-require 'activerecord_sortable/collection_proxy'
+require 'activerecord_sortable/association_relation'
 require 'activerecord_sortable/has_many_association'
 
 module ActiveRecordSortable

data/spec/dummy/log/development.log

@@ -3384,3 +3384,290 @@ Migrating to AddPositionToPostTags (20141008135500)
    (3.2ms)  DELETE FROM "post_tags";
    (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
    (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "posts" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2015-09-28 12:15:37.762938"], ["updated_at", "2015-09-28 12:15:37.762938"]]
+   (3.4ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.777441"], ["name", "Tag2"], ["updated_at", "2015-09-28 12:15:37.777441"]]
+   (3.4ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.782057"], ["name", "Tag1"], ["updated_at", "2015-09-28 12:15:37.782057"]]
+   (3.3ms)  commit transaction
+  Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "post_tags" ON "tags"."id" = "post_tags"."tag_id" WHERE "post_tags"."post_id" = ?  ORDER BY post_tags.position ASC  [["post_id", 1]]
+   (0.0ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.807430"], ["post_id", 1], ["tag_id", 1], ["updated_at", "2015-09-28 12:15:37.807430"]]
+  SQL (0.0ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.808816"], ["post_id", 1], ["tag_id", 2], ["updated_at", "2015-09-28 12:15:37.808816"]]
+   (3.1ms)  commit transaction
+  PostTag Load (0.1ms)  SELECT "post_tags".* FROM "post_tags"  WHERE "post_tags"."post_id" = ?  [["post_id", 1]]
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  UPDATE "post_tags" SET "created_at" = ?, "position" = ?, "updated_at" = ? WHERE "post_tags"."id" = 1  [["created_at", "2015-09-28 12:15:37.807430"], ["position", 1], ["updated_at", "2015-09-28 12:15:37.807430"]]
+   (3.3ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  UPDATE "post_tags" SET "created_at" = ?, "position" = ?, "updated_at" = ? WHERE "post_tags"."id" = 2  [["created_at", "2015-09-28 12:15:37.808816"], ["position", 2], ["updated_at", "2015-09-28 12:15:37.808816"]]
+   (3.3ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+  PostTag Load (0.1ms)  SELECT  "post_tags".* FROM "post_tags"  WHERE "post_tags"."post_id" = 1 AND "post_tags"."tag_id" = 1 LIMIT 1
+   (3.0ms)  DELETE FROM "users";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (2.9ms)  DELETE FROM "posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.1ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.7ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.8ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.8ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.7ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2015-09-28 12:15:37.858512"], ["updated_at", "2015-09-28 12:15:37.858512"]]
+   (3.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.865953"], ["title", "Post2"], ["updated_at", "2015-09-28 12:15:37.865953"]]
+   (3.4ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.870571"], ["title", "Post1"], ["updated_at", "2015-09-28 12:15:37.870571"]]
+   (2.9ms)  commit transaction
+  Post Load (0.2ms)  SELECT "posts".* FROM "posts"  WHERE "posts"."user_id" = ?  ORDER BY posts.position ASC  [["user_id", 1]]
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  UPDATE "posts" SET "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 1  [["updated_at", "2015-09-28 12:15:37.876819"], ["user_id", 1]]
+  SQL (0.2ms)  UPDATE "posts" SET "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 2  [["updated_at", "2015-09-28 12:15:37.878078"], ["user_id", 1]]
+   (3.6ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.4ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ? WHERE "posts"."id" = 1  [["position", 1], ["updated_at", "2015-09-28 12:15:37.883549"]]
+   (3.1ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.4ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ? WHERE "posts"."id" = 2  [["position", 2], ["updated_at", "2015-09-28 12:15:37.888803"]]
+   (3.6ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  commit transaction
+   (4.0ms)  DELETE FROM "users";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.4ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (3.6ms)  DELETE FROM "posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.5ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.5ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (2.9ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.917875"], ["name", "Tag2"], ["updated_at", "2015-09-28 12:15:37.917875"]]
+   (3.4ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.922213"], ["name", "Tag1"], ["updated_at", "2015-09-28 12:15:37.922213"]]
+   (3.3ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.926429"], ["name", "Tag3"], ["updated_at", "2015-09-28 12:15:37.926429"]]
+   (3.3ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "posts" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2015-09-28 12:15:37.933751"], ["updated_at", "2015-09-28 12:15:37.933751"]]
+  SQL (0.1ms)  INSERT INTO "post_tags" ("created_at", "position", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.934521"], ["position", 1], ["post_id", 1], ["tag_id", 1], ["updated_at", "2015-09-28 12:15:37.934521"]]
+  SQL (0.0ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.935181"], ["post_id", 1], ["tag_id", 2], ["updated_at", "2015-09-28 12:15:37.935181"]]
+  SQL (0.0ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.935762"], ["post_id", 1], ["tag_id", 3], ["updated_at", "2015-09-28 12:15:37.935762"]]
+   (2.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  UPDATE "post_tags" SET "position" = ?, "updated_at" = ? WHERE "post_tags"."id" = 2  [["position", 2], ["updated_at", "2015-09-28 12:15:37.939796"]]
+   (2.8ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.2ms)  UPDATE "post_tags" SET "position" = ?, "updated_at" = ? WHERE "post_tags"."id" = 3  [["position", 3], ["updated_at", "2015-09-28 12:15:37.943535"]]
+   (2.9ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  commit transaction
+  Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "post_tags" ON "tags"."id" = "post_tags"."tag_id" WHERE "post_tags"."post_id" = ?  ORDER BY "tags"."name" ASC  [["post_id", 1]]
+   (5.9ms)  DELETE FROM "users";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (2.6ms)  DELETE FROM "posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (2.9ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.4ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.4ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.6ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.0ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.977356"], ["name", "Tag2"], ["updated_at", "2015-09-28 12:15:37.977356"]]
+   (3.3ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.981621"], ["name", "Tag1"], ["updated_at", "2015-09-28 12:15:37.981621"]]
+   (3.3ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:37.985808"], ["name", "Tag3"], ["updated_at", "2015-09-28 12:15:37.985808"]]
+   (4.0ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "posts" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2015-09-28 12:15:37.993789"], ["updated_at", "2015-09-28 12:15:37.993789"]]
+  SQL (0.1ms)  INSERT INTO "post_tags" ("created_at", "position", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.994662"], ["position", 1], ["post_id", 1], ["tag_id", 1], ["updated_at", "2015-09-28 12:15:37.994662"]]
+  SQL (0.1ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.995443"], ["post_id", 1], ["tag_id", 2], ["updated_at", "2015-09-28 12:15:37.995443"]]
+  SQL (0.1ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:15:37.996143"], ["post_id", 1], ["tag_id", 3], ["updated_at", "2015-09-28 12:15:37.996143"]]
+   (3.0ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  UPDATE "post_tags" SET "position" = ?, "updated_at" = ? WHERE "post_tags"."id" = 2  [["position", 2], ["updated_at", "2015-09-28 12:15:38.000575"]]
+   (2.5ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.1ms)  UPDATE "post_tags" SET "position" = ?, "updated_at" = ? WHERE "post_tags"."id" = 3  [["position", 3], ["updated_at", "2015-09-28 12:15:38.003995"]]
+   (3.0ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  commit transaction
+   (3.1ms)  DELETE FROM "users";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (2.7ms)  DELETE FROM "posts";
+   (0.3ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.2ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.1ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.3ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.6ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.4ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:38.034699"], ["title", "Post2"], ["updated_at", "2015-09-28 12:15:38.034699"]]
+   (2.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:38.038588"], ["title", "Post1"], ["updated_at", "2015-09-28 12:15:38.038588"]]
+   (3.3ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:38.042867"], ["title", "Post3"], ["updated_at", "2015-09-28 12:15:38.042867"]]
+   (2.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2015-09-28 12:15:38.047239"], ["updated_at", "2015-09-28 12:15:38.047239"]]
+  SQL (0.1ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 1  [["position", 1], ["updated_at", "2015-09-28 12:15:38.047873"], ["user_id", 1]]
+  SQL (0.0ms)  UPDATE "posts" SET "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 2  [["updated_at", "2015-09-28 12:15:38.048436"], ["user_id", 1]]
+  SQL (0.1ms)  UPDATE "posts" SET "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 3  [["updated_at", "2015-09-28 12:15:38.048864"], ["user_id", 1]]
+   (2.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ? WHERE "posts"."id" = 2  [["position", 2], ["updated_at", "2015-09-28 12:15:38.052476"]]
+   (2.5ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ? WHERE "posts"."id" = 3  [["position", 3], ["updated_at", "2015-09-28 12:15:38.055824"]]
+   (3.0ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  commit transaction
+  Post Load (0.3ms)  SELECT "posts".* FROM "posts"  WHERE "posts"."user_id" = ?  ORDER BY "posts"."title" ASC  [["user_id", 1]]
+   (4.0ms)  DELETE FROM "users";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.6ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (3.7ms)  DELETE FROM "posts";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.4ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.5ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.4ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:38.086921"], ["title", "Post2"], ["updated_at", "2015-09-28 12:15:38.086921"]]
+   (3.0ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:38.091516"], ["title", "Post1"], ["updated_at", "2015-09-28 12:15:38.091516"]]
+   (3.0ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "posts" ("created_at", "title", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:15:38.096353"], ["title", "Post3"], ["updated_at", "2015-09-28 12:15:38.096353"]]
+   (3.1ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2015-09-28 12:15:38.101904"], ["updated_at", "2015-09-28 12:15:38.101904"]]
+  SQL (0.1ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 1  [["position", 1], ["updated_at", "2015-09-28 12:15:38.103120"], ["user_id", 1]]
+  SQL (0.1ms)  UPDATE "posts" SET "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 2  [["updated_at", "2015-09-28 12:15:38.104285"], ["user_id", 1]]
+  SQL (0.1ms)  UPDATE "posts" SET "updated_at" = ?, "user_id" = ? WHERE "posts"."id" = 3  [["updated_at", "2015-09-28 12:15:38.104881"], ["user_id", 1]]
+   (3.7ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.2ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ? WHERE "posts"."id" = 2  [["position", 2], ["updated_at", "2015-09-28 12:15:38.110534"]]
+   (2.9ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.1ms)  UPDATE "posts" SET "position" = ?, "updated_at" = ? WHERE "posts"."id" = 3  [["position", 3], ["updated_at", "2015-09-28 12:15:38.114986"]]
+   (2.9ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  commit transaction
+   (3.0ms)  DELETE FROM "users";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.5ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (3.5ms)  DELETE FROM "posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (3.1ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (2.6ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.0ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (2.9ms)  DELETE FROM "users";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (3.4ms)  DELETE FROM "posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.4ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.4ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (3.4ms)  DELETE FROM "users";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (3.5ms)  DELETE FROM "posts";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.2ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.7ms)  DELETE FROM "tags";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.5ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (2.9ms)  DELETE FROM "users";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (3.6ms)  DELETE FROM "posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.4ms)  DELETE FROM "tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.5ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (3.0ms)  DELETE FROM "users";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'users';
+   (3.6ms)  DELETE FROM "posts";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'posts';
+   (3.6ms)  DELETE FROM "tags";
+   (0.2ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'tags';
+   (3.4ms)  DELETE FROM "post_tags";
+   (0.1ms)  SELECT name FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';
+   (0.1ms)  DELETE FROM sqlite_sequence where name = 'post_tags';
+   (0.1ms)  SELECT COUNT(*) FROM "posts"
+   (0.2ms)  begin transaction
+  SQL (0.3ms)  INSERT INTO "posts" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2015-09-28 12:17:56.010135"], ["updated_at", "2015-09-28 12:17:56.010135"]]
+   (5.2ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (0.6ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:18:10.976339"], ["name", "1"], ["updated_at", "2015-09-28 12:18:10.976339"]]
+   (7.4ms)  commit transaction
+   (0.2ms)  begin transaction
+  SQL (0.5ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:18:21.385706"], ["name", "qwe2"], ["updated_at", "2015-09-28 12:18:21.385706"]]
+   (6.7ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.1ms)  INSERT INTO "tags" ("created_at", "name", "updated_at") VALUES (?, ?, ?)  [["created_at", "2015-09-28 12:18:31.526798"], ["name", "ewq"], ["updated_at", "2015-09-28 12:18:31.526798"]]
+   (3.7ms)  commit transaction
+   (0.0ms)  begin transaction
+  SQL (0.2ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:20:04.411415"], ["post_id", 1], ["tag_id", 3], ["updated_at", "2015-09-28 12:20:04.411415"]]
+   (6.2ms)  commit transaction
+  Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "post_tags" ON "tags"."id" = "post_tags"."tag_id" WHERE "post_tags"."post_id" = ?  ORDER BY post_tags.position ASC  [["post_id", 1]]
+   (0.2ms)  begin transaction
+  SQL (0.5ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:20:09.725375"], ["post_id", 1], ["tag_id", 1], ["updated_at", "2015-09-28 12:20:09.725375"]]
+   (6.2ms)  commit transaction
+   (0.2ms)  begin transaction
+  SQL (0.5ms)  INSERT INTO "post_tags" ("created_at", "post_id", "tag_id", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", "2015-09-28 12:20:11.392641"], ["post_id", 1], ["tag_id", 2], ["updated_at", "2015-09-28 12:20:11.392641"]]
+   (6.4ms)  commit transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  commit transaction
+  Post Load (0.3ms)  SELECT  "posts".* FROM "posts"   ORDER BY "posts"."id" DESC LIMIT 1
+  Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "post_tags" ON "tags"."id" = "post_tags"."tag_id" WHERE "post_tags"."post_id" = ?  ORDER BY post_tags.position ASC  [["post_id", 1]]

data/spec/models/association_reflection_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe 'Association reflection' do
 
   let(:post_reflection) do
-    User.reflections['posts']
+    User.reflections[:posts]
   end
 
   let(:user_post_reflection) do
-    User.reflections['user_posts']
+    User.reflections[:user_posts]
   end
 
   let(:sorted_post_reflection) do
-    User.reflections['sorted_posts']
+    User.reflections[:sorted_posts]
   end
 
   describe '.sortable?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_sortable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Vladislav Melanitskiy
@@ -14,16 +14,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0
 description: It adds possibility for sorting relation
 email:
 - co@rademade.com
@@ -34,9 +34,8 @@ files:
 - lib/activerecord_sortable.rb
 - lib/activerecord_sortable/association.rb
 - lib/activerecord_sortable/association_reflection.rb
-- lib/activerecord_sortable/collection_proxy.rb
+- lib/activerecord_sortable/association_relation.rb
 - lib/activerecord_sortable/has_many_association.rb
-- lib/activerecord_sortable/through_reflection.rb
 - lib/activerecord_sortable/version.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile

data/lib/activerecord_sortable/collection_proxy.rb

@@ -1,19 +0,0 @@
-# encoding: utf-8
-module ActiveRecord
-  module Associations
-    class CollectionProxy
-
-      alias_method :original_load_target, :load_target
-
-      def load_target
-        if proxy_association.reflection.sortable? and order_values.empty?
-          sortable_table_name = (proxy_association.try(:through_reflection) || proxy_association.reflection).table_name
-          order("#{sortable_table_name}.#{proxy_association.reflection.sortable_field} ASC").to_a
-        else
-          original_load_target
-        end
-      end
-
-    end
-  end
-end

data/lib/activerecord_sortable/through_reflection.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-module ActiveRecord
-  module Reflection
-    class ThroughReflection
-
-      def sortable_field
-        @delegate_reflection.options.fetch(:sortable_field, :position).to_sym
-      end
-
-      def sortable?
-        @delegate_reflection.options.fetch(:sortable, false)
-      end
-
-    end
-  end
-end