effective_pages 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 630627be0f26cceb988f5660a4bf176f8ec872e2
-  data.tar.gz: 2c21cad992101767adfd4ca8c4eeb9f304a11c78
+  metadata.gz: a262f391f673a4b0d27dca076bbc5cfc306547e1
+  data.tar.gz: 796159e1cdd9cbfea0e09a534f7bfa5a1ae97e56
 SHA512:
-  metadata.gz: 27d32f78c747f9e58c51ec8fbb7a695a640386fc84d6e0ba04263534232e3789d806dfe379db2ce333466d9bc817867ed234db9f21464f978d71b953704dc40a
-  data.tar.gz: 8f543b3f254c9b0b62ae8f7ff7a968424f53538c7d36e459a9426b6699de0006dec22af92ceb3440a93d876f29a25a3c185f6f05fa70736232c94c062f71e2c7
+  metadata.gz: 5e7bc28fd83ff3f5b923c5848d5c52cad7bc7f7dd476916b39a530e6ed1f6668536f2c81adf9d4b3c43469126bfa9dc65ea55e65f267a51c40cc0008c6669fbb
+  data.tar.gz: f0e511ec45b3c4cefac7087f74beae2856261a2a21eb2a32c920d6f9fbbc0a96c3b45943395405fe5125ce79a3a774bf272909a423cc260c56abd43e3d9af513

data/app/controllers/admin/pages_controller.rb

@@ -84,9 +84,7 @@ module Admin
     private
 
     def page_params
-      params.require(:effective_page).permit(
-        :title, :meta_description, :draft, :layout, :template, :slug, :roles => []
-      )
+      params.require(:effective_page).permit(EffectivePages.permitted_params)
     end
 
   end

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

@@ -6,7 +6,7 @@ if defined?(EffectiveDatatables)
           table_column :id
 
           table_column :title
-          table_column :actions, :sortable => false, :filter => false, :partial => '/admin/menus/actions'
+          table_column :actions, sortable: false, filter: false, partial: '/admin/menus/actions'
         end
 
         def collection

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

@@ -6,13 +6,13 @@ if defined?(EffectiveDatatables)
           default_order :title, :asc
           default_entries :all
 
-          table_column :id, :visible => false
+          table_column :id, visible: false
 
           table_column :title
           table_column :slug
           table_column :draft
 
-          table_column :actions, :sortable => false, :filter => false, :partial => '/admin/pages/actions'
+          table_column :actions, sortable: false, filter: false, partial: '/admin/pages/actions'
         end
 
         def collection

data/app/models/effective/menu.rb

@@ -1,20 +1,22 @@
 module Effective
   class Menu < ActiveRecord::Base
-    has_many :menu_items, :dependent => :delete_all
+    has_many :menu_items, dependent: :delete_all
 
     self.table_name = EffectivePages.menus_table_name.to_s
     attr_protected() if Rails::VERSION::MAJOR == 3
 
-    structure do
-      title           :string, :validates => [:presence, :uniqueness, :length => {:maximum => 255}]
-      timestamps
-    end
+    # structure do
+    #   title           :string
+    #   timestamps
+    # end
+
+    validates :title, presence: true, uniqueness: true, length: { maximum: 255 }
 
-    accepts_nested_attributes_for :menu_items, :allow_destroy => true
+    accepts_nested_attributes_for :menu_items, allow_destroy: true
 
     before_save do
       if self.menu_items.find { |menu_item| menu_item.lft == 1 }.blank?
-        menu_items.build(:title => 'Home', :url => '/', :lft => 1, :rgt => 2)
+        menu_items.build(title: 'Home', url: '/', lft: 1, rgt: 2)
       end
     end
 
@@ -36,7 +38,7 @@ module Effective
           right = attributes[:menu_items_attributes].map { |_, atts| atts[:rgt].to_i }.max
 
           root_node = menu.menu_items.find { |menu_item| menu_item.lft == 1 }
