fe 2.1.8 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68c166e10972662e9b667550fd956ab69bdaaa9155313580605a03358f367520
-  data.tar.gz: 976c66a25f837e10b3defdaa03dd7920f25a02e474717d7d34abae189258950b
+  metadata.gz: d306f5aed47841d5cb6e1eaef07f4013d83f50ad1eff4d9e2dc78673d125eaba
+  data.tar.gz: '08e9b227a6280aa3f26df0ec41b29c047230fbb43001db80e0b3ab1972a0fed1'
 SHA512:
-  metadata.gz: ecd59fa8f0780b3c25e4378d0290a6c57b3411d55cc44a4e62f642947811892794d39996e1d7bdc9a3314aa9ed197cc2fa35bb49093e49b98c69e2a911c14768
-  data.tar.gz: e3a1d295e0d627e80a0ed205ccfdbda13d9c4d083cd2ac83c0be8d389005da8953b99d5655dfe3b75f146e286b1863f54deefba412b2ef2630394c60f5d88a43
+  metadata.gz: b5bcfdd4f594490bb5fcc0e8c400f65e850401cd8771ef0d4e60e4b28bf1f7535d19d708e7101cfccd5c01a73557f00791a14f3e9f9e28cde532acb6ee78f8ff
+  data.tar.gz: 8c833039737b8aad2f2261d148d87c3c91e52e1b85889b3662d7a1765a3dbe788135d4fbc306358e0f123ae10da10df2ec23d54879a1e5f475c627b31b10c5f1

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/setup'
 require 'thor'
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake' if File.exists? 'spec/dummy/Rakefile'
+load 'rails/tasks/engine.rake' if File.exist? 'spec/dummy/Rakefile'
 
 Bundler::GemHelper.install_tasks
 

data/app/assets/javascripts/fe/jquery.html5_upload.js

