fae-rails 2.1.0 → 2.2.0

data/app/views/fae/shared/_form_header.html.slim

@@ -1,16 +1,17 @@
 ruby:
   require_locals ['header'], local_assigns
-  save_button_text    ||= t('fae.form.save')
-  cancel_button_text  ||= t('fae.form.cancel')
-  cloneable           ||= false
-  clone_button_text   ||= t('fae.form.clone')
-  subnav              ||= []
-  header_as_string      = header.is_a?(String) ? header : header.class.name.split('::').last
-  header_as_string      = header_as_string.singularize
-  title               ||= "#{params[:action]} #{header_as_string}".titleize
-  breadcrumb            = !local_assigns[:breadcrumbs].eql?(false)
-  languages           ||= false
-  show_flash_messages   = !local_assigns[:show_flash_messages].eql?(false)
+  save_button_text          ||= t('fae.form.save')
+  cancel_button_text        ||= t('fae.form.cancel')
+  cloneable                 ||= false
+  clone_button_text         ||= t('fae.form.clone')
+  launch_manager_text       ||= t('fae.form.launch_form_manager')
+  subnav                    ||= []
+  header_as_string          = header.is_a?(String) ? header : header.class.name.split('::').last
+  header_as_string          = header_as_string.singularize
+  title                     ||= "#{params[:action]} #{header_as_string}".titleize
+  breadcrumb                = !local_assigns[:breadcrumbs].eql?(false)
+  languages                 ||= false
+  show_flash_messages       = !local_assigns[:show_flash_messages].eql?(false)
 
 header.content-header.js-content-header
   - if breadcrumb
@@ -25,9 +26,12 @@ header.content-header.js-content-header
       .content-header-select
         = select_tag 'fae-languages', options_for_select(Fae.languages.map(&:reverse), selected), id: 'js-language', class: 'small_pulldown', prompt: 'All Languages'
 
+    - if Fae.use_form_manager
+      a.button.js-launch-form-manager href='#' = launch_manager_text
+
     a.button#js-header-cancel href=@index_path = cancel_button_text
     - if cloneable.present? && params[:id].present?
-      a.button data-method="post" href="#{@index_path}?from_existing=#{params[:id]}" = clone_button_text
+      a.button#js-header-clone data-method="post" href="#{@index_path}?from_existing=#{params[:id]}" = clone_button_text
     input name="commit" type="submit" value=save_button_text
 
   - if subnav.present?

data/app/views/fae/shared/_nested_table.html.slim

@@ -11,6 +11,7 @@ ruby:
   assoc_name          ||= assoc.to_s                      # 'restaurant_bars'
   title               ||= assoc_name.titleize             # 'Restaurant Bars'
   add_button_text     ||= t('fae.common.add', title: title.singularize)
+  hide_add_button     ||= false
   ordered             ||= false
   has_thumb           ||= false
   edit_column         ||= false
@@ -33,7 +34,7 @@ ruby:
     new_path += "item_id=#{parent_item.id}&=item_class=#{parent_item.class.to_s}"
   end
 
-  options_for_table = { index: index, assoc: assoc, assoc_name: assoc_name, title: title, add_button_text: add_button_text, ordered: ordered, has_thumb: has_thumb, edit_column: edit_column, cols: cols, assoc_name_singular: assoc_name_singular, new_path: new_path, edit_path: edit_path }
+  options_for_table = { index: index, assoc: assoc, assoc_name: assoc_name, title: title, add_button_text: add_button_text, hide_add_button: hide_add_button, ordered: ordered, has_thumb: has_thumb, edit_column: edit_column, cols: cols, assoc_name_singular: assoc_name_singular, new_path: new_path, edit_path: edit_path }
   options_for_table[:parent_item] = parent_item unless index
 
 section.addedit-form.js-addedit-form class="#{'content' if index}"
@@ -41,7 +42,8 @@ section.addedit-form.js-addedit-form class="#{'content' if index}"
     == render 'fae/shared/shared_nested_table', options_for_table
 
   - else
