contour 2.4.0.beta1 → 2.4.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437703b7d56331d9247a43445a273ee060fa74db
-  data.tar.gz: 89c9bc5675e5a46655db7c0d885010c89fb09780
+  metadata.gz: 310fce2685f889fe7272d0164e812429bb03ce5e
+  data.tar.gz: b82b531a51e1b45ae6b3b7d2e914d9314da8d7d8
 SHA512:
-  metadata.gz: fc137f49fc6f6e226f0d050bced540b6c06ebfa5dd0dad53246854303d34277c279a993e2e1fe8438e38d874d85398dffb6bffda8d4ce8c83a31a156e0bb279a
-  data.tar.gz: 9211c3702b21caa44288c4fef3886e6c79259396dcea424950f24992afdb083c2641c19599557e50528bfc9087b074484de59179f830d75b127cd8d4481e2c24
+  metadata.gz: 8b1f0ea2d95e77751a1fa0da7107751f41b96d9e6fd542240dbd4cfe61fa0d81b1b91d33e7768db58c59247957b9b6a794fd2238604a9b367e1a027aa86f2c59
+  data.tar.gz: c18c9dff02ed41227eee41d73c842bd44992a9cd15201ca2023a3259d0f1060b93f612075db46b30980be0e190a4bf8b9f9f4574ab79941eb22f675f3f1f1740

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 - Updated Bootstrap to 3.1.0
 - **Gem Changes**
   - Updated to devise 3.2.2
+- Added the suppress-click data-object
+  - <a href="#" data-object="suppress-click">Ignore Click</a>
+- Updated layout for contour per page header
+
+### Breaking Changes
+- Removed pagination AJAX methods to reduce overall contour JavaScript footprint
+- `sort_field_helper` updated to work with turbolinks and no longer uses AJAX
+
+### Bug Fix
+- Fixed the per page links to no longer include starting and ending links when the max page is reached
 
 ## 2.3.0 (February 3, 2014)
 

data/app/assets/javascripts/contour/global.js.coffee

@@ -30,18 +30,6 @@ $(document)
     catch error
       # Nothing
   )
