effective_pages 1.0.17 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06060a89741e53a47c0cca1d55400a53f4d5e105
-  data.tar.gz: fe0f7a48af172d1460b58afeaa9226f988f43477
+  metadata.gz: 922310db05a57eef7ef291c30097716e2d81fca8
+  data.tar.gz: c923e43f89d461bf5a2a13cd7051be76a45b748d
 SHA512:
-  metadata.gz: cf7922ca318903f343dce0468e45d14a78dd428d7caf6659633d38fed88dfc1ae3f4589d958754731bbf422e70223b8a401ec973e08e4f409084990dac37d1c5
-  data.tar.gz: 4b3214cf3574c17e5081a698ca5c84b0dca5415b5790904e968b3b761953aef95e3f0cd0a6ef2e30f1deac74516bc07c8401131902d7f612d53aec2559c9981b
+  metadata.gz: be05a9ddedd4958b5be1f04266f27aa9097d8f079caa5048c8ba31c4bdf4b4769457bcb7e85481dbb39b3d043268c11298104b15b685f1b69b982eb8e15ed06e
+  data.tar.gz: 251b3d2b50834499f591137cb65db4bf7de386424d26e9a482e753d8d2cb355217e72c1e3fee931a3bcca78cb4b79576123b0665861faae2d79f4a1c9209290a

data/README.md

@@ -413,9 +413,6 @@ end
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
-Code and Effect is the product arm of [AgileStyle](http://www.agilestyle.com/), an Edmonton-based shop that specializes in building custom web applications with Ruby on Rails.
-
-
 ## Testing
 
 Run tests by:

data/app/controllers/admin/menus_controller.rb

@@ -10,24 +10,21 @@ module Admin
       @datatable = Effective::Datatables::Menus.new() if defined?(EffectiveDatatables)
       @page_title = 'Menus'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :index, Effective::Menu)
+      authorize_effective_menus!
     end
 
     def new
       @menu = Effective::Menu.new()
       @page_title = 'New Menu'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :new, @menu)
+      authorize_effective_menus!
     end
 
     def create
       @menu = Effective::Menu.new(menu_params)
       @page_title = 'New Menu'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :create, @menu)
+      authorize_effective_menus!
 
       if @menu.save
         flash[:success] = 'Successfully created menu'
@@ -42,16 +39,14 @@ module Admin
       @menu = Effective::Menu.find(params[:id])
       @page_title = 'Edit Menu'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :edit, @menu)
+      authorize_effective_menus!
     end
 
     def update
       @menu = Effective::Menu.find(params[:id])
       @page_title = 'Edit Menu'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :update, @menu)
+      authorize_effective_menus!
 
       if @menu.update_attributes(menu_params)
         flash[:success] = 'Successfully updated menu'
@@ -65,8 +60,7 @@ module Admin
     def destroy
       @menu = Effective::Menu.find(params[:id])
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :destroy, @menu)
+      authorize_effective_menus!
 
       if @menu.destroy
         flash[:success] = 'Successfully deleted menu'
@@ -79,6 +73,11 @@ module Admin
 
     private
 
+    def authorize_effective_menus!
+      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(:title)
     end

data/app/controllers/admin/pages_controller.rb

@@ -5,28 +5,24 @@ module Admin
     layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
 
     def index
+      @datatable = Effective::Datatables::Pages.new() if defined?(EffectiveDatatables)
       @page_title = 'Pages'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :index, Effective::Page)
-
-      @datatable = Effective::Datatables::Pages.new() if defined?(EffectiveDatatables)
+      authorize_effective_pages!
     end
 
     def new
       @page = Effective::Page.new()
       @page_title = 'New Page'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :new, @page)
+      authorize_effective_pages!
     end
 
     def create
       @page = Effective::Page.new(page_params)
       @page_title = 'New Page'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :create, @page)
+      authorize_effective_pages!
 
       if @page.save
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
@@ -47,16 +43,14 @@ module Admin
       @page = Effective::Page.find(params[:id])
       @page_title = 'Edit Page'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :edit, @page)
+      authorize_effective_pages!
     end
 
     def update
       @page = Effective::Page.find(params[:id])
       @page_title = 'Edit Page'
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :update, @page)
+      authorize_effective_pages!
 
       if @page.update_attributes(page_params)
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
@@ -76,8 +70,7 @@ module Admin
     def destroy
       @page = Effective::Page.find(params[:id])
 
-      EffectivePages.authorized?(self, :admin, :effective_pages)
-      EffectivePages.authorized?(self, :destroy, @page)
+      authorize_effective_pages!
 
       if @page.destroy
         flash[:success] = 'Successfully deleted page'
@@ -90,6 +83,11 @@ module Admin
 
     private
 
+    def authorize_effective_pages!
+      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(EffectivePages.permitted_params)
     end

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

@@ -4,7 +4,3 @@
 - if defined?(EffectiveRegions)
   = link_to (effective_regions.edit_path('/')), title: 'Edit Content', 'data-no-turbolink': true, target: '_blank' do
     %span.glyphicon.glyphicon-edit
-
-= link_to effective_pages.admin_menu_path(menu), title: 'Delete', data: { method: :delete, confirm: 'Are you sure?  This menu will be made unavailable.' } do
-  %span.glyphicon.glyphicon-trash
-

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

@@ -2,7 +2,7 @@
   = f.input :title, :hint => "Give this menu a title"
 
   - if defined?(EffectiveRoles)
-    %h3 Menu Item Visibility
+    %h2 Menu Item Visibility
 
     %table.table
       %thead

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