-    a.js-add-link.table-add-link.button.-small href=new_path = add_button_text
+    - unless hide_add_button
+      a.js-add-link.table-add-link.button.-small href=new_path = add_button_text
     h2 = title
     - if helper_text.present?
       h6.table-helper-text = helper_text

data/app/views/fae/shared/_recent_changes.html.slim

@@ -8,7 +8,7 @@
             th = t('fae.changes.user')
             th = t('fae.changes.type')
             th = t('fae.changes.attrs')
-            th.-action-wide t('fea.changes.modified')
+            th.-action-wide = t('fea.changes.modified')
         tbody
           - if @item.try(:tracked_changes).present?
             - @item.tracked_changes.each do |change|

data/app/views/fae/shared/_shared_nested_table.html.slim

@@ -37,10 +37,13 @@ table class=table_class
                 i.icon-edit
           td = fae_delete_button item, "/#{fae_path}/#{assoc_name}/#{item.id.to_s}", class: 'js-tooltip table-action js-delete-link', remote: true
 
-    - else
+    - elsif !hide_add_button
       tr
         - td_link = link_to 'add some', new_path, class: 'js-add-link'
 
         td colspan=colspan.to_s No #{title} yet, #{td_link}.
+    - else
+      tr
+        td colspan=colspan.to_s No #{title} yet.
 
 .js-addedit-form-wrapper

data/app/views/layouts/fae/application.html.slim

@@ -12,6 +12,7 @@ html
   body class=body_class
     == render 'mobilenav'
     == render 'header'
+    .js-form-manager-container
     section.main-content#js-main-content
       == render 'sidenav'
 

data/config/deploy.rb

@@ -38,7 +38,8 @@ namespace :deploy do
   desc 'Symlink secrets.yml'
   task :symlink_secrets do
     on roles(:app) do
-      execute "ln -s #{shared_path}/secrets.yml #{release_path}/config/secrets.yml"
+      execute "rm #{release_path}/spec/dummy/config/secrets.yml"
+      execute "ln -s #{shared_path}/secrets.yml #{release_path}/spec/dummy/config/secrets.yml"
     end
   end
 
@@ -68,6 +69,7 @@ namespace :deploy do
     end
   end
 
+  after 'deploy:updating', 'deploy:symlink_secrets'
   after :finishing, 'deploy:cleanup'
 
 end

data/config/initializers/devise.rb

@@ -156,27 +156,27 @@ Devise.setup do |config|
   # Defines which strategy will be used to lock an account.
   # :failed_attempts = Locks an account after a number of failed attempts to sign in.
   # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
+  config.lock_strategy = :failed_attempts
 
   # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
+  config.unlock_keys = [ :email ]
 
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
   # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
   # :both  = Enables both strategies
   # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
+  config.unlock_strategy = :both
 
   # Number of authentication tries before locking an account if lock_strategy
   # is failed attempts.
-  # config.maximum_attempts = 20
+  config.maximum_attempts = 5
 
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
+  config.unlock_in = 1.hour
 
   # Warn on the last attempt before the account is locked.
-  # config.last_attempt_warning = false
+  config.last_attempt_warning = true
 
   # ==> Configuration for :recoverable
   #

data/config/locales/fae.en.yml

@@ -12,6 +12,9 @@ en:
       save: 'Save'
       cancel: 'Cancel'
       clone: 'Clone'
+      launch_form_manager: 'Manage Form'
+      save_form_manager: 'Save Changes'
+      cancel_form_manager: 'Cancel'
       attribute:
         first_name: 'First Name'
         last_name: 'Last Name'
@@ -31,6 +34,13 @@ en:
       last_login: 'Last Logged In'
       active: 'Active'
       add_user: 'Add User'
+    deploy_hook:
+      environment: 'Environment'
+      add_deploy_hook: 'Add Deploy Hook'
+      new_deploy_hook: 'New Deploy Hook'
+      edit_deploy_hook: 'Edit Deploy Hook'
+      section_heading: 'Deploy Hooks'
+      section_helper_text: ''
     page:
       title: 'Pages'
       disabled_title: 'Disabled Admin'
@@ -41,7 +51,7 @@ en:
       error_end: 'to be taken to our home page.'
       hello: 'Hello'
       welcome: 'Welcome to Fae'