-  .on('click', ".pagination a, .page a, .next a, .prev a", () ->
-    return false if $(this).parent().is('.active, .disabled, .per_page')
-    $.get(this.href, null, null, "script")
-    false
-  )
-  .on("click", ".per_page a", () ->
-    object_class = $(this).data('object')
-    $.get($("#"+object_class+"_search").attr("action"), $("#"+object_class+"_search").serialize() + "&"+object_class+"_per_page="+ $(this).data('count'), null, "script")
-    false
-  )
-  .on('click', '[data-object~="order"]', () ->
-    $('#order').val($(this).data('order'))
-    $($(this).data('form')).submit()
+  .on('click', '[data-object~="suppress-click"]', () ->
     false
   )

data/app/helpers/contour_helper.rb

@@ -4,12 +4,12 @@ module ContourHelper
     link_to 'Cancel', URI.parse(request.referer.to_s).path.blank? ? root_path : (URI.parse(request.referer.to_s).path), class: 'btn btn-default'
   end
 
-  def sort_field_helper(order, sort_field, display_name, search_form_id  = 'search_form')
+  def sort_field_helper(order, sort_field, display_name)
     sort_field_order = (order == sort_field) ? "#{sort_field} DESC" : sort_field
     symbol = (order == sort_field) ? '»' : (order == sort_field + ' DESC' ? '«' : '«»')
     selected_class = (order == sort_field) ? 'selected' : (order == sort_field + ' DESC' ? 'selected' : '')
     content_tag(:span, class: selected_class) do
-      display_name.to_s.html_safe + ' ' + link_to(raw(symbol), '#', data: { object: 'order', order: sort_field_order, form: "##{search_form_id}" }, style: 'text-decoration:none')
+      display_name.to_s.html_safe + ' ' + link_to(raw(symbol), url_for( params.merge( order: sort_field_order )  ), style: 'text-decoration:none')
     end.html_safe
   end
 

data/app/views/contour/layouts/_per_page.html.erb

@@ -1,8 +1,29 @@
 <% pagination_size_hash = { 'large' => 'lg', 'small' => 'sm' } %>
+<% per_page = 20 unless defined?(per_page) and per_page %>
+<% object_count = 0 unless defined?(object_count) and object_count %>
+<% page = params[:page].blank? ? 1 : params[:page].to_i %>
+<% current_page_min = (page - 1)*per_page + 1 %>
+<% current_page_max = page*per_page %>
+
 <ul class="pagination pull-right <%= "pagination-#{pagination_size_hash[pagination_size]}" if defined?(pagination_size) and ['large', 'small'].include?(pagination_size) %>">
-  <li class="disabled"><span>Per Page</span></li>
-  <li class="active per_page"><%= link_to (defined?(per_page) && per_page ? per_page : '20'), "#" %></li>
-  <% if defined?(object_count) and object_count %><li class="disabled"><span>out of <%= object_count %></span></li><% end %>
+  <% if current_page_min > 1 %>
+    <li><%= link_to '&laquo;'.html_safe, url_for( params.merge( page: page - 1 )  ) %></li>
+  <% else %>
+    <li class="disabled"><span>&laquo;</span></li>
+  <% end %>
+
+  <li>
+    <span style="color:#333">
+      <b><%= number_with_delimiter current_page_min %> to <%= number_with_delimiter [current_page_max, object_count].min %></b>
+      of <%= number_with_delimiter object_count %>
+    </span>
+  </li>
+
+  <% if current_page_max < object_count %>
+    <li><%= link_to '&raquo;'.html_safe, url_for( params.merge( page: page + 1 )  ) %></li>
+  <% else %>
+    <li class="disabled"><span>&raquo;</span></li>
+  <% end %>
 </ul>
 
 <div class="clear">&nbsp;</div>

data/app/views/kaminari/contour-large/_paginator.html.erb

@@ -8,8 +8,8 @@
 -%>
 <%= paginator.render do -%>
   <ul class="pagination pagination-lg">
-    <%= first_page_tag %> <%# unless current_page.first? %>
-    <%= prev_page_tag %> <%# unless current_page.first? %>
+    <%= 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 %>
@@ -17,7 +17,7 @@
         <%= gap_tag %>
       <% end -%>
     <% end -%>
-    <%= next_page_tag %> <%# unless current_page.last? %>
-    <%= last_page_tag %> <%# unless current_page.last? %>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
   </ul>
 <% end -%>

data/app/views/kaminari/contour-small/_paginator.html.erb

@@ -8,8 +8,8 @@
 -%>
 <%= paginator.render do -%>
   <ul class="pagination pagination-sm">
-    <%= first_page_tag %> <%# unless current_page.first? %>
-    <%= prev_page_tag %> <%# unless current_page.first? %>
+    <%= 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 %>
@@ -17,7 +17,7 @@
         <%= gap_tag %>
       <% end -%>
     <% end -%>
-    <%= next_page_tag %> <%# unless current_page.last? %>
-    <%= last_page_tag %> <%# unless current_page.last? %>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
   </ul>
 <% end -%>

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

@@ -8,8 +8,8 @@
 -%>
 <%= paginator.render do -%>
   <ul class="pagination">
-    <%= first_page_tag %> <%# unless current_page.first? %>
-    <%= prev_page_tag %> <%# unless current_page.first? %>
+    <%= 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 %>
@@ -17,7 +17,7 @@
         <%= gap_tag %>
       <% end -%>
     <% end -%>
-    <%= next_page_tag %> <%# unless current_page.last? %>
-    <%= last_page_tag %> <%# unless current_page.last? %>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
   </ul>
 <% end -%>

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 4
     TINY = 0
-    BUILD = "beta1" # nil, "pre", "rc", "rc2"
+    BUILD = "beta2" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/generators/contour/scaffold/scaffold_generator.rb

@@ -49,7 +49,7 @@ class Contour::ScaffoldGenerator < Rails::Generators::NamedBase
   end
 
   def generate_views
-    ['_form.html.erb', 'new.html.erb', 'edit.html.erb', 'show.html.erb', 'index.html.erb', 'index.js.erb'].each do |view|
+    ['_form.html.erb', 'new.html.erb', 'edit.html.erb', 'show.html.erb', 'index.html.erb'].each do |view|
       template view, "app/views/#{resource_name_plural}/#{view}"
     end
     template '_paginate.html.erb', "app/views/#{resource_name_plural}/_#{resource_name_plural}.html.erb"

data/lib/generators/contour/scaffold/templates/_paginate.html.erb

@@ -1,10 +1,10 @@
-<%%= render partial: 'contour/layouts/per_page', locals: { type: '<%= resource_name_plural %>', per_page: 20, object_count: @<%= resource_name_plural %>.total_count } %>
+<%%= render partial: 'contour/layouts/per_page', locals: { per_page: 20, object_count: @<%= resource_name_plural %>.total_count } %>
 
 <table class="table table-striped">
   <thead>
     <tr>
       <%- columns.each do |column| -%>
-      <th style="white-space:nowrap"><%%== sort_field_helper(@order, '<%= resource_name_plural %>.<%= column.name %>', '<%= column.name.titleize %>', '<%= resource_name_plural %>_search') %></th>
+      <th style="white-space:nowrap"><%%== sort_field_helper(@order, '<%= resource_name_plural %>.<%= column.name %>', '<%= column.name.titleize %>') %></th>
       <%- end -%>
       <th>Actions</th>
     </tr>

data/lib/generators/contour/scaffold/templates/index.html.erb

@@ -2,14 +2,15 @@
 <div class="page-header">
   <h1>
     <%%= @title %>
-    <%%= link_to "Create <%= resource_title %>", new_<%= resource_name %>_path, class: 'btn btn-xs btn-primary' %>
+    <%%= link_to 'Create <%= resource_title %>', new_<%= resource_name %>_path, class: 'btn btn-xs btn-primary' %>
   </h1>
 </div>
 
-<%%= form_tag <%= resource_name_plural %>_path, method: :get, remote: true, id: "<%= resource_name_plural %>_search", class: 'form-inline', data: { object: 'form-load', no_turbolink: true } do %>
-  <%%= hidden_field_tag :order %>
+<%%= form_tag <%= resource_name_plural %>_path, method: :get, class: 'form-inline' do %>
+  <%%= hidden_field_tag :order, params[:order] %>
   <%%= text_field_tag 'search', params[:search], class: 'form-control' %>
-  <%%= submit_tag 'Search', class: 'btn btn-primary' %>
+  <%%= submit_tag 'Search', class: 'btn btn-primary', name: nil %>
+  <%%= link_to 'Reset', <%= resource_name_plural %>_path, class: 'btn btn-default' %>
 <%% end %>
 
-<div id="<%= resource_name_plural %>"><div class="center"><%%= image_tag "contour/ajax-loader.gif" %></div></div>
+<%%= render partial: '<%= resource_name_plural %>/<%= resource_name_plural %>' %>

data/test/helpers/contour_helper_test.rb

@@ -3,10 +3,14 @@ require 'test_helper'
 class ContourHelperTest < ActionView::TestCase
 
   test "should show sort field helper" do
+    params[:controller] = 'welcome'
+    params[:action] = 'index'
     assert sort_field_helper("first_name DESC", "last_name", "First Name").kind_of?(String)
   end
 
   test "should show sort field helper with same order" do
+    params[:controller] = 'welcome'
+    params[:action] = 'index'
     assert sort_field_helper("first_name", "first_name", "First Name").kind_of?(String)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.4.0.beta1
+  version: 2.4.0.beta2
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -310,7 +310,6 @@ files:
 - lib/generators/contour/scaffold/templates/controller.rb
 - lib/generators/contour/scaffold/templates/edit.html.erb
 - lib/generators/contour/scaffold/templates/index.html.erb
-- lib/generators/contour/scaffold/templates/index.js.erb
 - lib/generators/contour/scaffold/templates/new.html.erb
 - lib/generators/contour/scaffold/templates/show.html.erb
 - test/contour_test.rb

data/lib/generators/contour/scaffold/templates/index.js.erb

@@ -1 +0,0 @@
-$("#<%= resource_name_plural %>").html("<%%= escape_javascript(render("<%= resource_name_plural %>")) %>");