admino 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d1dd4a6bc98fcad84bb9d2269ac8104bdc4beb
-  data.tar.gz: c5a3bf57e8c8c22abb5f3f26a45e324c8204415a
+  metadata.gz: e3846d45b87e8e04505a972b8deabf753e7518ed
+  data.tar.gz: f5a5177a520c3e14ce1828f0158e983ae230f93e
 SHA512:
-  metadata.gz: 222f144346d9e0c3666f7eb682c716599bd883376265d7ad10bb257805d39e8d0cdcade04fd7ac3cf73d2ca9f5bedb888ac4b534db6df5c0e03aff2c535f9ca5
-  data.tar.gz: 8a1117eb95c79108304c0d27e02578843f9a3bb985718202d1401d5b44cd8c44c263d83bfa5a1cc67dbb1a15d90cbc66a45e30921b1487d0619ebea5bb557bc2
+  metadata.gz: c063c612bd312def34cccd381533613f7c13aa2ad27470065ebe1ec90671ad3abf71a49893a7986e9c1dae0aa757c5dc0f2b59285f863d610a331173a4f25fb7
+  data.tar.gz: dc64e3c91e279a3c631bdd1cdd7503d17b6945e8b6b3ccbc39566d9246b3007108ec09e3ba5e0588d01d4b2b2004e6ad5d1e578b340906b1812b7ee902d38707

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.0.2
+
+* Support to sortings
+
 # v0.0.1
 
 * First release

data/README.md

@@ -1,5 +1,8 @@
 # Admino
 