-      no_objs_start: "You don'thave any objects setup to manage. If you need help getting started, check out the"
+      no_objs_start: "You don't have any objects setup to manage. If you need help getting started, check out the"
       no_objs_end: 'Quickstart Guide and Documentation site.'
     navbar:
       logout: 'Log Out'
@@ -52,6 +62,8 @@ en:
       jump_to: 'Jump to...'
       root_settings: 'Root Settings'
       no_results: 'No Results'
+      deployments: 'Deploy'
+      deploy_hooks: 'Deploy Hooks'
     changes:
       recent: 'Recent Changes'
       user: 'User'
@@ -69,6 +81,8 @@ en:
       last_day: 'Last Day'
       last_week: 'Last Week'
       last_month: 'Last Month'
+      on_prod: 'On Prod'
+      on_stage: 'On Stage'
       models:
         users: 'Users'
         types: 'Types'
@@ -76,6 +90,27 @@ en:
         user: 'User'
         type: 'Type'
         model: 'Model'
+    deploy:
+        page:
+          heading: 'Deploy'
+        ctas:
+          deploy: 'Deploy'
+        table:
+          past_heading: 'Past Deploys'
+          deploying_heading: 'Deploying'
+          deploying_helper: "After making changes in the CMS, click a deploy button above to push these changes to the respective front-end environment. Once your deployment posts to the “Past Deploys” table below, updates will be ready to review in the front-end environment.<br><br>Please note that each environment is distinct and will need to be deployed separately."
+          title: 'Activity'
+          deployed: 'Date/Time'
+          duration: 'Duration'
+          branch: 'Branch'
+          committer: 'Committer'
+          context: 'Environment'
+          state: 'State'
+          error_msg: 'Error Msg'
+          no_deploys: 'No deploys were found.'
+        changes:
+          production_heading: 'Changes since last production deploy'
+          staging_heading: 'Changes since last staging deploy'
     setup:
       prompt: 'Please create your super admin user.'
       password: 'Passwords must contain at least 8 characters.'
@@ -86,8 +121,9 @@ en:
       stage_url: 'Stage URL'
       logo_helper: 'Used on login page, 300x300px .jpg'
     images:
-      alt_helper: 'Brief description of image contents, used in hover text and by visually impaired users.'
+      alt_helper: 'Read by search engines and visually impaired readers.'
     application:
+      activity_log_heading: 'Activity Log'
       user_absent: 'user no longer exists'
       no_logs: 'No logs available.'
       view_site: 'View Site'
@@ -111,7 +147,7 @@ en:
       paragraph_break: 'Paragraph break'
       paragraph_break_help: 'Adding a blank line in between your paragraphs makes a paragraph break.'
     seo_title: 'A descriptive page title of ~50-65 characters. Displayed in search engine results.'
-    seo_description: 'A helpful page summary of 320 characters or less. Displayed in search engine results.'
+    seo_description: 'A helpful page summary of 200 characters or less. Displayed in search engine results.'
     search: 'Search %{search}'
     reset_search: 'Reset Search'
     apply_filters: 'Apply Filters'

data/config/locales/fae.zh-CN.yml

@@ -41,7 +41,7 @@ zh-CN:
       error_end: 'to be taken to our home page.'
       hello: 'Hello'
       welcome: 'Welcome to Fae'
-      no_objs_start: "You don'thave any objects setup to manage. If you need help getting started, check out the"
+      no_objs_start: "You don't have any objects setup to manage. If you need help getting started, check out the"
       no_objs_end: 'Quickstart Guide and Documentation site.'
     navbar:
       logout: 'Log Out'
@@ -86,7 +86,7 @@ zh-CN:
       stage_url: 'Stage URL'
       logo_helper: 'Used on login page, 300x300px .jpg'
     images:
-      alt_helper: 'Brief description of image contents, used in hover text and by visually impaired users.'
+      alt_helper: 'Read by search engines and visually impaired readers.'
     application:
       user_absent: 'user no longer exists'
       no_logs: 'No logs available.'

data/config/routes.rb

