fae-rails 1.7.1 → 2.0.0

data/app/helpers/fae/application_helper.rb

@@ -60,7 +60,7 @@ module Fae
 
     def change_item_link(change)
       text = "#{change.changeable_type.gsub('Fae::','')}: "
-      test_source_method = Rails::VERSION::MAJOR > 4 ? :data_source_exists? : :table_exists?
+      test_source_method = :data_source_exists?
 
       if change.changeable_type.exclude?('Fae') && change.changeable_type.exclude?('Page') && !ActiveRecord::Base.connection.send(test_source_method, change.changeable_type.tableize)
         return "#{change.changeable_type}: model destroyed"

data/app/helpers/fae/form_helper.rb

@@ -117,8 +117,7 @@ module Fae
     end
 
     def label_and_hint(attribute, options)
-      # @depreciation - remove dark_hint option in v2.0
-      hint = options[:hint] || options[:dark_hint]
+      hint = options[:hint]
 
       options[:helper_text] = attempt_common_helper_text(attribute) if options[:helper_text].blank?
 
@@ -229,9 +228,9 @@ module Fae
     def attempt_common_helper_text(attribute)
       case attribute
       when :seo_title
-       return 'Company Name | Keyword-driven description of the page section. Approx 65 characters.'
+       return 'A descriptive page title of ~50-65 characters. Displayed in search engine results.'
       when :seo_description
-       return 'Displayed in search engine results. Under 150 characters.'
+       return 'A helpful page summary of 320 characters or less. Displayed in search engine results.'
       else
        ''
       end

data/app/helpers/fae/nested_form_helper.rb

@@ -29,9 +29,9 @@ module Fae
           end
         end
       elsif item.class.columns_hash[attribute.to_s].present? && item.class.columns_hash[attribute.to_s].type == :boolean
-        content_tag(:td) do attr_toggle(item, attribute) end
+        content_tag(:td, fae_toggle(item, attribute))
       else
-        content_tag(:td) do col_name_or_image(item, attribute) end
+        content_tag(:td, col_name_or_image(item, attribute))
       end
     end
 

data/app/helpers/fae/view_helper.rb

@@ -32,7 +32,7 @@ module Fae
       end
     end
 
-    def attr_toggle(item, column)
+    def fae_toggle(item, column)
       active = item.send(column)
       link_class = active ? 'slider-yes-selected' : ''
       model_name = item.class.to_s.gsub('::','__').underscore.pluralize
@@ -46,8 +46,6 @@ module Fae
         </div>'.html_safe
       end
     end
-    # for backwards compatibility
-    alias_method :fae_toggle, :attr_toggle
 
     def fae_clone_button(item)
       return if item.blank?

data/app/models/concerns/fae/base_model_concern.rb

@@ -45,12 +45,6 @@ module Fae
         end
       end
 
-      # @depreciation - deprecate in v2.0
-      def filter_all
-        # override this method in your model
-        for_fae_index
-      end
-
       def filter(params)
         # override this method in your model
         for_fae_index
@@ -69,7 +63,7 @@ module Fae
         end
       end
 
-      def translate(*attributes)
+      def fae_translate(*attributes)
         attributes.each do |attribute|
           define_method attribute.to_s do
             self.send "#{attribute}_#{I18n.locale}"

data/app/models/fae/change.rb

@@ -45,7 +45,7 @@ module Fae
         # apply conditions and search from above to our scope
         order(id: :desc)
           .includes(:user).references(:user)
-          .where(date_scope).where(conditions).where(search)
+          .where(Arel.sql(date_scope)).where(conditions).where(Arel.sql(search))
       end
 
     end

data/app/models/fae/file.rb

@@ -14,7 +14,7 @@ module Fae
         maximum: Fae.max_file_upload_size.megabytes.to_i
       }
 
-    belongs_to :fileable, polymorphic: true, touch: true
+    belongs_to :fileable, polymorphic: true, touch: true, optional: true
 
     def readonly?
       false

data/app/models/fae/image.rb

@@ -17,7 +17,7 @@ module Fae
         maximum: Fae.max_image_upload_size.megabytes.to_i
       }
 
-    belongs_to :imageable, polymorphic: true, touch: true
+    belongs_to :imageable, polymorphic: true, touch: true, optional: true
 
     def readonly?
       false

data/app/models/fae/option.rb

@@ -27,7 +27,7 @@ module Fae
       instance = first
 
       if instance.blank?
-        instance = Option.new({title: 'My FINE Admin', time_zone: 'Pacific Time (US & Canada)', live_url: 'http://www.wearefine.com'})
+        instance = Option.new({title: 'My Fae Admin', time_zone: 'Pacific Time (US & Canada)', live_url: 'http://www.wearefine.com'})
         instance.singleton_guard = 0
         instance.save!
       end

data/app/models/fae/role.rb

@@ -7,7 +7,7 @@ module Fae
     has_many :users
 
     acts_as_list add_new_at: :bottom
-    default_scope { order('-position DESC') }
+    default_scope { order(Arel.sql('-position DESC')) }
 
     scope :public_roles, -> {where.not(name: 'super admin')}
 

