solidus_static_content 1.0.0 → 2.1.0

data/app/models/spree/page.rb

@@ -1,54 +1,53 @@
-class Spree::Page < ActiveRecord::Base
-  default_scope -> { order("position ASC") }
+# frozen_string_literal: true
 
-  has_and_belongs_to_many :stores, :join_table => 'spree_pages_stores'
+module Spree
+  class Page < ApplicationRecord
+    acts_as_list
+    default_scope -> { order("position ASC") }
 
-  validates_presence_of :title
-  validates_presence_of [:slug, :body], :if => :not_using_foreign_link?
-  validates_presence_of :layout, :if => :render_layout_as_partial?
+    has_and_belongs_to_many :stores, join_table: "spree_pages_stores"
 
-  validates :slug, :uniqueness => true, :if => :not_using_foreign_link?
-  validates :foreign_link, :uniqueness => true, :allow_blank => true
+    validates :title, presence: true
+    validates :slug, :body, presence: true, if: :not_using_foreign_link?
+    validates :layout, presence: {if: :render_layout_as_partial?}
+    validates :stores, presence: true
 
-  scope :visible, -> { where(:visible => true) }
-  scope :header_links, -> { where(:show_in_header => true).visible }
-  scope :footer_links, -> { where(:show_in_footer => true).visible }
-  scope :sidebar_links, -> { where(:show_in_sidebar => true).visible }
+    validates :slug, uniqueness: true, if: :not_using_foreign_link?
+    validates :foreign_link, uniqueness: true, allow_blank: true
 
-  scope :by_store, lambda { |store| joins(:stores).where("spree_pages_stores.store_id = ?", store) }
+    before_validation :generate_slug, if: :title?
 
-  before_save :update_positions_and_slug
+    scope :visible, -> { where(visible: true) }
+    scope :header_links, -> { where(show_in_header: true).visible }
+    scope :footer_links, -> { where(show_in_footer: true).visible }
+    scope :sidebar_links, -> { where(show_in_sidebar: true).visible }
+    scope :ordered_by_position, -> { order(:position) }
 
-  def initialize(*args)
-    super(*args)
+    scope :by_store, lambda { |store| joins(:stores).where("spree_pages_stores.store_id = ?", store) }
 
-    last_page = Spree::Page.last
-    self.position = last_page ? last_page.position + 1 : 0
-  end
+    before_save :normalize_slug
 
-  def link
-    foreign_link.blank? ? slug : foreign_link
-  end
+    def link
+      foreign_link.presence || slug
+    end
 
-private
+    def meta_title
+      super.presence || title
+    end
 
-  def update_positions_and_slug
-    # ensure that all slugs start with a slash
-    slug.prepend('/') if not_using_foreign_link? and not slug.start_with? '/'
+    private
 
-    unless new_record?
-      return unless prev_position = Spree::Page.find(self.id).position
-      if prev_position > self.position
-        Spree::Page.where("? <= position AND position < ?", self.position, prev_position).update_all("position = position + 1")
-      elsif prev_position < self.position
-        Spree::Page.where("? < position AND position <= ?", prev_position,  self.position).update_all("position = position - 1")
-      end
+    def normalize_slug
+      # ensure that all slugs start with a slash
+      slug.prepend("/") if not_using_foreign_link? && (!slug.start_with? "/")
     end
 
-    true
-  end
+    def not_using_foreign_link?
+      foreign_link.blank?
+    end
 
-  def not_using_foreign_link?
-    foreign_link.blank?
+    def generate_slug
+      self.slug ||= title.parameterize
+    end
   end
 end

data/app/overrides/solidus_static_content/pages_in_footer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  module PagesInFooter
+    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)
+  end
+end

data/app/overrides/solidus_static_content/pages_in_header.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  module PagesInHeader
+    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)
+  end
+end

data/app/overrides/solidus_static_content/pages_in_sidebar.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  module PagesInSidebar
+    Deface::Override.new(virtual_path: "spree/shared/_sidebar",
+      name: "pages_in_sidebar",
+      insert_bottom: "#sidebar",
+      partial: "spree/static_content/static_content_sidebar",
+      disabled: false)
+  end
+end

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "solidus_static_content"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+$LOAD_PATH.unshift(*Dir["#{__dir__}/../app/*"])
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/r

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+warn %{
+DEPRECATION: bin/r has been replaced by bin/rails-engine, please use that
+command instead.
+}.strip
+
+exec "#{__dir__}/rails-engine"

data/bin/rails

