Skip to content

Commit

Permalink
Bring in kaminari templates.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Dutil authored and Jeff Dutil committed Dec 2, 2014
1 parent ef9ba76 commit 945bc86
Show file tree
Hide file tree
Showing 13 changed files with 108 additions and 16 deletions.
1 change: 0 additions & 1 deletion frontend/.rspec

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))

gem 'spree_core', :path => '../core'
gem 'spree_api', :path => '../api'
gem 'spree_core', path: '../core'
gem 'spree_api', path: '../api'

gemspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<%# 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
-%>
<% unless current_page.first? %>
<li class="first">
<%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
</li>
<% end %>
8 changes: 8 additions & 0 deletions frontend/app/views/kaminari/twitter-bootstrap-3/_gap.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +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
-%>
<li class="page gap disabled"><a href="#" onclick="return false;"><%= raw(t 'views.pagination.truncate') %></a></li>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<%# 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
-%>
<% unless current_page.last? %>
<li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
<%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
</li>
<% end %>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<%# 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
-%>
<% unless current_page.last? %>
<li class="next_page">
<%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
</li>
<% end %>
12 changes: 12 additions & 0 deletions frontend/app/views/kaminari/twitter-bootstrap-3/_page.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +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
-%>
<li class="page<%= ' active' if page.current? %>">
<%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
</li>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<%# 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
-%>
<%- pagination_class ||= '' %>
<%= paginator.render do -%>
<ul class="pagination <%= pagination_class %>">
<%= 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? %>
</ul>
<% end -%>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<%# 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
-%>
<% unless current_page.first? %>
<li class="prev">
<%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
</li>
<% end %>
2 changes: 1 addition & 1 deletion frontend/spec/features/checkout_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
allow_any_instance_of(Spree::CheckoutController).to receive_messages(:try_spree_current_user => user)
end

it "redirects to payment page", js: true do
it "redirects to payment page", inaccessible: true, js: true do
visit spree.checkout_state_path(:delivery)
click_button "Save and Continue"
choose "Credit Card"
Expand Down
6 changes: 3 additions & 3 deletions frontend/spec/features/products_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

describe 'meta tags and title' do
let(:jersey) { Spree::Product.find_by_name('Ruby on Rails Baseball Jersey') }
let(:metas) { { :meta_description => 'Brand new Ruby on Rails Jersey', :meta_title => 'Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel', :meta_keywords => 'ror, jersey, ruby' } }
let(:metas) { { meta_description: 'Brand new Ruby on Rails Jersey', meta_title: 'Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel', meta_keywords: 'ror, jersey, ruby' } }

it 'should return the correct title when displaying a single product' do
click_link jersey.name
Expand Down Expand Up @@ -105,7 +105,7 @@
visit spree.product_path(product)
click_button "Add To Cart"
click_button "Checkout"
fill_in "order_email", :with => "test@example.com"
fill_in "order_email", with: "test@example.com"
click_button 'Continue'
within("tr[data-hook=item_total]") do
expect(page).to have_content("руб19.99")
Expand All @@ -115,7 +115,7 @@
end

it "should be able to search for a product" do
fill_in "keywords", :with => "shirt"
fill_in "keywords", with: "shirt"
click_button "Search"

expect(page.all('#products .product-list-item').size).to eq(1)
Expand Down
3 changes: 1 addition & 2 deletions frontend/spec/features/template_rendering_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe "Template rendering", :type => :feature do
describe "Template rendering", type: :feature do

after do
Capybara.ignore_hidden_elements = true
Expand All @@ -16,5 +16,4 @@
visit spree.root_path
expect(find('link[rel=canonical]')[:href]).to eql('http://spreestore.example.com/')
end

end
12 changes: 5 additions & 7 deletions frontend/spree_frontend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,23 @@ Gem::Specification.new do |s|
s.name = 'spree_frontend'
s.version = version
s.summary = 'Frontend e-commerce functionality for the Spree project.'
s.description = 'Required dependency for Spree'
s.description = s.summary

s.author = 'Sean Schofield'
s.email = 'sean@spreecommerce.com'
s.homepage = 'http://spreecommerce.com'
s.rubyforge_project = 'spree_frontend'

s.files = Dir['LICENSE', 'README.md', 'app/**/*', 'config/**/*', 'lib/**/*', 'db/**/*', 'vendor/**/*']
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.require_path = 'lib'
s.requirements << 'none'

s.add_dependency 'spree_api', version
s.add_dependency 'spree_core', version

s.add_dependency 'bootstrap-sass', '~> 3.2.0'
s.add_dependency 'canonical-rails', '~> 0.0.4'
s.add_dependency 'jquery-rails', '~> 3.1.2'

s.add_runtime_dependency 'bootstrap-sass', '~> 3.2.0'
s.add_runtime_dependency 'bootstrap-kaminari-views', '~> 0.0.3'
s.add_dependency 'jquery-rails', '~> 3.1.2'

s.add_development_dependency 'capybara-accessible'
end

0 comments on commit 945bc86

Please sign in to comment.