solidus_static_content 1.0.0 → 2.1.0

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,36 @@
-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.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", "< 5"]
+  spec.add_dependency "solidus_support", "~> 0.8"
+
+  spec.add_development_dependency "solidus_dev_support", "~> 2.7"
 end

metadata

@@ -1,228 +1,118 @@
 --- !ruby/object:Gem::Specification
 name: solidus_static_content
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Peter Berkenbosch
 - Roman Smirnov
-autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: solidus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: ffaker
+  name: solidus_core
   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'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
+        version: '5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
+        version: '0.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
-  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'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  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: Extention to manage the static pages for your Spree shop.
+        version: '2.7'
+description: Manage the static pages of your Solidus store or replace existing pages
+  with a static version
 email: peter@pero-ict.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gem_release.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".standard.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/spree/backend/spree_static_content.js
-- app/assets/javascripts/spree/frontend/spree_static_content.js
-- app/assets/stylesheets/spree/backend/spree_static_content.css
+- app/assets/stylesheets/spree/frontend/solidus_static_content.css
 - app/assets/stylesheets/spree/frontend/spree_static_content.css
-- app/controllers/spree/admin/pages_controller.rb
-- app/controllers/spree/static_content_controller.rb
 - app/helpers/spree/pages_helper.rb
+- app/models/solidus_static_content/permission_sets/page_display.rb
+- app/models/solidus_static_content/permission_sets/page_management.rb
 - app/models/spree/page.rb
-- app/overrides/pages_in_footer.rb
-- app/overrides/pages_in_header.rb
-- app/overrides/pages_in_menu.rb
-- app/overrides/pages_in_sidebar.rb
-- app/views/spree/admin/pages/_form.html.erb
-- app/views/spree/admin/pages/edit.html.erb
-- app/views/spree/admin/pages/index.html.erb
-- app/views/spree/admin/pages/new.html.erb
-- app/views/spree/static_content/_static_content_footer.html.erb
-- app/views/spree/static_content/_static_content_header.html.erb
-- app/views/spree/static_content/_static_content_list.html.erb
-- app/views/spree/static_content/_static_content_sidebar.html.erb
-- app/views/spree/static_content/show.html.erb
+- app/overrides/solidus_static_content/pages_in_footer.rb
+- app/overrides/solidus_static_content/pages_in_header.rb
+- app/overrides/solidus_static_content/pages_in_sidebar.rb
+- bin/console
+- bin/r
 - bin/rails
+- bin/rails-engine
+- bin/rails-sandbox
+- bin/rake
+- bin/sandbox
+- bin/sandbox_rails
+- bin/setup
 - config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es-MX.yml
 - config/locales/es.yml
 - config/locales/et.yml
 - config/locales/fr.yml
@@ -246,23 +136,35 @@ files:
 - db/migrate/20110717103112_add_meta_title_to_page.rb
 - db/migrate/20120723144115_add_render_as_partial_for_layout_for_spree_pages.rb
 - db/migrate/20140926121757_add_pages_stores.rb
+- db/migrate/20180305193240_update_spree_page_position.rb
+- lib/controllers/backend/spree/admin/pages_controller.rb
+- lib/controllers/frontend/spree/static_content_controller.rb
 - lib/generators/solidus_static_content/install/install_generator.rb
+- lib/generators/solidus_static_content/install/templates/app/controllers/static_content_controller.rb
+- lib/generators/solidus_static_content/install/templates/app/views/static_content/show.html.erb
 - lib/solidus_static_content.rb
-- lib/spree_static_content/engine.rb
+- lib/solidus_static_content/engine.rb
+- lib/solidus_static_content/route_matcher.rb
+- lib/solidus_static_content/testing_support/factories.rb
+- lib/solidus_static_content/version.rb
+- lib/views/backend/spree/admin/pages/_form.html.erb
+- lib/views/backend/spree/admin/pages/edit.html.erb
+- lib/views/backend/spree/admin/pages/index.html.erb
+- lib/views/backend/spree/admin/pages/new.html.erb
+- lib/views/backend/spree/admin/shared/_pages_tabs.html.erb
+- lib/views/frontend/spree/static_content/_static_content_footer.html.erb
+- lib/views/frontend/spree/static_content/_static_content_header.html.erb
+- lib/views/frontend/spree/static_content/_static_content_list.html.erb
+- lib/views/frontend/spree/static_content/_static_content_sidebar.html.erb
+- lib/views/frontend/spree/static_content/show.html.erb
 - solidus_static_content.gemspec