@@ -11,8 +11,10 @@ Fae::Engine.routes.draw do
     get 'logout' => '/devise/sessions#destroy', as: :destroy_user_session
   end
   resources :users
+  resources :deploy_hooks
 
   get 'settings' => 'users#settings', as: 'settings'
+  get 'deploy' => 'deploy#index', as: 'deploy'
   get 'help' => 'pages#help', as: 'help'
   get 'activity' => 'pages#activity_log', as: 'activity_log'
   post 'activity/filter' => 'pages#activity_log_filter', as: 'activity_log_filter'
@@ -38,7 +40,13 @@ Fae::Engine.routes.draw do
   get 'content_blocks/:slug' => '/admin/content_blocks#edit', as: 'edit_content_block'
   match 'content_blocks/:slug/update' => '/admin/content_blocks#update', via: [:put, :patch], as: 'update_content_block'
 
-  # catch all 404
+  get 'form_managers/fields' => 'form_managers#fields', as: 'form_managers_fields'
+  post 'form_managers/update' => 'form_managers#update', as: 'form_managers_update'
+
+  get 'deploy/deploys_list' => 'deploy#deploys_list', as: 'deploy_deploys_list'
+  post 'deploy/deploy_site' => 'deploy#deploy_site', as: 'deploy_deploy_site'
+
+  ## catch all 404
   match "*path" => 'pages#error404', via: [:get, :post]
 
 end

data/db/migrate/20140809222030_add_user_table.rb

@@ -34,7 +34,7 @@ class AddUserTable < ActiveRecord::Migration[4.2]
       t.string  :first_name
       t.string  :last_name
       t.integer :role_id
-      t.boolean :active
+      t.boolean :active, :default => true, :null => false
       t.string :language
 
       t.timestamps

data/db/migrate/20190925153222_create_fae_form_managers.rb

@@ -0,0 +1,11 @@
+class CreateFaeFormManagers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :fae_form_managers do |t|
+    	t.string :form_manager_model_name, index: true
+    	t.integer :form_manager_model_id, index: true
+    	t.text :fields
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220118192729_create_fae_publish_hooks.rb

@@ -0,0 +1,10 @@
+class CreateFaePublishHooks < ActiveRecord::Migration[5.2]
+  def change
+    create_table :fae_publish_hooks do |t|
+      t.string :url
+      t.string :environment, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220128133730_rename_publish_hooks.rb

@@ -0,0 +1,5 @@
+class RenamePublishHooks < ActiveRecord::Migration[5.2]
+  def change
+    rename_table :fae_publish_hooks, :fae_deploy_hooks
+  end
+end

data/db/migrate/20220202153607_add_position_to_deploy_hooks.rb

@@ -0,0 +1,6 @@
+class AddPositionToDeployHooks < ActiveRecord::Migration[5.2]
+  def change
+    add_column :fae_deploy_hooks, :position, :integer
+    add_index :fae_deploy_hooks, :position
+  end
+end

data/lib/fae/options.rb

@@ -5,7 +5,7 @@ require_relative 'validation_helper_collection'
 module Fae
   # configurable defaults
   class << self
-    mattr_accessor :devise_secret_key, :devise_mailer_sender, :dashboard_exclusions, :max_image_upload_size, :max_file_upload_size, :languages, :recreate_versions, :validation_helpers, :track_changes, :tracker_history_length, :slug_separator, :disabled_environments, :per_page, :use_cache
+    mattr_accessor :devise_secret_key, :devise_mailer_sender, :dashboard_exclusions, :max_image_upload_size, :max_file_upload_size, :languages, :recreate_versions, :validation_helpers, :track_changes, :tracker_history_length, :slug_separator, :disabled_environments, :per_page, :use_cache, :use_form_manager, :netlify
 
     self.devise_secret_key      = ''
     self.devise_mailer_sender   = 'change-me@example.com'
@@ -21,6 +21,8 @@ module Fae
     self.disabled_environments  = []
     self.per_page               = 25
     self.use_cache              = false
+    self.use_form_manager       = false
+    self.netlify                = {}
   end
 
   # this function maps the vars from your app into your engine
