fae-rails 1.7.1 → 2.2.0

data/db/migrate/20150930224821_create_fae_changes.rb

@@ -1,4 +1,4 @@
-class CreateFaeChanges < ActiveRecord::Migration
+class CreateFaeChanges < ActiveRecord::Migration[4.2]
   def change
     create_table :fae_changes do |t|
       t.integer :changeable_id

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, :has_top_nav, :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 = '1.7.1'
+  VERSION = '2.2.0'
 end

data/lib/generators/fae/base_generator.rb

@@ -4,11 +4,13 @@ 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 = []
     @@association_names = []
     @@attachments = []
+    @@graphql_attributes = []
     @@has_position = false
     @@display_field = ''
 
@@ -25,21 +27,28 @@ 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 arg.name['_id'] || arg.type.to_s == 'references'
-            @@association_names << arg.name.gsub('_id', '')
+          if options.polymorphic
+            @@attributes_flat << "#{polymorphic_name}:references{polymorphic}"
+          end
+
+          if is_association(arg)
+            @@association_names << arg.name.gsub(/_id$/, '')
           elsif !is_attachment(arg)
             @@attribute_names << arg.name
           end
           @@has_position = true if arg.name === 'position'
+
+          @@graphql_attributes << graphql_object(arg)
         end
 
         @@attributes_flat = @@attributes_flat.uniq.join(' ')
         @@association_names.uniq!
         @@attribute_names.uniq!
         @@attachments.uniq!
+        @@graphql_attributes.uniq!
       end
     end
 
@@ -50,8 +59,9 @@ module Fae
     def generate_model
       generate "model #{file_name} #{@@attributes_flat}"
       inject_concern
-      inject_position_scope
+      inject_display_field_to_model
       inject_model_attachments
+      inject_position_scope
     end
 
     def generate_controller_file
@@ -66,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}"
@@ -73,7 +84,7 @@ module Fae
     end
 
     def add_route
-      inject_into_file "config/routes.rb", after: "namespace :#{options.namespace} do\n" do <<-RUBY
+      inject_into_file "config/routes.rb", after: "namespace :#{options.namespace} do\n", force: true do <<-RUBY
     resources :#{plural_file_name}
 RUBY
       end
@@ -105,9 +116,9 @@ RUBY
       end
 
       inject_into_file "app/models/#{file_name}.rb", after: "include Fae::BaseModelConcern\n" do <<-RUBY
-\n  def fae_display_field
+  def fae_display_field
     #{@@display_field}
-  end\n
+  end
 RUBY
       end
 
@@ -117,7 +128,7 @@ RUBY
       if @@has_position
         inject_into_file "app/models/#{file_name}.rb", after: "include Fae::BaseModelConcern\n" do <<-RUBY
 \n  acts_as_list add_new_at: :top
-  default_scope { order(:position) }
+  default_scope { order(:position) }\n
 RUBY
         end
       end
@@ -147,9 +158,52 @@ RUBY
       inject_into_file 'app/models/concerns/fae/navigation_concern.rb', line, before: '# scaffold inject marker'
     end
 
+    def graphql_object(arg)
+      if is_association(arg)
+        assoc_name = arg.name.gsub(/_id$/, '')
+        assoc_type = "Types::#{assoc_name.classify}Type"
+        { attr: assoc_name.to_sym, type: assoc_type }
+      else
+        { attr: arg.name.to_sym, type: graphql_type(arg.type) }
+      end
+    end
+
+    def graphql_type(type)
+      case type.to_s
+      when 'integer'
+        'Integer'
+      when 'boolean'
+        'Boolean'
+      when 'image'
+        'Types::FaeImageType'
+      when 'file'
+        'Types::FaeFileType'
+      else
+        'String'
+      end
+    end
+
+    def generate_graphql_type
+      return unless uses_graphql
+      @graphql_attributes = @@graphql_attributes
+      template "graphql/graphql_type.rb", "app/graphql/types/#{file_name}_type.rb"
+    end
+
+    def uses_graphql
+      defined?(GraphQL)
+    end
+
+    def is_association(arg)
+      arg.name.end_with?('_id') || arg.type.to_s == 'references'
+    end
+
     def is_attachment(arg)
       [:image,:file].include?(arg.type)
     end
 
+    def polymorphic_name
+      "#{file_name.underscore}able"
+    end
+
   end
 end