-          root_node ||= menu.menu_items.build(:title => 'Home', :url => '/', :lft => 1, :rgt => 2)
+          root_node ||= menu.menu_items.build(title: 'Home', url: '/', lft: 1, rgt: 2)
           root_node.rgt = right + 1
 
           menu.save!
@@ -52,7 +54,7 @@ module Effective
     def build(&block)
       raise 'build must be called with a block' if !block_given?
 
-      root = menu_items.build(:title => 'Home', :url => '/', :lft => 1, :rgt => 2)
+      root = menu_items.build(title: 'Home', url: '/', lft: 1, rgt: 2)
       root.parent = true
       instance_exec(&block) # A call to dropdown or item
       root.rgt = menu_items.map(&:rgt).max

data/app/models/effective/menu_item.rb

@@ -2,27 +2,36 @@ module Effective
   class MenuItem < ActiveRecord::Base
     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 :menu, inverse_of: :menu_items
+    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
 
-    structure do
-      title           :string, :validates => [:presence, :length => {:maximum => 255}]
+    # structure do
+    #   title           :string
 
-      url             :string, :validates => [:length => {:maximum => 255}]
-      special         :string, :validates => [:length => {:maximum => 255}]   # divider / search / *_path
+    #   url             :string
+    #   special         :string  # divider / search / *_path
 
-      classes         :string, :validates => [:length => {:maximum => 255}]
-      new_window      :boolean, :default => false, :validates => [:inclusion => {:in => [true, false]}]
-      roles_mask      :integer, :default => nil # 0 is going to mean logged in, -1 is going to mean public, > 0 will be future implementation of roles masking
+    #   classes         :string
+    #   new_window      :boolean
+    #   roles_mask      :integer # 0 is going to mean logged in, -1 is going to mean public, > 0 will be future implementation of roles masking
 
-      lft             :integer, :validates => [:presence], :index => true
-      rgt             :integer, :validates => [:presence]
-    end
+    #   lft             :integer
+    #   rgt             :integer
+    # end
+
+    validates :title, presence: true, length: { maximum: 255 }
+    validates :url, length: { maximum: 255 }
+    validates :special, length: { maximum: 255 }
+    validates :classes, length: { maximum: 255 }
+    validates :new_window, inclusion: { in: [true, false] }
+
+    validates :lft, presence: true
+    validates :rgt, presence: true
 
     default_scope -> { includes(:menuable).order(:lft) }
 
@@ -42,12 +51,14 @@ module Effective
     # This will work with effective_roles one day...
     def visible_for?(user)
       can_view_page = (
-        if menuable.kind_of?(Effective::Page)
+        if dropdown?
+          true
+        elsif menuable.kind_of?(Effective::Page)
           menuable.roles_permit?(user)
         else
           true
         end
-      ) || dropdown? # If it's a dropdown, don't consider the page permissions, 'cause its not a link to the page anyway
+      )
 
       can_view_menu_item = (
         if roles_mask == nil

data/app/models/effective/page.rb

@@ -4,27 +4,36 @@ module Effective
     acts_as_role_restricted
     acts_as_regionable
 
-    has_many :menu_items, :as => :menuable, :dependent => :destroy
+    if EffectivePages.acts_as_asset_box.present?
+      acts_as_asset_box [EffectivePages.acts_as_asset_box]
+    end
+
+    has_many :menu_items, as: :menuable, dependent: :destroy
 
     self.table_name = EffectivePages.pages_table_name.to_s
 
     structure do
-      title             :string, :validates => [:presence, :length => {:maximum => 255}]
-      meta_description  :string, :validates => [:presence, :length => {:maximum => 150}]
+      title             :string
+      meta_description  :string
 
-      draft             :boolean, :default => false
+      draft             :boolean
 
-      layout            :string, :default => 'application', :validates => [:presence]
-      template          :string, :validates => [:presence]
+      layout            :string
+      template          :string
 
       slug              :string
-      roles_mask        :integer, :default => 0
+      roles_mask        :integer
 
       timestamps
     end
 
-    scope :drafts, -> { where(:draft => true) }
-    scope :published, -> { where(:draft => false) }
+    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) }
   end
 
 end

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

