effective_pages 1.1.9 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 10232000ebdfe564ff4a0ef275a2dd2de7286f88
-  data.tar.gz: fd42311db48022159ba9c363ed92b13d09e0d675
+SHA256:
+  metadata.gz: 8fb3aea6d94ec45d0c366ab6fe818d1bb2979bb59d2d88d9f194e7d0dd212682
+  data.tar.gz: 4cb2f4ac2f0a63ab3d1c2635815b1b5b0e80ca5d3eed2d0acc5d4390285144b3
 SHA512:
-  metadata.gz: b667a9f24a264ea2bcde76dab7be3553954a6237e0662e67d3f362de960b522620cfe81bf6cb482a29c60ce4a657225999d0ea0e627536775d2660a5a3939ba2
-  data.tar.gz: 526e8332b63783c119efc1a52ac995d20c6db4f0a2ab67c990c09ed2852fb7f8f70ebebdcd0f684842cec7f85314cfc4908459bc8739ba8775fcb6f3a891d352
+  metadata.gz: 10ae029db472e823b42500407aa201caf9ffd615b8845622cc2d9c3c71d414ce7db7aeb3fb2be5c2ef573c17e62f977e7d7b5eb4adb4720f556a5500142e9c7c
+  data.tar.gz: 76b70355bf3982f0fad8e0ff39d4b5b8da882f790acfbe8f28e9de3c7f1080f897ca000876aa0858336944731ee375153e91a1245a9a4194c6ac6a7bc0f9b51e

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -15,9 +15,9 @@ Rails 3.2.x and 4.x
 
 ## Bootstrap3
 
-This is the `bootstrap3` branch of effective_datatables which supports Twitter Bootstrap 3.
+This is the `bootstrap3` branch of effective_pages which supports Twitter Bootstrap 3.
 
-All published effective_datatables 3.x gems will support Twitter Bootstrap 3 and SimpleForm.
+All published effective_pages 1.x gems will support Twitter Bootstrap 3 and SimpleForm.
 
 For Bootstrap 4 please see the master branch and/or effective_pages 2.x gems.
 
@@ -438,5 +438,3 @@ guard
 4. Push to the branch (`git push origin my-new-feature`)
 5. Bonus points for test coverage
 6. Create new Pull Request
-
-

data/app/assets/config/effective_pages_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/app/controllers/admin/menus_controller.rb

@@ -1,18 +1,13 @@
 module Admin
   class MenusController < ApplicationController
-    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
+    before_action(:authenticate_user!)
 
     helper EffectiveMenusAdminHelper
 
     layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
 
     def index
-      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-        @datatable = Effective::Datatables::Menus.new()
-      else
-        @datatable = EffectiveMenusDatatable.new(self)
-      end
-
+      @datatable = EffectiveMenusDatatable.new(self)
       @page_title = 'Menus'
 
       authorize_effective_menus!
@@ -50,12 +45,12 @@ module Admin
     private
 
     def authorize_effective_menus!
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, action_name.to_sym, @menu || Effective::Menu)
+      EffectiveResources.authorize!(self, :admin, :effective_pages)
+      EffectiveResources.authorize!(self, action_name.to_sym, @menu || Effective::Menu)
     end
 
     def menu_params
-      params.require(:effective_menu).permit(:title)
+      params.require(:effective_menu).permit!
     end
 
   end

data/app/controllers/admin/pages_controller.rb

@@ -1,16 +1,11 @@
 module Admin
   class PagesController < ApplicationController
-    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
+    before_action(:authenticate_user!) # Devise
 
     layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
 
     def index
-      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-        @datatable = Effective::Datatables::Pages.new()
-      else
-        @datatable = EffectivePagesDatatable.new(self)
-      end
-
+      @datatable = EffectivePagesDatatable.new(self)
       @page_title = 'Pages'
 
       authorize_effective_pages!
