effective_pages 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 10232000ebdfe564ff4a0ef275a2dd2de7286f88
-  data.tar.gz: fd42311db48022159ba9c363ed92b13d09e0d675
+SHA256:
+  metadata.gz: bffac68aca6d5b8bf6eb6d49addc6440cf029d784f084e6aad1b61c5be9c6134
+  data.tar.gz: 65199de9b7977a8ca49da7804419e2b4dda375e119005e82c9617e7f8a4812d2
 SHA512:
-  metadata.gz: b667a9f24a264ea2bcde76dab7be3553954a6237e0662e67d3f362de960b522620cfe81bf6cb482a29c60ce4a657225999d0ea0e627536775d2660a5a3939ba2
-  data.tar.gz: 526e8332b63783c119efc1a52ac995d20c6db4f0a2ab67c990c09ed2852fb7f8f70ebebdcd0f684842cec7f85314cfc4908459bc8739ba8775fcb6f3a891d352
+  metadata.gz: 778e6319b2a2ea1d3aeb77d581e7646f0e2899ba65140c029cd537683596543f1c182ed2ba3a4d155acff1eaf5e4b850674255ff2cae17e436ec24db27e736ee
+  data.tar.gz: eeffa1a33cdba787cfe34cb1658683dd416d1c9988012d229ee80ad3036d058eaf919a0c5726373bfcfd924837e47b5985bccae9c6a5aab8888dd909334546d3

data/app/models/effective/menu.rb

@@ -2,6 +2,8 @@ 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
     attr_protected() if Rails::VERSION::MAJOR == 3
 

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

@@ -13,15 +13,15 @@
 
   = 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 }
+  - if (templates = EffectivePages.templates).length == 1
+    = f.hidden_field :template, value: templates.first
   - else
-    = f.input :template, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: EffectivePages.pages, include_blank: false
+    = f.input :template, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: templates
 
-  - if EffectivePages.layouts.length == 1
-    = f.input :layout, as: :hidden, value: EffectivePages.layouts.first
+  - if (layouts = EffectivePages.layouts).length == 1
+    = f.hidden_field :layout, value: layouts.first
   - else
-    = f.input :layout, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: EffectivePages.layouts, include_blank: false
+    = 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'

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '1.1.9'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/effective_pages.rb

@@ -40,12 +40,23 @@ module EffectivePages
     true
   end
 
-  def self.pages
-    Rails.env.development? ? read_pages : (@@pages ||= read_pages)
+  def self.templates
+    ApplicationController.view_paths.map { |path| Dir["#{path}/#{pages_path}/**"] }.flatten.reverse.map do |file|
+      name = File.basename(file).split('.').first
+      next if name.starts_with?('_')
+      next if Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
+      name
+    end.compact
   end
 
   def self.layouts
-    Rails.env.development? ? read_layouts : (@@layouts ||= read_layouts)
+    ApplicationController.view_paths.map { |path| Dir["#{path}/layouts/**"] }.flatten.reverse.map do |file|
+      name = File.basename(file).split('.').first
+      next if name.starts_with?('_')
+      next if name.include?('mailer')
+      next if Array(EffectivePages.excluded_layouts).map { |str| str.to_s }.include?(name)
+      name
+    end.compact
   end
 
   # Remove leading and trailing '/' characters
@@ -60,34 +71,4 @@ module EffectivePages
     @@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
-    files = ApplicationController.view_paths.map { |path| Dir["#{path}/#{pages_path}/**"] }.flatten.reverse
-
-    HashWithIndifferentAccess.new().tap do |pages|
-      files.each do |file|
-        name = File.basename(file).split('.').first
-        next if name.starts_with?('_') || Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
-
-        pages[name.to_sym] = {}
-      end
-    end
-  end
-
-  def self.read_layouts
-    files = ApplicationController.view_paths.map { |path| Dir["#{path}/layouts/**"] }.flatten.reverse
-
-    HashWithIndifferentAccess.new().tap do |layouts|
-      files.each do |file|
-        name = File.basename(file).split('.').first
-        next if name.starts_with?('_')
-        next if name.include?('mailer')
-        next if Array(EffectivePages.excluded_layouts).map { |str| str.to_s }.include?(name)
-
-        layouts[name.to_sym] = {}
-      end
-    end
-  end
-
 end

data/spec/dummy/spec

@@ -0,0 +1 @@
+../../spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,7 +121,7 @@ files:
 - Rakefile
 - app/assets/javascripts/effective_pages.js
 - app/assets/stylesheets/effective_pages.scss
-- app/assets/stylesheets/effective_pages/dropdown-submenu.css
+- 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
@@ -196,6 +196,7 @@ files:
 - 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
@@ -221,8 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Content pages, bootstrap3 menu builder and page-specific header tag helpers
@@ -251,6 +251,7 @@ test_files:
 - 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