admino 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c15fcada38f4aa3e23bbc6b1a460565a632fb7aa
-  data.tar.gz: 2420006c1f8910d432cd5a3da44776ff8a9fc94b
+  metadata.gz: cb6f069c49996e9bf994e63b48c08fc778387606
+  data.tar.gz: 5a189da715fb212272cb14396cc1351ef3b6765b
 SHA512:
-  metadata.gz: f3a34ac25cf486afeb7beb851dd6eecec93de4d7d6f47371570b0451cc533ed423c53a6a47ad5b6f9a80595533e5a0b6940a8b3da754f44e3793dc16fca330f9
-  data.tar.gz: 08c7f2fc10cb1762680895ce7cb18b257c20528a42de033d4e0c148ce8bf3360e07bc0c6d7ab08ae945af30cf3842eabf1a995f4707e3fcd3cfddfec9ac32940
+  metadata.gz: 76abf92afbb96a5d7afcda73150b01aa7f12c6173dbfe1f3ff038f35827727baac685c41b7d6afdd5e7a9f63222671ff335d842840bf2bb7beb40387e49f60a2
+  data.tar.gz: 47cfae8cb1f1703424e58d7cbe0ba62353e7d9494fd6fbc1403101ce1dd3bc234443dff57b79979eba5fffe54c0f657bcd26a096db3492ffa9f5c12cc39b2211

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.0.6
+
+* Moved the filter group params inside of the `:query` hash
+
 # v0.0.5
 
 * Rename Field into SearchField

data/README.md

@@ -47,7 +47,7 @@ class TasksQuery < Admino::Query::Base
 end
 ```
 
-Each query object gets initialized with a hash of params, and features a `#scope` method that returns the filtered/sorted result set. As you may have guessed, query objects can be great companions to index controller actions:
+Each query object gets initialized with a hash of params, and features a `#scope` method that returns the filtered/sorted result set. As you may have guessed, query objects can be great companions to index actions:
 
 ```ruby
 class TasksController < ApplicationController
@@ -86,8 +86,7 @@ class TasksQuery < Admino::Query::Base
   search_field :title_matches
 end
 ```
-The `#scope` method will check the presence of the `params[:query][:title_matches]` key. If it finds it, it will augment the query with a
-named scope called `:title_matches`, expected to be found within the `Task` model, that needs to accept an argument.
+The `#scope` method will check the presence of the `params[:query][:title_matches]` key. If it finds it, it will augment the query with a named scope called `:title_matches`, expected to be found within the `Task` model. The scope needs to accept an argument.
 
 ```ruby
 class Task < ActiveRecord::Base
@@ -112,7 +111,7 @@ class TasksQuery < Admino::Query::Base
 end
 ```
 
-Just like a search field, with a declared filter group the `#scope` method will check the presence of a `params[:query][:status]` key. If it finds it (and its value corresponds to one of the declared scopes) it will augment the query the scope itself:
+Just like a search field, with a declared filter group the `#scope` method will check the presence of a `params[:query][:status]` key. If it finds it (and its value corresponds to one of the declared scopes) it will augment the query with the scope itself:
 
 ```ruby
 class Task < ActiveRecord::Base
@@ -250,32 +249,21 @@ The great thing is that:
 
 The presenter also offers a `#simple_form` method to make it work with [Simple Form](https://github.com/plataformatec/simple_form) out of the box.
 
-### I18n
+### Output customization
 
-To localize the search form labels, as well as the group filter names and scope links, please refer to the following YAML file:
+The `#scope_link` methods are very flexible, allowing you to change almost every aspect of the generated links:
 
-```yaml
-en:
-  query:
-    attributes:
-      tasks_query:
-        title_matches: 'Title contains'
-    filter_groups:
-      tasks_query:
-        status:
-          name: 'Filter by status'
-          scopes:
-            completed: 'Completed'
-            pending: 'Pending'
-    sorting_scopes:
-      task_query:
-        by_due_date: 'By due date'
-        by_title: 'By title'
-```
+```erb
+<% status_filter = query.filter_group_by_name(:status) %>
 
-### Output customization
+<%= status_filter.scope_link :completed,
+                             'Custom title',
+                             active_class: 'active',
+                             class: 'custom-class'
+%>
+```
 