-- spec/controllers/static_content_controller_spec.rb
-- spec/factories/page_factory.rb
-- spec/features/admin/pages_spec.rb
-- spec/features/static_content_spec.rb
-- spec/helpers/page_helper_spec.rb
-- spec/lib/spree_static.content_spec.rb
-- spec/models/page_spec.rb
-- spec/spec_helper.rb
-homepage: http://spreecommerce.com/extensions/139-static-content
+homepage: https://github.com/solidusio-contrib/solidus_static_content#readme
 licenses:
-- BSD-3
-metadata: {}
-post_install_message: 
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://github.com/solidusio-contrib/solidus_static_content#readme
+  source_code_uri: https://github.com/solidusio-contrib/solidus_static_content#readme
+  changelog_uri: https://github.com/solidusio-contrib/solidus_static_content/releases
 rdoc_options: []
 require_paths:
 - lib
@@ -270,25 +172,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+requirements: []
+rubygems_version: 4.0.17
 specification_version: 4
-summary: Extention to manage the static pages for your Spree shop.
-test_files:
-- spec/controllers/static_content_controller_spec.rb
-- spec/factories/page_factory.rb
-- spec/features/admin/pages_spec.rb
-- spec/features/static_content_spec.rb
-- spec/helpers/page_helper_spec.rb
-- spec/lib/spree_static.content_spec.rb
-- spec/models/page_spec.rb
-- spec/spec_helper.rb
+summary: Extension to manage the static pages for your Solidus store.
+test_files: []

data/.travis.yml

@@ -1,21 +0,0 @@
-before_script:
-  - "bundle exec rake test_app"
-script: "bundle exec rspec spec"
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-env:
-  matrix:
-    - SOLIDUS_BRANCH=v1.1 DB=postgres
-    - SOLIDUS_BRANCH=v1.2 DB=postgres
-    - SOLIDUS_BRANCH=v1.3 DB=postgres
-    - SOLIDUS_BRANCH=v1.4 DB=postgres
-    - SOLIDUS_BRANCH=v2.0 DB=postgres
-    - SOLIDUS_BRANCH=master DB=postgres
-    - SOLIDUS_BRANCH=v1.1 DB=mysql
-    - SOLIDUS_BRANCH=v1.2 DB=mysql
-    - SOLIDUS_BRANCH=v1.3 DB=mysql
-    - SOLIDUS_BRANCH=v1.4 DB=mysql
-    - SOLIDUS_BRANCH=v2.0 DB=mysql
-    - SOLIDUS_BRANCH=master DB=mysql

data/app/assets/javascripts/spree/backend/spree_static_content.js

@@ -1 +0,0 @@
-//= require spree/backend

data/app/assets/javascripts/spree/frontend/spree_static_content.js

@@ -1 +0,0 @@
-//= require spree/frontend

data/app/assets/stylesheets/spree/backend/spree_static_content.css

@@ -1,3 +0,0 @@
-/*
- *= require spree/backend
-*/

data/app/controllers/spree/admin/pages_controller.rb

@@ -1,3 +0,0 @@
-class Spree::Admin::PagesController < Spree::Admin::ResourceController
-  
-end

data/app/controllers/spree/static_content_controller.rb

@@ -1,20 +0,0 @@
-class Spree::StaticContentController < Spree::StoreController
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
-  helper 'spree/products'
-  layout :determine_layout
-
-  def show
-    @page = Spree::Page.by_store(current_store).visible.find_by_slug!(request.path)
-  end
-
-  private
-    def determine_layout
-      return @page.layout if @page and @page.layout.present? and not @page.render_layout_as_partial?
-      Spree::Config.layout
-    end
-
-    def accurate_title
-      @page ? (@page.meta_title.present? ? @page.meta_title : @page.title) : nil
-    end
-end

data/app/overrides/pages_in_footer.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/shared/_footer",
-                     :name => "pages_in_footer",
-                     :insert_bottom => "#footer-right",
-                     :partial => "spree/static_content/static_content_footer",
-                     :disabled => false)

data/app/overrides/pages_in_header.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/shared/_main_nav_bar",
-                     :name => "pages_in_header",
-                     :insert_bottom => "#main-nav-bar",
-                     :partial => "spree/static_content/static_content_header",
-                     :disabled => false)

data/app/overrides/pages_in_menu.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_menu",
-                     :name => "static_content_pages_admin_tab",
-                     :insert_bottom => "[data-hook='admin_tabs']",
-                     :text => "<%= tab(:pages, label: 'Pages', icon: 'file-text') %>",
-                     :disabled => false)

data/app/overrides/pages_in_sidebar.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/shared/_sidebar",
-                     :name => "pages_in_sidebar",
-                     :insert_bottom => "#sidebar",
-                     :partial => "spree/static_content/static_content_sidebar",
-                     :disabled => false)