@@ -89,12 +84,12 @@ module Admin
     private
 
     def authorize_effective_pages!
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, action_name.to_sym, @page|| Effective::Page)
+      EffectiveResources.authorize!(self, :admin, :effective_pages)
+      EffectiveResources.authorize!(self, action_name.to_sym, @page|| Effective::Page)
     end
 
     def page_params
-      params.require(:effective_page).permit(EffectivePages.permitted_params)
+      params.require(:effective_page).permit!
     end
 
   end

data/app/controllers/effective/pages_controller.rb

@@ -1,7 +1,7 @@
 module Effective
   class PagesController < ApplicationController
     def show
-      @pages = (Rails::VERSION::MAJOR > 3 ? Effective::Page.all : Effective::Page.scoped)
+      @pages = Effective::Page.all
       @pages = @pages.published unless (params[:edit] || params[:preview])
 
       @page = @pages.find(params[:id])

data/app/datatables/effective_menus_datatable.rb

@@ -1,18 +1,16 @@
-unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  class EffectiveMenusDatatable < Effective::Datatable
+class EffectiveMenusDatatable < Effective::Datatable
 
-    datatable do
-      col :id, visible: false
-      col :updated_at, visible: false
+  datatable do
+    col :id, visible: false
+    col :updated_at, visible: false
 
-      col :title
+    col :title
 
-      actions_col partial: 'admin/menus/actions', partial_as: :menu
-    end
-
-    collection do
-      Effective::Menu.all
-    end
+    actions_col partial: 'admin/menus/actions', partial_as: :menu
+  end
 
+  collection do
+    Effective::Menu.all
   end
+
 end

data/app/datatables/effective_pages_datatable.rb

@@ -1,23 +1,21 @@
-unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  class EffectivePagesDatatable < Effective::Datatable
+class EffectivePagesDatatable < Effective::Datatable
 
-    datatable do
-      order :title, :asc
-      length :all
+  datatable do
+    order :title, :asc
+    length :all
 
-      col :id, visible: false
-      col :updated_at, visible: false
+    col :id, visible: false
+    col :updated_at, visible: false
 
-      col :title
-      col :slug
-      col :draft
+    col :title
+    col :slug
+    col :draft
 
-      actions_col partial: 'admin/pages/actions', partial_as: :page
-    end
-
-    collection do
-      Effective::Page.all
-    end
+    actions_col partial: 'admin/pages/actions', partial_as: :page
+  end
 
+  collection do
+    Effective::Page.all
   end
+
 end

data/app/models/effective/menu.rb

@@ -2,8 +2,9 @@ module Effective
   class Menu < ActiveRecord::Base
     has_many :menu_items, dependent: :delete_all
 
+    acts_as_role_restricted
+
     self.table_name = EffectivePages.menus_table_name.to_s
-    attr_protected() if Rails::VERSION::MAJOR == 3
 
     # structure do
     #   title           :string

data/app/models/effective/menu_item.rb

@@ -3,7 +3,7 @@ module Effective
     attr_accessor :parent  # This gets set on the Root node and a node created by Dropdown, so the item function knows whether to go down or to go accross
 
     belongs_to :menu, inverse_of: :menu_items
-    belongs_to :menuable, polymorphic: true # Optionaly belong to an object
+    belongs_to :menuable, polymorphic: true, optional: true # Optionaly belong to an object
 
     self.table_name = EffectivePages.menu_items_table_name.to_s
     attr_protected() if Rails::VERSION::MAJOR == 3

data/app/views/admin/pages/_form.html.haml

@@ -13,15 +13,15 @@
 
   = f.input :meta_description, hint: "A one or two sentence summary of this page. Appears on Google search results underneath the page title.", input_html: { maxlength: 150 }
 
-  - if EffectivePages.pages.length == 1
-    = f.input :template, as: :hidden, input_html: { value: EffectivePages.pages.first.first }
+  - if (templates = EffectivePages.templates).length == 1
+    = f.hidden_field :template, value: templates.first
   - else
-    = f.input :template, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: EffectivePages.pages, include_blank: false
+    = f.input :template, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: templates
 
