effective_pages 1.3.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: afb4f4c713dad16254ce08850d33f4b585b78d11ba55610671f24968ff935079
-  data.tar.gz: 937fe7d81c8d5954842b6c645ad439a191204fb5966c1c213f68a1c5a715ba63
+SHA1:
+  metadata.gz: 34388546575ee3a0145199e8c2fa700e442f1748
+  data.tar.gz: 787258504694e787fb2bd59603f338645d9ba30e
 SHA512:
-  metadata.gz: b25442cb26382208d134b491f9ad9a6a153ed3396c34bd3b2ed5611c42d055e90e9235d059303ee9bcbef968ef585426ec94fbd0de9e35bd76aeebb22bd2092f
-  data.tar.gz: 4dfd30367d586e0333ee3a6f0ad460b8893f179d6c7d3cd98a57efd89ee1a86294880803f5838f7198f253e868f639df29ad9b291d62f22be41123d4ee620c20
+  metadata.gz: 0dbce05dafe053a69e7ea730bfa84661d1e933bea00ba7f6aaed1cb478f834fcf24f473e34ee31dc0b1f38699376214325c6515759df45284a43282600739563
+  data.tar.gz: 22d91f533d7c3fad9f810358d6267890c38c129ea6464955b8c5cc72360962de3a95a01af0fe929b93d147197f36e77accbe5010fc40dcff22e5091092205a0f

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Code and Effect Inc.
+Copyright 2018 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

@@ -1,32 +1,28 @@
 # Effective Pages
 
-Content pages, bootstrap3 menu builder and page-specific header tag helpers for your Rails app.
+Content pages and page-specific header tag helpers for your Rails app.
 
 Create content pages ontop of one or more templates -- just regular Rails views -- that you define and control.
 
-Edit menus with a WYSIWYG drag-and-drop bootstrap3-strict menu builder.
-
 Use this gem to create a fully-functional CMS that provides full or restricted editing for your end users.
 
-Built ontop of effective_regions.
-
-Rails 3.2.x and 4.x
+Built ontop of effective_regions and effective_ckeditor.
 
 
-## Bootstrap3
+## effective_pages 2.0
 
-This is the `bootstrap3` branch of effective_pages which supports Twitter Bootstrap 3.
+This is the 2.0 series of effective_pages.
 
-All published effective_pages 1.x gems will support Twitter Bootstrap 3 and SimpleForm.
+This requires Twitter Bootstrap 4 and Rails 5.1+
 