@@ -1,7 +1,8 @@
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree_static_content/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
+if %w[g generate].include? ARGV.first
+  exec "#{__dir__}/rails-engine", *ARGV
+else
+  exec "#{__dir__}/rails-sandbox", *ARGV
+end

data/bin/rails-engine

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/solidus_static_content/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/rails-sandbox

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/sandbox

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+set -e
+
+case "$DB" in
+postgres|postgresql)
+  RAILSDB="postgresql"
+  ;;
+mysql)
+  RAILSDB="mysql"
+  ;;
+sqlite|'')
+  RAILSDB="sqlite3"
+  ;;
+*)
+  echo "Invalid DB specified: $DB"
+  exit 1
+  ;;
+esac
+
+if [ ! -z $SOLIDUS_BRANCH ]
+then
+  BRANCH=$SOLIDUS_BRANCH
+else
+  BRANCH="main"
+fi
+
+extension_name="solidus_static_content"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- "$@"
+}
+
+rm -rf ./sandbox
+rails new sandbox \
+  --database="$RAILSDB" \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-test \
+  --skip-javascript
+
+if [ ! -d "sandbox" ]; then
+  echo 'sandbox rails application failed'
+  exit 1
+fi
+
+# 🔥 Fix for Sprockets error: Ensure the manifest.js file exists
+mkdir -p sandbox/app/assets/config
+cat <<EOF > sandbox/app/assets/config/manifest.js
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+EOF
+
+cd ./sandbox
+cat <<RUBY >> Gemfile
+group :test, :development do
+  platforms :mri do
+    gem 'pry'
+  end
+end
+RUBY
+unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
+unbundled bundle exec rake db:drop db:create
+unbundled bundle exec rails generate solidus:install --payment-method=none --auto-accept "$@"
+unbundled bundle add ${extension_name} --path '../'
+unbundled bundle exec rails generate $extension_name:install --frontend=starter --auto-run-migrations
+
+echo
+echo "🚀 Sandbox app successfully created for ${extension_name}!"
+echo "🚀 Using $RAILSDB and Solidus $BRANCH"
+echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
+echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
+echo "🚀 This app is intended for test purposes."

data/bin/sandbox_rails

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+warn %{
+DEPRECATION: bin/sandbox_rails has been replaced by bin/rails-sandbox, please
+use that command instead.
+}.strip
+
+exec "#{__dir__}/rails-sandbox"

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bin/rake clobber

data/config/locales/de.yml

@@ -30,8 +30,10 @@ de:
     back_to_static_pages_list: "Zurück zu den statischen Seiten Liste"
     page: Seite
     pages: Seiten
-    static_content:
-      static_pages: Statische Seiten
-      new_page: Neue Seite
-      editing_page: Seite bearbeiten
-      link: Link
+    stores: Shops
+    static_pages: Statische Seiten
+    new_page: Neue Seite
+    editing_page: Seite bearbeiten
+    link: Link
+    add_one: Erstelle einen
+

data/config/locales/en.yml

@@ -26,12 +26,13 @@ en:
   spree:
     admin:
       tab:
-        Pages: Pages
+        pages: Pages
     back_to_static_pages_list: "Back to static pages list"
     page: Page
     pages: Pages
-    static_content:
-      static_pages: Static pages
-      new_page: New page
-      editing_page: Editing page
-      link: Link
+    stores: Stores
+    static_pages: Static pages
+    new_page: New page
+    editing_page: Editing page
+    link: Link
+    add_one: Create One

data/config/locales/es-MX.yml

@@ -0,0 +1,38 @@
+---
+es-MX:
+  activerecord:
+    attributes:
+      spree/page:
+        body: Cuerpo
+        foreign_link: Enlace externo (URL)
+        show_in_header: Mostrar en la cabecera
+        show_in_footer: Mostrar en el pie de página
+        layout: Disposición
+        meta_description: "Meta Descripción"
+        meta_keywords: "Meta Palabras"
+        meta_title: "Meta Título"
+        position: Posición
+        render_layout_as_partial: "Renderizar disposición como parciales"
+        show_in_sidebar: "Mostrar en el barra lateral"
+        slug: Slug
+        title: Título
+        visible: Visible
+    models:
+      spree/page:
+        few: Páginas
+        many: Páginas
+        one: Página
+        other: Páginas
+  spree:
+    admin:
+      tab:
+        pages: Páginas
+    back_to_static_pages_list: "Volver a la lista de páginas estáticas"
+    page: Página
+    pages: Páginas
+    stores: Tiendas
+    static_pages: "Páginas estáticas"
+    new_page: "Nueva página"
+    editing_page: "Edición de página"
+    link: Enlace
+    add_one: Crea uno