data/app/models/fae/static_page.rb

@@ -91,6 +91,10 @@ module Fae
       case assoc_obj.class.name
       when 'Fae::TextField', 'Fae::TextArea'
         return assoc_obj.content
+      when 'Fae::Image', 'Fae::File'
+        assoc_json = assoc_obj.as_json
+        assoc_json['asset'] = assoc_obj.asset.as_json
+        return assoc_json
       else
         return assoc_obj.as_json
       end

data/app/uploaders/fae/file_uploader.rb

@@ -2,11 +2,8 @@
 module Fae
   class FileUploader < CarrierWave::Uploader::Base
 
-    # Include RMagick support:
-    # include CarrierWave::RMagick
-    include CarrierWave::MimeTypes
+    include CarrierWave::MiniMagick
 
-    process :set_content_type
     process :save_file_size_in_model
 
     def save_file_size_in_model

data/app/uploaders/fae/image_uploader.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 module Fae
   class ImageUploader < CarrierWave::Uploader::Base
-    include CarrierWave::MimeTypes
-    include CarrierWave::RMagick
+
+    include CarrierWave::MiniMagick
 
     # saves file size to DB
     process :save_file_size_in_model

data/app/views/fae/images/_image_uploader.html.slim

@@ -4,8 +4,8 @@ ruby:
   image_name          ||= :image
   the_image             = item.send(image_name)
   label               ||= image_name.to_s.titleize
-  alt_label           ||= "#{label} alt text"
-  caption_label       ||= "#{label} caption"
+  alt_label           ||= "#{label} Alt Text"
+  caption_label       ||= "#{label} Caption"
   helper_text         ||= ""
   alt_helper_text     ||= 'Brief description of image contents, used in hover text and by visually impaired users.'
   caption_helper_text ||= ""

data/app/views/fae/options/_form.html.slim

@@ -1,7 +1,7 @@
 = simple_form_for(@option) do |f|
   header.content-header.js-content-header
     h1 Root Settings
-    .main_content-header-save
+    .content-header-buttons
       a.button#js-header-cancel href=fae.root_path(cancelled: true) Cancel
       = f.submit 'Save'
 

data/app/views/fae/pages/home.html.slim

@@ -1,25 +1,36 @@
 header.content-header.js-content-header.-dashboard
-  i.icon-home>
-  |   Welcome,
-  strong< = current_user.full_name
+  div
+    i.icon-home>
+    | &nbsp;&nbsp;Hello
+    strong< = current_user.full_name
 
 == render 'flash_messages'
 
-main.content
-  table.js-sort-column
-    thead
-      tr
-        th Name
-        th Type
-        th.-action-wide Modified
-    tbody
-      - @list.each do |item|
-        - begin
-          - parent = item.respond_to?(:fae_parent) ? item.fae_parent : nil
-          - edit_path = edit_polymorphic_path([main_app, fae_scope, parent, item])
-          - index_path = polymorphic_path([main_app, fae_scope, parent, item.class.to_s.pluralize.underscore])
-          tr
-            td: a href=edit_path = item.fae_display_field
-            td: a href=index_path = item.class.to_s
-            td = fae_date_format item.updated_at
-        - rescue
+- if @models.any?
+  main.content
+    table.js-sort-column
+      thead
+        tr
+          th Name
+          th Type
+          th.-action-wide Modified
+      tbody
+        - @list.each do |item|
+          - begin
+            - parent = item.respond_to?(:fae_parent) ? item.fae_parent : nil
+            - edit_path = edit_polymorphic_path([main_app, fae_scope, parent, item])
+            - index_path = polymorphic_path([main_app, fae_scope, parent, item.class.to_s.pluralize.underscore])
+            tr
+              td: a href=edit_path = item.fae_display_field
+              td: a href=index_path = item.class.to_s
+              td = fae_date_format item.updated_at
+          - rescue
+- else
+  section.help-section
+    article.content
+      h2 Welcome to Fae
+      p
+        ' You don'thave any objects setup to manage. If you need help getting started, check out the
+        br
+        a href="https://www.faecms.com/documentation/quickstart-guide" target="_blank" Quickstart Guide and Documentation site
+        ' .

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

@@ -1,40 +1,40 @@
 ruby:
   require_locals ['header'], local_assigns
-  save_button_text   ||= 'Save'
-  cancel_button_text ||= 'Cancel'
-  cloneable          ||= false
-  clone_button_text  ||= '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)
-  language           ||= false # @depreciation - remove in favor of `languages` in v2.0
-  languages          ||= language
+  save_button_text    ||= 'Save'
+  cancel_button_text  ||= 'Cancel'
+  cloneable           ||= false
+  clone_button_text   ||= '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)
 
-- if breadcrumb
-  == render 'breadcrumb', title: title
-- else
-  = form_header header
+header.content-header.js-content-header
+  - if breadcrumb
+    == render 'breadcrumb', title: title
+  - else
+    = form_header header
 
-.content-header-buttons
-  - if languages
-    - selected = current_user.language || ''
+  .content-header-buttons
+    - if languages
+      - selected = current_user.language || ''
 
