admino 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb6f069c49996e9bf994e63b48c08fc778387606
-  data.tar.gz: 5a189da715fb212272cb14396cc1351ef3b6765b
+  metadata.gz: cb9eedd24736483e6944b06a6b6b0952aeb20408
+  data.tar.gz: a0f73747f2038acbc6faffbafc02ea4845339826
 SHA512:
-  metadata.gz: 76abf92afbb96a5d7afcda73150b01aa7f12c6173dbfe1f3ff038f35827727baac685c41b7d6afdd5e7a9f63222671ff335d842840bf2bb7beb40387e49f60a2
-  data.tar.gz: 47cfae8cb1f1703424e58d7cbe0ba62353e7d9494fd6fbc1403101ce1dd3bc234443dff57b79979eba5fffe54c0f657bcd26a096db3492ffa9f5c12cc39b2211
+  metadata.gz: 0214c1c5f397f0d75874b0e83a93f75bdb3e0afb6d292ca398b4d98457af4dc6c25c09f41edb99a33e42d2d4ba9ab3ff546fe3733f1fa001515aa4ba77bdda19
+  data.tar.gz: bb590aa9fa115d5dbd0f91f027b4430df595a31d3675f4649232d16ec0b8e32484c4683a45ce966a818913d80d3e84d5495a059431133d46cbd7d480d4174d09

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.0.7
+
+* `#scope_params` does not change request params
+
 # v0.0.6
 
 * Moved the filter group params inside of the `:query` hash
@@ -10,14 +14,14 @@
 # v0.0.4
 
 * Rename Group into FilterGroup
-* Rename FilterGroup#available_scopes into #scopes
-* Rename Sorting#available_scopes into #scopes
-* Removed nil scope in FilterGroup
+* Rename `FilterGroup#available_scopes` into `#scopes`
+* Rename `Sorting#available_scopes` into `#scopes`
+* Removed nil scope in `FilterGroup`
 * Clicking on an active filter scope link will deactivate it
 
 # v0.0.3
 
-* Fixed bug in SortingPresenter with default scope
+* Fixed bug in `SortingPresenter` with default scope
 
 # v0.0.2
 

data/README.md

