fae-rails 1.7.1 → 2.0.0

data/lib/generators/fae/nested_index_scaffold_generator.rb

@@ -6,7 +6,6 @@ module Fae
     def go
       generate_model
       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

@@ -16,9 +16,9 @@ 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?
       end
 

data/lib/generators/fae/scaffold_generator.rb

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

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

@@ -1,7 +1,5 @@
 = 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'
+  == render 'fae/shared/form_header', header: @klass_name
 
   main.content
 <% @form_attrs.each do |attr| -%>

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,5 @@
 = 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
+  == render 'fae/shared/form_header', header: @item
 
   main.content
     = fae_input f, :title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fae-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0
 platform: ruby
 authors:
 - FINE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.0.7
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -86,154 +86,154 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 2.5.3
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 4.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 4.4.3
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
-  name: judge
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: judge-simple_form
+  name: judge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: judge-simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: remotipart
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: remotipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -393,6 +393,7 @@ files:
 - app/assets/images/fae/icons/user.svg
 - app/assets/images/fae/icons/users.svg
 - app/assets/images/fae/icons/zoom.svg
+- app/assets/images/fae/tutorial_model_location.png
 - app/assets/images/fae/youtube_helper.jpg
 - app/assets/javascripts/fae/_modals.js
 - app/assets/javascripts/fae/_tables.js
@@ -485,6 +486,7 @@ files:
 - app/assets/stylesheets/fae/modules/tables/_tooltips.scss
 - app/assets/stylesheets/fae/pages/_error.scss
 - app/assets/stylesheets/fae/pages/_help.scss
+- app/assets/stylesheets/fae/pages/_home.scss
 - app/assets/stylesheets/fae/pages/_login.scss
 - app/assets/stylesheets/fae/vendor/chosen.css
 - app/assets/stylesheets/fae/vendor/daterangepicker.css
@@ -576,11 +578,9 @@ files:
 - app/views/fae/pages/home.html.slim
 - app/views/fae/setup/first_user.html.slim
 - app/views/fae/shared/_errors.slim
-- app/views/fae/shared/_form_buttons.html.slim
 - app/views/fae/shared/_form_header.html.slim
 - app/views/fae/shared/_index_header.html.slim
 - app/views/fae/shared/_nested_table.html.slim
-- app/views/fae/shared/_nested_table_advanced.html.slim
 - app/views/fae/shared/_recent_changes.html.slim
 - app/views/fae/shared/_shared_nested_table.html.slim
 - app/views/fae/static_pages/index.html.slim
@@ -665,7 +665,6 @@ files:
 - lib/generators/fae/templates/views/new_nested.html.slim
 - lib/generators/fae/templates/views/static_page_form.html.slim
 - lib/generators/fae/templates/views/table_nested.html.slim
-- lib/sub_test_task_patch.rb
 homepage: https://github.com/wearefine/fae
 licenses:
 - MIT
@@ -686,7 +685,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: CMS for Rails. For Reals.

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

@@ -1,11 +0,0 @@
-/ @depreciation - delete this file in v2.0
-- save_button_text   ||= 'Save'
-- cancel_button_text ||= 'Cancel'
-- cloneable          ||= false
-- clone_button_text  ||= 'Clone'
-
-.main_content-header-save
-  a.button#js-header-cancel href=@index_path = cancel_button_text
-  - if cloneable.present? && params[:id].present?
-    a.button< data-method="post" data-confirm=t('fae.clone_confirmation') href="#{@index_path}?from_existing=#{params[:id]}" = clone_button_text
-  input< name="commit" type="submit" value=save_button_text

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

@@ -1,18 +0,0 @@
-/ this file is meant for backwards compatibiliy
-/ DO NOT delete this partial
-/ DO NOT intentially use this partial
-/ 'fae/shared/nested_table' directly
-
-== render 'fae/shared/nested_table',
-  assoc:                assoc,
-  parent_item:          parent_item,
-  assoc_name:           (assoc_name ||= nil),
-  title:                (title ||= nil),
-  header:               (header ||= nil),
-  ordered:              (ordered ||= nil),
-  has_thumb:            (has_thumb ||= nil),
-  cols:                 (cols ||= nil),
-  assoc_name_singular:  (assoc_name_singular ||= nil),
-  title_singular:       (title_singular ||= nil),
-  new_path:             (new_path ||= nil),
-  edit_path:            (edit_path ||= nil)