-    .content-header-select
-      = select_tag 'fae-languages', options_for_select(Fae.languages.map(&:reverse), selected), id: 'js-language', class: 'small_pulldown', prompt: 'All Languages'
+      .content-header-select
+        = select_tag 'fae-languages', options_for_select(Fae.languages.map(&:reverse), selected), id: 'js-language', class: 'small_pulldown', prompt: 'All Languages'
 
-  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
-  input name="commit" type="submit" value=save_button_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
+    input name="commit" type="submit" value=save_button_text
 
-- if subnav.present?
-  ul.content-header-subnav#js-content-header-subnav
-    ruby:
-      # @depreciation - remove conditional when Rails 4 support is dropped, below becomes:
-      # link.parameterize(separator: '_')
-      parameterize_argument = Rails::VERSION::MAJOR == 4 ? '_' : { separator: '_' }
-    - subnav.each do |link, id_selector|
-      - subnav_item = link.is_a?(Array) ? link : [link, link.parameterize(parameterize_argument)]
-      li: a href="##{subnav_item[1]}" = subnav_item[0]
+  - if subnav.present?
+    ul.content-header-subnav#js-content-header-subnav
+      - subnav.each do |link, id_selector|
+        - subnav_item = link.is_a?(Array) ? link : [link, link.parameterize(separator: '_')]
+        li: a href="##{subnav_item[1]}" = subnav_item[0]
+
+- if show_flash_messages
+  == render 'fae/shared/errors'

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

@@ -9,9 +9,7 @@ ruby:
 
   # optional locals
   assoc_name          ||= assoc.to_s                      # 'restaurant_bars'
-  # @depreciation - remove header option in v2.0
-  header              ||= assoc_name.titleize             # 'Restaurant Bars'
-  title               ||= header
+  title               ||= assoc_name.titleize             # 'Restaurant Bars'
   add_button_text     ||= "Add #{title.singularize}"
   ordered             ||= false
   has_thumb           ||= false
@@ -35,7 +33,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, header: header, 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, 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}"

data/app/views/fae/users/index.html.slim

@@ -19,5 +19,5 @@ main.content
           td = user.email
           td = user.role.name
           td = fae_date_format user.last_sign_in_at if user.last_sign_in_at.present?
-          td = attr_toggle user, :active unless current_user == user
+          td = fae_toggle user, :active unless current_user == user
           td = fae_delete_button user, user unless current_user == user

data/db/migrate/20140809222030_add_user_table.rb

@@ -1,4 +1,4 @@
-class AddUserTable < ActiveRecord::Migration
+class AddUserTable < ActiveRecord::Migration[4.2]
   def change
     create_table(:fae_users) do |t|
       ## Database authenticatable

data/db/migrate/20140822224029_create_fae_roles.rb

@@ -1,4 +1,4 @@
-class CreateFaeRoles < ActiveRecord::Migration
+class CreateFaeRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :fae_roles do |t|
       t.string :name

data/db/migrate/20141008180718_create_fae_images_table.rb

@@ -1,4 +1,4 @@
-class CreateFaeImagesTable < ActiveRecord::Migration
+class CreateFaeImagesTable < ActiveRecord::Migration[4.2]
   def change
     create_table(:fae_images) do |t|
       t.string :name

data/db/migrate/20141017194616_create_fae_options.rb

@@ -1,4 +1,4 @@
-class CreateFaeOptions < ActiveRecord::Migration
+class CreateFaeOptions < ActiveRecord::Migration[4.2]
   def change
     create_table :fae_options do |t|
       t.string :title

data/db/migrate/20141021181327_create_fae_files.rb

@@ -1,4 +1,4 @@
-class CreateFaeFiles < ActiveRecord::Migration
+class CreateFaeFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :fae_files do |t|
       t.string :name

data/db/migrate/20141021183047_create_fae_text_areas.rb

@@ -1,4 +1,4 @@
-class CreateFaeTextAreas < ActiveRecord::Migration
+class CreateFaeTextAreas < ActiveRecord::Migration[4.2]
   def change
     create_table :fae_text_areas do |t|
       t.string :label

data/db/migrate/20141021184311_create_fae_pages.rb

@@ -1,4 +1,4 @@
-class CreateFaePages < ActiveRecord::Migration
+class CreateFaePages < ActiveRecord::Migration[4.2]
   def change
     create_table :fae_static_pages do |t|
       t.string :title

data/db/migrate/20141105214814_create_fae_text_fields.rb

@@ -1,4 +1,4 @@
-class CreateFaeTextFields < ActiveRecord::Migration
+class CreateFaeTextFields < ActiveRecord::Migration[4.2]
   def change
     create_table :fae_text_fields do |t|
       t.references :contentable, polymorphic: true, index: true

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/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
 
     self.devise_secret_key      = ''
     self.devise_mailer_sender   = 'change-me@example.com'

data/lib/fae/version.rb

@@ -1,3 +1,3 @@
 module Fae
-  VERSION = '1.7.1'
+  VERSION = '2.0.0'
 end

data/lib/generators/fae/base_generator.rb

@@ -50,8 +50,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
@@ -105,9 +106,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 +118,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