-  - if EffectivePages.layouts.length == 1
-    = f.input :layout, as: :hidden, value: EffectivePages.layouts.first
+  - if (layouts = EffectivePages.layouts).length == 1
+    = f.hidden_field :layout, value: layouts.first
   - else
-    = f.input :layout, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: EffectivePages.layouts, include_blank: false
+    = f.input :layout, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: layouts
 
   - if f.object.respond_to?(:roles)
     = f.input :roles, collection: EffectiveRoles.roles_collection(f.object), as: :check_boxes, hint: '* leave blank for a regular public page that anyone can view'

data/config/effective_pages.rb

@@ -43,28 +43,6 @@ EffectivePages.setup do |config|
   #config.acts_as_asset_box = header_image: true
   #config.acts_as_asset_box = { header_image: true, body_images: 1..4 }
 
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
-  #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
-  #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
-  #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
-  # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) && resource.roles_permit?(current_user) } # CanCanCan
-  # Use effective_roles:  resource.roles_permit?(current_user)
-
   # Layout Settings
   # Configure the Layout per controller, or all at once
 

data/lib/effective_pages/engine.rb

@@ -12,15 +12,5 @@ module EffectivePages
       eval File.read("#{config.root}/config/effective_pages.rb")
     end
 
-    initializer 'effective_pages.effective_assets_validation', after: :load_config_initializers do
-      if EffectivePages.acts_as_asset_box
-        begin
-          require 'effective_assets'
-        rescue Exception
-          raise "unable to load effective_assets.  Plese add gem 'effective_assets' to your Gemfile and then 'bundle install'"
-        end
-      end
-    end
-
   end
 end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '1.1.9'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/effective_pages.rb

@@ -1,3 +1,4 @@
+require 'effective_resources'
 require 'effective_datatables'
 require 'effective_regions'
 require 'effective_roles'
@@ -6,46 +7,36 @@ require 'effective_pages/engine'
 require 'effective_pages/version'
 
 module EffectivePages
-  mattr_accessor :pages_table_name
-  mattr_accessor :menus_table_name
-  mattr_accessor :menu_items_table_name
 
-  mattr_accessor :pages_path
-  mattr_accessor :excluded_pages
-  mattr_accessor :excluded_layouts
-
-  mattr_accessor :site_og_image
-  mattr_accessor :site_title
-  mattr_accessor :site_title_suffix
-  mattr_accessor :fallback_meta_description
-
-  mattr_accessor :silence_missing_page_title_warnings
-  mattr_accessor :silence_missing_meta_description_warnings
-
-  mattr_accessor :authorization_method
-  mattr_accessor :simple_form_options
-  mattr_accessor :layout
-  mattr_accessor :menu
-
-  mattr_accessor :acts_as_asset_box
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [
+      :pages_table_name, :menus_table_name, :menu_items_table_name,
+      :pages_path, :excluded_pages, :excluded_layouts,
+      :site_og_image, :site_title, :site_title_suffix, :fallback_meta_description,
+      :silence_missing_page_title_warnings, :silence_missing_meta_description_warnings,
+      :simple_form_options, :layout, :menu, :acts_as_asset_box
+    ]
   end
 
-  def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
-    end
-    true
-  end
+  include EffectiveGem
 
-  def self.pages
-    Rails.env.development? ? read_pages : (@@pages ||= read_pages)
+  def self.templates
+    ApplicationController.view_paths.map { |path| Dir["#{path}/#{pages_path}/**"] }.flatten.reverse.map do |file|
+      name = File.basename(file).split('.').first
+      next if name.starts_with?('_')
+      next if Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
+      name
+    end.compact
   end
 
   def self.layouts
-    Rails.env.development? ? read_layouts : (@@layouts ||= read_layouts)
+    ApplicationController.view_paths.map { |path| Dir["#{path}/layouts/**"] }.flatten.reverse.map do |file|
+      name = File.basename(file).split('.').first
+      next if name.starts_with?('_')
+      next if name.include?('mailer')
+      next if Array(EffectivePages.excluded_layouts).map { |str| str.to_s }.include?(name)
+      name
+    end.compact
   end
 
   # Remove leading and trailing '/' characters
