effective_pages 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffac68aca6d5b8bf6eb6d49addc6440cf029d784f084e6aad1b61c5be9c6134
-  data.tar.gz: 65199de9b7977a8ca49da7804419e2b4dda375e119005e82c9617e7f8a4812d2
+  metadata.gz: 41e4524f61448f30e7c0f746a97f5bedca824d2cbabd20843c33ccf494ba3abd
+  data.tar.gz: 3bb6fc1fabc93d7dfd68508d546bb021a8060d5c6a1bf1cc96a40f89b2fbd220
 SHA512:
-  metadata.gz: 778e6319b2a2ea1d3aeb77d581e7646f0e2899ba65140c029cd537683596543f1c182ed2ba3a4d155acff1eaf5e4b850674255ff2cae17e436ec24db27e736ee
-  data.tar.gz: eeffa1a33cdba787cfe34cb1658683dd416d1c9988012d229ee80ad3036d058eaf919a0c5726373bfcfd924837e47b5985bccae9c6a5aab8888dd909334546d3
+  metadata.gz: c1e667eb86d0bbbe5bb0baa8f098c9cc02f3509392d926ab1eeb33e92ad5504dff2342c44b16e07fc6e6df685b90a44bea229c37c3e397890502afaf317ea2c7
+  data.tar.gz: ece1510127050a09a8a6d0ff2324f4f063c19574f5a8cf3980d0664be768d5434fd4660f9d0da2e7a8c98566f5615a6d7f10dc3c9a8dbb4a7b8c9d446f509586

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,15 +1,12 @@
 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])
 
-      raise ActiveRecord::RecordNotFound unless @page.present? # Incase .find() isn't raising it
-      raise Effective::AccessDenied unless @page.roles_permit?(current_user)
-
-      EffectivePages.authorized?(self, :show, @page)
+      EffectiveResources.authorize!(self, :show, @page)
 
       @page_title = @page.title
       @meta_description = @page.meta_description

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

@@ -5,7 +5,6 @@ module Effective
     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/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.2.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

data/lib/effective_pages.rb

@@ -1,3 +1,4 @@
+require 'effective_resources'
 require 'effective_datatables'
 require 'effective_regions'
 require 'effective_roles'
@@ -6,39 +7,18 @@ 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.templates
     ApplicationController.view_paths.map { |path| Dir["#{path}/#{pages_path}/**"] }.flatten.reverse.map do |file|
@@ -67,8 +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
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -119,6 +119,7 @@ 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.scss
@@ -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
@@ -207,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
@@ -222,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-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.

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