+[![Build Status](https://travis-ci.org/cantierecreativo/admino.png?branch=v0.0.1)](https://travis-ci.org/cantierecreativo/admino)
+[![Coverage Status](https://coveralls.io/repos/cantierecreativo/admino/badge.png?branch=master)](https://coveralls.io/r/cantierecreativo/admino?branch=master)
+
 TODO: Write a gem description
 
 ## Installation
@@ -27,3 +30,4 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/lib/admino/query.rb

@@ -4,6 +4,8 @@ require 'admino/query/configuration'
 require 'admino/query/field'
 require 'admino/query/group'
 require 'admino/query/group_presenter'
+require 'admino/query/sorting'
+require 'admino/query/sorting_presenter'
 
 module Admino
   module Query

data/lib/admino/query/base.rb

@@ -15,6 +15,7 @@ module Admino
       attr_reader :params
       attr_reader :groups
       attr_reader :fields
+      attr_reader :sorting
 
       def self.i18n_scope
         :query
@@ -26,6 +27,7 @@ module Admino
 
         init_groups
         init_fields
+        init_sorting
       end
 
       def scope(starting_scope = nil)
@@ -37,7 +39,10 @@ module Admino
 
         scope_builder = starting_scope
 
-        (fields + groups).each do |field|
+        scope_augmenters = fields + groups
+        scope_augmenters << sorting if sorting
+
+        scope_augmenters.each do |field|
           scope_builder = field.augment_scope(scope_builder)
         end
 
@@ -88,6 +93,12 @@ module Admino
           @fields[config.name] = Field.new(config, params)
         end
       end
+
+      def init_sorting
+        if config.sorting
+          @sorting = Sorting.new(config.sorting, params)
+        end
+      end
     end
   end
 end

data/lib/admino/query/base_presenter.rb

@@ -4,6 +4,7 @@ module Admino
   module Query
     class BasePresenter < Showcase::Presenter
       presents_collection :groups
+      presents :sorting
 
       def form(options = {}, &block)
         h.form_for(

data/lib/admino/query/configuration.rb

@@ -27,8 +27,29 @@ module Admino
         end
       end
 
+      class Sorting
+        attr_reader :scopes
+        attr_reader :default_scope
+        attr_reader :default_direction
+
+        def initialize(scopes, options = {})
+          options.symbolize_keys!
+          options.assert_valid_keys(:default_scope, :default_direction)
+
+          @scopes = scopes.map(&:to_sym)
+          @default_scope = if options[:default_scope]
+                             options[:default_scope].to_sym
+                           end
+
+          @default_direction = if options[:default_direction]
+                                 options[:default_direction].to_sym
+                               end
+        end
+      end
+
       attr_reader :fields
       attr_reader :groups
+      attr_reader :sorting
       attr_accessor :starting_scope_callable
       attr_accessor :ending_scope_callable
 
@@ -48,6 +69,10 @@ module Admino
           self.groups << group
         end
       end
+
+      def add_sorting_scopes(scopes, options = {})
+        @sorting = Sorting.new(scopes, options)
+      end
     end
   end
 end

data/lib/admino/query/dsl.rb

@@ -17,6 +17,11 @@ module Admino
         config.add_group(name, scopes)
       end
 
+      def sorting(*args)
+        options = args.extract_options!
+        config.add_sorting_scopes(args, options)
+      end
+
       def starting_scope(&block)
         config.starting_scope_callable = block
       end

data/lib/admino/query/group.rb

@@ -15,14 +15,14 @@ module Admino
       end
 
       def augment_scope(scope)
-        if current_scope
-          scope.send(current_scope)
+        if active_scope
+          scope.send(active_scope)
         else
           scope
         end
       end
 
-      def current_scope
+      def active_scope
         if param_value && available_scopes.include?(param_value.to_sym)
           param_value.to_sym
         else
@@ -31,7 +31,7 @@ module Admino
       end
 
       def is_scope_active?(scope)
-        current_scope == scope
+        active_scope == scope
       end
 
       def param_value

data/lib/admino/query/sorting.rb

@@ -0,0 +1,74 @@
+require 'coercible'
+require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/hash'
+
+module Admino
+  module Query
+    class Sorting
+      attr_reader :params
+      attr_reader :config
+
+      def initialize(config, params)
+        @config = config
+        @params = ActiveSupport::HashWithIndifferentAccess.new(params)
+      end
+
+      def augment_scope(scope)
+        if active_scope
+          scope.send(active_scope, ascending? ? :asc : :desc)
+        else
+          scope
+        end
+      end
+
+      def is_scope_active?(scope)
+        active_scope == scope
+      end
+
+      def ascending?
+        if params[:sort_order] == 'desc'
+          false
+        elsif params[:sort_order].blank? && active_scope == default_scope
+          default_direction_is_ascending?
+        else
+          true
+        end
+      end
+
+      def active_scope
+        if param_value && available_scopes.include?(param_value.to_sym)
+          param_value.to_sym
+        elsif default_scope
+          default_scope
+        else
+          nil
+        end
+      end
+
+      def default_scope
+        config.default_scope
+      end
+
+      def default_direction_is_ascending?
+        config.default_direction != :desc
+      end
+
+      def param_value
+        params.fetch(param_name, nil)
+      end
+
+      def param_name
+        :sorting
+      end
+
+      def available_scopes
+        config.scopes
+      end
+
+      def scope_name
+        config.name
+      end
+    end
+  end
+end
+

data/lib/admino/query/sorting_presenter.rb

@@ -0,0 +1,41 @@
+require 'showcase'
+
+module Admino
+  module Query
+    class SortingPresenter < Showcase::Presenter
+      def scope_link(scope, label, *args)
+        options = args.extract_options!
+
+        desc_class = options.delete(:desc_class) { 'is-desc' }
+        asc_class = options.delete(:asc_class) { 'is-asc' }
+
+        options = Showcase::Helpers::HtmlOptions.new(options)
+
+        if is_scope_active?(scope)
+          options.add_class!(ascending? ? asc_class : desc_class)
+        end
+
+        h.link_to label, scope_path(scope), options.to_h
+      end
+
+      def scope_path(scope)
+        h.request.path + "?" + scope_params(scope).to_query
+      end
+
+      def scope_params(scope)
+        params = ActiveSupport::HashWithIndifferentAccess.new(h.request.query_parameters)
+
+        if is_scope_active?(scope)
+          params.merge!(sorting: scope.to_s, sort_order: ascending? ? 'desc' : 'asc')
+        elsif default_scope == scope
+          params.merge!(sorting: scope.to_s, sort_order: default_direction.to_s)
+        else
+          params.merge!(sorting: scope.to_s, sort_order: 'asc')
+        end
+
+        params
+      end
+    end
+  end
+end
+

data/lib/admino/table/head_row.rb

@@ -5,9 +5,11 @@ module Admino
   module Table
     class HeadRow < Row
       attr_reader :resource_klass
+      attr_reader :query
 
-      def initialize(resource_klass, view_context)
+      def initialize(resource_klass, query, view_context)
         @resource_klass = resource_klass
+        @query = query
         @columns = ""
 
         super(view_context)
@@ -38,6 +40,14 @@ module Admino
         default_options = column_html_options(attribute_name)
         html_options = Showcase::Helpers::HtmlOptions.new(default_options)
         html_options.merge_attrs!(options)
+        html_options = html_options.to_h
+
+        sorting_scope = html_options.delete(:sorting)
+        if sorting_scope
+          raise ArgumentError, 'query object is required' unless query
+          sorting_html_options = html_options.delete(:sorting_html_options) { {} }
+          label = query.sorting.scope_link(sorting_scope, label, sorting_html_options)
+        end
 
         @columns << h.content_tag(:th, label.to_s, html_options.to_h)
       end

data/lib/admino/table/presenter.rb

@@ -6,6 +6,7 @@ module Admino
   module Table
     class Presenter < Showcase::Presenter
       attr_reader :collection_klass
+      attr_reader :query
 
       def self.tag_helper(name, tag, options = {})
         default_options_method = :"#{name}_html_options"
@@ -28,8 +29,13 @@ module Admino
       tag_helper :tbody,    :tbody
       tag_helper :tbody_tr, :tr, params: %w(resource index)
 
-      def initialize(collection, klass, context)
-        @collection_klass = klass
+      def initialize(*args)
+        context = args.pop
+        collection = args.shift
+
+        @collection_klass = args.shift
+        @query = args.shift
+
         super(collection, context)
       end
 
@@ -37,7 +43,7 @@ module Admino
         table_tag(options) do
           thead_tag do
             thead_tr_tag do
-              row = head_row(collection_klass, view_context)
+              row = head_row(collection_klass, query, view_context)
               h.capture(row, nil, &block) if block_given?
               row.to_html
             end
@@ -64,8 +70,8 @@ module Admino
         @collection ||= present_collection(object)
       end
 
-      def head_row(collection_klass, view_context)
-        HeadRow.new(collection_klass, view_context)
+      def head_row(collection_klass, query, view_context)
+        HeadRow.new(collection_klass, query, view_context)
       end
 
       def resource_row(resource, view_context)

data/lib/admino/version.rb

@@ -1,3 +1,4 @@
 module Admino
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
+

data/spec/admino/query/base_spec.rb

@@ -50,6 +50,23 @@ module Admino
         end
       end
 
+      context 'with a declared sorting' do
+        let(:config) { Configuration.new }
+        let(:sorting_config) do
+          config.add_sorting_scopes([:by_title, :by_date])
+        end
+
+        before do
+          sorting_config
+        end
+
+        it 'returns a configured Sorting' do
+          sorting = query.sorting
+          expect(sorting.config).to eq sorting_config
+          expect(sorting.params).to eq params
+        end
+      end
+
       describe '#scope' do
         let(:config) { Configuration.new }
         let(:result) { query.scope(starting_scope) }

data/spec/admino/query/dsl_spec.rb

@@ -18,6 +18,13 @@ module Admino
         expect(group.scopes).to eq [:one, :two]
       end
 
+      it 'allows #sortings declaration' do
+        sorting = config.sorting
+        expect(sorting.scopes).to eq [:by_title, :by_date]
+        expect(sorting.default_scope).to eq :by_title
+        expect(sorting.default_direction).to eq :desc
+      end
+
       it 'allows #starting_scope block declaration' do
         expect(config.starting_scope_callable.call).to eq 'start'
       end

data/spec/admino/query/group_presenter_spec.rb

@@ -26,29 +26,33 @@ module Admino
       end
 
       describe '#scope_link' do
+        subject { presenter.scope_link(:foo) }
+
         before do
-          group.stub(:is_scope_active?).with(:foo).and_return(true)
+          group.stub(:is_scope_active?).with(:foo).and_return(false)
         end
 
         context 'active CSS class' do
+          before do
+            group.stub(:is_scope_active?).with(:foo).and_return(true)
+          end
+
           it 'adds an is-active class' do
-            expect(presenter.scope_link(:foo)).to have_tag(:a, with: { class: 'is-active' })
+            should have_tag(:a, with: { class: 'is-active' })
           end
 
           context 'if an :active_class option is specified' do
+            subject { presenter.scope_link(:foo, active_class: 'active') }
+
             it 'adds it' do
-              expect(presenter.scope_link(:foo, active_class: 'active')).to have_tag(:a, with: { class: 'active' })
+              should have_tag(:a, with: { class: 'active' })
             end
           end
+        end
 
-          context 'else' do
-            before do
-              group.stub(:is_scope_active?).with(:foo).and_return(false)
-            end
-
-            it 'does not add it' do
-              expect(presenter.scope_link(:foo)).not_to have_tag(:a, with: { class: 'is-active' })
-            end
+        context 'else' do
+          it 'does not add it' do
+            should_not have_tag(:a, with: { class: 'is-active' })
           end
         end
 
@@ -58,12 +62,14 @@ module Admino
           end
 
           it 'uses #scope_name method' do
-            expect(presenter.scope_link(:foo)).to have_tag(:a, text: 'scope_name')
+            should have_tag(:a, text: 'scope_name')
           end
 
           context 'if a second parameter is supplied' do
+            subject { presenter.scope_link(:foo, 'test', active_class: 'active') }
+
             it 'uses it' do
-              expect(presenter.scope_link(:foo, 'test')).to have_tag(:a, text: 'test')
+              should have_tag(:a, text: 'test')
             end
           end
         end
@@ -74,7 +80,7 @@ module Admino
           end
 
           it 'uses #scope_path method' do
-            expect(presenter.scope_link(:foo)).to have_tag(:a, href: 'URL')
+            should have_tag(:a, href: 'URL')
           end
         end
       end

data/spec/admino/query/group_spec.rb

@@ -7,28 +7,28 @@ module Admino
       let(:config) { Configuration::Group.new(:foo, [:bar]) }
       let(:params) { {} }
 
-      describe '#current_scope' do
+      describe '#active_scope' do
         context 'with no param' do
           let(:params) { {} }
 
-          it 'returns the param value for the field' do
-            expect(group.current_scope).to be_nil
+          it 'returns nil' do
+            expect(group.active_scope).to be_nil
           end
         end
 
         context 'with an invalid value' do
           let(:params) { { 'foo' => 'qux' } }
 
-          it 'returns the param value for the field' do
-            expect(group.current_scope).to be_nil
+          it 'returns nil' do
+            expect(group.active_scope).to be_nil
           end
         end
 
         context 'with a valid value' do
           let(:params) { { 'foo' => 'bar' } }
 
-          it 'returns nil' do
-            expect(group.current_scope).to eq :bar
+          it 'returns the scope name' do
+            expect(group.active_scope).to eq :bar
           end
         end
       end

data/spec/admino/query/sorting_presenter_spec.rb

@@ -0,0 +1,167 @@
+require 'spec_helper'
+
+module Admino
+  module Query
+    describe SortingPresenter do
+      subject(:presenter) { SortingPresenter.new(sorting, view) }
+      let(:view) { RailsViewContext.new }
+      let(:sorting) { double('Sorting', default_scope: 'by_name') }
+      let(:request_object) do
+        double(
+          'ActionDispatch::Request',
+          query_parameters: { 'sorting' => 'by_date' },
+          path: '/'
+        )
+      end
+
+      before do
+        view.stub(:request).and_return(request_object)
+      end
+
+      describe '#scope_link' do
+        subject { presenter.scope_link(:by_title, 'Titolo') }
+
+        before do
+          sorting.stub(:is_scope_active?).with(:by_title).and_return(false)
+        end
+
+        context 'scope is active' do
+          before do
+            sorting.stub(:is_scope_active?).with(:by_title).and_return(true)
+          end
+
+          context 'ascending' do
+            before do
+              sorting.stub(:ascending?).and_return(true)
+            end
+
+            it 'adds an is-asc class' do
+              should have_tag(:a, with: { class: 'is-asc' })
+            end
+
+            context 'if an :asc_class option is specified' do
+              subject { presenter.scope_link(:by_title, 'Titolo', asc_class: 'asc') }
+
+              it 'adds it' do
+                should have_tag(:a, with: { class: 'asc' })
+              end
+            end
+          end
+
+          context 'descendent' do
+            before do
+              sorting.stub(:ascending?).and_return(false)
+            end
+
+            it 'adds an is-desc class' do
+              should have_tag(:a, with: { class: 'is-desc' })
+            end
+
+            context 'if a :desc_class option is specified' do
+              subject { presenter.scope_link(:by_title, 'Titolo', desc_class: 'desc') }
+
+              it 'adds it' do
+                should have_tag(:a, with: { class: 'desc' })
+              end
+            end
+          end
+        end
+
+        context 'else' do
+          it 'does not add it' do
+            should_not have_tag(:a, with: { class: 'is-asc' })
+          end
+        end
+
+        context 'label' do
+          it 'uses the provided argument' do
+            should have_tag(:a, text: 'Titolo')
+          end
+        end
+
+        context 'URL' do
+          before do
+            presenter.stub(:scope_path).with(:by_title).and_return('URL')
+          end
+
+          it 'uses #scope_path method' do
+            should have_tag(:a, href: 'URL')
+          end
+        end
+      end
+
+      describe '#scope_params' do
+        subject { presenter.scope_params(:by_title) }
+
+        before do
+          sorting.stub(:is_scope_active?).with(:by_title).and_return(false)
+        end
+
+        it 'sets the sorting param as the scope' do
+          subject[:sorting] == 'by_title'
+        end
+
+        context 'scope is active' do
+          before do
+            sorting.stub(:is_scope_active?).with(:by_title).and_return(true)
+          end
+
+          context 'is currently ascending' do
+            before do
+              sorting.stub(:ascending?).and_return(true)
+            end
+
+            it 'sets the sorting order to descending' do
+              subject[:sort_order] == 'desc'
+            end
+          end
+
+          context 'is currently descending' do
+            before do
+              sorting.stub(:ascending?).and_return(false)
+            end
+
+            it 'sets the sorting order to ascending' do
+              subject[:sort_order] == 'asc'
+            end
+          end
+        end
+
+        context 'scope is the default one' do
+          let(:sorting) { double('Sorting', default_scope: 'by_title') }
+
+          context 'default scope is ascending' do
+            before do
+              sorting.stub(:default_direction).and_return(:asc)
+            end
+
+            it 'sets the sorting order to ascending' do
+              subject[:sort_order] == 'asc'
+            end
+          end
+
+          context 'default scope is descending' do
+            before do
+              sorting.stub(:default_direction).and_return(:desc)
+            end
+
+            it 'sets the sorting order to descending' do
+              subject[:sort_order] == 'desc'
+            end
+          end
+        end
+
+        context 'else' do
+          before do
+            sorting.stub(:is_scope_active?).with(:by_title).and_return(false)
+          end
+
+          it 'sets the sorting order to ascending' do
+            subject[:sort_order] == 'asc'
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/admino/query/sorting_spec.rb

@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+module Admino
+  module Query
+    describe Sorting do
+      subject(:sorting) { Sorting.new(config, params) }
+      let(:config) do
+        Configuration::Sorting.new(sorting_scopes, options)
+      end
+      let(:sorting_scopes) { [:by_title, :by_date] }
+      let(:options) { {} }
+      let(:params) { {} }
+
+      describe '#active_scope' do
+        context 'with no param' do
+          let(:params) { {} }
+
+          it 'returns false' do
+            expect(sorting.active_scope).to be_nil
+          end
+
+          context 'if a default scope is configured' do
+            let(:options) { { default_scope: :by_date } }
+
+            it 'returns it' do
+              expect(sorting.active_scope).to eq :by_date
+            end
+          end
+        end
+
+        context 'with an invalid value' do
+          let(:params) { { 'sorting' => 'foo' } }
+
+          it 'returns false' do
+            expect(sorting.active_scope).to be_nil
+          end
+        end
+
+        context 'with a valid value' do
+          let(:params) { { 'sorting' => 'by_title' } }
+
+          it 'returns the scope name' do
+            expect(sorting.active_scope).to eq :by_title
+          end
+        end
+      end
+
+      describe '#ascending?' do
+        context 'with no param' do
+          let(:params) { {} }
+
+          it 'returns true' do
+            expect(sorting).to be_ascending
+          end
+        end
+
+        context 'with invalid value' do
+          let(:params) { { 'sort_order' => 'foo' } }
+
+          it 'returns true' do
+            expect(sorting).to be_ascending
+          end
+        end
+
+        context 'with "asc" value' do
+          let(:params) { { 'sort_order' => 'asc' } }
+
+          it 'returns nil' do
+            expect(sorting).to be_ascending
+          end
+        end
+
+        context 'with "desc" value' do
+          let(:params) { { 'sort_order' => 'desc' } }
+
+          it 'returns the param value for the field' do
+            expect(sorting).not_to be_ascending
+          end
+        end
+
+        context 'if a default scope and direction are set and default scope is current' do
+          let(:options) { { default_scope: :by_date, default_direction: :desc } }
+          let(:params) { { 'sorting' => 'by_date', 'sort_order' => 'desc' } }
+
+          it 'returns it' do
+            expect(sorting).not_to be_ascending
+          end
+        end
+      end
+
+      describe '#augment_scope' do
+        let(:result) { sorting.augment_scope(scope) }
+        let(:scope) { ScopeMock.new('original') }
+
+        context 'if the field has a value' do
+          let(:params) { { 'sorting' => 'by_title', 'sort_order' => 'desc' } }
+
+          it 'returns the original scope chained with the current scope' do
+            expect(result.chain).to eq [:by_title, [:desc]]
+          end
+        end
+
+        context 'else' do
+          it 'returns the original scope' do
+            expect(result).to eq scope
+          end
+        end
+
+        context 'if a default scope is configured' do
+          let(:options) { { default_scope: :by_date } }
+          let(:params) { {} }
+
+          it 'returns the original scope chained with the default scope' do
+            expect(result.chain).to eq [:by_date, [:asc]]
+          end
+
+          context 'if a default direction is configured' do
+            let(:options) { { default_scope: :by_date, default_direction: :desc } }
+
+            it 'returns the original scope chained with the default scope and default direction' do
+              expect(result.chain).to eq [:by_date, [:desc]]
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/spec/admino/table/head_row_spec.rb

@@ -3,9 +3,10 @@ require 'spec_helper'
 module Admino
   module Table
     describe HeadRow do
-      subject(:row) { HeadRow.new(klass, view) }
-      let(:view) { RailsViewContext.new }
+      subject(:row) { HeadRow.new(klass, query, view) }
       let(:klass) { Post }
+      let(:query) { nil }
+      let(:view) { RailsViewContext.new }
 
       it 'takes a class and a view context' do
         expect(row.resource_klass).to eq klass
@@ -50,6 +51,30 @@ module Admino
           end
         end
 
+        context 'sorting' do
+          context 'if no query object is present' do
+            it 'raises an ArgumentError' do
+              expect { row.column(:title, sorting: :by_title) }.to raise_error ArgumentError
+            end
+          end
+
+          context 'else' do
+            let(:query) { double('Query', sorting: sorting) }
+            let(:sorting) { double('Sorting') }
+
+            before do
+              sorting.stub(:scope_link).with(:by_title, 'Title', {}).
+                and_return('Link')
+            end
+
+            before { row.column(:title, sorting: :by_title) }
+
+            it 'generates a sorting scope link' do
+              should have_tag(:th, text: 'Link')
+            end
+          end
+        end
+
         context 'role' do
           before { row.column(:author_name) }
 

data/spec/admino/table/presenter_spec.rb

@@ -4,8 +4,9 @@ require 'ostruct'
 module Admino
   module Table
     describe Presenter do
-      subject(:presenter) { presenter_klass.new(collection, Post, view) }
+      subject(:presenter) { presenter_klass.new(collection, Post, query, view) }
       let(:presenter_klass) { Presenter }
+      let(:query) { double('Query') }
       let(:view) { RailsViewContext.new }
 
       let(:collection) { [ first_post, second_post ] }
@@ -21,7 +22,7 @@ module Admino
         PostPresenter.stub(:new).with(first_post, view).and_return(first_post_presenter)
         PostPresenter.stub(:new).with(second_post, view).and_return(second_post_presenter)
 
-        HeadRow.stub(:new).with(Post, view).and_return(head_row)
+        HeadRow.stub(:new).with(Post, query, view).and_return(head_row)
         ResourceRow.stub(:new).with(first_post_presenter, view).and_return(resource_row)
         ResourceRow.stub(:new).with(second_post_presenter, view).and_return(resource_row)
       end

data/spec/spec_helper.rb

@@ -37,6 +37,10 @@ class TestQuery < Admino::Query::Base
 
   group :bar, [:one, :two]
 
+  sorting :by_title, :by_date,
+          default_scope: :by_title,
+          default_direction: :desc
+
   starting_scope { 'start' }
   ending_scope { 'end' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admino
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: showcase
@@ -188,6 +188,8 @@ files:
 - lib/admino/query/field.rb
 - lib/admino/query/group.rb
 - lib/admino/query/group_presenter.rb
+- lib/admino/query/sorting.rb
+- lib/admino/query/sorting_presenter.rb
 - lib/admino/table.rb
 - lib/admino/table/head_row.rb
 - lib/admino/table/presenter.rb
@@ -200,6 +202,8 @@ files:
 - spec/admino/query/field_spec.rb
 - spec/admino/query/group_presenter_spec.rb
 - spec/admino/query/group_spec.rb
+- spec/admino/query/sorting_presenter_spec.rb
+- spec/admino/query/sorting_spec.rb
 - spec/admino/table/head_row_spec.rb
 - spec/admino/table/presenter_spec.rb
 - spec/admino/table/resource_row_spec.rb
@@ -236,6 +240,8 @@ test_files:
 - spec/admino/query/field_spec.rb
 - spec/admino/query/group_presenter_spec.rb
 - spec/admino/query/group_spec.rb
+- spec/admino/query/sorting_presenter_spec.rb
+- spec/admino/query/sorting_spec.rb
 - spec/admino/table/head_row_spec.rb
 - spec/admino/table/presenter_spec.rb
 - spec/admino/table/resource_row_spec.rb