data/config/locales/es.yml

@@ -30,8 +30,9 @@ es:
     back_to_static_pages_list: "Volver a la lista de páginas estáticas"
     page: Página
     pages: Páginas
-    static_content:
-      static_pages: "Páginas estáticas"
-      new_page: "Nueva página"
-      editing_page: "Edición de página"
-      link: Enlace
+    stores: Tiendas
+    static_pages: "Páginas estáticas"
+    new_page: "Nueva página"
+    editing_page: "Edición de página"
+    link: Enlace
+    add_one: Crea uno

data/config/locales/et.yml

@@ -30,8 +30,9 @@ et:
     back_to_static_pages_list: "Tagasi staatiliste lehtede nimekiri"
     page: Lehekülg
     pages: Leheküljed
-    static_content:
-      static_pages: Leheküljed
-      new_page: Uus lehekülg
-      editing_page: Muudan lehekülge
-      link: Link
+    stores: Kauplustes
+    static_pages: Leheküljed
+    new_page: Uus lehekülg
+    editing_page: Muudan lehekülge
+    link: Link
+    add_one: Loo see

data/config/locales/fr.yml

@@ -30,8 +30,10 @@ fr:
     back_to_static_pages_list: "Retour à la liste des pages statiques"
     page: Page
     pages: Pages
-    static_content:
-      editing_page: "Edition de la page"
-      link: Lien
-      new_page: "Nouvelle page"
-      static_pages: "Pages statiques"
+    stores: Magasins
+    editing_page: "Edition de la page"
+    link: Lien
+    new_page: "Nouvelle page"
+    static_pages: "Pages statiques"
+    add_one: "Créer une"
+

data/config/locales/it.yml

@@ -30,8 +30,9 @@ it:
     back_to_static_pages_list: Torna alla lista delle pagine statiche
     page: Pagina
     pages: Pagine
-    static_content:
-      static_pages: Pagine statiche
-      new_page: Nuova pagina
-      editing_page: Modifica pagina
-      link: Link
+    stores: I negozi
+    static_pages: Pagine statiche
+    new_page: Nuova pagina
+    editing_page: Modifica pagina
+    link: Link
+    add_one: Crearne uno

data/config/locales/nl.yml

@@ -30,8 +30,10 @@ nl:
     back_to_static_pages_list: "Terug naar statische pagina's"
     page: Page
     pages: "Statische pagina's"
-    static_content:
-      editing_page: "Pagina bewerken"
-      link: Link
-      new_page: "Nieuwe pagina"
-      static_pages: "Statische pagina's"
+    stores: Winkel
+    editing_page: "Pagina bewerken"
+    link: Link
+    new_page: "Nieuwe pagina"
+    static_pages: "Statische pagina's"
+    add_one: "Creëer er een"
+

data/config/locales/pl.yml

@@ -32,8 +32,9 @@ pl:
     back_to_static_pages_list: "Powrót do listy stron statycznych"
     page: Strona
     pages: "Strony statyczne"
-    static_content:
-      editing_page: "Edycja strony"
-      link: Odnośnik
-      new_page: "Nowa strona"
-      static_pages: "Strony statyczne"
+    stores: Sklepy
+    editing_page: "Edycja strony"
+    link: Odnośnik
+    new_page: "Nowa strona"
+    static_pages: "Strony statyczne"
+    add_one: "Stworzyć jeden"

data/config/locales/pt-BR.yml

@@ -30,8 +30,9 @@ pt-BR:
     back_to_static_pages_list: "Voltar à lista de páginas estáticas"
     page: Página
     pages: Páginas
-    static_content:
-      editing_page: "Editando página"
-      link: Link
-      new_page: "Nova página"
-      static_pages: "Páginas estáticas"
+    stores: Lojas
+    editing_page: "Editando página"
+    link: Link
+    new_page: "Nova página"
+    static_pages: "Páginas estáticas"
+    add_one: Crie um

data/config/locales/pt.yml

@@ -30,8 +30,10 @@ pt:
     back_to_static_pages_list: "Voltar à lista de páginas estáticas"
     page: Página
     pages: Páginas
-    static_content:
-      editing_page: "Editar página"
-      link: Link
-      new_page: "Nova página"
-      static_pages: "Páginas estáticas"
+    stores: Lojas
+    new_page: "Nova página"
+    editing_page: "Editar página"
+    link: Link
+    new_page: "Nova página"
+    static_pages: "Páginas estáticas"
+    add_one: Crie um

