solidus_static_content 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4fb012c97e50d28d83c4efce564265f2fdb538f7
-  data.tar.gz: d159565b4f4ea4a7a883ce4378fa1a4b35f6d21f
+SHA256:
+  metadata.gz: 7a98d396588682a74ff937428388774a578806c8161da21195131e282244c0f9
+  data.tar.gz: 6247ace2e49037b397ae2adaca3456cf121a5d0fd242d7d8f5fc15c742afadc3
 SHA512:
-  metadata.gz: a814032d5eab0fab3c699c1169864a59c8d48a8438d21eaa1115d6064444adc59ca8c103990f81002cb638ddeb8b7f37b37652a7ba814e9b68cbd2b8f5f70af8
-  data.tar.gz: 3624ace3e06d964c27007cce8e50527c29e50e1ae7069fef94b10151538adb6e76614a3881a0c05d5b44a1e46b730637b402466797a4f27374787b42a244c2ba
+  metadata.gz: 4a7ec81a975abfc2d02b987787db16c99d33536525981fa0f30693d274bd519bc5e6721629f6cdae1dff8a1c30d33d323be79d23abb897a04b320130b38687d6
+  data.tar.gz: 4fe5ad4a7eae624705fd593d604c5bef9ac44ec91f3de12f5bd9293dc71086ad8b975fef2ef35f31b7d6b44cce8949091f2b543d6a07006ee0cf2dd7e0531664

data/.circleci/config.yml

@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  # Always take the latest version of the orb, this allows us to
+  # run specs against Solidus supported versions only without the need
+  # to change this configuration every time a Solidus version is released
+  # or goes EOL.
+  solidusio_extensions: solidusio/extensions@volatile
+
+jobs:
+  run-specs-with-postgres:
+    executor: solidusio_extensions/postgres
+    steps:
+      - solidusio_extensions/run-tests
+  run-specs-with-mysql:
+    executor: solidusio_extensions/mysql
+    steps:
+      - solidusio_extensions/run-tests
+
+workflows:
+  "Run specs on supported Solidus versions":
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql
+  "Weekly run specs against master":
+    triggers:
+      - schedule:
+          cron: "0 0 * * 4" # every Thursday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - run-specs-with-postgres
+      - run-specs-with-mysql

data/.gem_release.yml

@@ -0,0 +1,5 @@
+bump:
+  recurse: false
+  file: 'lib/solidus_static_content/version.rb'
+  message: Bump SolidusStaticContent to %{version}
+  tag: true

data/.gitignore

@@ -1,9 +1,20 @@
+*.gem
+\#*
+*~
+.#*
 .DS_Store
-nbproject
-**.gem
+.idea
+.project
+.sass-cache
+coverage
 Gemfile.lock
-spec/dummy/
-.rvmrc
 tmp
-coverage
-.bundle
+nbproject
+pkg
+*.swp
+spec/dummy
+spec/examples.txt
+/sandbox
+.rvmrc
+.ruby-version
+.ruby-gemset

data/.rspec

@@ -1,3 +1,2 @@
---colour
---format
-progress
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,2 @@
+require:
+  - solidus_dev_support/rubocop

data/CHANGELOG.md