@@ -0,0 +1,2 @@
+-# intentionally left blank
+-# = form.input :start_at

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

@@ -0,0 +1,2 @@
+- 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/app/views/admin/pages/_form.html.haml

@@ -1,25 +1,30 @@
-= 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 => "Give this page a title", :input_html => {:maxlength => 255}
-  = f.input :draft, :hint => "Save this page as a draft.  It will not be accessible on the website."
+= 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.'
 
   - if !f.object.new_record? || 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
+    = 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
 
-  = 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.acts_as_asset_box
+    = render partial: '/admin/pages/asset_box_fields', locals: { page: page, form: f, f: f }
+
+  = 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 }
 
   - if EffectivePages.pages.length == 1
-    = f.input :template, :as => :hidden, input_html: { :value => EffectivePages.pages.first.first }
+    = f.input :template, as: :hidden, input_html: { value: EffectivePages.pages.first.first }
   - else
-    = f.input :template, :as => :select, :collection => EffectivePages.pages, :include_blank => false
+    = f.input :template, as: (defined?(EffectiveFormInputs?) ? :effective_select : :select), collection: EffectivePages.pages, include_blank: false
 
   - if EffectivePages.layouts.length == 1
-    = f.input :layout, :as => :hidden, :value => EffectivePages.layouts.first
+    = f.input :layout, as: :hidden, value: EffectivePages.layouts.first
   - else
-    = f.input :layout, :as => :select, :collection => EffectivePages.layouts, :include_blank => false
+    = f.input :layout, as: (defined?(EffectiveFormInputs?) ? :effective_select : :select), collection: EffectivePages.layouts, include_blank: false
 
   - 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.input :roles, collection: EffectiveRoles.roles_collection(f.object), as: :check_boxes, hint: '* leave blank for a regular public page that anyone can view'
 
   .form-group
     .col-xs-12

data/lib/effective_pages/engine.rb

@@ -11,9 +11,20 @@ module EffectivePages
     end
 
     # Set up our default configuration options.
-    initializer "effective_pages.defaults", :before => :load_config_initializers do |app|
+    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")
     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.0.11'.freeze
+  VERSION = '1.0.12'.freeze
 end

data/lib/effective_pages.rb

@@ -1,5 +1,4 @@
 require 'haml-rails'
-require 'migrant'
 require 'effective_datatables'
 require 'effective_regions'
 require 'effective_roles'
@@ -22,6 +21,8 @@ module EffectivePages
   mattr_accessor :layout
   mattr_accessor :menu
 
+  mattr_accessor :acts_as_asset_box
+
   def self.setup
     yield self
   end
@@ -49,6 +50,10 @@ 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
@@ -70,7 +75,9 @@ module EffectivePages
     HashWithIndifferentAccess.new().tap do |layouts|
       files.each do |file|
         name = File.basename(file).split('.').first
-        next if name.starts_with?('_') || Array(EffectivePages.excluded_layouts).map(&:to_s).include?(name)
+        next if name.starts_with?('_')
+        next if name.include?('mailer_layout')
+        next if Array(EffectivePages.excluded_layouts).map(&:to_s).include?(name)
 
         layouts[name.to_sym] = {}
       end

data/lib/generators/templates/effective_pages.rb

@@ -19,6 +19,13 @@ EffectivePages.setup do |config|
   # Any app/views/layouts/ layout files that should be excluded
   config.excluded_layouts = [:admin]
 
+  # 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 }
+
   # Use CanCan: can?(action, resource)
   # Use effective_roles:  resource.roles_permit?(current_user)
   config.authorization_method = Proc.new { |controller, action, resource| true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: migrant
-  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: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +172,8 @@ files:
 - app/views/admin/menus/index.html.haml
 - app/views/admin/menus/new.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