data/config/locales/ro.yml

@@ -24,15 +24,17 @@ ro:
   spree:
     page: Pagină
     pages: Pagine
-    static_content:
-      static_pages: Pagini statice
-      static_pages_desc: Descrierea paginilor statice
-      new_page: Pagină nouă
-      editing_page: Editarea paginii
-      confirm_delete: Sunteți siguri că doriți să ștergeți această pagină?
-      link: Link
-      meta_title: Titlu meta
-      page_navigation_title: Pagini
+    stores: Magazine
+    new_page: Pagină nouă
+    static_pages: Pagini statice
+    static_pages_desc: Descrierea paginilor statice
+    new_page: Pagină nouă
+    editing_page: Editarea paginii
+    confirm_delete: Sunteți siguri că doriți să ștergeți această pagină?
+    link: Link
+    meta_title: Titlu meta
+    page_navigation_title: Pagini
+    add_one: Creeaza una
     back_to_static_pages_list: Înapoi la lista de pagini
     admin:
       tab:

data/config/locales/ru.yml

@@ -27,11 +27,13 @@ ru:
   spree:
     page: "Страница"
     pages: "Страницы"
-    static_content:
-      static_pages: "Статические страницы"
-      new_page: "Новая страница"
-      editing_page: "Редактирование страницы"
-      link: "Ссылка"
+    stores: "магазины"
+    new_page: "Новая страница"
+    static_pages: "Статические страницы"
+    new_page: "Новая страница"
+    editing_page: "Редактирование страницы"
+    link: "Ссылка"
+    add_one: "Создай"
     back_to_static_pages_list: "Назад к списку страниц"
     admin:
       tab:

data/config/locales/sv.yml

@@ -30,8 +30,10 @@ sv:
     back_to_static_pages_list: "Tillbaka till listan med sidor"
     page: Sida
     pages: Sidor
-    static_content:
-      editing_page: "Editera sidan"
-      link: Länk
-      new_page: "Ny sida"
-      static_pages: "Statiska sidor"
+    stores: Butiker
+    new_page: "Ny sida"
+    editing_page: "Editera sidan"
+    link: Länk
+    new_page: "Ny sida"
+    static_pages: "Statiska sidor"
+    add_one: "Skapa en"

data/config/routes.rb

@@ -1,8 +1,18 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   namespace :admin do
-    resources :pages
+    resources :pages do
+      collection do
+        post :update_positions
+      end
+    end
   end
-  constraints(Spree::StaticPage) do
-    get '/(*path)', :to => 'static_content#show', :as => 'static'
+
+  # Check if the layout is not the default layout to avoid conflicts with the starter_frontend routes
+  if Spree::Config.layout != "layouts/storefront"
+    constraints(SolidusStaticContent::RouteMatcher) do
+      get "/(*path)", to: "static_content#show", as: "static"
+    end
   end
 end

data/db/migrate/20081216193152_create_pages.rb

@@ -1,4 +1,6 @@
-class CreatePages < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class CreatePages < SolidusSupport::Migration[4.2]
   def self.up
     create_table :spree_pages do |t|
       t.string :title

data/db/migrate/20090625125735_extend_pages.rb

@@ -1,19 +1,20 @@
-class ExtendPages < ActiveRecord::Migration
-  class Page < ActiveRecord::Base
+# frozen_string_literal: true
+
+class ExtendPages < SolidusSupport::Migration[4.2]
+  class Page < ApplicationRecord
   end
 
   def self.up
     change_table :spree_pages do |t|
-      t.boolean :show_in_header, :default => false, :null => false
-      t.boolean :show_in_footer, :default => false, :null => false
-      t.string  :foreign_link
-      t.integer :position, :default => 1, :null => false
+      t.boolean :show_in_header, default: false, null: false
+      t.boolean :show_in_footer, default: false, null: false
+      t.string :foreign_link
+      t.integer :position, default: 1, null: false
       if Page.table_exists?
-        Page.order(:updated_at).each_with_index{|page,x| page.update_attribute(:position, x+1)}
+        Page.order(:updated_at).each_with_index { |page, x| page.update_attribute(:position, x + 1) }
       else
-        Spree::Page.order(:updated_at).each_with_index{|page,x| page.update_attribute(:position, x+1)}
+        Spree::Page.order(:updated_at).each_with_index { |page, x| page.update_attribute(:position, x + 1) }
       end
-
     end
   end