admino 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4eb78eff1dce04c14a06aaa131711c1b9041045
-  data.tar.gz: 2e30ce30aea3d5d2c7997560ef2440fdd7dc6eac
+  metadata.gz: 02804bb71709b2b990d69c156f4bc6e1c1598a13
+  data.tar.gz: 1cf458d64706709d71ab562730c4b7bfff9e5db9
 SHA512:
-  metadata.gz: 093b7d660f83546c7df47b8227105c2874cc2a37e611c902c068d083692998f436ed44c91bab10c5d7e8e3ee0d4e31c1a60a8f7f9e35a2377d2d7be7496d6fed
-  data.tar.gz: 409a2614cf6fbe3d024f1424e6e893ec7b7d7f3a8673056f90187fe8eeaa18a81522213d8400f4e121baf2ba9fe423c67d3b098e21bd5035eb0c2e092864978c
+  metadata.gz: afe27118fbab995ae04dbd9dad10495a347259d601fb375d6c9eceb950b94cf5fcac1f46b5a240f219f556fa99cebb902f23b7832eee6c0fc930af19c171e21b
+  data.tar.gz: 62e10b186cab528cf6227415b1b1a4a374475220952c157748799efa09de2a88722927f509ba5d2a194faffcc2a0ad3b7a8a8e0dbae627ac66efda91afaa1874

data/README.md