data/lib/generators/fae/nested_index_scaffold_generator.rb

@@ -5,8 +5,8 @@ module Fae
 
     def go
       generate_model
+      generate_graphql_type
       generate_nested_index_controller_file
-      inject_display_field_to_model
       generate_view_files
       add_route
       inject_nav_item

data/lib/generators/fae/nested_scaffold_generator.rb

@@ -6,6 +6,7 @@ module Fae
 
     def go
       generate_nested_model_file
+      generate_graphql_type
       generate_nested_controller_file
       generate_view_files
       add_route
@@ -16,14 +17,16 @@ module Fae
       def generate_nested_model_file
         generate "model #{file_name} #{@@attributes_flat}"
         inject_concern
-        inject_position_scope
-        inject_model_attachments
         inject_display_field_to_model
+        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
 
@@ -43,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/page_generator.rb

@@ -11,6 +11,7 @@ module Fae
       if attributes.present?
         attributes.each do |attr|
           @@attributes[attr.name.to_sym] = convert_attr_type(attr.type)
+          @@graphql_attributes << graphql_object(attr)
         end
       end
     end
@@ -18,6 +19,7 @@ module Fae
     def go
       generate_static_page_controller
       generate_static_page_model
+      generate_graphql_type
       generate_static_page_view
     end
 
@@ -37,6 +39,12 @@ module Fae
       template "models/pages_model.rb", "app/models/#{file_name}_page.rb"
     end
 
+    def generate_graphql_type
+      return unless uses_graphql
+      @graphql_attributes = @@graphql_attributes
+      template "graphql/graphql_page_type.rb", "app/graphql/types/#{file_name}_page_type.rb"
+    end
+
     def generate_static_page_view
       @attributes = @@attributes
       template "views/static_page_form.html.#{options.template}", "app/views/#{options.namespace}/content_blocks/#{file_name}.html.#{options.template}"

data/lib/generators/fae/scaffold_generator.rb

@@ -5,7 +5,7 @@ module Fae
 
     def go
       generate_model
-      inject_display_field_to_model
+      generate_graphql_type
       generate_controller_file
       generate_view_files
       add_route

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/graphql/graphql_page_type.rb

@@ -0,0 +1,17 @@
+class Types::<%= class_name %>PageType < Types::BaseObject
+
+  graphql_name '<%= class_name %>Page'
+
+  field :title, String, null: false
+<% if @graphql_attributes.present? -%>
+<% @graphql_attributes.each do |graphql_object| -%>
+<% if graphql_object[:type]['Types::']  -%>
+  field :<%= graphql_object[:attr] %>, <%= graphql_object[:type] %>, null: true
+<% else -%>
+  field :<%= graphql_object[:attr] %>, <%= graphql_object[:type] %>,
+    null: true,
+    method: :<%= graphql_object[:attr] %>_content
+<% end -%>
+<% end -%>
+<% end -%>
+end

data/lib/generators/fae/templates/graphql/graphql_type.rb

@@ -0,0 +1,13 @@
+class Types::<%= class_name %>Type < Types::BaseObject
+
+  graphql_name '<%= class_name %>'
+
+  field :id, ID, null: false
+<% if @graphql_attributes.present? -%>
+<% @graphql_attributes.each do |graphql_object| -%>
+  field :<%= graphql_object[:attr] %>, <%= graphql_object[:type] %>, null: true
+<% end -%>
+<% end -%>
+  field :created_at, String, null: false
+  field :updated_at, String, null: false
+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,7 +1,14 @@
-= simple_form_for(['admin', @item]) do |f|
-  header.content-header.js-content-header
-    == render 'fae/shared/form_header', header: @klass_name
-  == render 'fae/shared/errors'
+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
 <% @form_attrs.each do |attr| -%>

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/index_nested.html.slim

@@ -4,4 +4,5 @@ section.js-index-addedit-form
   == render 'fae/shared/nested_table',
     assoc: :<%= file_name.pluralize %>,
     index: true,
+    ordered: <%= @has_position %>,
     cols: [<%= @form_attrs.map {|attr| ":#{attr}"}.join(', ') %>]

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

@@ -1,6 +1,17 @@
-= simple_form_for @item, url: fae.update_content_block_path(slug: @item.slug), method: :put do |f|
-  header.content-header.js-content-header
-    == render 'fae/shared/form_header', header: @item
+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
     = fae_input f, :title