lolita 3.3.5 → 3.3.6

data/app/controllers/lolita/info_controller.rb

@@ -4,11 +4,10 @@ class Lolita::InfoController < ApplicationController
 
   def index
     if Lolita.mappings.any?
-      available_mapping = Lolita.mappings.detect{|name,mapping|
-        authorization_proxy.can?(:read,mapping.to)
-      }
-      available_mapping &&= available_mapping.last
-      return redirect_to(lolita_resources_path(available_mapping)) if available_mapping
+      if available_mapping = Lolita.mappings.detect{ |name,mapping| authorization_proxy.authorize!(:read, mapping.to) }
+        mapping = available_mapping.last
+        return redirect_to(lolita_resources_path(mapping))
+      end
     end
     render :layout => false
   end

data/app/helpers/components/lolita/configuration/list_component.rb

@@ -1,11 +1,11 @@
-module Components
-  module Lolita
-    module Configuration
-      module ListComponent
-        def sort_options
-          params[:sort]
-        end
-      end
-    end
-  end
+module Components
+  module Lolita
+    module Configuration
+      module ListComponent
+        def sort_options
+          params[:sort]
+        end
+      end
+    end
+  end
 end

data/app/views/components/lolita/configuration/column/_first.html.haml

@@ -1,2 +1,2 @@
-%td{:class => "first-column cell"}
+%td{:class => "first-column cell"}
   = check_box_tag "#{resource_name}[id]", record.id

data/app/views/components/lolita/configuration/column/header/_first.html.haml

@@ -1 +1 @@
-%th{:class => "first-column"}= "*"
+%th{:class => "first-column"}= "*"

data/app/views/components/lolita/configuration/column/header/_sort.html.haml

@@ -1,6 +1,6 @@
-- sort_mapping = {"desc" => '⇓', "asc" => '⇑'}
-- new_params = params.reject{|k,v| ["controller","action"].include?(k.to_s)}
-- direction_indicator = raw(sort_mapping[column.current_sort_state(new_params)[1]])
-- new_params[:s] = column.sort_params(new_params)
-
-= link_to raw("#{column.title.to_s.capitalize} #{direction_indicator}"), lolita_resources_path(new_params)
+- sort_mapping = {"desc" => '⇓', "asc" => '⇑'}
+- new_params = params.reject{|k,v| ["controller","action"].include?(k.to_s)}
+- direction_indicator = raw(sort_mapping[column.current_sort_state(new_params)[1]])
+- new_params[:s] = column.sort_params(new_params)
+
+= link_to raw("#{column.title.to_s.capitalize} #{direction_indicator}"), lolita_resources_path(new_params)

data/app/views/components/lolita/configuration/columns/header/_display.html.haml

@@ -1,5 +1,5 @@
-%thead
-  %tr
-    - columns.each do |column|
-      = render_component *column.build("header")
-    = render_component "lolita/configuration/column/header", :last
+%thead
+  %tr
+    - columns.each do |column|
+      = render_component *column.build("header")
+    = render_component "lolita/configuration/column/header", :last

data/app/views/components/lolita/configuration/field/array/checkbox/_display.html.haml

@@ -1,8 +1,8 @@
-- ids_method = field.name.to_s.match(/_ids$/) ? field.name : "#{field.name.to_s.singularize}_ids"
-= hidden_field_tag "#{resource_name}[#{ids_method}][]",""
-- field.view_values(self).each do |value|
-  - editors = resource.send(:"#{ids_method}")
-  .habtm-container
-    = label_tag "#{resource_name}_#{field.name}_#{value.last}",value.first, :class => "habtm-label"
-    = check_box_tag "#{resource_name}[#{ids_method}][]", value.last, resource.send("#{ids_method}").include?(value.last), :id => "#{resource_name}_#{field.name}_#{value.last}", :class => "habtm-checkbox"
+- ids_method = field.name.to_s.match(/_ids$/) ? field.name : "#{field.name.to_s.singularize}_ids"
+= hidden_field_tag "#{resource_name}[#{ids_method}][]",""
+- field.view_values(self).each do |value|
+  - editors = resource.send(:"#{ids_method}")
+  .habtm-container
+    = label_tag "#{resource_name}_#{field.name}_#{value.last}",value.first, :class => "habtm-label"
+    = check_box_tag "#{resource_name}[#{ids_method}][]", value.last, resource.send("#{ids_method}").include?(value.last), :id => "#{resource_name}_#{field.name}_#{value.last}", :class => "habtm-checkbox"
 .clear

data/app/views/components/lolita/configuration/search/_display.html.haml

@@ -1,2 +1,2 @@
-= form_tag lolita_resources_path(), :method => :get, :class => "search" do 
-  %input{:type => "text", :name => "q", :value => params[:q], :placeholder => t("lolita.search")}
+= form_tag lolita_resources_path(), :method => :get, :class => "search" do 
+  %input{:type => "text", :name => "q", :value => params[:q], :placeholder => t("lolita.search")}

data/app/views/kaminari/lolita/_first_page.html.erb

@@ -1,11 +1,11 @@
-<%# Link to the "First" page
-  - available local variables
-    url:           url to the first page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="first">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
-</span>
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="first">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+</span>

data/app/views/kaminari/lolita/_gap.html.erb

@@ -1,8 +1,8 @@
-<%# Non-link tag that stands for skipped pages...
-  - available local variables
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>

data/app/views/kaminari/lolita/_last_page.html.erb

@@ -1,11 +1,11 @@
-<%# Link to the "Last" page
-  - available local variables
-    url:           url to the last page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="last">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
-</span>
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="last">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</span>

data/app/views/kaminari/lolita/_next_page.html.erb

@@ -1,11 +1,11 @@
-<%# Link to the "Next" page
-  - available local variables
-    url:           url to the next page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="next">
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
-</span>
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="next">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</span>

data/app/views/kaminari/lolita/_page.html.erb

@@ -1,12 +1,12 @@
-<%# Link showing page number
-  - available local variables
-    page:          a page object for "this" page
-    url:           url to this page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="page<%= ' current' if page.current? %>">
-  <%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
-</span>
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page<%= ' current' if page.current? %>">
+  <%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</span>

data/app/views/kaminari/lolita/_paginator.html.erb

@@ -1,23 +1,23 @@
-<%# The container tag
-  - available local variables
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside
--%>
-<%= paginator.render do -%>
-  <nav class="pagination">
-    <%= first_page_tag unless current_page.first? %>
-    <%= prev_page_tag unless current_page.first? %>
-    <% each_page do |page| -%>
-      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
-        <%= page_tag page %>
-      <% elsif !page.was_truncated? -%>
-        <%= gap_tag %>
-      <% end -%>
-    <% end -%>
-    <%= next_page_tag unless current_page.last? %>
-    <%= last_page_tag unless current_page.last? %>
-  </nav>
-<% end -%>
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <nav class="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+  </nav>
+<% end -%>

data/app/views/kaminari/lolita/_prev_page.html.erb

@@ -1,11 +1,11 @@
-<%# Link to the "Previous" page
-  - available local variables
-    url:           url to the previous page
-    current_page:  a page object for the currently displayed page
-    num_pages:     total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="prev">
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
-</span>
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="prev">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</span>