@@ -1,4 +1,4 @@
-# Admino
+![Admino Logo](https://raw.github.com/cantierecreativo/admino/master/logo.jpg)
 
 [![Gem Version](https://badge.fury.io/rb/admino.png)](http://badge.fury.io/rb/admino)
 [![Build Status](https://travis-ci.org/cantierecreativo/admino.png?branch=v0.0.1)](https://travis-ci.org/cantierecreativo/admino)
@@ -222,14 +222,11 @@ sorting.ascending?                       # => true
 
 ### Presenting search form and filters to the user
 
-Admino also offers a [Showcase presenter](https://github.com/stefanoverna/showcase) that makes it really easy to generate search forms and filtering links:
+Admino offers some helpers that make it really easy to generate search forms and filtering links:
 
 ```erb
-<%# instanciate the the query object presenter %>
-<% query = present(@query) %>
-
 <%# generate the search form %>
-<%= query.form do |q| %>
+<%= search_form_for(query) do |q| %>
   <p>
     <%= q.label :title_matches %>
     <%= q.text_field :title_matches %>
@@ -240,13 +237,11 @@ Admino also offers a [Showcase presenter](https://github.com/stefanoverna/showca
 <% end %>
 
 <%# generate the filtering links %>
-<% query.filter_groups.each do |filter_group| %>
+<% filters_for(query) do |filter_group| %>
   <h6><%= filter_group.name %></h6>
   <ul>
-    <% filter_group.scopes.each do |scope| %>
-      <li>
-        <%= filter_group.scope_link(scope) %>
-      <li>
+    <% filter_group.each_scope do |scope| %>
+      <li><%= scope.link %><li>
     <% end %>
   </ul>
 <% end %>
@@ -254,14 +249,11 @@ Admino also offers a [Showcase presenter](https://github.com/stefanoverna/showca
 <%# generate the sorting links %>
 <h6>Sort by</h6>
 <ul>
-  <% query.sorting.scopes.each do |scope| %>
-    <li>
-      <%= query.sorting.scope_link(scope) %>
-    </li>
+  <% sortings_for(query) do |scope| %>
+    <li><%= scope.link %></li>
   <% end %>
 </ul>
 ```
-
 The great thing is that:
 
 * the search form gets automatically filled in with the last input the user submitted
@@ -272,20 +264,19 @@ The great thing is that:
 
 ### Simple Form support
 
-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.
+If you prefer using [Simple Form](https://github.com/plataformatec/simple_form), please use the `simple_search_form_for` helper instead.
 
 ### Output customization
 
-The `#scope_link` methods are very flexible, allowing you to change almost every aspect of the generated links:
+The `#link` methods are very flexible, allowing you to change almost every aspect of the generated links:
 
 ```erb
-<% status_filter = query.filter_group_by_name(:status) %>
-
-<%= status_filter.scope_link :completed,
-                             'Custom title',
-                             active_class: 'active',
-                             class: 'custom-class'
-%>
+<% filter_group.each_scope do |scope| %>
+  <li><%= scope.link 'Custom title',
+                     active_class: 'active',
+                     class: 'custom-class'
+  %><li>
+<% end %>
 ```
 
 Please refer to the tests for the details.
@@ -374,10 +365,10 @@ en:
 
 ## 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:
+Admino offers a `table_for` helper that makes it really easy to generate HTML tables from a set of records:
 
 ```erb
-<%= Admino::Table::Presenter.new(@tasks, Task, self).to_html do |row, record| %>
+<%= table_for(@tasks, class: Task) do |row, record| %>
   <%= row.column :title %>
   <%= row.column :completed do %>
     <%= record.completed ? '✓' : '✗' %>
@@ -386,6 +377,8 @@ Admino offers a [Showcase collection presenter](https://github.com/stefanoverna/
 <% end %>
 ```
 
+With produces the following output:
+
 ```html
 <table>
   <thead>
@@ -410,10 +403,10 @@ Admino offers a [Showcase collection presenter](https://github.com/stefanoverna/
 
 ### Record actions
 
-Often tables need to offer some kind of action associated with the records. The presenter implements the following DSL to support that:
+Often tables need to offer some kind of action associated with the records. The table builder implements the following DSL to support that:
 
 ```erb
-<%= Admino::Table::Presenter.new(@tasks, Task, self).to_html do |row, record| %>
+<%= table_for(@tasks, class: Task) do |row, record| %>
   <%# ... %>
   <%= row.actions do %>
     <%= row.action :show, admin_task_path(record) %>
@@ -459,7 +452,7 @@ You can then pass the query object as a parameter to the table presenter initial
 ```erb
 <% query = present(@query) %>
 
-<%= Admino::Table::Presenter.new(@tasks, Task, query, self).to_html do |row, record| %>
+<%= table_for(@tasks, class: Task) do |row, record| %>
   <%= row.column :title, sorting: :by_title %>
   <%= row.column :due_date, sorting: :by_due_date %>
 <% end %>
@@ -488,7 +481,7 @@ This generates links that allow the visitor to sort the result set in ascending
 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| %>
+<%= table_for(@tasks, class: Task, html: { class: 'table-class' }) do |row, record| %>
   <%= row.column :title, 'Custom title',
                  class: 'custom-class', role: 'custom-role', data: { custom: 'true' },
                  sorting: :by_title, sorting_html_options: { desc_class: 'down' }
@@ -550,6 +543,18 @@ class CustomTablePresenter < Admino::Table::Presenter
 end
 ```
 
+```erb
+<%= table_for(@tasks, class: Task, presenter: CustomTablePresenter) do |row, record| %>
+  <%= row.column :title, 'Custom title',
+                 class: 'custom-class', role: 'custom-role', data: { custom: 'true' },
+                 sorting: :by_title, sorting_html_options: { desc_class: 'down' }
+  %>
+  <%= row.action :show, admin_task_path(record), 'Custom label',
+                 class: 'custom-class', role: 'custom-role', data: { custom: 'true' }
+  %>
+<% end %>
+```
+
 Please refer to the tests for all the details.
 
 ### Inherited resources (and similar)
@@ -589,7 +594,7 @@ 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| %>
+<%= table_for(@tasks, class: Task, presenter: CustomTablePresenter) do |row, record| %>
   <%# ... %>
   <%= row.actions :show, :edit, :destroy %>
 <% end %>

data/admino.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'i18n'
   spec.add_development_dependency 'rspec-html-matchers'
   spec.add_development_dependency 'actionpack'
+  spec.add_development_dependency 'simple_form'
 end
 

data/lib/admino.rb

@@ -3,7 +3,12 @@ require 'active_support/core_ext/module/delegation'
 require "admino/version"
 require "admino/query"
 require "admino/table"
+require "admino/action_view_extension"
 
 module Admino
 end
 
+ActiveSupport.on_load(:action_view) do
+  include Admino::ActionViewExtension
+end
+

data/lib/admino/action_view_extension.rb

@@ -0,0 +1,48 @@
+require 'active_support/core_ext/hash'
+require 'admino/table/presenter'
+require 'admino/query/base_presenter'
+
+module Admino
+  module ActionViewExtension
+    module Internals
+      def self.present_query(query, context, options)
+        presenter_klass = options.fetch(:presenter, Admino::Query::BasePresenter)
+        presenter_klass.new(query, context)
+      end
+    end
+
+    def table_for(collection, options = {}, &block)
+      options.symbolize_keys!
+      options.assert_valid_keys(:presenter, :class, :html)
+      presenter_klass = options.fetch(:presenter, Admino::Table::Presenter)
+      presenter = presenter_klass.new(collection, options[:class], self)
+      html_options = options.fetch(:html, {})
+      presenter.to_html(html_options, &block)
+    end
+
+    def filters_for(query, options = {}, &block)
+      options.symbolize_keys!
+      options.assert_valid_keys(:presenter)
+      Internals.present_query(query, self, options).filter_groups.each(&block)
+    end
+
+    def sortings_for(query, options = {}, &block)
+      options.symbolize_keys!
+      options.assert_valid_keys(:presenter)
+      Internals.present_query(query, self, options).sorting.scopes.each(&block)
+    end
+
+    def search_form_for(query, options = {}, &block)
+      options.symbolize_keys!
+      options.assert_valid_keys(:presenter)
+      Internals.present_query(query, self, options).form(&block)
+    end
+
+    def simple_search_form_for(query, options = {}, &block)
+      options.symbolize_keys!
+      options.assert_valid_keys(:presenter)
+      Internals.present_query(query, self, options).simple_form(&block)
+    end
+  end
+end
+

data/lib/admino/query.rb

@@ -6,6 +6,7 @@ require 'admino/query/filter_group'
 require 'admino/query/filter_group_presenter'
 require 'admino/query/sorting'
 require 'admino/query/sorting_presenter'
+require 'admino/query/scope_presenter'
 
 module Admino
   module Query

data/lib/admino/query/filter_group_presenter.rb

@@ -24,6 +24,16 @@ module Admino
         h.link_to label, scope_path(scope), options.to_h
       end
 
+      def scopes
+        @scopes ||= super.map do |scope|
+          ScopePresenter.new(scope, self, view_context)
+        end
+      end
+
+      def each_scope(&block)
+        scopes.each(&block)
+      end
+
       def scope_path(scope)
         h.request.path + "?" + scope_params(scope).to_query
       end

data/lib/admino/query/scope_presenter.rb

@@ -0,0 +1,17 @@
+require 'showcase'
+
+module Admino
+  module Query
+    class ScopePresenter < Showcase::Presenter
+      def initialize(object, parent, view_context)
+        super(object, view_context)
+        @parent = parent
+      end
+
+      def link(*args)
+        @parent.scope_link(object, *args)
+      end
+    end
+  end
+end
+

data/lib/admino/query/sorting_presenter.rb

@@ -25,6 +25,12 @@ module Admino
         h.request.path + "?" + scope_params(scope).to_query
       end
 
+      def scopes
+        @scopes ||= super.map do |scope|
+          ScopePresenter.new(scope, self, view_context)
+        end
+      end
+
       def scope_params(scope)
         params = ActiveSupport::HashWithIndifferentAccess.new(
           h.request.query_parameters.deep_dup

data/lib/admino/table/presenter.rb

@@ -34,12 +34,22 @@ module Admino
         collection = args.shift
 
         @collection_klass = args.shift
+
+        if !@collection_klass && !collection.empty?
+          @collection_klass = collection.first.class
+        end
+
         @query = args.shift
 
         super(collection, context)
       end
 
       def to_html(options = {}, &block)
+
+        if @collection_klass.nil?
+          raise ArgumentError, 'collection is empty and no explicit class is specified'
+        end
+
         table_tag(options) do
           thead_tag do
             thead_tr_tag do

data/lib/admino/version.rb

@@ -1,4 +1,4 @@
 module Admino
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end
 

data/occurred at /Users/stefanoverna/.dotfiles/vim/rspec_formatter.rb

@@ -0,0 +1,2 @@
+
+

data/spec/admino/integration_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe 'Action View integration' do
+  let(:context) { RailsViewContext.new }
+
+  describe '#simple_table_for' do
+    let(:collection) { [ first_post, second_post ] }
+    let(:first_post) { Post.new('1') }
+    let(:second_post) { Post.new('2') }
+
+    it 'produces HTML' do
+      result = context.table_for(collection) do |table, record|
+        table.column :title
+        table.actions do
+          table.action :show, '/foo', 'Show'
+        end
+      end
+      expect(result).to eq <<-HTML.strip
+        <table><thead><tr><th role=\"title\">Title</th><th role=\"actions\">Actions</th></tr></thead><tbody><tr class=\"is-even\"><td role=\"title\">Post 1</td><td role=\"actions\"><a href=\"/foo\" role=\"show\">Show</a></td></tr><tr class=\"is-odd\"><td role=\"title\">Post 2</td><td role=\"actions\"><a href=\"/foo\" role=\"show\">Show</a></td></tr></tbody></table>
+      HTML
+    end
+  end
+
+  describe '#filters_for' do
+    let(:params) {
+      {
+        query: { bar: 'one' }
+      }
+    }
+    let(:query) { TestQuery.new(params) }
+
+    it 'produces HTML' do
+      result = ""
+      context.filters_for(query) do |group|
+        result << "#{group.name}: "
+        group.each_scope do |scope|
+          result << scope.link
+        end
+      end
+
+      expect(result).to eq <<-HTML.strip
+        Bar: <a href="/?query%5Bbar%5D=empty">Empty</a><a class="is-active" href="/?">One</a><a href="/?query%5Bbar%5D=two">Two</a>
+      HTML
+    end
+  end
+
+  describe '#sortings_for' do
+    let(:params) {
+      {
+        sorting: 'by_title',
+        sort_order: 'desc'
+      }
+    }
+    let(:query) { TestQuery.new(params) }
+
+    it 'produces HTML' do
+      result = ""
+      context.sortings_for(query) do |scope|
+        result << scope.link
+      end
+
+      expect(result).to eq <<-HTML.strip
+        <a class=\"is-desc\" href=\"/?sort_order=asc&amp;sorting=by_title\">By title</a><a href=\"/?sort_order=asc&amp;sorting=by_date\">By date</a>
+      HTML
+    end
+  end
+
+  describe '#search_form_for' do
+    let(:params) {
+      {
+        query: { foo: 'test' }
+      }
+    }
+    let(:query) { TestQuery.new(params) }
+
+    it 'produces HTML' do
+      result = context.search_form_for(query) do |f|
+        f.text_field :foo
+      end
+
+      expect(result).to eq <<-HTML.strip
+        <form accept-charset=\"UTF-8\" action=\"/?p=1\" class=\"new_query\" id=\"new_query\" method=\"get\"><div style=\"display:none\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div><input id=\"query_foo\" name=\"query[foo]\" type=\"text\" value=\"test\" /></form>
+      HTML
+    end
+  end
+
+  describe '#simple_search_form_for' do
+    let(:params) {
+      {
+        query: { foo: 'test' }
+      }
+    }
+    let(:query) { TestQuery.new(params) }
+
+    it 'produces HTML' do
+      result = context.simple_search_form_for(query) do |f|
+        f.input :foo
+      end
+
+      expect(result).to eq <<-HTML.strip
+        <form accept-charset=\"UTF-8\" action=\"/?p=1\" class=\"simple_form new_query\" id=\"new_query\" method=\"get\"><div style=\"display:none\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div><div class=\"input string required query_foo\"><label class=\"string required\" for=\"query_foo\"><abbr title=\"required\">*</abbr> Foo</label><input aria-required=\"true\" class=\"string required\" id=\"query_foo\" name=\"query[foo]\" required=\"required\" type=\"text\" value=\"test\" /></div></form>
+      HTML
+    end
+  end
+end
+

data/spec/admino/query/base_presenter_spec.rb

@@ -16,7 +16,7 @@ module Admino
       end
 
       before do
-        view.stub(:request).and_return(request_object)
+        allow(view).to receive(:request).and_return(request_object)
       end
 
       describe '#form' do

data/spec/admino/query/base_spec.rb

@@ -122,17 +122,17 @@ module Admino
             sorting_config
             query
 
-            query.search_field_by_name(:search_field).
-              stub(:augment_scope).
+            allow(query.search_field_by_name(:search_field)).
+              to receive(:augment_scope).
               with(starting_scope).
               and_return(scope_chained_with_search_field)
 
-            query.filter_group_by_name(:filter_group).
-              stub(:augment_scope).
+            allow(query.filter_group_by_name(:filter_group)).
+              to receive(:augment_scope).
               with(scope_chained_with_search_field).
               and_return(scope_chained_with_group_filter)
 
-            query.sorting.stub(:augment_scope).
+            allow(query.sorting).to receive(:augment_scope).
               with(scope_chained_with_group_filter).
               and_return(final_chain)
           end

data/spec/admino/query/dsl_spec.rb

@@ -16,7 +16,7 @@ module Admino
         filter_group = config.filter_groups.first
         expect(filter_group.name).to eq :bar
         expect(filter_group.scopes).to eq [:one, :two]
-        expect(filter_group.include_empty_scope?).to be_true
+        expect(filter_group.include_empty_scope?).to be_truthy
       end
 
       it 'allows #sortings declaration' do
@@ -38,7 +38,7 @@ module Admino
         let(:search_field) { double('SearchField', value: 'value') }
 
         before do
-          instance.stub(:search_field_by_name).
+          allow(instance).to receive(:search_field_by_name).
             with(:foo).
             and_return(search_field)
         end

data/spec/admino/query/filter_group_presenter_spec.rb

@@ -28,7 +28,7 @@ module Admino
       end
 
       before do
-        view.stub(:request).and_return(request_object)
+        allow(view).to receive(:request).and_return(request_object)
       end
 
       describe '#scope_link' do
@@ -36,7 +36,7 @@ module Admino
         let(:scope_active) { false }
 
         before do
-          filter_group.stub(:is_scope_active?).
+          allow(filter_group).to receive(:is_scope_active?).
             with(:foo).and_return(scope_active)
         end
 
@@ -44,49 +44,49 @@ module Admino
           let(:scope_active) { true }
 
           it 'adds an is-active class' do
-            should have_tag(:a, with: { class: 'is-active' })
+            is_expected.to 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
-              should have_tag(:a, with: { class: 'active' })
+              is_expected.to have_tag(:a, with: { class: 'active' })
             end
           end
         end
 
         context 'else' do
           it 'does not add it' do
-            should_not have_tag(:a, with: { class: 'is-active' })
+            is_expected.not_to have_tag(:a, with: { class: 'is-active' })
           end
         end
 
         context 'label' do
           before do
-            presenter.stub(:scope_name).with(:foo).and_return('scope_name')
+            allow(presenter).to receive(:scope_name).with(:foo).and_return('scope_name')
           end
 
           it 'uses #scope_name method' do
-            should have_tag(:a, text: 'scope_name')
+            is_expected.to 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
-              should have_tag(:a, text: 'test')
+              is_expected.to have_tag(:a, text: 'test')
             end
           end
         end
 
         context 'URL' do
           before do
-            presenter.stub(:scope_path).with(:foo).and_return('URL')
+            allow(presenter).to receive(:scope_path).with(:foo).and_return('URL')
           end
 
           it 'uses #scope_path method' do
-            should have_tag(:a, href: 'URL')
+            is_expected.to have_tag(:a, href: 'URL')
           end
         end
       end
@@ -96,7 +96,7 @@ module Admino
         subject { presenter.scope_params(:foo) }
 
         before do
-          filter_group.stub(:is_scope_active?).with(:foo).and_return(scope_active)
+          allow(filter_group).to receive(:is_scope_active?).with(:foo).and_return(scope_active)
         end
 
         context 'if scope is active' do

data/spec/admino/query/filter_group_spec.rb

@@ -110,7 +110,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_truthy
         end
       end
 
@@ -120,11 +120,11 @@ module Admino
         context 'if include_empty_scope is true' do
           let(:options) { { include_empty_scope: true } }
 
-          it { should eq [:empty, :bar, :other] }
+          it { is_expected.to eq [:empty, :bar, :other] }
         end
 
         context 'else' do
-          it { should eq [:bar, :other] }
+          it { is_expected.to eq [:bar, :other] }
         end
       end
     end

data/spec/admino/query/sorting_presenter_spec.rb

@@ -24,53 +24,53 @@ module Admino
       end
 
       before do
-        view.stub(:request).and_return(request_object)
+        allow(view).to receive(: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)
+          allow(sorting).to receive(: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)
+            allow(sorting).to receive(:is_scope_active?).with(:by_title).and_return(true)
           end
 
           context 'ascending' do
             before do
-              sorting.stub(:ascending?).and_return(true)
+              allow(sorting).to receive(:ascending?).and_return(true)
             end
 
             it 'adds an is-asc class' do
-              should have_tag(:a, with: { class: 'is-asc' })
+              is_expected.to 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' })
+                is_expected.to have_tag(:a, with: { class: 'asc' })
               end
             end
           end
 
           context 'descendent' do
             before do
-              sorting.stub(:ascending?).and_return(false)
+              allow(sorting).to receive(:ascending?).and_return(false)
             end
 
             it 'adds an is-desc class' do
-              should have_tag(:a, with: { class: 'is-desc' })
+              is_expected.to 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' })
+                is_expected.to have_tag(:a, with: { class: 'desc' })
               end
             end
           end
@@ -78,23 +78,23 @@ module Admino
 
         context 'else' do
           it 'does not add it' do
-            should_not have_tag(:a, with: { class: 'is-asc' })
+            is_expected.not_to have_tag(:a, with: { class: 'is-asc' })
           end
         end
 
         context 'label' do
           it 'uses the provided argument' do
-            should have_tag(:a, text: 'Titolo')
+            is_expected.to have_tag(:a, text: 'Titolo')
           end
         end
 
         context 'URL' do
           before do
-            presenter.stub(:scope_path).with(:by_title).and_return('URL')
+            allow(presenter).to receive(:scope_path).with(:by_title).and_return('URL')
           end
 
           it 'uses #scope_path method' do
-            should have_tag(:a, href: 'URL')
+            is_expected.to have_tag(:a, href: 'URL')
           end
         end
       end
@@ -103,7 +103,7 @@ module Admino
         subject { presenter.scope_params(:by_title) }
 
         before do
-          sorting.stub(:is_scope_active?).with(:by_title).and_return(false)
+          allow(sorting).to receive(:is_scope_active?).with(:by_title).and_return(false)
         end
 
         it 'preserves other params' do
@@ -121,12 +121,12 @@ module Admino
 
         context 'scope is active' do
           before do
-            sorting.stub(:is_scope_active?).with(:by_title).and_return(true)
+            allow(sorting).to receive(:is_scope_active?).with(:by_title).and_return(true)
           end
 
           context 'is currently ascending' do
             before do
-              sorting.stub(:ascending?).and_return(true)
+              allow(sorting).to receive(:ascending?).and_return(true)
             end
 
             it 'sets the sorting order to descending' do
@@ -136,7 +136,7 @@ module Admino
 
           context 'is currently descending' do
             before do
-              sorting.stub(:ascending?).and_return(false)
+              allow(sorting).to receive(:ascending?).and_return(false)
             end
 
             it 'sets the sorting order to ascending' do
@@ -150,7 +150,7 @@ module Admino
 
           context 'default scope is ascending' do
             before do
-              sorting.stub(:default_direction).and_return(:asc)
+              allow(sorting).to receive(:default_direction).and_return(:asc)
             end
 
             it 'sets the sorting order to ascending' do
@@ -160,7 +160,7 @@ module Admino
 
           context 'default scope is descending' do
             before do
-              sorting.stub(:default_direction).and_return(:desc)
+              allow(sorting).to receive(:default_direction).and_return(:desc)
             end
 
             it 'sets the sorting order to descending' do
@@ -171,7 +171,7 @@ module Admino
 
         context 'else' do
           before do
-            sorting.stub(:is_scope_active?).with(:by_title).and_return(false)
+            allow(sorting).to receive(:is_scope_active?).with(:by_title).and_return(false)
           end
 
           it 'sets the sorting order to ascending' do

data/spec/admino/query/sorting_spec.rb

@@ -128,7 +128,7 @@ module Admino
         let(:params) { { 'sorting' => 'by_date' } }
 
         it 'returns true if the provided scope is the one currently active' do
-          expect(sorting.is_scope_active?(:by_date)).to be_true
+          expect(sorting.is_scope_active?(:by_date)).to be_truthy
         end
       end
     end

data/spec/admino/table/head_row_spec.rb

@@ -23,7 +23,7 @@ module Admino
             end
 
             it 'generates a label with it' do
-              should have_tag(:th, text: 'This is a title')
+              is_expected.to have_tag(:th, text: 'This is a title')
             end
           end
 
@@ -40,7 +40,7 @@ module Admino
             end
 
             it 'generates a label with the human attribute name' do
-              should have_tag(:th, text: 'This is foo')
+              is_expected.to have_tag(:th, text: 'This is foo')
             end
           end
 
@@ -48,7 +48,7 @@ module Admino
             before { row.column(:title) }
 
             it 'generates a label with the titleized attribute name' do
-              should have_tag(:th, text: 'Title')
+              is_expected.to have_tag(:th, text: 'Title')
             end
 
             context 'with I18n set up' do
@@ -62,7 +62,7 @@ module Admino
               before { row.column(:title) }
 
               it 'generates a label with the human attribute name' do
-                should have_tag(:th, text: 'Post title')
+                is_expected.to have_tag(:th, text: 'Post title')
               end
             end
           end
@@ -80,14 +80,14 @@ module Admino
             let(:sorting) { double('Sorting') }
 
             before do
-              sorting.stub(:scope_link).with(:by_title, 'Title', {}).
+              allow(sorting).to receive(: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')
+              is_expected.to have_tag(:th, text: 'Link')
             end
           end
         end
@@ -96,7 +96,7 @@ module Admino
           before { row.column(:author_name) }
 
           it 'generates a role attribute with the snake-cased name of the attribute' do
-            should have_tag(:th, with: { role: 'author-name' })
+            is_expected.to have_tag(:th, with: { role: 'author-name' })
           end
         end
 
@@ -104,7 +104,7 @@ module Admino
           before { row.column(:title, class: 'foo') }
 
           it 'uses it to build attributes' do
-            should have_tag(:th, with: { class: 'foo' })
+            is_expected.to have_tag(:th, with: { class: 'foo' })
           end
         end
       end
@@ -116,11 +116,11 @@ module Admino
           before { row.actions }
 
           it 'renders a th cell with role "actions"' do
-            should have_tag(:th, with: { role: 'actions' })
+            is_expected.to have_tag(:th, with: { role: 'actions' })
           end
 
           it 'renders a th cell with text "Actions"' do
-            should have_tag(:th, text: 'Actions')
+            is_expected.to have_tag(:th, text: 'Actions')
           end
         end
 
@@ -134,7 +134,7 @@ module Admino
 
           it 'renders a th cell with I18n text' do
             row.actions
-            should have_tag(:th, text: 'Available actions')
+            is_expected.to have_tag(:th, text: 'Available actions')
           end
 
           context 'and specific I18n set up' do
@@ -147,7 +147,7 @@ module Admino
 
             it 'uses the specific I18n text' do
               row.actions
-              should have_tag(:th, text: 'Post actions')
+              is_expected.to have_tag(:th, text: 'Post actions')
             end
           end
         end

data/spec/admino/table/presenter_spec.rb

@@ -17,12 +17,12 @@ module Admino
       let(:resource_row) { double('ResourceRow', to_html: '<td id="tbody_td"></td>'.html_safe) }
 
       before do
-        HeadRow.stub(:new).with(Post, query, view).and_return(head_row)
-        ResourceRow.stub(:new).with(first_post, view).and_return(resource_row)
-        ResourceRow.stub(:new).with(second_post, view).and_return(resource_row)
+        allow(HeadRow).to receive(:new).with(Post, query, view).and_return(head_row)
+        allow(ResourceRow).to receive(:new).with(first_post, view).and_return(resource_row)
+        allow(ResourceRow).to receive(:new).with(second_post, view).and_return(resource_row)
       end
 
-      describe '#.to_html' do
+      describe '#to_html' do
         let(:result) { presenter.to_html }
 
         it 'outputs a table' do
@@ -39,8 +39,8 @@ module Admino
 
         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')
+            allow(first_post).to receive(:dom_id).and_return('post_1')
+            allow(second_post).to receive(:dom_id).and_return('post_2')
           end
 
           it 'adds a record identifier to each collection row' do
@@ -164,6 +164,15 @@ module Admino
             expect(presenter.to_html).to have_tag('tbody tr td#custom_tbody_td')
           end
         end
+
+        context 'with empty collection and no collection_klass' do
+          let(:collection) { [] }
+          subject(:presenter) { presenter_klass.new(collection, nil, query, view) }
+
+          it 'raises an Exception' do
+            expect { result }.to raise_error(ArgumentError)
+          end
+        end
       end
     end
   end

data/spec/admino/table/resource_row_spec.rb

@@ -21,7 +21,7 @@ module Admino
           end
 
           it 'fills the cell with the block content' do
-            should have_tag(:td, text: 'foo')
+            is_expected.to have_tag(:td, text: 'foo')
           end
         end
 
@@ -29,7 +29,7 @@ module Admino
           before { row.column(:title) }
 
           it 'fills the cell with the attribute value' do
-            should have_tag(:td, text: 'Post 1')
+            is_expected.to have_tag(:td, text: 'Post 1')
           end
         end
 
@@ -43,7 +43,7 @@ module Admino
           before { row.column(:author_name) }
 
           it 'generates a role attribute with the snake-cased name of the attribute' do
-            should have_tag(:td, with: { role: 'author-name' })
+            is_expected.to have_tag(:td, with: { role: 'author-name' })
           end
         end
 
@@ -51,7 +51,7 @@ module Admino
           before { row.column(:title, class: 'title') }
 
           it 'uses it to build attributes' do
-            should have_tag(:td, with: { class: 'title' })
+            is_expected.to have_tag(:td, with: { class: 'title' })
           end
 
           context 'with a class that implements a <action_name>_html_options' do
@@ -65,7 +65,7 @@ module Admino
             end
 
             it 'renders them as attributes' do
-              should have_tag(:td, with: { class: 'attribute title' })
+              is_expected.to have_tag(:td, with: { class: 'attribute title' })
             end
           end
         end
@@ -79,13 +79,13 @@ module Admino
               called = true
             end
 
-            expect(called).to be_true
+            expect(called).to be_truthy
           end
         end
 
         context 'no block' do
           before do
-            row.stub(:action)
+            allow(row).to receive(:action)
           end
 
           before do
@@ -107,7 +107,7 @@ module Admino
             before { row.action(:show, '/') }
 
             it 'generates a link with the specified URL' do
-              should have_tag(:a, with: { href: '/' })
+              is_expected.to have_tag(:a, with: { href: '/' })
             end
           end
 
@@ -124,7 +124,7 @@ module Admino
             before { row.action(:show) }
 
             it 'uses a method to build the URL (ie. show_url)' do
-              should have_tag(:a, with: { href: '/posts/1' })
+              is_expected.to have_tag(:a, with: { href: '/posts/1' })
             end
           end
 
@@ -145,7 +145,7 @@ module Admino
           before { row.action(:show, '/') }
 
           it 'generates a td cell with actions role' do
-            should have_tag(:td, with: { role: 'actions' })
+            is_expected.to have_tag(:td, with: { role: 'actions' })
           end
         end
 
@@ -153,7 +153,7 @@ module Admino
           before { row.action(:show, '/') }
 
           it 'generates a link with role' do
-            should have_tag(:a, with: { role: 'show' })
+            is_expected.to have_tag(:a, with: { role: 'show' })
           end
         end
 
@@ -162,7 +162,7 @@ module Admino
             before { row.action(:show, '/') }
 
             it 'generates a link with a titleized attribute' do
-              should have_tag(:a, text: 'Show')
+              is_expected.to have_tag(:a, text: 'Show')
             end
           end
 
@@ -177,7 +177,7 @@ module Admino
             before { row.action(:show, '/') }
 
             it 'generates a I18n text' do
-              should have_tag(:a, text: 'Show post')
+              is_expected.to have_tag(:a, text: 'Show post')
             end
           end
         end
@@ -186,7 +186,7 @@ module Admino
           before { row.action(:show, '/', class: 'foo') }
 
           it 'renders them as attributes' do
-            should have_tag(:a, with: { class: 'foo' })
+            is_expected.to have_tag(:a, with: { class: 'foo' })
           end
 
           context 'with a class that implements a <action_name>_html_options' do
@@ -204,7 +204,7 @@ module Admino
             end
 
             it 'renders them as attributes' do
-              should have_tag(:a, with: { class: 'foo show-button button' })
+              is_expected.to have_tag(:a, with: { class: 'foo show-button button' })
             end
           end
         end
@@ -215,7 +215,7 @@ module Admino
           end
 
           it 'renders it' do
-            should have_tag(:td, text: 'Foo')
+            is_expected.to have_tag(:td, text: 'Foo')
           end
         end
       end

data/spec/admino/table/row_spec.rb

@@ -21,27 +21,27 @@ module Admino
 
         context 'with a symbol param' do
           let(:arguments) { [:title] }
-          it { should eq [:title, nil, {}] }
+          it { is_expected.to eq [:title, nil, {}] }
         end
 
         context 'with a string param' do
           let(:arguments) { ['Title'] }
-          it { should eq [nil, 'Title', {}] }
+          it { is_expected.to eq [nil, 'Title', {}] }
         end
 
         context 'with a symbol and string param' do
           let(:arguments) { [:title, 'Title'] }
-          it { should eq [:title, 'Title', {}] }
+          it { is_expected.to eq [:title, 'Title', {}] }
         end
 
         context 'with two symbol params' do
           let(:arguments) { [:title, :foo] }
-          it { should eq [:title, :foo, {}] }
+          it { is_expected.to eq [:title, :foo, {}] }
         end
 
         context 'with options' do
           let(:arguments) { [{ foo: 'bar' }] }
-          it { should eq [nil, nil, { foo: 'bar' }] }
+          it { is_expected.to eq [nil, nil, { foo: 'bar' }] }
         end
       end
 
@@ -52,22 +52,22 @@ module Admino
 
         context 'with a symbol param' do
           let(:arguments) { [:show] }
-          it { should eq [:show, nil, nil, {}] }
+          it { is_expected.to eq [:show, nil, nil, {}] }
         end
 
         context 'with a one string param' do
           let(:arguments) { ['/'] }
-          it { should eq [nil, '/', nil, {}] }
+          it { is_expected.to eq [nil, '/', nil, {}] }
         end
 
         context 'with a two string params' do
           let(:arguments) { ['/', 'Details'] }
-          it { should eq [nil, '/', 'Details', {}] }
+          it { is_expected.to eq [nil, '/', 'Details', {}] }
         end
 
         context 'with options' do
           let(:arguments) { [{ foo: 'bar' }] }
-          it { should eq [nil, nil, nil, { foo: 'bar' }] }
+          it { is_expected.to eq [nil, nil, nil, { foo: 'bar' }] }
         end
       end
     end

data/spec/spec_helper.rb

@@ -69,9 +69,21 @@ class Post < Struct.new(:key, :dom_id)
 end
 
 require 'action_view'
+require 'simple_form'
+require 'simple_form/action_view_extensions/form_helper'
 
 class RailsViewContext < ActionView::Base
   include ActionView::Helpers::TagHelper
+  include SimpleForm::ActionViewExtensions::FormHelper
+  include Admino::ActionViewExtension
+
+  def request
+    OpenStruct.new(path: '/', fullpath: '/?p=1')
+  end
+
+  def polymorphic_path(*args)
+    '/'
+  end
 end
 
 RSpec.configure do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admino
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: showcase
@@ -164,6 +164,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Make administrative views creation less repetitive
 email:
 - s.verna@cantierecreativo.net
@@ -182,6 +196,7 @@ files:
 - TODO.md
 - admino.gemspec
 - lib/admino.rb
+- lib/admino/action_view_extension.rb
 - lib/admino/query.rb
 - lib/admino/query/base.rb
 - lib/admino/query/base_presenter.rb
@@ -189,6 +204,7 @@ files:
 - lib/admino/query/dsl.rb
 - lib/admino/query/filter_group.rb
 - lib/admino/query/filter_group_presenter.rb
+- lib/admino/query/scope_presenter.rb
 - lib/admino/query/search_field.rb
 - lib/admino/query/sorting.rb
 - lib/admino/query/sorting_presenter.rb
@@ -198,6 +214,9 @@ files:
 - lib/admino/table/resource_row.rb
 - lib/admino/table/row.rb
 - lib/admino/version.rb
+- logo.jpg
+- occurred at /Users/stefanoverna/.dotfiles/vim/rspec_formatter.rb
+- spec/admino/integration_spec.rb
 - spec/admino/query/base_presenter_spec.rb
 - spec/admino/query/base_spec.rb
 - spec/admino/query/dsl_spec.rb
@@ -236,6 +255,7 @@ signing_key:
 specification_version: 4
 summary: Make administrative views creation less repetitive
 test_files:
+- spec/admino/integration_spec.rb
 - spec/admino/query/base_presenter_spec.rb
 - spec/admino/query/base_spec.rb
 - spec/admino/query/dsl_spec.rb