active_record_sorting 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d95760abdb45a152cee923d24c16f775f4b5814
-  data.tar.gz: 3588d1042821d5b172c5706d8960530eb9e9720d
+  metadata.gz: 5b0efa3c2c9fab95170e8bf7537bc3bb8bc4b140
+  data.tar.gz: f301b09466d7025f72c0f58679d6dfbcdb5b78f0
 SHA512:
-  metadata.gz: 9caa292897399d8b5608783d29a955a8aebdb2e73906c2ec8b9cd5d031ef71944b704437eac6a3b1e3c0bb56279b7e24fbc18b9a67bc76169e4cf168091ca0bc
-  data.tar.gz: 5b45e88eac5991161b9bd97060285a7c635f7337ad6c2372e29f30778781414d0a3dc3f45265a67a9370d2cec9711d1a0e005ca7339dbfb2b8941d04257aff0e
+  metadata.gz: 7b1afc2ed2fc414adc4bf723f80128966510583d097820972a6e16aa14a77e6cf8dc376107e42d1106d889b6571099696a49698a6405b07b7b0798605ae57e88
+  data.tar.gz: f2d054dec6857fdaa0b595c164f709575d409c4b6f7c52af872a474ae7ed1b0e9d8659d70de863bf16704317643830894d55dabefbb3020abd3a821c667bdaaf

data/README.md

@@ -27,8 +27,7 @@ But if you care about you code being clean and follow single responsibility prin
 
 1. Create sorting class:
     ```ruby
-    # app/sortings
-     
+    # app/sortings/user_sorting
     class UserSorting < ActiveRecordSorting::Base
       named_sorting_orders :full_name
     
@@ -40,17 +39,17 @@ But if you care about you code being clean and follow single responsibility prin
 2. In your controller:
    
     ```ruby
-    def index
-     @users = UserSorting.sort(User, params[:sort]).page(params[:page])
-    end
+   UserSorting.sort(user_scope, 'id_asc').another_scope 
+   UserSorting.sort(user_scope, 'created_at_desc')
+   UserSorting.sort(user_scope, 'relation.column_asc')
+   UserSorting.sort(user_scope, 'full_name_asc')
+   UserSorting.sort(user_scope, 'any_column_desc')
     ```
-    Example values of `sort` param: `'id_asc', 'created_at_desc', 'relation.column_asc', 'named_order_asc', 'column_desc'`, etc.
 
 You can also define basic sorting class if you don't want to create it for each model:
 
 ```ruby
-# app/sorting/sorting
-
+# app/sortings/sorting
 class Sorting < ActiveRecordSorting::Base
 end
 ```
@@ -66,9 +65,7 @@ If you still want to access sort from your model just do the following:
 
 ```ruby
 class User < ActiveRecord::Base
-   def self.sort(order)
-     UserSorting.sort(self, order)
-   end
+  include ActiveRecordSorting::Concern
 end
 
 # Usage
@@ -77,6 +74,8 @@ User.sort(params[:sort])
 
 ```
 
+It will instantiate `UserSorting` if it is present, base sorting class otherwise.
+
 ## Contributing
 
 1. Fork it

data/lib/active_record_sorting/concern.rb

@@ -0,0 +1,14 @@
+require 'active_support/concern'
+
+module ActiveRecordSorting
+  module Concern
+    extend ActiveSupport::Concern
+
+    included do
+      def self.sort(order)
+        klass = "#{self.name}Sorting".constantize rescue ActiveRecordSorting::Base
+        klass.new(self).sort(order)
+      end
+    end
+  end
+end

data/lib/active_record_sorting/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordSorting
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/active_record_sorting.rb

@@ -1,5 +1,6 @@
 require "active_record_sorting/version"
 require "active_record_sorting/base"
+require "active_record_sorting/concern"
 
 module ActiveRecordSorting
 end

data/spec/active_record_sorting/concern_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ActiveRecordSorting::Concern do
+  let(:scope) { double }
+
+  context 'custom sorting class exists' do
+    subject { User }
+    let(:sorting_class) { UserSorting }
+
+    it 'should delegate sorting to sorting class' do
+      expected_to_sort_with 'name_asc', sorting_class
+    end
+  end
+
+  context 'custom sorting class doesnt exists' do
+    subject { Group }
+    let(:sorting_class) { ActiveRecordSorting::Base }
+
+    it 'should delegate sorting to base sorting class' do
+      expected_to_sort_with 'name_asc', sorting_class
+    end
+  end
+
+  private
+
+  def expected_to_sort_with(order, sorting_class)
+    expect(sorting_class).to receive(:new).with(subject).and_call_original
+    expect_any_instance_of(sorting_class).
+      to receive(:sort).with(order).and_return scope
+
+    expect(subject.sort(order)).to eq scope
+  end
+end

data/spec/fixtures/group.rb

@@ -1,2 +1,3 @@
 class Group < ActiveRecord::Base
+  include ActiveRecordSorting::Concern
 end

data/spec/fixtures/user.rb

@@ -1,3 +1,5 @@
 class User < ActiveRecord::Base
+  include ActiveRecordSorting::Concern
+
   belongs_to :group
 end

data/spec/fixtures/user_sorting.rb

@@ -0,0 +1,2 @@
+class UserSorting < ActiveRecordSorting::Base
+end

data/spec/spec_helper.rb

@@ -6,3 +6,4 @@ ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 require 'fixtures/schema'
 require 'fixtures/group'
 require 'fixtures/user'
+require 'fixtures/user_sorting'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_sorting
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - yratanov
@@ -110,11 +110,14 @@ files:
 - active_record_sorting.gemspec
 - lib/active_record_sorting.rb
 - lib/active_record_sorting/base.rb
+- lib/active_record_sorting/concern.rb
 - lib/active_record_sorting/version.rb
 - spec/active_record_sorting/base_spec.rb
+- spec/active_record_sorting/concern_spec.rb
 - spec/fixtures/group.rb
 - spec/fixtures/schema.rb
 - spec/fixtures/user.rb
+- spec/fixtures/user_sorting.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -142,7 +145,9 @@ specification_version: 4
 summary: Extract you sorting logic to separate object
 test_files:
 - spec/active_record_sorting/base_spec.rb
+- spec/active_record_sorting/concern_spec.rb
 - spec/fixtures/group.rb
 - spec/fixtures/schema.rb
 - spec/fixtures/user.rb
+- spec/fixtures/user_sorting.rb
 - spec/spec_helper.rb