data/lib/sub_test_task_patch.rb

@@ -1,129 +0,0 @@
-# @deprecation - Rails::TestTask was deprecated in Rails 5, but this class is required to run Travis tests in Rails 4
-# can deprecate when we drop Rails 4 support
-
-require 'rake/testtask'
-
-module Rails
-  class TestTask < Rake::TestTask # :nodoc: all
-    # A utility class which is used primarily in "rails/test_unit/testing.rake"
-    # to help define rake tasks corresponding to <tt>rake test</tt>.
-    #
-    # This class takes a TestInfo class and defines the appropriate rake task
-    # based on the information, then invokes it.
-    class TestCreator # :nodoc:
-      def initialize(info)
-        @info = info
-      end
-
-      def invoke_rake_task
-        if @info.files.any?
-          create_and_run_single_test
-          reset_application_tasks
-        else
-          Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke
-        end
-      end
-
-      private
-
-        def create_and_run_single_test
-          Rails::TestTask.new('test:single') { |t|
-            t.test_files = @info.files
-          }
-          ENV['TESTOPTS'] ||= @info.opts
-          Rake::Task['test:single'].invoke
-        end
-
-        def reset_application_tasks
-          Rake.application.top_level_tasks.replace @info.tasks
-        end
-    end
-
-    # This is a utility class used by the <tt>TestTask::TestCreator</tt> class.
-    # This class takes a set of test tasks and checks to see if they correspond
-    # to test files (or can be transformed into test files). Calling <tt>files</tt>
-    # provides the set of test files and is used when initializing tests after
-    # a call to <tt>rake test</tt>.
-    class TestInfo # :nodoc:
-      def initialize(tasks)
-        @tasks = tasks
-        @files = nil
-      end
-
-      def files
-        @files ||= @tasks.map { |task|
-          [task, translate(task)].find { |file| test_file?(file) }
-        }.compact
-      end
-
-      def translate(file)
-        if file =~ /^app\/(.*)$/
-          "test/#{$1.sub(/\.rb$/, '')}_test.rb"
-        else
-          "test/#{file}_test.rb"
-        end
-      end
-
-      def tasks
-        @tasks - test_file_tasks - opt_names
-      end
-
-      def opts
-        opts = opt_names
-        if opts.any?
-          "-n #{opts.join ' '}"
-        end
-      end
-
-      private
-
-      def test_file_tasks
-        @tasks.find_all { |task|
-          [task, translate(task)].any? { |file| test_file?(file) }
-        }
-      end
-
-      def test_file?(file)
-        file =~ /^test/ && File.file?(file) && !File.directory?(file)
-      end
-
-      def opt_names
-        (@tasks - test_file_tasks).reject { |t| task_defined? t }
-      end
-
-      def task_defined?(task)
-        Rake::Task.task_defined? task
-      end
-    end
-
-    def self.test_creator(tasks)
-      info = TestInfo.new(tasks)
-      TestCreator.new(info)
-    end
-
-    def initialize(name = :test)
-      super
-      @libs << "test" # lib *and* test seem like a better default
-    end
-
-    def define
-      task @name do
-        if ENV['TESTOPTS']
-          ARGV.replace Shellwords.split ENV['TESTOPTS']
-        end
-        libs = @libs - $LOAD_PATH
-        $LOAD_PATH.unshift(*libs)
-        file_list.each { |fl|
-          FileList[fl].to_a.each { |f| require File.expand_path f }
-        }
-      end
-    end
-  end
-
-  # Silence the default description to cut down on `rake -T` noise.
-  class SubTestTask < Rake::TestTask # :nodoc:
-    def desc(string)
-      # Ignore the description.
-    end
-  end
-end