-For Bootstrap 4 please see the master branch and/or effective_pages 2.x gems.
+Please check out [bootstrap3 branch](https://github.com/code-and-effect/effective_datatables/tree/bootstrap3) for more information using this gem with Bootstrap 3.
 
 
 ## Getting Started
 
 Please first install the [effective_regions](https://github.com/code-and-effect/effective_regions) and [effective_datatables](https://github.com/code-and-effect/effective_datatables) gems.
 
-Please download and install [Twitter Bootstrap3](http://getbootstrap.com)
+Please download and install [Twitter Bootstrap4](http://getbootstrap.com)
 
 Add to your Gemfile:
 
@@ -98,10 +94,10 @@ An example of a two-column layout I like to create is as follows:
     = page.title
 
 .row
-  .col-sm-6
+  .col
     = effective_region page, :left do
       %p this is default left column content
-  .col-sm-6
+  .col
     = effective_region page, :right do
       %p this is default right column content
 ```
@@ -178,179 +174,6 @@ When creating a Page, if you've also installed the [effective_roles](https://git
 
 Use this functionality to create member-only type pages.
 
-
-## Menus
-
-The menus rendered by this gem output strict bootstrap3 (v3.3.2) html.  It is intended for bootstrap3 navbars as well as footer menus, sidebar menus and more.  It outputs the ul tag and all contained li items:
-
-```html
-<ul class="nav navbar-nav">
-...
-</ul>
-```
-
-The bootstrap3 `.active` class will be added to the appropriate li item based on the current page.
-
-
-### Create a menu
-
-Each Effective::Menu object is referred to by its title. The title is unique, so only one `'main menu'` can exist.
-
-To display our first menu, we must create an Effective::Menu object and then render it in the Rails application layout or appropriate view.
-
-To create your first menu, either:
-
-- Visit `/admin/menus` and click `New Menu`.  Give it a title: `'main menu'`.
-
-or
-
-- Run `bundle exec rake effective_pages:seed` to create a menu called `'main menu'` with some placeholder menu items.
-
-then add it to your application layout where you would normally display your site's menu:
-
-```html
-= render_menu('main menu')
-```
-
-or with some additional custom classes rendered on the opening `<ul>` tag
-
-```html
-= render_menu('main menu', :class => 'menu-right')
-```
-
-
-### Editing menu items
-
-Once created and displayed by your application layout, the menu items will be drag-and-drop editable on any page where the menu is present.  This menu editting functionality requires the [effective_regions](https://github.com/code-and-effect/effective_regions) gem.
-
-So to edit the menu, visit any page on your website prefixed with `/edit/`.  This will load the effective_regions editor, and all displayed Effective::Menu menus will have a dotted blue border which indicates it to be an editable region.
-
-NOTE: Right now, the page you visit to edit the menu must contain an effective_region somewhere in a view.  This requirement may be removed in the future.  The menu editor will not work unless at least one effective_region is used somewhere on the page.
-
-Once you're on the edit page and see the dotted blue bordered menus:
-
-- Hover over the menu to click the Add button.
-- Drag-and-drop items around to set their position in the menu.
-- Drag-and-drop a menu item onto the trashcan icon to delete it.
-- Double-click a menu item to bring up a dialog and configure its properties.
-
-The menu item dialog provides all configurable options for each menu item.
-
-A menu item's link can be configured in four different ways:
-
-- Page, links to an Effective::Page object
-- URL, any url you type
-- Route, any rails route, such as destroy_user_session_path, root_path, or events_path
-- Divider, an li with class='divider'
-
-From this dialog, you can also configure permissions and add raw html classes.
-
-Clicking 'Save' from the toolbar will persist the changes you've made to any menus.
-
-
-### Menu building DSL
-
-Menus may also be created programatically.
-
-As an Aside:
-
-- To store the Effective::Menu tree structure, this gem implements the Modified Preorder Tree Traversal algorithm.
-- Check out the [Storing Hierarchial Data in a Database](http://www.sitepoint.com/hierarchical-data-database-2/) guide for background information on this algorithm.
-- You don't have to worry about any lft and rgt values when building menus with this gem.
-
-To create the same tree structure used in the above article:
-
-```ruby
-Effective::Menu.new(:title => 'some menu').build do
-  dropdown 'Fruit' do
-    dropdown 'Red' do
-      item 'Cherry'
-    end
-
-    dropdown 'Yellow' do
-      item 'Banana'
-    end
-  end
-
-  dropdown 'Meat' do
-    item 'Beef'
-    item 'Pork'
-  end
-end.save
-```
-
-and another more advanced example:
-
-```ruby
-Effective::Menu.new(:title => 'main menu').build do
-  dropdown 'About' do
-    item Effective::Page.find_by_title('Who Are We?')
-    divider
-    item Effective::Page.find_by_title('Code of Ethics'), '#', :class => 'nav-indent'
-    item Effective::Page.find_by_title('Entrance Requirements'), '#', :class => 'nav-indent'
-    item Effective::Page.find_by_title('Board and Staff')
-  end
-
-  item 'Portal', :user_portal_path
-  item 'Pay Fees', '/fee_payments/new'
-  item 'Events', :events_path
-
-  dropdown 'Current Members', :roles_mask => 1 do # effective_roles. Only members see this dropdown
-    item Effective::Page.find_by_title('Volunteer Opportunities')
-    item Effective::Page.find_by_title('Mentoring')
-  end
-
-  dropdown 'Account', :signed_in => true do # Only current_user.present? users see this dropdown
-    item 'Site Admin', '/admin', :roles_mask => 3 # effective_roles.  Only admins see this item
-    item 'Account Settings', :user_settings_path
-    divider
-    item 'Downloads', '#'
-    item 'Mentoring Resources', '#'
-    divider
-    item 'Sign Out', :destroy_user_session_path
-  end
-
-  item 'Sign In', :new_user_session_path, :signed_out => true # Only current_user.blank? users see this item
-end.save
-```
-
-The entire DSL consists of just 3 commands:  dropdown, item and divider
-
-with the following valid options:
-
-```ruby
-:signed_in => true|false    # Only signed in (current_user.present?) users see this item
-:signed_out => true|false   # Only signed out (current_user.blank?) users see this item
-:roles_mask => 1            # See effective_roles Bitmask Implementation
-:class => 'custom classes'  # Custom HTML classes
-:new_window => true         # Open link in a new window
-```
-
-### Max Depth
-
-The default max-depth for bootstrap3 menus is 2.  As per the bootstrap3 navbar component, there exist only top level items and top level dropdowns that may contain only li items.  No dropdowns in dropdowns.
-
-This gem has the ability to extend the bootstrap3 functionality and provides support for dropdowns inside dropdowns to any nested depth.
-
-To enable this functionality, require the following stylesheet on the asset pipeline by adding to your application.css:
-
-```ruby
-*= require effective_pages
-```
-
-and change the `config.menu[:maxdepth]` value in the `app/config/initializers/effective_pages.rb` initializer to 3, 4, or even 9999.
-
-### Breadcrumbs
-
-Bootstrap3 breadcrumbs can be generated based on a given menu and page.
-
-```ruby
-= render_breadcrumb(menu, page)
-```
-
-where menu is an `Effective::Menu` object, or the name of a menu, `'main menu'` and page is an `Effective::Page` object, or a string.
-
-
 ## Authorization
 
 All authorization checks are handled via the config.authorization_method found in the `config/initializers/effective_pages.rb` file.
@@ -411,25 +234,14 @@ can [:show], Effective::Page
 
 if user.is?(:admin)
   can :manage, Effective::Page
-  can :manage, Effective::Menu
-
   can :admin, :effective_pages # Can access the admin screens
 end
 ```
 
-
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
-## Testing
-
-Run tests by:
-
-```ruby
-guard
-```
-
 ## Contributing
 
 1. Fork it
@@ -438,3 +250,5 @@ 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/controllers/admin/menus_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class MenusController < ApplicationController
-    before_action(:authenticate_user!)
+    before_action(:authenticate_user!) # Devise
 
     helper EffectiveMenusAdminHelper
 
@@ -45,12 +45,12 @@ module Admin
     private
 
     def authorize_effective_menus!
-      EffectiveResources.authorize!(self, :admin, :effective_pages)
-      EffectiveResources.authorize!(self, action_name.to_sym, @menu || Effective::Menu)
+      EffectivePages.authorized?(self, :admin, :effective_pages)
+      EffectivePages.authorized?(self, action_name.to_sym, @menu || Effective::Menu)
     end
 
     def menu_params
-      params.require(:effective_menu).permit!
+      params.require(:effective_menu).permit(:title)
     end
 
   end

data/app/controllers/admin/pages_controller.rb

@@ -84,12 +84,12 @@ module Admin
     private
 
     def authorize_effective_pages!
-      EffectiveResources.authorize!(self, :admin, :effective_pages)
-      EffectiveResources.authorize!(self, action_name.to_sym, @page|| Effective::Page)
+      EffectivePages.authorized?(self, :admin, :effective_pages)
+      EffectivePages.authorized?(self, action_name.to_sym, @page|| Effective::Page)
     end
 
     def page_params
-      params.require(:effective_page).permit!
+      params.require(:effective_page).permit(EffectivePages.permitted_params)
     end
 
   end

data/app/controllers/effective/pages_controller.rb

@@ -6,12 +6,15 @@ module Effective
 
       @page = @pages.find(params[:id])
 
-      EffectiveResources.authorize!(self, :show, @page)
+      raise ActiveRecord::RecordNotFound unless @page.present? # Incase .find() isn't raising it
+      raise Effective::AccessDenied.new('Access Denied', :show, @page) unless @page.roles_permit?(current_user)
+
+      EffectivePages.authorized?(self, :show, @page)
 
       @page_title = @page.title
       @meta_description = @page.meta_description
 
-      render @page.template, :layout => @page.layout, :locals => {:page => @page}
+      render @page.template, layout: @page.layout, locals: { page: @page }
     end
   end
 end

data/app/datatables/effective_pages_datatable.rb

@@ -8,9 +8,16 @@ class EffectivePagesDatatable < Effective::Datatable
     col :updated_at, visible: false
 
     col :title
-    col :slug
+
+    col :slug do |page|
+      link_to(page.slug, effective_pages.page_path(page), target: '_blank')
+    end
+
     col :draft
 
+    col :layout, visible: false
+    col :tempate, visible: false
+
     actions_col partial: 'admin/pages/actions', partial_as: :page
   end
 

data/app/helpers/effective_menus_helper.rb

@@ -3,7 +3,7 @@ module EffectiveMenusHelper
     menu = Effective::Menu.find_by_title(menu.to_s) if menu.kind_of?(String) || menu.kind_of?(Symbol)
     return "<ul class='nav navbar-nav'><li>Menu '#{menu}' does not exist</li></ul>".html_safe if !menu.present?
 
-    if effectively_editting? && EffectiveResources.authorized?(controller, :edit, menu)
+    if (effectively_editting? && EffectivePages.authorized?(controller, :edit, menu) rescue false)
       options[:menu_id] = menu.id
       form_for(menu, :url => '/') { |form| options[:form] = form }
     end

data/app/models/effective/access_denied.rb

@@ -0,0 +1,17 @@
+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/menu.rb

@@ -2,8 +2,6 @@ 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
 
     # structure do

data/app/models/effective/menu_item.rb

@@ -3,10 +3,9 @@ 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, optional: true # Optionaly belong to an object
+    belongs_to :menuable, polymorphic: true # Optionaly belong to an object
 
     self.table_name = EffectivePages.menu_items_table_name.to_s
-    attr_protected() if Rails::VERSION::MAJOR == 3
 
     acts_as_role_restricted
 

data/app/models/effective/page.rb

@@ -1,12 +1,8 @@
 module Effective
   class Page < ActiveRecord::Base
-    acts_as_sluggable
     acts_as_role_restricted
     acts_as_regionable
-
-    if EffectivePages.acts_as_asset_box.present?
-      acts_as_asset_box [EffectivePages.acts_as_asset_box]
-    end
+    acts_as_slugged
 
     has_many :menu_items, as: :menuable, dependent: :destroy
 
@@ -29,11 +25,18 @@ module Effective
 
     validates :title, presence: true, length: { maximum: 255 }
     validates :meta_description, presence: true, length: { maximum: 150 }
+
     validates :layout, presence: true
     validates :template, presence: true
 
     scope :drafts, -> { where(draft: true) }
     scope :published, -> { where(draft: false) }
+    scope :sorted, -> { order(:title) }
+    scope :except_home, -> { where.not(title: 'Home') }
+
+    def to_s
+      title
+    end
   end
 
 end

data/app/views/admin/menus/_actions.html.haml

@@ -1,6 +1,2 @@
-= link_to effective_pages.admin_menu_path(menu), title: 'Settings' do
-  %span.glyphicon.glyphicon-cog
-
-- if defined?(EffectiveRegions)
-  = link_to (effective_regions.edit_path('/')), title: 'Edit Content', 'data-no-turbolink': true, target: '_blank' do
-    %span.glyphicon.glyphicon-edit
+= dropdown(variation: :dropleft) do
+  = dropdown_link_to 'Settings', effective_pages.admin_menu_path(menu)

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

@@ -1,6 +1,4 @@
-= simple_form_for(menu, (EffectivePages.simple_form_options || {}).merge(:url => (menu.persisted? ? effective_pages.admin_menu_path(menu) : effective_pages.admin_menus_path))) do |f|
-  = f.input :title, :hint => "Give this menu a title"
+= effective_form_with(model: menu, url: (menu.persisted? ? effective_pages.admin_menu_path(menu) : effective_pages.admin_menus_path)) do |f|
+  = f.text_field :title, hint: 'Give this menu a title'
 
-  .pull-right
-    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
-    = link_to 'Cancel', effective_pages.admin_menus_path
+  = f.submit

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

@@ -1,13 +1,7 @@
-= link_to effective_pages.edit_admin_page_path(page.id), title: 'Settings' do
-  %span.glyphicon.glyphicon-cog
-
-= link_to effective_pages.page_path(page, (page.draft? ? {preview: true} : nil)), title: 'View', 'data-no-turbolink': true, target: '_blank' do
-  %span.glyphicon.glyphicon-eye-open
-
-- if defined?(EffectiveRegions)
-  = link_to (effective_regions.edit_path(page)), title: 'Edit Content', 'data-no-turbolink': true, target: '_blank' do
-    %span.glyphicon.glyphicon-edit
-
-= link_to effective_pages.admin_page_path(page.id), title: 'Delete', data: { method: :delete, confirm: 'Are you sure you want to delete? This cannot be undone.' } do
-  %span.glyphicon.glyphicon-trash
+= dropdown(variation: :dropleft) do
+  = dropdown_link_to 'Edit', effective_pages.edit_admin_page_path(page)
+  = dropdown_link_to 'Edit Content', effective_regions.edit_path(page), 'data-no-turbolink': true, target: '_blank'
+  = dropdown_link_to 'View', effective_pages.page_path(page, (page.draft? ? {preview: true} : nil)), 'data-no-turbolink': true, target: '_blank'
 
+  = dropdown_link_to "Delete #{page}", effective_pages.admin_page_path(page),
+    data: { method: :delete, confirm: "Really delete #{page}?" }

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

@@ -1,37 +1,27 @@
-= simple_form_for(page, (EffectivePages.simple_form_options || {}).merge(url: (page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path))) do |f|
-  = f.input :title, hint: 'The title of your page.', input_html: { maxlength: 255 }
-  = f.input :draft, hint: 'Save this page as a draft.  It will not be accessible on the website.'
+= effective_form_with(model: page, url: (page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path)) do |f|
+  = f.text_field :title, hint: 'The title of your page.', input_html: { maxlength: 255 }
+  = f.check_box :draft, label: 'Save this page as a draft.  It will not be accessible on the website.'
 
-  - if !f.object.new_record? || f.object.errors.include?(:slug)
+  - if f.object.persisted? || f.object.errors.include?(:slug)
     - current_url = (effective_pages.page_url(f.object) rescue nil)
-    = f.input :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
-
-  - if EffectivePages.acts_as_asset_box
-    = render partial: '/admin/pages/asset_box_fields', locals: { page: page, form: f, f: f }
+    = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
 
   = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
 
-  = 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 }
+  = f.text_field :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 (templates = EffectivePages.templates).length == 1
     = f.hidden_field :template, value: templates.first
   - else
-    = f.input :template, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: templates
+    = f.select :template, templates
 
   - if (layouts = EffectivePages.layouts).length == 1
     = f.hidden_field :layout, value: layouts.first
   - else
-    = 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'
+    = f.select :layout, layouts
 
-  .form-group
-    .col-xs-12
-      .form-group
-        .pull-right
-          = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
-          - if defined?(EffectiveRegions)
-            = f.button :submit, 'Save and Edit Content', data: { disable_with: 'Saving...' }
-          = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
-          = link_to 'Cancel', effective_pages.admin_pages_path
+  = f.submit do
+    = f.save 'Save'
+    = f.save 'Save and Edit Content'
+    = f.save 'Save and Add New'
+    = link_to 'Cancel', effective_pages.admin_pages_path

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

@@ -1,6 +1,6 @@
 %h1.effective-admin-heading= @page_title
 
 %p.text-right.effective-admin-actions
-  = link_to 'New Page', effective_pages.new_admin_page_path, :class => 'btn btn-primary'
+  = link_to 'New Page', effective_pages.new_admin_page_path, class: 'btn btn-primary'
 
 = render_datatable(@datatable)

data/config/effective_pages.rb

@@ -36,12 +36,27 @@ EffectivePages.setup do |config|
   config.silence_missing_page_title_warnings = false
   config.silence_missing_meta_description_warnings = false
 
-  # Work with EffectiveAssets
-  # The following will be passed into the acts_as_asset_box for the Effective::Page model
-  # The /admin/pages/new form will create the corresponding inputs
-  #config.acts_as_asset_box = :header_image
-  #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
@@ -51,20 +66,6 @@ EffectivePages.setup do |config|
     :admin => 'application'
   }
 
-  # SimpleForm Options
-  # This Hash of options will be passed into any simple_form_for() calls
-  config.simple_form_options = {}
-
-  # config.simple_form_options = {
-  #   :html => {:class => 'form-horizontal'},
-  #   :wrapper => :horizontal_form,
-  #   :wrapper_mappings => {
-  #     :boolean => :horizontal_boolean,
-  #     :check_boxes => :horizontal_radio_and_checkboxes,
-  #     :radio_buttons => :horizontal_radio_and_checkboxes
-  #   }
-  # }
-
   # All effective_page menu options
   config.menu = {
     :apply_active_class => true,  # Add an .active class to the appropriate li item based on current page url

data/config/routes.rb

@@ -1,19 +1,16 @@
-class EffectivePagesRoutingConstraint
+class EffectivePagesConstraint
   def self.matches?(request)
     Effective::Page.find(request.path_parameters[:id] || '/').present? rescue false
   end
 end
 
 EffectivePages::Engine.routes.draw do
-  if defined?(EffectiveDatatables)
-    namespace :admin do
-      resources :pages, except: [:show]
-      resources :menus, only: [:index, :show, :new, :create]
-    end
+  namespace :admin do
+    resources :pages, except: [:show]
   end
 
   scope :module => 'effective' do
-    get '*id' => "pages#show", :constraints => EffectivePagesRoutingConstraint, :as => :page
+    get '*id', to: 'pages#show', constraints: EffectivePagesConstraint, as: :page
   end
 end
 
@@ -24,4 +21,4 @@ Rails.application.routes.append do
   end
 end
 
-#root :to => 'Effective::Pages#show', :id => 'home'
+#root to: 'effective/pages#show', id: 'home'

data/lib/effective_pages/engine.rb

@@ -4,6 +4,10 @@ module EffectivePages
 
     # Include Helpers to base application
     initializer 'effective_pages.action_controller' do |app|
+      ActiveSupport.on_load :action_controller do
+        helper EffectivePagesHelper
+        helper EffectiveMenusHelper
+      end
     end
 
     # Set up our default configuration options.

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '1.3.2'.freeze
+  VERSION = '2.0.0'.freeze
 end