solidus_static_content 1.0.0 → 2.0.0

data/lib/views/backend/spree/admin/pages/edit.html.erb

@@ -0,0 +1,32 @@
+<%= render 'spree/admin/shared/pages_tabs' %>
+
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Page), spree.admin_pages_path) %>
+<% admin_breadcrumb(@page.title) %>
+
+<% content_for :page_title do %>
+  <%= t("spree.editing_page") %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_to t("spree.back_to_static_pages_list"), spree.admin_pages_path %>
+  </li>
+<% end %>
+
+<div data-hook='admin_page_edit_form_header'>
+  <%= render "spree/shared/error_messages", :target => @page %>
+</div>
+
+<%= form_for [:admin, @page], as: :page, url: admin_page_path(@page) do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+
+    <div class='clear'></div>
+
+    <div data-hook='admin_page_edit_form_buttons'>
+      <% if can?(:update, @page) %>
+        <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+      <% end %>
+    </div>
+  </fieldset>
+<% end %>

data/lib/views/backend/spree/admin/pages/index.html.erb

@@ -0,0 +1,68 @@
+<%= render 'spree/admin/shared/pages_tabs' %>
+
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::Page) %>
+    <li>
+      <%= link_to t("spree.new_page"), new_object_url, icon: 'plus' %>
+    </li>
+  <% end %>
+<% end %>
+
+<% content_for :page_title do %>
+  <%= t("spree.static_pages") %>
+<% end %>
+
+<% if @pages.any? %>
+  <table class="index responsive sortable" id="listing_pages" data-hook data-sortable-link="<%= update_positions_admin_pages_url %>">
+    <colgroup>
+      <col style="width: 10%">
+      <col style="width: 40%">
+      <col style="width: 35%">
+      <col style="width: 10%">
+      <col style="width: 15%">
+    </colgroup>
+
+    <thead>
+      <tr data-hook="admin_pages_index_headers">
+        <th></th>
+        <th><%= Spree::Page.human_attribute_name(:title) %></th>
+        <th><%= t("spree.link") %></th>
+        <th><%= Spree::Page.human_attribute_name(:visible) %></th>
+        <th data-hook="admin_pages_index_header_actions" class="actions"></th>
+      </tr>
+    </thead>
+
+    <tbody class="ui-sortable">
+      <% @pages.each do |page| %>
+        <tr data-hook="admin_pages_index_rows" class="<%= cycle('odd', 'even') %>" id="<%= dom_id page %>">
+          <td>
+            <% if can?(:update_positions, Spree::StockLocation) %>
+              <span class='handle ui-sortable-handle'></span>
+            <% end %>
+          </td>
+          <td><%= page.title %></td>
+          <td><%= link_to page.link, page.link, :target => '_blank' %></td>
+          <td>
+            <span class='pill pill-<%= page.visible ? 'active' : 'inactive' %>'>
+              <%= t("spree.#{page.visible? ? :active : :inactive}") %>
+            </span>
+          </td>
+          <td data-hook="admin_pages_index_row_actions" class="actions" >
+            <% if can?(:update, page) %>
+              <%= link_to_edit page, no_text: true %>
+            <% end %>
+            <% if can?(:destroy, page) %>
+              <%= link_to_delete page, no_text: true %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="no-objects-found">
+    <%= render 'spree/admin/shared/no_objects_found',
+                resource: Spree::Page,
+                new_resource_url: new_object_url %>
+  </div>
+<% end %>

data/lib/views/backend/spree/admin/pages/new.html.erb