-The presenter supports a number of optional arguments that allow a great amount of flexibility regarding customization of CSS classes, labels and HTML attributes. Please refer to the tests for the details.
+Please refer to the tests for the details.
 
 ### Overwriting the starting scope
 
@@ -290,16 +278,26 @@ end
 
 ### Coertions
 
-Admino can perform automatic coertions from a param string input to the type needed by the model named scope:
+Suppose the presence of a model scope that requires a non-textual argument (ie. a date):
+
+```ruby
+class Task < ActiveRecord::Base
+  scope :due_date_from, ->(date) { where('due_date >= ?', date) }
+end
+```
+
+Admino can perform some automatic coertions to the textual parameter it gets, and pass the coerced value to the scope:
 
 ```ruby
 class TasksQuery < Admino::Query::Base
-  # ...
-  field :due_date_from, coerce: :to_date
-  field :due_date_to, coerce: :to_date
+  search_field :due_date_from, coerce: :to_date
 end
+
+query = TaskQuery.new(query: { due_date_from: '2014-03-01' })
+query.search_field_by_name(:due_date_from).value # => #<Date Sat, 01 Mar 2014>
 ```
-The following coertions are available:
+
+If a specific coercion cannot be performed with the provided input, the scope won't be chained. The following coertions are available:
 
 * `:to_boolean`
 * `:to_constant`
@@ -311,13 +309,11 @@ The following coertions are available:
 * `:to_symbol`
 * `:to_time`
 