@@ -0,0 +1,80 @@
+# Changelog
+
+## [v2.0.0](https://github.com/solidusio-contrib/solidus_static_content/tree/v2.0.0) (2020-06-05)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_static_content/compare/v1.0.0...v2.0.0)
+
+**Breaking changes:**
+
+- Rename SpreeStaticContent to SolidusStaticContent [\#67](https://github.com/solidusio-contrib/solidus_static_content/pull/67) ([aldesantis](https://github.com/aldesantis))
+- Remove deprecated constants [\#66](https://github.com/solidusio-contrib/solidus_static_content/pull/66) ([aldesantis](https://github.com/aldesantis))
+
+**Implemented enhancements:**
+
+- Remove the `I18n` namespace from views [\#54](https://github.com/solidusio-contrib/solidus_static_content/issues/54)
+- Drag & drop ordering + general views updates [\#53](https://github.com/solidusio-contrib/solidus_static_content/pull/53) ([elia](https://github.com/elia))
+- Use the same sidebar logic that Solidus uses [\#52](https://github.com/solidusio-contrib/solidus_static_content/pull/52) ([elia](https://github.com/elia))
+- Auto-generate slug when missing, require presence of a store, attach to the default store by default [\#48](https://github.com/solidusio-contrib/solidus_static_content/pull/48) ([elia](https://github.com/elia))
+- Some more streamlining of the setup process and readme [\#46](https://github.com/solidusio-contrib/solidus_static_content/pull/46) ([elia](https://github.com/elia))
+- Remove Deface hook for Pages in favor of MenuItem [\#45](https://github.com/solidusio-contrib/solidus_static_content/pull/45) ([elia](https://github.com/elia))
+- CircleCI test results [\#43](https://github.com/solidusio-contrib/solidus_static_content/pull/43) ([elia](https://github.com/elia))
+- General cleanup and updates [\#42](https://github.com/solidusio-contrib/solidus_static_content/pull/42) ([elia](https://github.com/elia))
+- Gem structure refresh [\#39](https://github.com/solidusio-contrib/solidus_static_content/pull/39) ([elia](https://github.com/elia))
+
+**Fixed bugs:**
+
+- Could not find table 'spree\_pages'  [\#30](https://github.com/solidusio-contrib/solidus_static_content/issues/30)
+- Meta tag added to pages are added as well as the store ones [\#13](https://github.com/solidusio-contrib/solidus_static_content/issues/13)
+- Page not found if store isn't mounted at the root [\#12](https://github.com/solidusio-contrib/solidus_static_content/issues/12)
+- Add html code in static\_content [\#7](https://github.com/solidusio-contrib/solidus_static_content/issues/7)
+- Add support for Solidus mounted on subpaths [\#55](https://github.com/solidusio-contrib/solidus_static_content/pull/55) ([elia](https://github.com/elia))
+- Fix meta tags [\#50](https://github.com/solidusio-contrib/solidus_static_content/pull/50) ([elia](https://github.com/elia))
+- Update the engine name to match migrations [\#49](https://github.com/solidusio-contrib/solidus_static_content/pull/49) ([elia](https://github.com/elia))
+- Avoid adding the menu item multiple times [\#47](https://github.com/solidusio-contrib/solidus_static_content/pull/47) ([elia](https://github.com/elia))
+- Limit sprockets to v3 until it's fixed on Solidus [\#44](https://github.com/solidusio-contrib/solidus_static_content/pull/44) ([elia](https://github.com/elia))
+
+**Closed issues:**
+
+- Couldn't find Spree::Page [\#33](https://github.com/solidusio-contrib/solidus_static_content/issues/33)
+- Spree::PagesHelper doesn't have `render\_snippet` method [\#25](https://github.com/solidusio-contrib/solidus_static_content/issues/25)
+- admin menu item 'Pages' still appears after logout [\#9](https://github.com/solidusio-contrib/solidus_static_content/issues/9)
+- Problem with solidus 2.1.0.beta1 and solidus\_static\_content [\#5](https://github.com/solidusio-contrib/solidus_static_content/issues/5)
+- DB Migration not working [\#4](https://github.com/solidusio-contrib/solidus_static_content/issues/4)
+- Migrations not running [\#3](https://github.com/solidusio-contrib/solidus_static_content/issues/3)
+
+**Merged pull requests:**
+
+- Update the readme with the solidus\_dev\_support template [\#71](https://github.com/solidusio-contrib/solidus_static_content/pull/71) ([aldesantis](https://github.com/aldesantis))
+- Update extension template with solidus\_dev\_support [\#70](https://github.com/solidusio-contrib/solidus_static_content/pull/70) ([aldesantis](https://github.com/aldesantis))
+- Adds Spree::PermissionSets for Pages [\#64](https://github.com/solidusio-contrib/solidus_static_content/pull/64) ([memotoro](https://github.com/memotoro))
+- Relax solidus\_support dependency [\#63](https://github.com/solidusio-contrib/solidus_static_content/pull/63) ([kennyadsl](https://github.com/kennyadsl))
+- Regenerate ext with solidus\_dev\_support [\#60](https://github.com/solidusio-contrib/solidus_static_content/pull/60) ([elia](https://github.com/elia))
+- Fixes wrong labels, tabs and breadcrumbs [\#59](https://github.com/solidusio-contrib/solidus_static_content/pull/59) ([memotoro](https://github.com/memotoro))
+- Replace Spree.t and I18n.t with the "t" helper [\#56](https://github.com/solidusio-contrib/solidus_static_content/pull/56) ([elia](https://github.com/elia))
+- Update pg requirement from ~\> 0.21 to ~\> 1.1 [\#41](https://github.com/solidusio-contrib/solidus_static_content/pull/41) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update factory\_bot requirement from ~\> 4.7 to ~\> 5.1 [\#37](https://github.com/solidusio-contrib/solidus_static_content/pull/37) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update mysql2 requirement from ~\> 0.4.10 to ~\> 0.5.2 [\#36](https://github.com/solidusio-contrib/solidus_static_content/pull/36) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Relax sqlite gem dependency for Rails 6 compatibility [\#35](https://github.com/solidusio-contrib/solidus_static_content/pull/35) ([aldesantis](https://github.com/aldesantis))
+- Patch store relationship saving [\#34](https://github.com/solidusio-contrib/solidus_static_content/pull/34) ([octoxan](https://github.com/octoxan))
+- Switch from Travis to CircleCI [\#32](https://github.com/solidusio-contrib/solidus_static_content/pull/32) ([BravoSimone](https://github.com/BravoSimone))
+- Update test files [\#28](https://github.com/solidusio-contrib/solidus_static_content/pull/28) ([jtapia](https://github.com/jtapia))
+- Use dynamic attributes on factories [\#24](https://github.com/solidusio-contrib/solidus_static_content/pull/24) ([aitbw](https://github.com/aitbw))
+- Extension maintenance [\#23](https://github.com/solidusio-contrib/solidus_static_content/pull/23) ([aitbw](https://github.com/aitbw))
+- Fix specs [\#22](https://github.com/solidusio-contrib/solidus_static_content/pull/22) ([kennyadsl](https://github.com/kennyadsl))
+- Remove versions past EOL from .travis.yml [\#19](https://github.com/solidusio-contrib/solidus_static_content/pull/19) ([jacobherrington](https://github.com/jacobherrington))
+- Add Solidus 2.7 to .travis.yml [\#18](https://github.com/solidusio-contrib/solidus_static_content/pull/18) ([jacobherrington](https://github.com/jacobherrington))
+- Relax Deface dependency [\#14](https://github.com/solidusio-contrib/solidus_static_content/pull/14) ([aldesantis](https://github.com/aldesantis))
+- Fixes visibility hidden of Page menu before login [\#11](https://github.com/solidusio-contrib/solidus_static_content/pull/11) ([memotoro](https://github.com/memotoro))
+
+## [v1.0.0](https://github.com/solidusio-contrib/solidus_static_content/tree/v1.0.0) (2016-09-22)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_static_content/compare/3ad3f010dcb5cb66d195abe0c6c9abdd05ccc76f...v1.0.0)
+
+**Merged pull requests:**
+
+- Support Solidus 2.0, test all versions [\#2](https://github.com/solidusio-contrib/solidus_static_content/pull/2) ([jhawthorn](https://github.com/jhawthorn))
+- Solidus support [\#1](https://github.com/solidusio-contrib/solidus_static_content/pull/1) ([alexblackie](https://github.com/alexblackie))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile

@@ -1,13 +1,33 @@
-source 'https://rubygems.org/'
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-if branch == 'master' || branch >= "v2.0"
-  gem "rails-controller-testing", group: :test
-end
+# Needed to help Bundler figure out how to resolve dependencies,
+# otherwise it takes forever to resolve them.
+# See https://github.com/bundler/bundler/issues/6677
+gem 'rails', '>0.a'
 
-gem 'pg'
-gem 'mysql2'
+# Provides basic authentication functionality for testing parts of your engine
+gem 'solidus_auth_devise'
+
+case ENV['DB']
+when 'mysql'
+  gem 'mysql2'
+when 'postgresql'
+  gem 'pg'
+else
+  gem 'sqlite3'
+end
 
 gemspec
+
+# Use a local Gemfile to include development dependencies that might not be
+# relevant for the project or for other contributors, e.g. pry-byebug.
+#
+# We use `send` instead of calling `eval_gemfile` to work around an issue with
+# how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
+send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'

data/README.md

@@ -1,105 +1,118 @@
 # Solidus Static Content
 
-[![Build Status](https://travis-ci.org/solidusio-contrib/solidus_static_content.svg)](https://travis-ci.org/solidusio-contrib/solidus_static_content)
+[![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_static_content.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_static_content)
 
-A fork of the [Spree extension][1] for compatibility with [Solidus][7].
+A fork of the [Spree extension](https://github.com/spree-contrib/spree_static_content) for
+compatibility with [Solidus](https://solidus.io).
 
-Good, clean content management of pages for Spree. You can use this to:
+Good, clean content management of pages for Solidus. You can use it to:
 
-- Add and manage static pages such as an 'About' page.
-- Show a static page instead of existing dynamic pages such as the home page,
-  products pages, and taxon pages.
+- Add and manage static pages such as an About page.
+- Show a static page instead of existing dynamic pages such as the home page, products pages, and
+  taxon pages.
 
-## Basic Installation
+## Installation
 
-Add to your `Gemfile`:
+Add solidus_static_content to your Gemfile:
 
 ```ruby
-gem 'solidus_static_content', github: 'solidusio-contrib/solidus_static_content'
+gem 'solidus_static_content'
 ```
 
-Run:
+Bundle your dependencies and run the installation generator:
 
+```shell
+bundle
+bundle exec rails g solidus_static_content:install
 ```
-$ bundle install
-$ bundle exec rails g solidus_static_content:install
-```
 
-That's all!
+## Usage
+
+Using the 'Pages' option in the admin tab, you can add static pages to your Solidus store. The page
+content can be pulled directly from the database, be a separate layout file or be rendered as a
+partial.
 
+In the admin tab, use the 'New page' option to create a new static page.
 
-## HowTo
+The title, slug, body, and meta fields will replace their respective page elements on load. The
+title, slug and body element are all required fields.
 
-Using the 'Pages' option in the admin tab, you can add static pages to your
-Spree install. The page content can be pulled directly from the database, be a
-separate layout file or rendered as a partial.
+Body text provided without a layout/partial being specified will be loaded in the
+`spree_application` layout after it is pulled from the database.
 
-In the admin tab, use the 'New page' option to create a new static page.
+### Layout and partial rendering
 
-The title, slug, body, and meta fields will replace their respective page
-elements on load. The title, slug and body element are all required fields.
+To render an entire page without the `spree_application` layout, specify a relative path to the
+layout file (e.g. `spree/layouts/layout_file_name`). Note that the name of this file will not be
+prefixed with an underscore as it is a layout, not a partial.
 
-Body text provided without a layout / partial being specified will be loaded in
-the spree_application layout after it is pulled from the database.
+To render a partial, specify the path in the layout file name and check the 'Render layout as
+partial' option. The path specified in the layout area will not have an underscore, but it will be
+required in the filename.
 
+Also note the availability of the `render_snippet` helper which finds a page by its slug and renders
+the raw page body anywhere in your view.
 
-### Layout and Partial Rendering
+### Options
 
-To render an entire page without the spree_application layout, specify a
-relative path to the layout file (eg.  `spree/layouts/layout_file_name`). This
-file will not be prefixed with an underscore as it is a layout, not a partial.
+Use the 'Show in' checkboxes to specify whether to display the page links in the header, footer or
+sidebar. The position setting alters the order in which they appear.
 
-To render a partial, specify the path in the layout file name and check the
-'Render layout as partial' option. The path specified in the layout area will
-not have an underscore, but it will be required in the filename.
+Finally, toggle the visibility using the 'Visible' checkbox. If it is unchecked, the page will not
+be available.
 
-Also note the availability of the render_snippet helper which finds a page by
-its slug and renders the raw page body anywhere in your view.
+## Development
 
-### Options
+### Testing the extension
+
+First bundle your dependencies, then run `bin/rake`. `bin/rake` will default to building the dummy
+app if it does not exist, then it will run specs. The dummy app can be regenerated by using
+`bin/rake extension:test_app`.
+
+```shell
+bundle
+bin/rake
+```
+
+To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
+
+```shell
+bundle exec rubocop
+```
 
-Use the 'Show in' checkboxes to specify whether to display the page links in the
-header, footer or sidebar. The position setting alters the order in which they
-appear.
+When testing your application's integration with this extension you may use its factories.
+Simply add this require statement to your spec_helper:
 
-Finally, toggle the visibility using the 'Visible' checkbox. If it is unchecked,
-the page will not be available.
+```ruby
+require 'solidus_static_content/factories'
+```
 
+### Running the sandbox
 
-## Contributing
+To run this extension in a sandboxed Solidus application, you can run `bin/sandbox`. The path for
+the sandbox app is `./sandbox` and `bin/rails` will forward any Rails commands to
+`sandbox/bin/rails`.
 
-In the spirit of [free software][2], **everyone** is encouraged to help improve
-this project.
+Here's an example:
 
-Here are some ways *you* can contribute:
+```shell
+$ bin/rails server
+=> Booting Puma
+=> Rails 6.0.2.1 application starting in development
+* Listening on tcp://127.0.0.1:3000
+Use Ctrl-C to stop
+```
 
-* by using prerelease versions
-* by reporting [bugs][3]
-* by suggesting new features
-* by writing translations
-* by writing or editing documentation
-* by writing specifications
-* by writing code (*no patch is too small*: fix typos, add comments, clean up inconsistent whitespace)
-* by refactoring code
-* by resolving [issues][3]
-* by reviewing patches
+### Releasing new versions
 
-Starting point:
+Your new extension version can be released using `gem-release` like this:
 
-* Fork the repo
-* Clone your repo
-* Run `bundle install`
-* Run `bundle exec rake test_app` to create the test application in `spec/test_app`
-* Make your changes
-* Ensure specs pass by running `bundle exec rspec spec`
-* Submit your pull request
+```shell
+bundle exec gem bump -v VERSION --tag --push --remote upstream && gem release
+```
 
-Copyright (c) 2014 [Peter Berkenbosch][4] and [contributors][5], released under the [New BSD License][6]
+## License
 
-[1]: https://github.com/spree-contrib/spree_static_content/
-[2]: http://www.fsf.org/licensing/essays/free-sw.html
-[3]: https://github.com/solidusio-contrib/solidus_static_content/issues
-[4]: https://github.com/peterberkenbosch
-[5]: https://github.com/solidusio-contrib/solidus_static_content/graphs/contributors
-[6]: ./LICENSE.md
-[7]: https://solidus.io/
+Copyright (c) 2014 [Peter Berkenbosch](https://github.com/peterberkenbosch) and
+[contributors](https://github.com/solidusio-contrib/solidus_static_content/graphs/contributors),
+released under the New BSD License.

data/Rakefile

@@ -1,15 +1,6 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+# frozen_string_literal: true
 
-require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'solidus_dev_support/rake_tasks'
+SolidusDevSupport::RakeTasks.install
 
-RSpec::Core::RakeTask.new
-
-task :default => [:spec]
-
-desc "Generates a dummy app for testing"
-task :test_app do
-  ENV['LIB_NAME'] = 'solidus_static_content'
-  Rake::Task['common:test_app'].invoke
-end
+task default: 'extension:specs'

data/app/assets/stylesheets/spree/frontend/solidus_static_content.css

@@ -0,0 +1,7 @@
+/* Sidebar */
+nav#pages .pages-root {
+  text-transform: uppercase;
+  border-bottom: 1px solid rgb(217, 217, 219);
+  margin-bottom: 5px;
+  font-size: 14px;
+}

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

@@ -1,7 +1,2 @@
-/* Sidebar */
-nav#pages .pages-root {
-  text-transform: uppercase;
-  border-bottom: 1px solid rgb(217, 217, 219);
-  margin-bottom: 5px;
-  font-size: 14px;
-}
+/*  DEPRECATED: Delegate to the solidus namespaced file */
+/* = require spree/frontend/solidus_static_content */

data/app/models/solidus_static_content/permission_sets/page_display.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  module PermissionSets
+    class PageDisplay < Spree::PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::Page
+      end
+    end
+  end
+end