@@ -0,0 +1,31 @@
+<%= render 'spree/admin/shared/pages_tabs' %>
+
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Page), spree.admin_pages_path) %>
+
+<% content_for :page_title do %>
+  <%= t("spree.new_page") %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_to t("spree.back_to_static_pages_list"), spree.admin_pages_path %>
+  </li>
+<% end %>
+
+<%= render "spree/shared/error_messages", :target => @page %>
+
+<div data-hook='admin_page_new_form'>
+  <%= form_for [:admin, @page] do |f| %>
+    <fieldset class='no-border-top'>
+      <%= render partial: 'form', locals: { f: f } %>
+
+      <div class='clear'></div>
+
+      <% if can?(:create, Spree::Page) %>
+        <div data-hook='admin_page_new_form_buttons'>
+          <%= render partial: 'spree/admin/shared/new_resource_links' %>
+        </div>
+      <% end %>
+    </fieldset>
+  <% end %>
+</div>

data/lib/views/backend/spree/admin/shared/_pages_tabs.html.erb

@@ -0,0 +1,9 @@
+<% content_for :tabs do %>
+  <nav>
+    <ul class='tabs' data-hook='admin_settings_pages_tabs'>
+      <% if can?(:display, Spree::Page) %>
+        <%= settings_tab_item plural_resource_name(Spree::Page), spree.admin_pages_path %>
+      <% end %>
+    </ul>
+  </nav>
+<% end %>

data/{app/views → lib/views/frontend}/spree/static_content/_static_content_sidebar.html.erb

@@ -1,6 +1,6 @@
 <% if Spree::Page.by_store(current_store).visible.sidebar_links.any? %>
 <nav id="pages" class="sidebar-item">
-  <h6 class="pages-root"><%= Spree.t(:pages) %></h6>
+  <h6 class="pages-root"><%= t("spree.pages") %></h6>
   <ul class="pages-list"><%= render :partial => "spree/static_content/static_content_list", :collection => Spree::Page.visible.sidebar_links, :as => :page %></ul>
 </nav>
 <% end %>

data/lib/views/frontend/spree/static_content/show.html.erb

@@ -0,0 +1,18 @@
+<% if @page.layout.present? and @page.render_layout_as_partial? %>
+  <%= render :partial => @page.layout %>
+<% else %>
+  <% content_for :sidebar do %>
+    <div data-hook="homepage_sidebar_navigation">
+      <% if "spree/products" == params[:controller] && @taxon %>
+        <%= render partial: 'spree/shared/filters' %>
+      <% else %>
+        <%= render partial: 'spree/shared/taxonomies' %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <h1><%= @page.title %></h1>
+  <div id="page_content">
+    <%= raw @page.body %>
+  </div>
+<% end %>

data/solidus_static_content.gemspec

@@ -1,32 +1,37 @@
-Gem::Specification.new do |s|
-  s.platform    = Gem::Platform::RUBY
-  s.name        = 'solidus_static_content'
-  s.version     = '1.0.0'
-  s.summary     = 'Extention to manage the static pages for your Spree shop.'
-  s.description = s.summary
-  s.required_ruby_version = '>= 1.9.3'
-
-  s.authors      = [%q{Peter Berkenbosch}, %q{Roman Smirnov}]
-  s.email        = 'peter@pero-ict.nl'
-  s.homepage     = 'http://spreecommerce.com/extensions/139-static-content'
-  s.license      = %q{BSD-3}
-
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
-  s.require_path = 'lib'
-  s.requirements << 'none'
-
-  s.add_dependency 'solidus', ['>= 1.1', '< 3']
-  s.add_dependency 'deface', '~> 1.0.2'
-
-  s.add_development_dependency 'capybara', '~> 2.7'
-  s.add_development_dependency 'factory_girl', '~> 4.7'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'database_cleaner', '~> 1.5'
-  s.add_development_dependency 'rspec-rails',  '~> 3.5'
-  s.add_development_dependency 'sqlite3', '~> 1.3'
-  s.add_development_dependency 'poltergeist', '~> 1.10'
-  s.add_development_dependency 'simplecov', '~> 0.12'
-  s.add_development_dependency 'pry-rails'
-  s.add_development_dependency 'test-unit'
+# frozen_string_literal: true
+
+require_relative 'lib/solidus_static_content/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'solidus_static_content'
+  spec.version = SolidusStaticContent::VERSION
+  spec.authors = ['Peter Berkenbosch', 'Roman Smirnov']
+  spec.email = 'peter@pero-ict.nl'
+
+  spec.summary = 'Extension to manage the static pages for your Solidus store.'
+  spec.description = 'Manage the static pages of your Solidus store or replace existing pages with a static version'
+  spec.homepage = 'https://github.com/solidusio-contrib/solidus_static_content#readme'
+  spec.license = 'BSD-3-Clause'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_static_content#readme'
+  spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_static_content/releases'
+
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
+
+  spec.files = files.grep_v(%r{^(test|spec|features)/})
+  spec.test_files = files.grep(%r{^(test|spec|features)/})
+  spec.bindir = "exe"
+  spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'deface', '~> 1.0'
+  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
+  spec.add_dependency 'solidus_support', '~> 0.5'
+
+  spec.add_development_dependency 'solidus_dev_support'
 end