@@ -1,2 +1,3 @@
-%h2= @page_title
-= render :partial => 'form', :as => :menu, :object => @menu
+%h1.effective-admin-heading= @page_title
+
+= render partial: 'form', as: :menu, object: @menu

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

@@ -1,9 +1,3 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
 
-%p.text-right= link_to 'New Menu', effective_pages.new_admin_menu_path, :class => 'btn btn-primary'
-
-= render_datatable @datatable do
-  %p There are no menus
-
-- if @datatable.present?
-  %p.text-right= link_to 'New Menu', effective_pages.new_admin_menu_path, :class => 'btn btn-primary'
+= render_datatable(@datatable)

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

@@ -1,2 +1,3 @@
-%h2= @page_title
-= render :partial => 'form', :as => :menu, :object => @menu
+%h1.effective-admin-heading= @page_title
+
+= render partial: 'form', as: :menu, object: @menu

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

@@ -1,2 +1,3 @@
-%h2= @page_title
-= render :partial => 'form', :as => :page, :object => @page
+%h1.effective-admin-heading= @page_title
+
+= render partial: 'form', as: :page, object: @page

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

@@ -1,9 +1,6 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
 
-%p.text-right= link_to 'New Page', effective_pages.new_admin_page_path, :class => 'btn btn-primary'
+%p.text-right.effective-admin-actions
+  = link_to 'New Page', effective_pages.new_admin_page_path, :class => 'btn btn-primary'
 
-= render_datatable @datatable do
-  %p There are no pages
-
-- if @datatable.present?
-  %p.text-right= link_to 'New Page', effective_pages.new_admin_page_path, :class => 'btn btn-primary'
+= render_datatable(@datatable)

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

@@ -1,2 +1,3 @@
-%h2= @page_title
-= render :partial => 'form', :as => :page, :object => @page
+%h1.effective-admin-heading= @page_title
+
+= render partial: 'form', as: :page, object: @page

data/{lib/generators/templates → config}/effective_pages.rb

@@ -1,5 +1,3 @@
-# EffectivePages Rails Engine
-
 EffectivePages.setup do |config|
   config.pages_table_name = :pages
   config.menus_table_name = :menus
@@ -39,9 +37,27 @@ EffectivePages.setup do |config|
   #config.acts_as_asset_box = header_image: true
   #config.acts_as_asset_box = { header_image: true, body_images: 1..4 }
 
-  # Use CanCan: authorize!(action, resource)
+  # 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)
-  config.authorization_method = Proc.new { |controller, action, resource| true }
 
   # Layout Settings
   # Configure the Layout per controller, or all at once

data/lib/effective_pages/engine.rb

@@ -13,7 +13,7 @@ module EffectivePages
     # Set up our default configuration options.
     initializer "effective_pages.defaults", before: :load_config_initializers do |app|
       # Set up our defaults, as per our initializer template
-      eval File.read("#{config.root}/lib/generators/templates/effective_pages.rb")
+      eval File.read("#{config.root}/config/effective_pages.rb")
     end
 
     initializer 'effective_pages.effective_assets_validation', after: :load_config_initializers do

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '1.0.17'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/generators/effective_pages/install_generator.rb

@@ -3,9 +3,9 @@ module EffectivePages
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      desc "Creates an EffectivePages initializer in your application."
+      desc 'Creates an EffectivePages initializer in your application.'
 
-      source_root File.expand_path("../../templates", __FILE__)
+      source_root File.expand_path('../../templates', __FILE__)
 
       def self.next_migration_number(dirname)
         if not ActiveRecord::Base.timestamped_migrations
@@ -16,7 +16,7 @@ module EffectivePages
       end
 
       def copy_initializer
-        template "effective_pages.rb", "config/initializers/effective_pages.rb"
+        template ('../' * 3) + 'config/effective_pages.rb', 'config/initializers/effective_pages.rb'
       end
 
       def create_migration_file
@@ -24,7 +24,7 @@ module EffectivePages
         @menus_table_name = ':' + EffectivePages.menus_table_name.to_s
         @menu_items_table_name = ':' + EffectivePages.menu_items_table_name.to_s
 
-        migration_template '../../../db/migrate/01_create_effective_pages.rb.erb', 'db/migrate/create_effective_pages.rb'
+        migration_template ('../' * 3) + 'db/migrate/01_create_effective_pages.rb.erb', 'db/migrate/create_effective_pages.rb'
       end
 
       def copy_example_page
@@ -32,7 +32,7 @@ module EffectivePages
       end
 
       def setup_routes
-        inject_into_file "config/routes.rb", "\n  # if you want EffectivePages to render the home / root page\n  # uncomment the following line and create an Effective::Page with slug == 'home' \n  # root :to => 'Effective::Pages#show', :id => 'home'\n", :before => /root (:?)to.*/
+        inject_into_file 'config/routes.rb', "\n  # if you want EffectivePages to render the home / root page\n  # uncomment the following line and create an Effective::Page with slug == 'home' \n  # root :to => 'Effective::Pages#show', :id => 'home'\n", :before => /root (:?)to.*/
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,13 +179,13 @@ files:
 - app/views/admin/pages/edit.html.haml
 - app/views/admin/pages/index.html.haml
 - app/views/admin/pages/new.html.haml
+- config/effective_pages.rb
 - config/routes.rb
 - db/migrate/01_create_effective_pages.rb.erb
 - lib/effective_pages.rb
 - lib/effective_pages/engine.rb
 - lib/effective_pages/version.rb
 - lib/generators/effective_pages/install_generator.rb
-- lib/generators/templates/effective_pages.rb
 - lib/generators/templates/example.html.haml
 - lib/tasks/effective_pages_tasks.rake
 - spec/controllers/effective/pages_controller_spec.rb