effective_pages 1.3.2 → 2.0.0

data/lib/effective_pages.rb

@@ -1,24 +1,58 @@
-require 'effective_resources'
 require 'effective_datatables'
 require 'effective_regions'
 require 'effective_roles'
-require 'effective_slugs'
 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
 
-  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
-    ]
+  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 :layout
+  mattr_accessor :menu
+
+  def self.setup
+    yield self
+  end
+
+  def self.authorized?(controller, action, resource)
+    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
+
+    return !!authorization_method unless authorization_method.respond_to?(:call)
+    controller = controller.controller if controller.respond_to?(:controller)
+
+    begin
+      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
+    rescue *@_exceptions
+      false
+    end
   end
 
-  include EffectiveGem
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
+  end
+
+  # Remove leading and trailing '/' characters
+  #  Will return:  "effective/pages"
+  def self.pages_path=(filepath)
+    filepath = filepath.to_s
+    filepath = filepath[1..-1] if filepath.starts_with?('/')
+    @@pages_path = filepath.chomp('/')
+  end
 
   def self.templates
     ApplicationController.view_paths.map { |path| Dir["#{path}/#{pages_path}/**"] }.flatten.reverse.map do |file|
@@ -39,12 +73,8 @@ module EffectivePages
     end.compact
   end
 
-  # Remove leading and trailing '/' characters
-  #  Will return:  "effective/pages"
-  def self.pages_path=(filepath)
-    filepath = filepath.to_s
-    filepath = filepath[1..-1] if filepath.starts_with?('/')
-    @@pages_path = filepath.chomp('/')
+  def self.permitted_params
+    @@permitted_params ||= [:title, :meta_description, :draft, :layout, :template, :slug, roles: []]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,92 +24,63 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: sassc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: effective_ckeditor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: effective_regions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_roles
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_slugs
+  name: effective_roles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
-description: Content pages, bootstrap3 menu builder and page-specific header tag helpers
-  for your Rails app.
+        version: '0'
+description: Content pages for your rails app
 email:
 - info@codeandeffect.com
 executables: []
@@ -118,11 +89,6 @@ extra_rdoc_files: []
 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
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
@@ -132,6 +98,7 @@ 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/menu.rb
 - app/models/effective/menu_item.rb
 - app/models/effective/page.rb
@@ -147,7 +114,6 @@ files:
 - app/views/admin/menus/show.html.haml
 - app/views/admin/pages/_actions.html.haml
 - app/views/admin/pages/_additional_fields.html.haml
-- app/views/admin/pages/_asset_box_fields.html.haml
 - app/views/admin/pages/_form.html.haml
 - app/views/admin/pages/edit.html.haml
 - app/views/admin/pages/index.html.haml
@@ -161,51 +127,11 @@ files:
 - lib/generators/effective_pages/install_generator.rb
 - lib/generators/templates/example.html.haml
 - lib/tasks/effective_pages_tasks.rake
-- spec/controllers/effective/pages_controller_spec.rb
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/effective/pages/example.html.haml
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/01_create_effective_pages.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- 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
-- spec/models/effective/menu_spec.rb
-- spec/spec_helper.rb
-- spec/support/factories.rb
 homepage: https://github.com/code-and-effect/effective_pages
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -220,49 +146,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
-summary: Content pages, bootstrap3 menu builder and page-specific header tag helpers
-  for your Rails app.
-test_files:
-- spec/spec_helper.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/effective/pages/example.html.haml
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- 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
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/db/migrate/01_create_effective_pages.rb
-- spec/dummy/README.rdoc
-- spec/models/effective/menu_spec.rb
-- spec/support/factories.rb
-- spec/controllers/effective/pages_controller_spec.rb
-- spec/effective_pages_spec.rb
-- spec/helpers/effective_menus_helper_spec.rb
+summary: Content pages for your rails app
+test_files: []

data/Rakefile

@@ -1,24 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# Our tasks
-load 'lib/tasks/effective_pages_tasks.rake'
-
-# Testing tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-require "bundler/vendored_thor"
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-
-task :default => :spec

data/app/assets/config/effective_pages_manifest.js

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

data/app/assets/stylesheets/effective_pages/dropdown-submenu.scss

@@ -1,7 +0,0 @@
-/* http://www.bootply.com/71520 */
-li.dropdown > ul.dropdown-menu > li.dropdown{position:relative;}
-li.dropdown > ul.dropdown-menu > li.dropdown>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
-li.dropdown > ul.dropdown-menu > li.dropdown:hover>.dropdown-menu{display:block;}
-li.dropdown > ul.dropdown-menu > li.dropdown>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;}
-li.dropdown > ul.dropdown-menu > li.dropdown:hover>a:after{border-left-color:#ffffff;}
-li.dropdown > ul.dropdown-menu > li.dropdown.pull-left{float:none;}li.dropdown > ul.dropdown-menu > li.dropdown.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;}

data/app/assets/stylesheets/effective_pages.scss

@@ -1 +0,0 @@
-@import 'effective_pages/dropdown-submenu';

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

@@ -1,2 +0,0 @@
-- Effective::Page.new().asset_boxes.each do |asset_box, opts|
-  = form.input asset_box, as: :asset_box, required: (opts.present?), hint: "The #{asset_box.to_s.titleize.downcase} of your page."

data/spec/controllers/effective/pages_controller_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Effective::PagesController do
-  routes { EffectivePages::Engine.routes }
-
-  let(:page) { FactoryGirl.create(:page) }
-  let(:draft) { FactoryGirl.create(:page, :draft => true) }
-  let(:page_with_invalid_template) { FactoryGirl.create(:page, :template => 'notemplate') }
-  let(:page_with_invalid_layout) { FactoryGirl.create(:page, :layout => 'nolayout') }
-
-  before (:each) do
-  end
-
-  context "#show" do
-    context 'valid requests' do
-      it 'raises RecordNotFound when the page is a draft' do
-        expect {
-          get :show, :id => draft.id
-        }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-
-      it 'renders a draft page when edit=true is passed' do
-        get :show, :id => draft.id, :edit => true
-
-        response.should be_success
-      end
-
-      it 'renders the appropriate page template' do
-        get :show, :id => page.id
-
-        expect(response).to render_template('layouts/application')
-        expect(response).to render_template('effective/pages/example')
-      end
-    end
-
-    context 'invalid requests' do
-      it 'raises RecordNotFound when passed invalid ID' do
-        expect { get :show, :id => 999 }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-
-      it 'raises MissingTemplate when the page has an unknown template' do
-        expect {
-          get :show, :id => page_with_invalid_template.id
-        }.to raise_error(ActionView::MissingTemplate)
-      end
-
-      it 'raises MissingTemplate when the page has an unknown layout' do
-        expect {
-          get :show, :id => page_with_invalid_layout.id
-        }.to raise_error(ActionView::MissingTemplate)
-      end
-    end
-
-    context 'authentication' do
-      it 'prevents the page from being viewed when not authorized' do
-        original_auth_method = EffectivePages.authorization_method
-        EffectivePages.authorization_method = Proc.new { |controller, action, resource| false }
-
-        expect { get :show, :id => page.id }.to raise_error(Effective::AccessDenied)
-
-        EffectivePages.authorization_method = original_auth_method
-      end
-    end
-  end # /show
-
-end