data/spec/controllers/spree/admin/pages_controller_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::PagesController do
+  describe '.build_resource' do
+    it 'pre-assigns the default store' do
+      default_store = create(:store, default: true)
+
+      expect(subject.send(:build_resource).stores).to eq([default_store])
+    end
+  end
+end

data/spec/controllers/{static_content_controller_spec.rb → spree/static_content_controller_spec.rb}

@@ -1,37 +1,34 @@
 require 'spec_helper'
 
 describe Spree::StaticContentController, type: :controller do
-  before do
-    controller.stub spree_current_user: nil
-  end
-
   let!(:store) { create(:store, default: true) }
 
   context '#show' do
     it 'accepts path as root' do
       page = create(:page, slug: '/', stores: [store])
       request.path = page.slug
-      spree_get :show, path: page.slug
-      expect(response).to be_success
+      get :show, params: { path: page.slug }
+      expect(response).to be_successful
     end
 
     it 'accepts path as string' do
       page = create(:page, slug: 'hello', stores: [store])
       request.path = page.slug
-      spree_get :show, path: page.slug
-      expect(response).to be_success
+      get :show, params: { path: page.slug }
+      expect(response).to be_successful
     end
 
     it 'accepts path as nested' do
       page = create(:page, slug: 'aa/bb/cc', stores: [store])
       request.path = page.slug
-      spree_get :show, path: page.slug
-      expect(response).to be_success
+      get :show, params: { path: page.slug }
+      expect(response).to be_successful
     end
 
     it 'respond with a 404 when no page exists' do
-      spree_get :show
-      expect(response.response_code).to eq(404)
+      expect {
+        get :show
+      }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 end

data/spec/features/{admin → spree/admin}/pages_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 RSpec.feature 'Admin Static Content', js: true do
   stub_authorization!
 
+  background do
+    create :store, default: true
+  end
+
   context 'when no page exists' do
     background do
       visit spree.admin_path
@@ -10,10 +14,11 @@ RSpec.feature 'Admin Static Content', js: true do
     end
 
     scenario 'can create new page' do
-      expect(page).to have_text /No Pages found, Add One!/i
+      expect(page).to have_text /No Pages found/i
 
       click_link 'New page'
-      expect(page).to have_text 'Static pages'
+
+      expect(page).to have_text 'New page'
 
       fill_in 'page_title', with: 'Contact us'
       fill_in 'page_slug', with: 'contact-us'
@@ -56,11 +61,9 @@ RSpec.feature 'Admin Static Content', js: true do
 
     scenario 'can be deleted' do
       within_row(1) do
-        click_icon :trash
+        accept_confirm { click_icon :trash }
       end
 
-      page.driver.browser.switch_to.alert.accept unless Capybara.javascript_driver == :poltergeist
-
       expect(page).not_to have_text static_page.title
     end
   end

data/spec/features/{static_content_spec.rb → spree/static_content_spec.rb}