@@ -1,7 +1,7 @@
 /* Taken from https://github.com/mihaild/jquery-html5-upload */
 
 (function($) {
-    $.fn.html5_upload = function(_options) {
+    $.fn.html5_upload = function(options) {
 
         function get_file_name(file) {
             return file.name || file.fileName;

data/app/controllers/fe/admin/elements_controller.rb

@@ -57,7 +57,7 @@ class Fe::Admin::ElementsController < ApplicationController
         @page_element = Fe::PageElement.create(element: @element, page: @page)
         format.js
       else
-        format.js { render action: 'error.js.erb' }
+        format.js { render 'error' }
       end
     end
   end
@@ -70,7 +70,7 @@ class Fe::Admin::ElementsController < ApplicationController
       if @element.update(element_params)
         format.js
       else
-        format.js { render action: 'error.js.erb' }
+        format.js { render 'error' }
       end
     end
   end

data/app/models/fe/question_sheet.rb

@@ -85,10 +85,10 @@ module Fe
       # set page conditional_id values to new ids based on old_id
       question_sheet.all_elements.each do |el|
         if el.conditional_type != "Fe::Page" && el.conditional_id.present?
-          # noop
+          el.update(conditional_id: question_sheet.element_id_mappings[el.conditional_id])
         end
 
-        # note that conditional elements are already translated to new ids in the element import so no need to do it here
+        # handle page conditionals separately since they use page.old_id instead of element_id_mappings
         if el.conditional_type == "Fe::Page" && el.conditional_id
           el.update(conditional_id: question_sheet.pages.detect{ |el2| el2.old_id == el.conditional_id }&.id)
         end

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "2.1.8"
+  VERSION = "2.1.11"
 end

data/spec/controllers/fe/admin/elements_controller_spec.rb

@@ -87,7 +87,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       }.to change{Fe::Element.count}.by(0)
 
       expect(assigns(:page_element)).to be_nil
-      expect(response).to render_template('error.js.erb')
+      expect(response).to render_template('error')
     end
   end
   context '#update' do
@@ -114,7 +114,7 @@ describe Fe::Admin::ElementsController, type: :controller do
 
       put :update, params: {element: { slug: "Illegal Chars: #@$!" }, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
       expect(assigns(:element)).to eq(element)
-      expect(response).to render_template('error.js.erb')
+      expect(response).to render_template('error')
     end
   end
   context '#destroy' do

data/spec/dummy/config/application.rb

@@ -25,7 +25,8 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.default_locale = :en
-    config.action_view.raise_on_missing_translations = false
+    # In Rails 7+, this setting has moved to I18n
+    config.i18n.raise_on_missing_translations = false
   end
 end
 

data/spec/dummy/config/database.yml

@@ -1,5 +1,5 @@
 mysql: &mysql
-  adapter: mysql<%= "2" unless ( ENV["TRAVIS_RUBY_VERSION"].include? "j" if ENV["TRAVIS_RUBY_VERSION"] ) %>
+  adapter: mysql<%= "2" unless (ENV["TRAVIS_RUBY_VERSION"].include? "j" if ENV["TRAVIS_RUBY_VERSION"]) %>
   username: root
   password:
 
@@ -9,20 +9,35 @@ postgresql: &postgresql
   password:
   min_messages: ERROR
 
+sqlite3: &sqlite3
+  adapter: sqlite3
+
 defaults: &defaults
   pool: 5
   timeout: 5000
   host: localhost
-  <<: *<%= ENV['DB'] || "mysql" %>
+  <<: *<%= ENV['DB'] || "sqlite3" %>
 
 development:
+  <% if (ENV['DB'] || "sqlite3") == "sqlite3" %>
+  database: db/fe_dev.sqlite3
+  <% else %>
   database: fe_dev
+  <% end %>
   <<: *defaults
 
 test:
+  <% if (ENV['DB'] || "sqlite3") == "sqlite3" %>
+  database: db/fe_test.sqlite3
+  <% else %>
   database: fe_test
+  <% end %>
   <<: *defaults
 
 production:
+  <% if (ENV['DB'] || "sqlite3") == "sqlite3" %>
+  database: db/fe_prod.sqlite3
+  <% else %>
   database: fe_prod
-  <<: *defaults
+  <% end %>
+  <<: *defaults

data/spec/dummy/db/schema.rb

@@ -2,17 +2,16 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181108201746) do
-
-  create_table "fe_addresses", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+ActiveRecord::Schema[7.2].define(version: 2018_11_08_201746) do
+  create_table "fe_addresses", force: :cascade do |t|
     t.datetime "startdate"
     t.datetime "enddate"
     t.string   "address1"
@@ -29,38 +28,38 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.datetime "updated_at"
   end
 
-  create_table "fe_answer_sheet_question_sheets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_answer_sheet_question_sheets", force: :cascade do |t|
     t.integer  "answer_sheet_id"
     t.integer  "question_sheet_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["answer_sheet_id", "question_sheet_id"], name: "answer_sheet_question_sheet", using: :btree
+    t.index ["answer_sheet_id", "question_sheet_id"], name: "answer_sheet_question_sheet"
   end
 
-  create_table "fe_answers", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_answers", force: :cascade do |t|
     t.integer  "answer_sheet_id",                       null: false
     t.integer  "question_id",                           null: false
-    t.text     "value",                   limit: 65535
+    t.text     "value"
     t.integer  "attachment_file_size"
     t.string   "attachment_content_type"
     t.string   "attachment_file_name"
     t.datetime "attachment_updated_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["answer_sheet_id", "question_id"], name: "answer_sheet_question", using: :btree
+    t.index ["answer_sheet_id", "question_id"], name: "answer_sheet_question"
   end
 
-  create_table "fe_applications", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_applications", force: :cascade do |t|
     t.integer  "applicant_id"
     t.string   "status"
     t.datetime "submitted_at"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "locale",       default: "en"
-    t.index ["applicant_id"], name: "question_sheet_id", using: :btree
+    t.index ["applicant_id"], name: "question_sheet_id"
   end
 
-  create_table "fe_conditions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_conditions", force: :cascade do |t|
     t.integer  "question_sheet_id", null: false
     t.integer  "trigger_id",        null: false
     t.string   "expression",        null: false
@@ -68,18 +67,18 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.integer  "toggle_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["question_sheet_id"], name: "index_fe_conditions_on_question_sheet_id", using: :btree
-    t.index ["toggle_id"], name: "index_fe_conditions_on_toggle_id", using: :btree
-    t.index ["toggle_page_id"], name: "index_fe_conditions_on_toggle_page_id", using: :btree
-    t.index ["trigger_id"], name: "index_fe_conditions_on_trigger_id", using: :btree
+    t.index ["question_sheet_id"], name: "index_fe_conditions_on_question_sheet_id"
+    t.index ["toggle_id"], name: "index_fe_conditions_on_toggle_id"
+    t.index ["toggle_page_id"], name: "index_fe_conditions_on_toggle_page_id"
+    t.index ["trigger_id"], name: "index_fe_conditions_on_trigger_id"
   end
 
-  create_table "fe_elements", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_elements", force: :cascade do |t|
     t.integer  "question_grid_id"
     t.string   "kind",                      limit: 40,                    null: false
     t.string   "style",                     limit: 40
     t.string   "label"
-    t.text     "content",                   limit: 65535
+    t.text     "content"
     t.boolean  "required"
     t.string   "slug",                      limit: 36
     t.integer  "position"
@@ -97,41 +96,41 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.datetime "updated_at"
     t.integer  "related_question_sheet_id"
     t.integer  "conditional_id"
-    t.text     "tooltip",                   limit: 65535
+    t.text     "tooltip"
     t.boolean  "hide_label",                              default: false
     t.boolean  "hide_option_labels",                      default: false
     t.integer  "max_length"
     t.string   "conditional_type"
-    t.text     "conditional_answer",        limit: 65535
+    t.text     "conditional_answer"
     t.integer  "choice_field_id"
     t.boolean  "share",                                   default: false
-    t.text     "label_translations",        limit: 65535
-    t.text     "tip_translations",          limit: 65535
-    t.text     "content_translations",      limit: 65535
-    t.index ["conditional_id"], name: "index_fe_elements_on_conditional_id", using: :btree
-    t.index ["question_grid_id"], name: "index_fe_elements_on_question_grid_id", using: :btree
-    t.index ["slug"], name: "index_fe_elements_on_slug", using: :btree
+    t.text     "label_translations"
+    t.text     "tip_translations"
+    t.text     "content_translations"
+    t.index ["conditional_id"], name: "index_fe_elements_on_conditional_id"
+    t.index ["question_grid_id"], name: "index_fe_elements_on_question_grid_id"
+    t.index ["slug"], name: "index_fe_elements_on_slug"
   end
 
-  create_table "fe_email_templates", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_email_templates", force: :cascade do |t|
     t.string   "name",       limit: 1000,  null: false
-    t.text     "content",    limit: 65535
+    t.text     "content"
     t.boolean  "enabled"
     t.string   "subject"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "fe_page_elements", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_page_elements", force: :cascade do |t|
     t.integer  "page_id"
     t.integer  "element_id"
     t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["page_id", "element_id"], name: "page_element", using: :btree
+    t.index ["page_id", "element_id"], name: "page_element"
   end
 
-  create_table "fe_pages", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_pages", force: :cascade do |t|
     t.integer  "question_sheet_id",                                null: false
     t.string   "label",              limit: 60,                    null: false
     t.integer  "number"
@@ -139,11 +138,11 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.boolean  "hidden",                           default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "all_element_ids",    limit: 65535
-    t.text     "label_translations", limit: 65535
+    t.text     "all_element_ids"
+    t.text     "label_translations"
   end
 
-  create_table "fe_people", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_people", force: :cascade do |t|
     t.string   "first_name", limit: 50
     t.string   "last_name",  limit: 50
     t.integer  "user_id"
@@ -152,15 +151,15 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.datetime "updated_at"
   end
 
-  create_table "fe_question_sheets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_question_sheets", force: :cascade do |t|
     t.string   "label",      limit: 100,                   null: false
     t.boolean  "archived",                 default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "languages",  limit: 65535
+    t.text     "languages"
   end
 
-  create_table "fe_references", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_references", force: :cascade do |t|
     t.integer  "question_id"
     t.integer  "applicant_answer_sheet_id"
     t.datetime "email_sent_at"
@@ -180,11 +179,11 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.integer  "question_sheet_id"
     t.boolean  "visible"
     t.string   "visibility_cache_key"
-    t.index ["applicant_answer_sheet_id"], name: "index_fe_references_on_applicant_answer_sheet_id", using: :btree
-    t.index ["question_id"], name: "index_fe_references_on_question_id", using: :btree
+    t.index ["applicant_answer_sheet_id"], name: "index_fe_references_on_applicant_answer_sheet_id"
+    t.index ["question_id"], name: "index_fe_references_on_question_id"
   end
 
-  create_table "fe_users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "fe_users", force: :cascade do |t|
     t.integer  "user_id"
     t.datetime "last_login"
     t.string   "type"
@@ -193,7 +192,7 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.datetime "updated_at"
   end
 
-  create_table "phone_numbers", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "phone_numbers", force: :cascade do |t|
     t.string   "number"
     t.string   "extensions"
     t.integer  "person_id"
@@ -206,20 +205,19 @@ ActiveRecord::Schema.define(version: 20181108201746) do
     t.datetime "updated_at"
   end
 
-  create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "users", force: :cascade do |t|
     t.string  "username"
     t.string  "email"
     t.integer "person_id"
   end
 
-  create_table "versions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4" do |t|
+  create_table "versions", force: :cascade do |t|
     t.string   "item_type",  limit: 191,        null: false
     t.integer  "item_id",                       null: false
     t.string   "event",                         null: false
     t.string   "whodunnit"
-    t.text     "object",     limit: 4294967295
+    t.text     "object"
     t.datetime "created_at"
-    t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id", using: :btree
+    t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
-
-end
+end