@@ -32,4 +34,4 @@ module Fae
     Devise.mailer_sender = Fae.devise_mailer_sender
     Kaminari.config.default_per_page = Fae.per_page
   end
-end
+end

data/lib/fae/version.rb

@@ -1,3 +1,3 @@
 module Fae
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/generators/fae/base_generator.rb

@@ -4,6 +4,7 @@ module Fae
     argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
     class_option :namespace, type: :string, default: 'admin', desc: 'Sets the namespace of the generator'
     class_option :template, type: :string, default: 'slim', desc: 'Sets the template engine of the generator'
+    class_option :polymorphic, type: :boolean, default: false, desc: 'Makes the model and scaffolding polymorphic. parent-model is ignored if passed.'
 
     @@attributes_flat = []
     @@attribute_names = []
@@ -26,7 +27,11 @@ module Fae
           if is_attachment(arg)
             @@attachments << arg
           else
-            @@attributes_flat << "#{arg.name}:#{arg.type}"
+            @@attributes_flat << "#{arg.name}:#{arg.type}" + (arg.has_index? ? ":index" : "")
+          end
+
+          if options.polymorphic
+            @@attributes_flat << "#{polymorphic_name}:references{polymorphic}"
           end
 
           if is_association(arg)
@@ -71,6 +76,7 @@ module Fae
       @attachments = @@attachments
       @has_position = @@has_position
       @display_field = @@display_field
+      @polymorphic_name = polymorphic_name
       template "views/index.html.#{options.template}", "app/views/#{options.namespace}/#{plural_file_name}/index.html.#{options.template}"
       template "views/_form.html.#{options.template}", "app/views/#{options.namespace}/#{plural_file_name}/_form.html.#{options.template}"
       copy_file "views/new.html.#{options.template}", "app/views/#{options.namespace}/#{plural_file_name}/new.html.#{options.template}"
@@ -195,5 +201,9 @@ RUBY
       [:image,:file].include?(arg.type)
     end
 
+    def polymorphic_name
+      "#{file_name.underscore}able"
+    end
+
   end
 end

data/lib/generators/fae/nested_scaffold_generator.rb

@@ -21,10 +21,12 @@ module Fae
         inject_model_attachments
         inject_position_scope
         inject_parent_info if options.parent_model.present?
+        inject_polymorphic_info if options.polymorphic
       end
 
       def generate_nested_controller_file
         @attachments = @@attachments
+        @polymorphic_name = polymorphic_name
         template "controllers/nested_scaffold_controller.rb", "app/controllers/#{options.namespace}/#{file_name.pluralize}_controller.rb"
       end
 
@@ -44,6 +46,17 @@ module Fae
   def fae_nested_parent
     :#{options.parent_model.underscore}
   end
+RUBY
+        end
+      end
+
+      def inject_polymorphic_info
+        inject_into_file "app/models/#{file_name}.rb", after: "BaseModelConcern\n" do <<-RUBY
+
+  def fae_nested_parent
+    :#{polymorphic_name}
+  end
+
 RUBY
         end
       end

data/lib/generators/fae/templates/assets/fae.js

@@ -3,4 +3,4 @@
 // or just add your javascript directly to this file
 
 // Uncomment the following line if you want to use Trumbowyg HTML Editor
-// //= require fae/vendor/trumbowyg
+// //= require fae/vendor/trumbowyg

data/lib/generators/fae/templates/controllers/nested_scaffold_controller.rb

@@ -1,5 +1,19 @@
 module <%= options.namespace.capitalize %>
   class <%= class_name.pluralize %>Controller < Fae::NestedBaseController
+
+<% if options.polymorphic %>
+    def new
+      @item = @klass.new
+      raise_undefined_parent if @item.fae_nested_foreign_key.blank?
+
+      item_id = params[:item_id].to_i || nil
+      item_class = params[:item_class] || nil
+      @item.send("<%= @polymorphic_name %>_id=", item_id)
+      @item.send("<%= @polymorphic_name %>_type=", item_class)
+      build_assets
+    end
+<% end %>
+
 <% if @attachments.present? %>
     private
 

data/lib/generators/fae/templates/initializers/fae.rb