@@ -29,10 +29,12 @@ feature 'Static Content Page', js: true do
       expect(page).to have_text 'Root Page Test'
     end
 
-    scenario 'is limited within its own constraints' do
-      create(:page, slug: '/t/categories/page3', title: 'Constraint Test', stores: [store])
-      visit '/t/categories/page3'
-      expect(page).not_to have_text 'Constraint Test'
+    scenario 'is limited within its own constraints', js: false do
+      create(:taxon, permalink: 'test', name: 'The Taxon')
+      create(:page, slug: '/t/test', title: 'The Page', stores: [store])
+      visit '/t/test'
+      expect(page).to have_content('The Taxon')
+      expect(page).not_to have_content('The Page')
     end
 
     scenario 'fetch correct page' do

data/spec/lib/solidus_static_content/engine_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+RSpec.describe SolidusStaticContent::Engine do
+  describe '.activate_menu_item' do
+    it 'adds the menu item only once' do
+      described_class.activate_menu_items
+
+      expect {
+        described_class.activate_menu_items
+        described_class.activate_menu_items
+      }.not_to change(Spree::Backend::Config.menu_items, :size)
+    end
+  end
+end

data/spec/lib/{spree_static.content_spec.rb → solidus_static_content/route_matcher_spec.rb}

@@ -1,33 +1,24 @@
 require 'spec_helper'
 
-describe StaticPage do
-  context '.remove_spree_mount_point' do
-    specify do
-      path = '/hello'
-      expect(subject.remove_spree_mount_point(path)).to eq 'hello'
-    end
-  end
-end
-
-describe Spree::StaticPage do
+describe SolidusStaticContent::RouteMatcher do
   subject { described_class }
 
   context '.matches?' do
     it 'is true when valid page' do
       page = create(:page, slug: 'hello', visible: true)
-      request = double('request', path: page.slug)
+      request = instance_double(Rack::Request, path_info: page.slug)
       expect(subject.matches?(request)).to be true
     end
 
     it 'is false when using reserved slug name' do
       page = create(:page, slug: 'login', visible: true)
-      request = double('request', path: page.slug)
+      request = instance_double(Rack::Request, path_info: page.slug)
       expect(subject.matches?(request)).to be false
     end
 
     it 'is false when page is not accessible' do
       page = create(:page, slug: 'hello', visible: false)
-      request = double('request', path: page.slug)
+      request = instance_double(Rack::Request, path_info: page.slug)
       expect(subject.matches?(request)).to be false
     end
   end

data/spec/models/{page_spec.rb → spree/page_spec.rb}

@@ -9,11 +9,6 @@ describe Spree::Page do
     end
   end
 
-  it 'always add / prefix to slug' do
-    page = create(:page, slug: 'hello')
-    expect(page.slug).to eq '/hello'
-  end
-
   context '.link' do
     it 'return slug if foreign_link blank' do
       page = create(:page, slug: 'hello')
@@ -26,9 +21,7 @@ describe Spree::Page do
     end
   end
 
-
   context "pages in stores" do
-
     before(:each) do
       @store = create(:store)
       @page = create(:page, :stores => [@store])
@@ -40,7 +33,29 @@ describe Spree::Page do
       expect(pages_by_store).to include(@page)
       expect(pages_by_store).to_not include(@page2)
     end
+  end
 
+  describe '#slug' do
+    it 'always adds a "/" (slash) prefix to the slug' do
+      page = create(:page, slug: 'hello')
+      expect(page.slug).to eq '/hello'
+    end
+
+    context 'when a title is present' do
+      it 'is generated from the title' do
+        page = create(:page, slug: nil, title: 'Hello World!')
+
+        expect(page).to be_valid
+        expect(page.slug).to eq('/hello-world')
+      end
+    end
   end
 
+  describe '.meta_title' do
+    it 'falls back to title' do
+      page = build(:page, title: "Foo Bar", meta_title: nil)
+
+      expect(page.meta_title).to eq("Foo Bar")
+    end
+  end
 end