@@ -371,12 +371,12 @@ Admino offers a [Showcase collection presenter](https://github.com/stefanoverna/
     </tr>
   <thead>
   <tbody>
-    <tr id='task_1' class='is-even'>
+    <tr class='is-even'>
       <td role='title'>Call mum ASAP</td>
       <td role='completed'>✓</td>
       <td role='due-date'>2013-02-04</td>
     </tr>
-    <tr id='task_2' class='is-odd'>
+    <tr class='is-odd'>
       <!-- ... -->
     </tr>
   <tbody>
@@ -407,7 +407,7 @@ Often tables need to offer some kind of action associated with the records. The
     </tr>
   <thead>
   <tbody>
-    <tr id='task_1' class='is-even'>
+    <tr class='is-even'>
       <!-- ... -->
       <td role='actions'>
         <a href='/admin/tasks/1' role='show'>Show</a>
@@ -570,6 +570,46 @@ This will enable you to generate row actions even faster, simply declaring them
 <% end %>
 ```
 
+### Showcase::Traits::Record
+
+As funny it may sound, it is strongly suggested to pass to the table presenter an array of records which in turn have been already presented. This enables you to use as columns not only the raw attributes of the model, but all the methods defined in the presenter.
+
+Furthermore, if the record presenter includes the `Showcase::Traits::Record` trait, each row of the table will automatically have an unique id attribute thanks to the [`#dom_id` method](https://github.com/stefanoverna/showcase#dom_id).
+
+```ruby
+class TaskPresenter < Showcase::Presenter
+  include Showcase::Traits::Record
+
+  def truncated_title
+    h.truncate(title, length: 50)
+  end
+end
+```
+
+```erb
+<% tasks = present_collection(@tasks)
+
+<%= Admino::Table::Presenter.new(tasks, Task, self).to_html do |row, record| %>
+  <%= row.column :truncated_title, 'Title' %>
+<% end %>
+```
+
+```html
+<table>
+  <thead>
+    <th role='truncated-title'>Title</th>
+  <thead>
+  <tbody>
+    <tr id='task_1' class='is-even'>
+      <td role='truncated-title'>Call mum ASAP</td>
+    </tr>
+    <tr id='task_2' class='is-odd'>
+      <td role='truncated-title'>Buy some milk</td>
+    </tr>
+  <tbody>
+</table>
+```
+
 ### 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

@@ -31,7 +31,7 @@ module Admino
       end
 
       def is_scope_active?(scope)
-        active_scope == scope
+        active_scope == scope.to_sym
       end
 
       def value

data/lib/admino/query/filter_group_presenter.rb

@@ -1,6 +1,7 @@
 require 'i18n'
 require 'showcase'
 require 'showcase/helpers/html_options'
+require 'active_support/core_ext/object/deep_dup'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/hash'
@@ -29,7 +30,7 @@ module Admino
 
       def scope_params(scope)
         params = ActiveSupport::HashWithIndifferentAccess.new(
-          h.request.query_parameters
+          h.request.query_parameters.deep_dup
         )
 
         params[:query] ||= {}

data/lib/admino/query/sorting.rb

@@ -23,7 +23,7 @@ module Admino
       end
 
       def is_scope_active?(scope)
-        active_scope == scope
+        active_scope == scope.to_sym
       end
 
       def ascending?

data/lib/admino/query/sorting_presenter.rb

@@ -1,4 +1,5 @@
 require 'showcase'
+require 'active_support/core_ext/object/deep_dup'
 
 module Admino
   module Query
@@ -25,7 +26,9 @@ module Admino
       end
 
       def scope_params(scope)
-        params = ActiveSupport::HashWithIndifferentAccess.new(h.request.query_parameters)
+        params = ActiveSupport::HashWithIndifferentAccess.new(
+          h.request.query_parameters.deep_dup
+        )
 
         if is_scope_active?(scope)
           params.merge!(sorting: scope.to_s, sort_order: ascending? ? 'desc' : 'asc')

data/lib/admino/version.rb

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

data/spec/admino/query/filter_group_presenter_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'active_support/hash_with_indifferent_access'
 
 module Admino
   module Query
@@ -16,7 +17,9 @@ module Admino
       let(:request_object) do
         double(
           'ActionDispatch::Request',
-          query_parameters: { 'query' => { 'field' => 'value', 'filter_group' => 'bar' } },
+          query_parameters: ActiveSupport::HashWithIndifferentAccess.new(
+            'query' => { 'field' => 'value', 'filter_group' => 'bar' }
+          ),
           path: '/'
         )
       end
@@ -87,6 +90,7 @@ module Admino
 
       describe '#scope_params' do
         let(:scope_active) { false }
+        subject { presenter.scope_params(:foo) }
 
         before do
           filter_group.stub(:is_scope_active?).with(:foo).and_return(scope_active)
@@ -96,7 +100,12 @@ module Admino
           let(:scope_active) { true }
 
           it 'deletes the filter_group param' do
-            expect(presenter.scope_params(:foo)[:query]).not_to have_key 'filter_group'
+            expect(subject[:query]).not_to have_key 'filter_group'
+          end
+
+          it 'keeps the request parameters intact' do
+            presenter.scope_params(:foo)
+            expect(request_object.query_parameters[:query][:filter_group]).to be_present
           end
         end
 
@@ -104,12 +113,12 @@ module Admino
           let(:scope_active) { false }
 
           it 'is set as filter group value' do
-            expect(presenter.scope_params(:foo)[:query][:filter_group]).to eq 'foo'
+            expect(subject[:query][:filter_group]).to eq 'foo'
           end
         end
 
         it 'preserves the other params' do
-          expect(presenter.scope_params(:foo)[:query][:field]).to eq 'value'
+          expect(subject[:query][:field]).to eq 'value'
         end
       end
 

data/spec/admino/query/filter_group_spec.rb

@@ -56,7 +56,7 @@ module Admino
         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
+          expect(filter_group.is_scope_active?('bar')).to be_true
         end
       end
     end

data/spec/admino/query/sorting_presenter_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'active_support/hash_with_indifferent_access'
 
 module Admino
   module Query
@@ -15,7 +16,9 @@ module Admino
       let(:request_object) do
         double(
           'ActionDispatch::Request',
-          query_parameters: { 'sorting' => 'by_date', 'other' => 'value' },
+          query_parameters: ActiveSupport::HashWithIndifferentAccess.new(
+            'sorting' => 'by_date', 'other' => 'value'
+          ),
           path: '/'
         )
       end
@@ -107,6 +110,11 @@ module Admino
           expect(subject[:other]).to eq 'value'
         end
 
+        it 'keeps the request parameters intact' do
+          subject
+          expect(request_object.query_parameters[:sorting]).to eq 'by_date'
+        end
+
         it 'sets the sorting param as the scope' do
           expect(subject[:sorting]).to eq 'by_title'
         end

data/spec/admino/table/presenter_spec.rb

@@ -37,14 +37,21 @@ module Admino
           expect(result).to have_tag('table tbody tr', count: 2)
         end
 
-        it 'adds a record idenfier to each collection row' do
-          expect(result).to have_tag('tbody tr#post_1')
-          expect(result).to have_tag('tbody tr#post_2')
+        context 'if the record responds to #dom_id' do
+          before do
+            first_post.stub(:dom_id).and_return('post_1')
+            second_post.stub(:dom_id).and_return('post_2')
+          end
+
+          it 'adds a record identifier to each collection row' do
+            expect(result).to have_tag('tbody tr#post_1:first-child')
+            expect(result).to have_tag('tbody tr#post_2:last-child')
+          end
         end
 
         it 'adds zebra classes to each collection row' do
-          expect(result).to have_tag('tbody #post_1.is-even')
-          expect(result).to have_tag('tbody #post_2.is-odd')
+          expect(result).to have_tag('tbody tr.is-even:first-child')
+          expect(result).to have_tag('tbody tr.is-odd:last-child')
         end
 
         it 'delegates thead columns creation to .to_html HeadRow' do
@@ -126,11 +133,11 @@ module Admino
           end
 
           it "allows customizing the tbody_tr html attributes" do
-            expect(presenter.to_html).to have_tag(:tr, with: { id: 'post_1', class: 'index-0' })
+            expect(presenter.to_html).to have_tag("tbody tr.index-0:first-child")
           end
 
           it 'allows customizing zebra classes' do
-            expect(presenter.to_html).to have_tag(:tr, with: { id: 'post_1', class: 'one' })
+            expect(presenter.to_html).to have_tag("tbody tr.one:first-child")
           end
         end
 

data/spec/spec_helper.rb

@@ -64,10 +64,6 @@ class Post < Struct.new(:key, :dom_id)
   def to_key
     [key]
   end
-
-  def dom_id
-    "post_#{key}"
-  end
 end
 
 require 'action_view'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admino
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: showcase