-If a specific coercion cannot be performed with the provided input, the scope won't be chained.
-
 Please see the [`Coercible::Coercer::String`](https://github.com/solnic/coercible/blob/master/lib/coercible/coercer/string.rb) class for details.
 
 ### Default sorting
 
-If you need to setup a default sorting, you can pass some optional arguments to a `scoping` declaration:
+If you need to setup a default sorting, you can pass some optional arguments to the `sorting` declaration:
 
 ```ruby
 class TasksQuery < Admino::Query::Base
@@ -328,6 +324,29 @@ class TasksQuery < Admino::Query::Base
 end
 ```
 
+### I18n
+
+To localize the search form labels, as well as the group filter names and scope links, please refer to the following YAML file:
+
+```yaml
+en:
+  query:
+    attributes:
+      tasks_query:
+        title_matches: 'Title contains'
+    filter_groups:
+      tasks_query:
+        status:
+          name: 'Filter by status'
+          scopes:
+            completed: 'Completed'
+            pending: 'Pending'
+    sorting_scopes:
+      task_query:
+        by_due_date: 'By due date'
+        by_title: 'By title'
+```
+
 ## Admino::Table::Presenter
 
 Admino offers a [Showcase collection presenter](https://github.com/stefanoverna/showcase) that makes it really easy to generate HTML tables from a set of records:
@@ -348,14 +367,14 @@ Admino offers a [Showcase collection presenter](https://github.com/stefanoverna/
     <tr>
       <th role='title'>Title</th>
       <th role='completed'>Completed</th>
-      <th role='due_date'>Due date</th>
+      <th role='due-date'>Due date</th>
     </tr>
   <thead>
   <tbody>
     <tr id='task_1' class='is-even'>
       <td role='title'>Call mum ASAP</td>
       <td role='completed'>✓</td>
-      <td role='due_date'>2013-02-04</td>
+      <td role='due-date'>2013-02-04</td>
     </tr>
     <tr id='task_2' class='is-odd'>
       <!-- ... -->
@@ -366,7 +385,7 @@ Admino offers a [Showcase collection presenter](https://github.com/stefanoverna/
 
 ### Record actions
 
-Often table rows needs to offer some kind of action associated with the record. The presenter implements the following DSL to support that:
+Often tables need to offer some kind of action associated with the records. The presenter implements the following DSL to support that:
 
 ```erb
 <%= Admino::Table::Presenter.new(@tasks, Task, self).to_html do |row, record| %>
@@ -402,7 +421,15 @@ Often table rows needs to offer some kind of action associated with the record.
 
 ### Sortable columns
 
-Once a query object is passed to the presenter, columns can be associated to specific sorting scopes of the query object using the `sorting` option:
+If you want to make the table headers sortable, then please create an Admino query object class to define the available sorting scopes.
+
+```ruby
+class TaskQuery < Admino::Query::Base
+  sorting :by_title, :by_due_date
+end
+```
+
+You can then pass the query object as a parameter to the table presenter initializer, and associate table columns to specific sorting scopes of the query object using the `sorting` directive:
 
 ```erb
 <% query = present(@query) %>
@@ -420,10 +447,10 @@ This generates links that allow the visitor to sort the result set in ascending
   <thead>
     <tr>
       <th role='title'>
-        <a href="/admin/tasks?sorting=by_title&sort_order=desc" class='is-asc'>Title</a>
+        <a href='/admin/tasks?sorting=by_title&sort_order=desc' class='is-asc'>Title</a>
       </th>
-      <th role='due_date'>
-        <a href="/admin/tasks?sorting=by_due_date&sort_order=asc" class='is-asc'>Due date</a>
+      <th role='due-date'>
+        <a href='/admin/tasks?sorting=by_due_date&sort_order=asc'>Due date</a>
       </th>
     </tr>
   <thead>
@@ -433,7 +460,7 @@ This generates links that allow the visitor to sort the result set in ascending
 
 ### Customizing the output
 
-The `#column` and `#action` methods are very flexible, allowing youto change almost every aspect of the generated table cells:
+The `#column` and `#action` methods are very flexible, allowing you to change almost every aspect of the generated table cells:
 
 ```erb
 <%= Admino::Table::Presenter.new(@tasks, Task, self).to_html(class: 'table-class') do |row, record| %>
@@ -447,7 +474,7 @@ The `#column` and `#action` methods are very flexible, allowing youto change alm
 <% end %>
 ```
 
-If you need more power, you can also decide to subclass `Admino::Table::Presenter`. For each HTML element, there's a set of methods you can override to customize it's appeareance.
+If you need more power, you can also subclass `Admino::Table::Presenter`. For each HTML element, there's a set of methods you can override to customize it's appeareance.
 Table cells are generated through two collaborator classes: `Admino::Table::HeadRow` and `Admino::Table::ResourceRow`. You can easily replace them with a subclass if you want. To grasp the idea here's an example:
 
 ```ruby
@@ -500,17 +527,11 @@ end
 
 Please refer to the tests for all the details.
 
-### Inherited resources
+### Inherited resources (and similar)
 
-If the action URLs can be programmatically generated, it becomes even easier to specify the table actions:
+If your controller actions are generated through [Inherited Resources](https://github.com/josevalim/inherited_resources), then you can always get the URL pointing to the show action with the `resource_path` helper method. Similar helpers [are available for the other REST actions too](https://github.com/josevalim/inherited_resources#url-helpers) (new, edit, destroy).
 
-```erb
-<%= CustomTablePresenter.new(@tasks, Task, self).to_html do |row, record| %>
-  <%# ... %>
-  <%= row.actions :show, :edit, :destroy %>
-<% end %>
-```
-For instance, using [Inherited Resources](https://github.com/josevalim/inherited_resources) to generate controller actions, you can use its [helper methods](https://github.com/josevalim/inherited_resources#url-helpers) to build a custom subclass of `Admino::Table::Presenter`:
+More in general, if you are able to programmatically generate/obtain the URLs of your row actions, you can subclass `Admino::Table::Presenter` and declare them:
 
 ```ruby
 class CustomTablePresenter < Admino::Table::Presenter
@@ -540,6 +561,15 @@ class CustomTablePresenter < Admino::Table::Presenter
 end
 ```
 
+This will enable you to generate row actions even faster, simply declaring them as arguments to the `#actions` DSL method:
+
+```erb
+<%= CustomTablePresenter.new(@tasks, Task, self).to_html do |row, record| %>
+  <%# ... %>
+  <%= row.actions :show, :edit, :destroy %>
+<% end %>
+```
+
 ### I18n
 
 Column titles are generated using the model [`#human_attribute_name`](http://apidock.com/rails/ActiveRecord/Base/human_attribute_name/class) method, so if you already translated the model attribute names, you're good to go. To translate actions, please refer to the following YAML file:

data/lib/admino/query/filter_group.rb

@@ -23,8 +23,8 @@ module Admino
       end
 
       def active_scope
-        if param_value && scopes.include?(param_value.to_sym)
-          param_value.to_sym
+        if value && scopes.include?(value.to_sym)
+          value.to_sym
         else
           nil
         end
@@ -34,8 +34,8 @@ module Admino
         active_scope == scope
       end
 
-      def param_value
-        params.fetch(param_name, nil)
+      def value
+        params.fetch(:query, {}).fetch(param_name, nil)
       end
 
       def param_name

data/lib/admino/query/filter_group_presenter.rb

@@ -28,12 +28,16 @@ module Admino
       end
 
       def scope_params(scope)
-        params = ActiveSupport::HashWithIndifferentAccess.new(h.request.query_parameters)
+        params = ActiveSupport::HashWithIndifferentAccess.new(
+          h.request.query_parameters
+        )
+
+        params[:query] ||= {}
 
         if is_scope_active?(scope)
-          params.delete(param_name)
+          params[:query].delete(param_name)
         else
-          params.merge!(param_name => scope.to_s)
+          params[:query].merge!(param_name => scope.to_s)
         end
 
         params

data/lib/admino/table/head_row.rb

@@ -30,23 +30,18 @@ module Admino
       end
 
       def column(*args, &block)
-        params = parse_column_args(args)
+        attribute_name, label, html_options = parse_column_args(args)
 
-        attribute_name = params[:attribute_name]
-        label = params[:label]
-        options = params[:html_options]
+        label ||= column_label(attribute_name)
 
-        if label.nil? && attribute_name
-          label = resource_klass.human_attribute_name(attribute_name.to_s)
-        end
-
-        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
+        html_options = complete_column_html_options(
+          attribute_name,
+          html_options
+        )
 
         sorting_scope = html_options.delete(:sorting)
         sorting_html_options = html_options.delete(:sorting_html_options) { {} }
+
         if sorting_scope
           raise ArgumentError, 'query object is required' unless query
           label = query.sorting.scope_link(sorting_scope, label, sorting_html_options)
@@ -61,6 +56,23 @@ module Admino
 
       private
 
+      def column_label(attribute_name)
+        if attribute_name
+          resource_klass.human_attribute_name(attribute_name.to_s)
+        end
+      end
+
+      def complete_column_html_options(attribute_name, final_html_options)
+        if attribute_name.nil?
+          return final_html_options
+        end
+
+        default_options = column_html_options(attribute_name)
+        html_options = Showcase::Helpers::HtmlOptions.new(default_options)
+        html_options.merge_attrs!(final_html_options)
+        html_options = html_options.to_h
+      end
+
       def column_html_options(attribute_name)
         { role: attribute_name.to_s.gsub(/_/, '-') }
       end

data/lib/admino/table/presenter.rb

@@ -43,26 +43,42 @@ module Admino
         table_tag(options) do
           thead_tag do
             thead_tr_tag do
-              row = head_row(collection_klass, query, view_context)
-              h.capture(row, nil, &block) if block_given?
-              row.to_html
+              th_tags(&block)
             end
           end <<
           tbody_tag do
-            collection.each_with_index.map do |resource, index|
-              html_options = base_tbody_tr_html_options(resource, index)
-              tbody_tr_tag(resource, index, html_options) do
-                row = resource_row(resource, view_context)
-                h.capture(row, resource, &block) if block_given?
-                row.to_html
-              end
-            end.join.html_safe
+            tbody_tr_tags(&block)
           end
         end
       end
 
       private
 
+      def tbody_tr_tags(&block)
+        collection.each_with_index.map do |resource, index|
+          html_options = base_tbody_tr_html_options(resource, index)
+          tbody_tr_tag(resource, index, html_options) do
+            td_tags(resource, &block)
+          end
+        end.join.html_safe
+      end
+
+      def th_tags(&block)
+        row = head_row(collection_klass, query, view_context)
+        if block_given?
+          h.capture(row, nil, &block)
+        end
+        row.to_html
+      end
+
+      def td_tags(resource, &block)
+        row = resource_row(resource, view_context)
+        if block_given?
+          h.capture(row, resource, &block)
+        end
+        row.to_html
+      end
+
       def collection
         object
       end

data/lib/admino/table/resource_row.rb

@@ -15,11 +15,12 @@ module Admino
       end
 
       def column(*args, &block)
-        params = parse_column_args(args)
+        attribute_name, label, html_options = parse_column_args(args)
 
-        attribute_name = params[:attribute_name]
-        label = params[:label]
-        options = params[:html_options]
+        html_options = complete_column_html_options(
+          attribute_name,
+          html_options
+        )
 
         if block_given?
           content = h.capture(resource, &block)
@@ -29,11 +30,7 @@ module Admino
           raise ArgumentError, 'attribute name or block required'
         end
 
-        default_options = column_html_options(attribute_name)
-        html_options = Showcase::Helpers::HtmlOptions.new(default_options)
-        html_options.merge_attrs!(options)
-
-        @columns << h.content_tag(:td, content, html_options.to_h)
+        @columns << h.content_tag(:td, content, html_options)
       end
 
       def actions(*actions, &block)
@@ -47,76 +44,93 @@ module Admino
       end
 
       def action(*args, &block)
-        params = parse_action_args(args)
-
-        action_name = params[:action_name]
-        label = params[:label]
-        url = params[:url]
-        options = params[:html_options]
-
         if block_given?
           @actions << h.capture(resource, &block)
-          return
-        end
+        else
+          action_name, url, label, html_options = parse_action_args(args)
 
-        if url.nil?
-          if action_name.nil?
-            raise ArgumentError, 'no URL provided, action name required'
-          end
+          label ||= action_label(action_name)
+          url ||= action_url(action_name)
+          html_options = complete_action_html_options(
+            action_name,
+            html_options
+          )
+
+          @actions << h.link_to(label, url, html_options)
+        end
+      end
 
-          action_url_method = "#{action_name}_action_url"
+      def to_html
+        buffer = @columns
 
-          if !respond_to?(action_url_method, true)
-            raise ArgumentError,
-                  "no URL provided, ##{action_url_method} method required"
+        if @actions.any?
+          html_options = column_html_options(:actions)
+          buffer << h.content_tag(:td, html_options) do
+            @actions.join(" ").html_safe
           end
-
-          url = send(action_url_method)
         end
 
-        base_options = if action_name
-                         action_html_options(action_name)
-                       end
-
-        html_options = Showcase::Helpers::HtmlOptions.new(base_options)
+        buffer.html_safe
+      end
 
-        action_html_options_method = "#{action_name}_action_html_options"
+      private
 
-        if respond_to?(action_html_options_method, true)
-          action_html_options = send(action_html_options_method)
-          html_options.merge_attrs!(action_html_options)
+      def action_url(action_name)
+        if action_name.nil?
+          raise ArgumentError,
+                'no URL provided, action name required'
         end
 
-        html_options.merge_attrs!(options)
+        action_url_method = "#{action_name}_action_url"
 
-        if label.nil? && action_name
-          label = I18n.t(
-            :"#{resource.class.model_name.i18n_key}.#{action_name}",
-            scope: 'table.actions',
-            default: [
-              :"#{action_name}",
-              action_name.to_s.titleize
-            ]
-          )
+        if !respond_to?(action_url_method, true)
+          raise ArgumentError,
+                "no URL provided, ##{action_url_method} method required"
         end
 
-        @actions << h.link_to(label, url, html_options.to_h)
+        url = send(action_url_method)
       end
 
-      def to_html
-        buffer = @columns
+      def complete_action_html_options(action_name, final_html_options)
+        if action_name
+          default_options = column_html_options(action_name)
+          html_options = Showcase::Helpers::HtmlOptions.new(default_options)
 
-        if @actions.any?
-          html_options = column_html_options(:actions)
-          buffer << h.content_tag(:td, html_options) do
-            @actions.join(" ").html_safe
+          action_html_options_method = "#{action_name}_action_html_options"
+          if respond_to?(action_html_options_method, true)
+            html_options.merge_attrs!(send(action_html_options_method))
           end
+
+          html_options.merge_attrs!(final_html_options)
+          html_options.to_h
+        else
+          final_html_options
         end
+      end
 
-        buffer.html_safe
+      def complete_column_html_options(attribute_name, final_html_options)
+        if attribute_name
+          default_options = column_html_options(attribute_name)
+          html_options = Showcase::Helpers::HtmlOptions.new(default_options)
+          html_options.merge_attrs!(final_html_options)
+          html_options.to_h
+        else
+          final_html_options
+        end
       end
 
-      private
+      def action_label(action_name)
+        return nil unless action_name
+
+        I18n.t(
+          :"#{resource.class.model_name.i18n_key}.#{action_name}",
+          scope: 'table.actions',
+          default: [
+            :"#{action_name}",
+            action_name.to_s.titleize
+          ]
+        )
+      end
 
       def action_html_options(action_name)
         { role: action_name.to_s.gsub(/_/, '-') }

data/lib/admino/table/row.rb

@@ -10,7 +10,7 @@ module Admino
       end
 
       def parse_column_args(args)
-        options = args.extract_options!
+        html_options = args.extract_options!
 
         attribute_name = if args.first.is_a?(Symbol)
                            args.shift
@@ -24,15 +24,11 @@ module Admino
                   nil
                 end
 
-        {
-          attribute_name: attribute_name,
-          label: label,
-          html_options: options
-        }
+        [attribute_name, label, html_options]
       end
 
       def parse_action_args(args)
-        options = args.extract_options!
+        html_options = args.extract_options!
 
         action_name = if args.first.is_a?(Symbol)
                         args.shift
@@ -48,12 +44,7 @@ module Admino
 
         label = args.shift
 
-        {
-          action_name: action_name,
-          url: url,
-          label: label,
-          html_options: options
-        }
+        [action_name, url, label, html_options]
       end
 
       def to_html

data/lib/admino/version.rb

@@ -1,4 +1,4 @@
 module Admino
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 

data/spec/admino/query/filter_group_presenter_spec.rb

@@ -16,7 +16,7 @@ module Admino
       let(:request_object) do
         double(
           'ActionDispatch::Request',
-          query_parameters: { 'filter_group' => 'bar' },
+          query_parameters: { 'query' => { 'field' => 'value', 'filter_group' => 'bar' } },
           path: '/'
         )
       end
@@ -86,6 +86,8 @@ module Admino
       end
 
       describe '#scope_params' do
+        let(:scope_active) { false }
+
         before do
           filter_group.stub(:is_scope_active?).with(:foo).and_return(scope_active)
         end
@@ -94,7 +96,7 @@ module Admino
           let(:scope_active) { true }
 
           it 'deletes the filter_group param' do
-            expect(presenter.scope_params(:foo)).not_to have_key 'filter_group'
+            expect(presenter.scope_params(:foo)[:query]).not_to have_key 'filter_group'
           end
         end
 
@@ -102,9 +104,13 @@ module Admino
           let(:scope_active) { false }
 
           it 'is set as filter group value' do
-            expect(presenter.scope_params(:foo)[:filter_group]).to eq 'foo'
+            expect(presenter.scope_params(:foo)[:query][:filter_group]).to eq 'foo'
           end
         end
+
+        it 'preserves the other params' do
+          expect(presenter.scope_params(:foo)[:query][:field]).to eq 'value'
+        end
       end
 
       describe '#name' do

data/spec/admino/query/filter_group_spec.rb

@@ -17,7 +17,7 @@ module Admino
         end
 
         context 'with an invalid value' do
-          let(:params) { { 'foo' => 'qux' } }
+          let(:params) { { 'query' => { 'foo' => 'qux' } } }
 
           it 'returns nil' do
             expect(filter_group.active_scope).to be_nil
@@ -25,7 +25,7 @@ module Admino
         end
 
         context 'with a valid value' do
-          let(:params) { { 'foo' => 'bar' } }
+          let(:params) { { 'query' => { 'foo' => 'bar' } } }
 
           it 'returns the scope name' do
             expect(filter_group.active_scope).to eq :bar
@@ -38,7 +38,7 @@ module Admino
         let(:scope) { ScopeMock.new('original') }
 
         context 'if the search_field has a value' do
-          let(:params) { { 'foo' => 'bar' } }
+          let(:params) { { 'query' => { 'foo' => 'bar' } } }
 
           it 'returns the original scope chained with the filter_group scope' do
             expect(result.chain).to eq [:bar, []]
@@ -53,7 +53,7 @@ module Admino
       end
 
       describe '#is_scope_active?' do
-        let(:params) { { 'foo' => 'bar' } }
+        let(:params) { { 'query' => { 'foo' => 'bar' } } }
 
         it 'returns true if the provided scope is the one currently active' do
           expect(filter_group.is_scope_active?(:bar)).to be_true

data/spec/admino/query/sorting_presenter_spec.rb

@@ -15,7 +15,7 @@ module Admino
       let(:request_object) do
         double(
           'ActionDispatch::Request',
-          query_parameters: { 'sorting' => 'by_date' },
+          query_parameters: { 'sorting' => 'by_date', 'other' => 'value' },
           path: '/'
         )
       end
@@ -103,8 +103,12 @@ module Admino
           sorting.stub(:is_scope_active?).with(:by_title).and_return(false)
         end
 
+        it 'preserves other params' do
+          expect(subject[:other]).to eq 'value'
+        end
+
         it 'sets the sorting param as the scope' do
-          subject[:sorting] == 'by_title'
+          expect(subject[:sorting]).to eq 'by_title'
         end
 
         context 'scope is active' do
@@ -118,7 +122,7 @@ module Admino
             end
 
             it 'sets the sorting order to descending' do
-              subject[:sort_order] == 'desc'
+              expect(subject[:sort_order]).to eq 'desc'
             end
           end
 
@@ -128,7 +132,7 @@ module Admino
             end
 
             it 'sets the sorting order to ascending' do
-              subject[:sort_order] == 'asc'
+              expect(subject[:sort_order]).to eq 'asc'
             end
           end
         end
@@ -142,7 +146,7 @@ module Admino
             end
 
             it 'sets the sorting order to ascending' do
-              subject[:sort_order] == 'asc'
+              expect(subject[:sort_order]).to eq 'asc'
             end
           end
 
@@ -152,7 +156,7 @@ module Admino
             end
 
             it 'sets the sorting order to descending' do
-              subject[:sort_order] == 'desc'
+              expect(subject[:sort_order]).to eq 'desc'
             end
           end
         end
@@ -163,7 +167,7 @@ module Admino
           end
 
           it 'sets the sorting order to ascending' do
-            subject[:sort_order] == 'asc'
+            expect(subject[:sort_order]).to eq 'asc'
           end
         end
       end

data/spec/admino/table/row_spec.rb

@@ -21,22 +21,22 @@ module Admino
 
         context 'with a symbol param' do
           let(:arguments) { [:title] }
-          it { should eq(attribute_name: :title, label: nil, html_options: {}) }
+          it { should eq [:title, nil, {}] }
         end
 
         context 'with a string param' do
           let(:arguments) { ['Title'] }
-          it { should eq(attribute_name: nil, label: 'Title', html_options: {}) }
+          it { should eq [nil, 'Title', {}] }
         end
 
         context 'with a string and a symbol param' do
           let(:arguments) { [:title, 'Title'] }
-          it { should eq(attribute_name: :title, label: 'Title', html_options: {}) }
+          it { should eq [:title, 'Title', {}] }
         end
 
         context 'with options' do
           let(:arguments) { [{ foo: 'bar' }] }
-          it { should eq(attribute_name: nil, label: nil, html_options: { foo: 'bar' }) }
+          it { should eq [nil, nil, { foo: 'bar' }] }
         end
       end
 
@@ -47,22 +47,22 @@ module Admino
 
         context 'with a symbol param' do
           let(:arguments) { [:show] }
-          it { should eq(action_name: :show, url: nil, label: nil, html_options: {}) }
+          it { should eq [:show, nil, nil, {}] }
         end
 
         context 'with a one string param' do
           let(:arguments) { ['/'] }
-          it { should eq(action_name: nil, url: '/', label: nil, html_options: {}) }
+          it { should eq [nil, '/', nil, {}] }
         end
 
         context 'with a two string params' do
           let(:arguments) { ['/', 'Details'] }
-          it { should eq(action_name: nil, url: '/', label: 'Details', html_options: {}) }
+          it { should eq [nil, '/', 'Details', {}] }
         end
 
         context 'with options' do
           let(:arguments) { [{ foo: 'bar' }] }
-          it { should eq(action_name: nil, url: nil, label: nil, html_options: { foo: 'bar' }) }
+          it { should eq [nil, nil, nil, { foo: 'bar' }] }
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admino
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stefano Verna