@@ -56,38 +47,4 @@ module EffectivePages
     @@pages_path = filepath.chomp('/')
   end
 
-  def self.permitted_params
-    @@permitted_params ||= [:title, :meta_description, :draft, :layout, :template, :slug, (EffectiveAssets.permitted_params if EffectivePages.acts_as_asset_box), roles: []].compact
-  end
-
-  private
-
-  def self.read_pages
-    files = ApplicationController.view_paths.map { |path| Dir["#{path}/#{pages_path}/**"] }.flatten.reverse
-
-    HashWithIndifferentAccess.new().tap do |pages|
-      files.each do |file|
-        name = File.basename(file).split('.').first
-        next if name.starts_with?('_') || Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
-
-        pages[name.to_sym] = {}
-      end
-    end
-  end
-
-  def self.read_layouts
-    files = ApplicationController.view_paths.map { |path| Dir["#{path}/layouts/**"] }.flatten.reverse
-
-    HashWithIndifferentAccess.new().tap do |layouts|
-      files.each do |file|
-        name = File.basename(file).split('.').first
-        next if name.starts_with?('_')
-        next if name.include?('mailer')
-        next if Array(EffectivePages.excluded_layouts).map { |str| str.to_s }.include?(name)
-
-        layouts[name.to_sym] = {}
-      end
-    end
-  end
-
 end

data/spec/dummy/spec

@@ -0,0 +1 @@
+../../spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.3.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,9 +119,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/config/effective_pages_manifest.js
 - app/assets/javascripts/effective_pages.js
 - app/assets/stylesheets/effective_pages.scss
-- app/assets/stylesheets/effective_pages/dropdown-submenu.css
+- app/assets/stylesheets/effective_pages/dropdown-submenu.scss
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
@@ -131,9 +132,6 @@ files:
 - app/helpers/effective_menus_admin_helper.rb
 - app/helpers/effective_menus_helper.rb
 - app/helpers/effective_pages_helper.rb
-- app/models/effective/access_denied.rb
-- app/models/effective/datatables/menus.rb
-- app/models/effective/datatables/pages.rb
 - app/models/effective/menu.rb
 - app/models/effective/menu_item.rb
 - app/models/effective/page.rb
@@ -196,6 +194,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/spec
 - spec/dummy/spec_link
 - spec/effective_pages_spec.rb
 - spec/helpers/effective_menus_helper_spec.rb
@@ -206,7 +205,7 @@ homepage: https://github.com/code-and-effect/effective_pages
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,9 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Content pages, bootstrap3 menu builder and page-specific header tag helpers
   for your Rails app.
@@ -251,6 +249,7 @@ test_files:
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
+- spec/dummy/spec
 - spec/dummy/spec_link
 - spec/dummy/script/rails
 - spec/dummy/Rakefile

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end

data/app/models/effective/datatables/menus.rb

@@ -1,19 +0,0 @@
-if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  module Effective
-    module Datatables
-      class Menus < Effective::Datatable
-        datatable do
-          table_column :id, visible: false
-          table_column :updated_at, visible: false
-
-          table_column :title
-          actions_column partial: '/admin/menus/actions'
-        end
-
-        def collection
-          Effective::Menu.all
-        end
-      end
-    end
-  end
-end

data/app/models/effective/datatables/pages.rb

@@ -1,25 +0,0 @@
-if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  module Effective
-    module Datatables
-      class Pages < Effective::Datatable
-        datatable do
-          default_order :title, :asc
-          default_entries :all
-
-          table_column :id, visible: false
-          table_column :updated_at, visible: false
-
-          table_column :title
-          table_column :slug
-          table_column :draft
-
-          actions_column partial: '/admin/pages/actions'
-        end
-
-        def collection
-          Effective::Page.all
-        end
-      end
-    end
-  end
-end