fae-rails 2.1.0 → 3.0.0

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/db/migrate/20221118161833_create_fae_seo_sets.rb

@@ -0,0 +1,13 @@
+class CreateFaeSeoSets < ActiveRecord::Migration[7.0]
+  def change
+    create_table :fae_seo_sets do |t|
+      t.string :seo_title
+      t.text :seo_description
+      t.string :social_media_title
+      t.text :social_media_description
+      t.references :seo_setable, polymorphic: true, index: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/fae/concerns/models/base.rb

@@ -1,3 +1,5 @@
+# TODO - can we remove this/do we need backwards compaitibility?
+
 # moved to app/models/concerns/fae/base_model_concern.rb
 # keep for backwards compatibility
 module Fae::Concerns::Models::Base

data/lib/fae/engine.rb

@@ -1,5 +1,4 @@
 require 'devise'
-
 module Fae
   class Engine < ::Rails::Engine
     isolate_namespace Fae
@@ -15,8 +14,9 @@ module Fae
     require 'slim'
     require 'kaminari'
     require 'fae/version'
+    require "sprockets/railtie"
 
-    config.autoload_paths += %W(#{config.root}/lib)
+    config.eager_load_paths += %W(#{config.root}/app)
 
     config.to_prepare do
       # Require decorators from main application
@@ -29,7 +29,7 @@ module Fae
 
     config.generators do |g|
       g.test_framework :rspec, fixture: false
-      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.fixture_replacement :factory_bot, dir: 'spec/factories'
       g.assets false
       g.helper false
     end

data/lib/fae/options.rb

@@ -4,24 +4,24 @@ 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'
-    self.dashboard_exclusions   = []
-    self.max_image_upload_size  = 2
-    self.max_file_upload_size   = 5
-    self.languages              = {}
-    self.recreate_versions      = false
-    self.validation_helpers     = ValidationHelperCollection.new
-    self.track_changes          = true
-    self.tracker_history_length = 15
-    self.slug_separator         = '-'
-    self.disabled_environments  = []
-    self.per_page               = 25
-    self.use_cache              = false
-  end
+  self.devise_secret_key      = ''
+  self.devise_mailer_sender   = 'change-me@example.com'
+  self.dashboard_exclusions   = []
+  self.max_image_upload_size  = 2
+  self.max_file_upload_size   = 5
+  self.languages              = {}
+  self.recreate_versions      = false
+  self.validation_helpers     = ValidationHelperCollection.new
+  self.track_changes          = true
+  self.tracker_history_length = 15
+  self.slug_separator         = '-'
+  self.disabled_environments  = []
+  self.per_page               = 25
+  self.use_cache              = false
+  self.use_form_manager       = false
+  self.netlify                = {}
 
   # this function maps the vars from your app into your engine
   def self.setup(&block)
@@ -32,4 +32,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 = '3.0.0'
 end

data/lib/generators/fae/base_generator.rb

@@ -4,6 +4,9 @@ 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.'
+
+    Rails::Generators::GeneratedAttribute::DEFAULT_TYPES += ['image', 'file', 'seo_set']
 
     @@attributes_flat = []
     @@attribute_names = []
@@ -21,12 +24,15 @@ module Fae
     def set_globals
       if attributes.present?
         attributes.each do |arg|
-          # :image and :file args get used to generate association defs and form elements
-          # we don't want them in attributes_flat or attribute_names as they are not real model generator field options
+          # prevent these from being in attributes_flat or attribute_names as they are not real model generator field options
           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 +77,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}"
@@ -137,6 +144,12 @@ RUBY
   has_fae_image :#{attachment.name}\n
 RUBY
           end
+        elsif attachment.type == :seo_set
+            inject_into_file "app/models/#{file_name}.rb", after: "include Fae::BaseModelConcern\n" do
+              <<-RUBY
+    has_fae_seo_set :#{attachment.name}\n
+  RUBY
+            end
         elsif attachment.type == :file
           inject_into_file "app/models/#{file_name}.rb", after: "include Fae::BaseModelConcern\n" do
             <<-RUBY
@@ -172,6 +185,8 @@ RUBY
         'Types::FaeImageType'
       when 'file'
         'Types::FaeFileType'
+      when 'seo_set'
+        'Types::FaeSeoSetType'
       else
         'String'
       end
@@ -192,8 +207,16 @@ RUBY
     end
 
     def is_attachment(arg)
-      [:image,:file].include?(arg.type)
+      [:image, :file, :seo_set].include?(arg.type)
+    end
+
+    def polymorphic_name
+      "#{file_name.underscore}able"
+    end
+
+    def polymorphic_name
+      "#{file_name.underscore}able"
     end
 
   end
-end
+end

data/lib/generators/fae/controller_generator.rb

@@ -1,4 +1,3 @@
-require_relative 'base_generator'
 module Fae
   class ControllerGenerator < Fae::BaseGenerator
     source_root ::File.expand_path('../templates', __FILE__)

data/lib/generators/fae/install_generator.rb

@@ -58,4 +58,4 @@ RUBY
     end
 
   end
-end
+end

data/lib/generators/fae/model_generator.rb

@@ -1,4 +1,3 @@
-require_relative 'base_generator'
 module Fae
   class ModelGenerator < Fae::BaseGenerator
     source_root ::File.expand_path('../templates', __FILE__)
@@ -8,4 +7,4 @@ module Fae
     end
 
   end
-end
+end

data/lib/generators/fae/nested_index_scaffold_generator.rb

@@ -1,4 +1,3 @@
-require_relative 'base_generator'
 module Fae
   class NestedIndexScaffoldGenerator < Fae::BaseGenerator
     source_root ::File.expand_path('../templates', __FILE__)
@@ -34,4 +33,4 @@ module Fae
       end
 
   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
 
@@ -39,11 +41,30 @@ module Fae
 
       def inject_parent_info
         inject_into_file "app/models/#{file_name}.rb", after: "BaseModelConcern\n" do <<-RUBY
-\n  belongs_to :#{options.parent_model.underscore}, touch: true
+        \n  belongs_to :#{options.parent_model.underscore}, touch: true
+          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
+
+      def inject_polymorphic_info
+        inject_into_file "app/models/#{file_name}.rb", after: "BaseModelConcern\n" do <<-RUBY
 
   def fae_nested_parent
-    :#{options.parent_model.underscore}
+    :#{polymorphic_name}
   end
+
 RUBY
         end
       end

data/lib/generators/fae/page_generator.rb

@@ -1,5 +1,4 @@
 require_relative 'base_generator'
-
 module Fae
   class PageGenerator < Fae::BaseGenerator
     desc 'Creates model with dependancies for Fae Static Pages'
@@ -70,4 +69,4 @@ module Fae
       end
     end
   end
-end
+end

data/lib/generators/fae/scaffold_generator.rb

@@ -13,4 +13,4 @@ module Fae
     end
 
   end
-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,17 @@
 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
 
@@ -10,4 +22,4 @@ module <%= options.namespace.capitalize %>
     end
 <% end %>
   end
-end
+end

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

@@ -5,7 +5,14 @@ module <%= options.namespace.capitalize %>
 
     def build_assets
 <% @attachments.each do |attachment| -%>
+<% if attachment.type == :seo_set -%>
+      if @item.<%= attachment.name %>.blank?
+        @item.build_<%= attachment.name %>
+        @item.<%= attachment.name %>.build_social_media_image
+      end
+<% else -%>
       @item.build_<%= attachment.name %> if @item.<%= attachment.name %>.blank?
+<% end -%>
 <% end -%>
     end
 <% end %>

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
@@ -14,5 +23,7 @@
     = fae_image_form f, :<%= attachment.name -%>
 <% elsif attachment.type == :file -%>
     = fae_file_form f, :<%= attachment.name -%>
+<% elsif attachment.type == :seo_set -%>
+    = fae_seo_set_form f, :<%= attachment.name -%>
 <% end -%>
 <% end -%>

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,9 +23,15 @@
   = 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 -%>
 
   = f.submit
   = button_tag 'Cancel', type: 'button', class: 'js-cancel-nested cancel-nested-button'
+
+  - if Fae.use_form_manager
+    a.button.js-launch-form-manager href='#' = t('fae.form.launch_form_manager')

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