activerecord_sortable 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5640a5dd9f693339206e48b5ab9b3a5da3f147ff
-  data.tar.gz: 308004a4966b8cf43fd8918461b36dda03ad75ef
+  metadata.gz: 1bf73c95b55406d62e73c59a4e3d61b1fe9f7116
+  data.tar.gz: 55acfcb751c18e34f8dd09d016444a105cbcd9ff
 SHA512:
-  metadata.gz: 29d9883a543f1e643b1fa44f2631afd345f4d38a648180432b1fd6ac914c6c93c67b262e090935a063acfe6a451523b95d07e146161e9a3b7ed3fb9bf8ddf1a4
-  data.tar.gz: 50e11bb35d513717b964f06a4496f06f2b4b8c12ce17f28920f50a59df4654b66083433f6d065b652f5e6b1f5316266af5d49a51ff4f4e2e98a38d01c90e8e25
+  metadata.gz: ef04696ffa2b16931bae9b146f4bf20c74f0f20fdefb1b4d27dd6ac26ef2c60a3e979f0bfc53286a0615dd6396fa89d7f0aea9c5c1c18cbfb410d9a1e02cdad7
+  data.tar.gz: b0e3147d74a143f2d3bf10c5828b440b7a2aae5ad663131d373f456f665f66bd2d0e1931462b7896350544f0253ec5d036c40fccf302fc9e6b2c981ed72413b9

data/lib/activerecord_sortable.rb

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

data/lib/activerecord_sortable/collection_proxy.rb

@@ -0,0 +1,19 @@
+# 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

@@ -0,0 +1,16 @@
+# 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

data/lib/activerecord_sortable/version.rb

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

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.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Vladislav Melanitskiy
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 description: It adds possibility for sorting relation
 email:
 - co@rademade.com
@@ -34,8 +40,9 @@ files:
 - lib/activerecord_sortable.rb
 - lib/activerecord_sortable/association.rb
 - lib/activerecord_sortable/association_reflection.rb
-- lib/activerecord_sortable/association_relation.rb
+- lib/activerecord_sortable/collection_proxy.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/association_relation.rb

@@ -1,17 +0,0 @@
-# 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