@@ -60,4 +60,19 @@ Fae.setup do |config|
   # on the parent app
   # Defaults to false
   # config.use_cache = true
-end
+
+  ## use_form_manager
+  # Enable Manage Form buttons in form headers
+  # Defaults to false
+  # config.use_form_manager = true
+
+  ## Netlify configs
+  # Environment variables are recommended for any sensitive Netlify configuration details.
+  # config.netlify = {
+  #   api_user: 'netlify-api-user',
+  #   api_token: 'netlify-api-token',
+  #   site: 'site-name-in-netlify',
+  #   site_id: 'site-id-in-netlify',
+  #   api_base: 'https://api.netlify.com/api/v1/'
+  # }
+end

data/lib/generators/fae/templates/views/_form.html.slim

@@ -1,4 +1,13 @@
-= simple_form_for(['admin', @item]) do |f|
+ruby:
+	form_options = {
+		html: {
+			data: {
+				form_manager_model: @item.fae_form_manager_model_name,
+				form_manager_info: (@form_manager.present? ? @form_manager.to_json : nil)
+			}
+		}
+	}
+= simple_form_for([:admin, @item], form_options) do |f|
   == render 'fae/shared/form_header', header: @klass_name
 
   main.content

data/lib/generators/fae/templates/views/_form_index_nested.html.slim

@@ -1,4 +1,18 @@
-= simple_form_for(['<%= options.namespace %>', @item], html: {multipart: true, novalidate: true, class: 'js-file-form'}, remote: true, data: {type: "html"}) do |f|
+ruby:
+	form_options = {
+		html: {
+			multipart: true,
+			novalidate: true,
+			class: 'js-file-form',
+			remote: true,
+			data: {
+				type: "html",
+				form_manager_model: @item.fae_form_manager_model_name,
+				form_manager_info: (@form_manager.present? ? @form_manager.to_json : nil)
+			}
+		}
+	}
+= simple_form_for(['<%= options.namespace %>', @item], form_options) do |f|
 <% @form_attrs.each do |attr| -%>
   = fae_input f, :<%= attr %>
 <% end -%>

data/lib/generators/fae/templates/views/_form_nested.html.slim

@@ -1,4 +1,18 @@
-= simple_form_for(['<%= options.namespace %>', @item], html: {multipart: true, novalidate: true, class: 'js-file-form'}, remote: true, data: {type: "html"}) do |f|
+ruby:
+	form_options = {
+		html: {
+			multipart: true,
+			novalidate: true,
+			class: 'js-file-form',
+			remote: true,
+			data: {
+				type: "html",
+				form_manager_model: @item.fae_form_manager_model_name,
+				form_manager_info: (@form_manager.present? ? @form_manager.to_json : nil)
+			}
+		}
+	}
+= simple_form_for([:admin, @item], form_options) do |f|
 <% @form_attrs.each do |attr| -%>
   = fae_input f, :<%= attr %>
 <% end -%>
@@ -9,7 +23,10 @@
   = fae_file_form f, :<%= attachment.name -%>
 <% end -%>
 <% end -%>
-<% if options.parent_model.present? %>
+<% if options.polymorphic %>
+  = f.hidden_field :<%= @polymorphic_name %>_id
+  = f.hidden_field :<%= @polymorphic_name %>_type
+<% elsif options.parent_model.present? %>
   = f.hidden_field :<%= options.parent_model.underscore %>_id
 <% end -%>
 

data/lib/generators/fae/templates/views/static_page_form.html.slim

@@ -1,4 +1,16 @@
-= simple_form_for @item, url: fae.update_content_block_path(slug: @item.slug), method: :put do |f|
+ruby:
+	form_options = {
+		url: fae.update_content_block_path(slug: @item.slug),
+		method: :put,
+		html: {
+			data: {
+				form_manager_model: @item.fae_form_manager_model_name,
+				form_manager_model_id: @item.fae_form_manager_model_id,
+				form_manager_info: (@form_manager.present? ? @form_manager.to_json : nil)
+			}
+		}
+	}
+= simple_form_for @item, form_options do |f|
   == render 'fae/shared/form_header', header: @item
 
   main.content