archangel 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a64319173910746312e102a3101c834448b6b48ca2820c870ef07266bfc77f
-  data.tar.gz: f691facf12d5f3fd4b705bebb3af929e3a670d954a6629b0236d2d23e798638a
+  metadata.gz: a8ac8ef3703d78962fd606346dd01c09c33326cf43c1aa8ee047fddbd3cb7e29
+  data.tar.gz: d0bdb734fa98d3b04a11aa58c264cd3e3fd19dd9debd84cf37b5fefccd331500
 SHA512:
-  metadata.gz: 9c94efb7d13766d7ccadaf9cb31021c844772c23bd2997dfc85cc79fcb84ab8943ce868f2cee1abdb45857211d8da877b39ffac446fd03838b2ac68b7d90d030
-  data.tar.gz: 5014fdc8c6b90b50d1f6b3780aae9de22e93b08ab74861b4302f14e723bd69c5bfb58fcfb78f5c40f1e6fb30c5e90d33b067ccd1a163f3b66730414613e6793e
+  metadata.gz: 92dfd293a69d2ced66a65dd4bbed24b57d2f99bc2e3bc52aed82854229dc634213335f6e8383df6ee22582e6da05c723125f26a38c4f5aba3a678e187014d0e3
+  data.tar.gz: ee57a7cdc9bc1bd63e51ca382ee712a976ad3d6906c9737d607c748d1431274da9c8e150e69b5e752df15c523d816a0421d37d786c93eb43ff4a6e5966c50d48

data/.codeclimate.yml

@@ -2,6 +2,9 @@ version: "2"
 plugins:
   brakeman:
     enabled: true
+  erblint:
+    enabled: true
+    config_file: .erb-lint.yml
   eslint:
     enabled: true
     channel: "eslint-4"
@@ -13,5 +16,6 @@ plugins:
     enabled: true
   rubocop:
     enabled: true
-  scss-lint:
+    channel: rubocop-0-70
+  sass-lint:
     enabled: true

data/.erb-lint.yml

@@ -0,0 +1,23 @@
+---
+linters:
+  Rubocop:
+    enabled: true
+    rubocop_config:
+      inherit_from:
+        - .rubocop.yml
+      Layout/InitialIndentation:
+        Enabled: false
+      Layout/TrailingBlankLines:
+        Enabled: false
+      Layout/TrailingWhitespace:
+        Enabled: false
+      Naming/FileName:
+        Enabled: false
+      Style/FrozenStringLiteralComment:
+        Enabled: false
+      Metrics/LineLength:
+        Enabled: false
+      Lint/UselessAssignment:
+        Enabled: false
+      Rails/OutputSafety:
+        Enabled: false

data/.eslintrc.json

@@ -8,8 +8,8 @@
     "sourceType": "module"
   },
   "globals": {
-    "window": true,
     "document": true,
+    "window": true,
     "$": true,
     "jQuery": true,
     "Archangel": true,

data/.nvmrc

@@ -1 +1 @@
-8.11.1
+10.16.0

data/.rubocop.yml

@@ -2,13 +2,19 @@ inherit_from:
   - .rubocop_disabled.yml
   - .rubocop_enabled.yml
   - .rubocop_exclude.yml
-  - .rubocop_todo.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rails
+  - rubocop-rspec
 
 AllCops:
+  TargetRubyVersion: 2.5
   Exclude:
     - 'bin/**/*'
     - 'db/migrate/**/*'
     - 'spec/dummy/**/*'
+    - 'RESOURCES/**/*'
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/.rubocop_exclude.yml

@@ -2,7 +2,6 @@ Metrics/BlockLength:
   Exclude:
     - '**/*.gemspec'
     - '**/*.rake'
-    - 'config/initializers/simple_form_bootstrap.rb'
     - 'config/routes.rb'
     - 'lib/archangel/testing_support/**/*.rb'
     - 'spec/**/*.rb'

data/.sass-lint.yml

@@ -0,0 +1,8 @@
+files:
+  include:
+    - 'app/assets/stylesheets/**/*.s+(a|c)ss'
+    - 'app/themes/**/*.s+(a|c)ss'
+  ignore:
+    - 'vendor/assets/**/*.*'
+    - 'node_modules/**/*.*'
+    - 'RESOURCES/**/*.*'

data/.travis.yml

@@ -1,6 +1,13 @@
 sudo: false
+dist: trusty
 language: ruby
-cache: bundler
+cache:
+  - bundler
+addons:
+  chrome: stable
+  apt:
+    packages:
+      - chromium-chromedriver
 env:
   global:
     - CC_TEST_REPORTER_ID=10625f04e4c8c9fe7c22d49639163f1427fe16bc253aabcb316edbe43c41270b
@@ -10,6 +17,8 @@ before_install:
   - gem --version
 install: ruby -S bundle install
 before_script:
+  - ln -s /usr/lib/chromium-browser/chromedriver ~/bin/chromedriver
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
@@ -18,7 +27,6 @@ script:
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.2

data/Gemfile

@@ -5,30 +5,36 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "brakeman", "~> 4.3", require: false
+  gem "brakeman", "~> 4.5", require: false
+  gem "erb_lint", "~> 0.0.28", require: false
   gem "inch", "~> 0.8", require: false
   gem "listen", "~> 3.1", require: false
   gem "mdl", "~> 0.5", require: false
-  gem "reek", "~> 5.2", require: false
-  gem "rubocop", "~> 0.59", require: false
-  gem "scss_lint", "~> 0.57", require: false
+  gem "reek", "~> 5.4", require: false
+  gem "rubocop", "~> 0.70", require: false
+  gem "rubocop-performance", "~> 1.3", require: false
+  gem "rubocop-rails", "~> 2.0", require: false
+  gem "rubocop-rspec", "~> 1.33", require: false
   gem "yard", "~> 0.9", require: false
 end
 
 group :development, :test do
   gem "pg", "~> 1.1"
-  gem "pry-byebug", "~> 3.6"
-  gem "sqlite3", ">= 1.3", platforms: %i[ruby mswin mswin64 mingw x64_mingw]
+  gem "pry-byebug", "~> 3.7"
+  gem "sqlite3", "~> 1.4.1"
 end
 
 group :test do
-  gem "capybara", "~> 3.8"
+  gem "json-schema", "~> 2.8", require: false
+  gem "launchy", "~> 2.4", require: false
+  gem "simplecov", "~> 0.16", require: false
+  gem "timecop", "~> 0.9", require: false
+  gem "webdrivers", "~> 4.0", require: false
+
+  # Shared, general purpose gems
+  gem "capybara", "~> 3.21"
   gem "database_cleaner", "~> 1.7"
-  gem "factory_bot_rails", "~> 4.11"
-  gem "poltergeist", "~> 1.18"
-  gem "rails-controller-testing", "~> 1.0"
+  gem "factory_bot_rails", "~> 5.0"
   gem "rspec-rails", "~> 3.8"
-  gem "shoulda-callback-matchers", "~> 1.1"
-  gem "shoulda-matchers", "~> 3.1"
-  gem "simplecov", "~> 0.16"
+  gem "shoulda-matchers", "~> 4.0"
 end

data/README.md

@@ -23,15 +23,22 @@ Deploy a sample application to [Heroku](https://www.heroku.com/) to play with.
 
 ## Requirements
 
-* Ruby >= 2.2.10
+* Ruby >= 2.4.6
 * Rails ~> 5.1
 
+Additional requirements for `development` and `test` environment:
+
+* Google Chrome
+  * Install using [Homebrew Cask](https://github.com/Homebrew/homebrew-cask) with `brew cask install google-chrome`
+* Chromedriver
+  * Install using [Homebrew Cask](https://github.com/Homebrew/homebrew-cask) with `brew cask install chromedriver`
+
 ## Installation
 
 Add to your application's Gemfile
 
 ```
-gem "archangel", "~> 0.3"
+gem "archangel", "~> 0.4"
 ```
 
 Run the bundle command
@@ -71,7 +78,6 @@ $ bundle exec rails db:migrate
 ## Code Analysis
 
 * [Travis CI](https://travis-ci.org/) is used for running tests.
-* [Hound](https://houndci.com/) is used as the code analyzer in pull request.
 * [Code Climate](https://codeclimate.com/) is used to analyze overall maintainability.
 
 ## Developers
@@ -84,12 +90,10 @@ General documentation for developers
 * [Documentation for theme developers](https://github.com/archangel/archangel/blob/master/docs/Theme/Developers.md)
 * [Documentation for releasing a gem version](https://github.com/archangel/archangel/blob/master/docs/Release.md) (maintainers only)
 
-## Logo
+## Special Thanks
 
 Archangel's logo was created by [Joshua Boyd](http://www.joshadamboyd.com/).
 
-## Special Thanks
-
 [@archangel-dlt](https://github.com/archangel-dlt/) originally had the "archangel" gem name and were kind enough to give it up
 
 ## Contributing

data/app/assets/javascripts/archangel/input/datetimepicker.js

@@ -1,87 +1,41 @@
-$(function() {
+$.fn.inputTimePicker = function () {
   'use strict';
 
-  var archangelDatetimepickerTranslations = function() {
-    return {
-      separator: Archangel.translate.datetimepicker.separator,
-      applyLabel: Archangel.translate.datetimepicker.apply,
-      cancelLabel: Archangel.translate.datetimepicker.cancel,
-      fromLabel: Archangel.translate.datetimepicker.from,
-      toLabel: Archangel.translate.datetimepicker.to,
-      customRangeLabel: Archangel.translate.datetimepicker.custom_range,
-      weekLabel: Archangel.translate.datetimepicker.week,
-      daysOfWeek: [
-        Archangel.translate.datetimepicker.days.sunday,
-        Archangel.translate.datetimepicker.days.monday,
-        Archangel.translate.datetimepicker.days.tuesday,
-        Archangel.translate.datetimepicker.days.wednesday,
-        Archangel.translate.datetimepicker.days.thursday,
-        Archangel.translate.datetimepicker.days.friday,
-        Archangel.translate.datetimepicker.days.saturday
-      ],
-      monthNames: [
-        Archangel.translate.datetimepicker.months.january,
-        Archangel.translate.datetimepicker.months.february,
-        Archangel.translate.datetimepicker.months.march,
-        Archangel.translate.datetimepicker.months.april,
-        Archangel.translate.datetimepicker.months.may,
-        Archangel.translate.datetimepicker.months.june,
-        Archangel.translate.datetimepicker.months.july,
-        Archangel.translate.datetimepicker.months.august,
-        Archangel.translate.datetimepicker.months.september,
-        Archangel.translate.datetimepicker.months.october,
-        Archangel.translate.datetimepicker.months.november,
-        Archangel.translate.datetimepicker.months.december
-      ]
-    };
-  };
+  $(this).flatpickr({
+    enableTime: true,
+    noCalendar: true,
+    dateFormat: 'h:i K'
+  });
+};
 
-  function extend(obj, src) {
-    for (var key in src) {
-      if (src.hasOwnProperty(key)) {
-        obj[key] = src[key];
-      }
-    }
-    return obj;
-  }
+$.fn.inputDatePicker = function () {
+  'use strict';
 
-  // Time picker
-  $('input.time_picker').daterangepicker({
-    singleDatePicker: true,
-    timePicker: true,
-    timePickerIncrement: 5,
-    timePicker24Hour: false,
-    timePickerSeconds: false,
-    showDropdowns: true,
-    locale: extend(
-      archangelDatetimepickerTranslations(),
-      { format: Archangel.translate.datetimepicker.time_format }
-    )
+  $(this).flatpickr({
+    dateFormat: 'Y-m-d',
+    altInput: true,
+    altFormat: 'F j, Y'
   });
+};
 
-  // Date picker
-  $('input.date_picker').daterangepicker({
-    singleDatePicker: true,
-    timePicker: false,
-    showDropdowns: true,
-    locale: extend(
-      archangelDatetimepickerTranslations(),
-      { format: Archangel.translate.datetimepicker.date_format }
-    )
-  });
+$.fn.inputDateTimePicker = function () {
+  'use strict';
 
-  // Date time picker
-  $('input.date_time_picker').daterangepicker({
-    singleDatePicker: true,
-    timePicker: true,
-    timePickerIncrement: 5,
-    timePicker24Hour: false,
-    timePickerSeconds: false,
-    showDropdowns: true,
-    locale: extend(
-      archangelDatetimepickerTranslations(),
-      { format: Archangel.translate.datetimepicker.datetime_format }
-    )
+  $(this).flatpickr({
+    enableTime: true,
+    dateFormat: 'Y-m-d H:i',
+    altInput: true,
+    altFormat: 'F j, Y @ h:i K'
   });
+};
+
+$(function() {
+  'use strict';
+
+  $('input.time_picker').inputTimePicker();
+
+  $('input.date_picker').inputDatePicker();
+
+  $('input.date_time_picker').inputDateTimePicker();
 
 });

data/app/assets/javascripts/archangel/input/meta_keywords.js

@@ -1,17 +1,5 @@
 $.fn.inputTextMetaKeywords = function () {
   'use strict';
-
-  this.selectize({
-    delimiter: ',',
-    persist: false,
-    create: function(input) {
-      return {
-        value: input,
-        text: input
-      };
-    }
-  });
-
 };
 
 $(function() {

data/app/assets/javascripts/archangel/input/wysiwyg.js.erb

@@ -1,44 +1,59 @@
 $.fn.inputTextareaWysiwyg = function () {
   'use strict';
 
-  this.trumbowyg({
-    svgPath: '<%= asset_path("trumbowyg/icons.svg") %>',
-    resetCss: true,
-    removeformatPasted: true,
-    autogrow: true,
-    btnsDef: {
-      align: {
-        dropdown: ['justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull'],
-        ico: 'justifyLeft'
+  $(this).each(function() {
+    new Jodit(this, {
+      buttons: [
+        'source',
+        '|',
+        'bold', 'underline', 'italic',
+        '|',
+        'link', 'image', 'video',
+        '|',
+        'ul', 'ol',
+        '|',
+        'align', 'outdent', 'indent',
+        '|',
+        'eraser', 'brush'
+      ],
+      disablePlugins: [
+        'font', 'formatBlock', 'fullsize', 'mobile', 'redoundo', 'symbols'
+      ],
+      filebrowser: {
+        buttons: [
+          'filebrowser.upload', 'filebrowser.update', 'filebrowser.select',
+          '|',
+          'filebrowser.tiles', 'filebrowser.list',
+          '|',
+          'filebrowser.filter',
+          '|',
+          'filebrowser.sort'
+        ],
+        fullsize: false,
+        headers: {
+          'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+        },
+        items: {
+          url: '<%= Archangel::Engine.routes.url_helpers.wysiwyg_backend_assets_path %>',
+          method: 'GET'
+        },
+        showFileName: false,
+        showFileSize: false,
+        showFileChangeTime: false,
       },
-      list: {
-        dropdown: ['unorderedList', 'orderedList'],
-        ico: 'unorderedList'
-      },
-      image: {
-        dropdown: ['insertImage', 'base64', 'upload'],
-        ico: 'insertImage'
-      }
-    },
-    btns: [
-      ['viewHTML'],
-      ['formatting'],
-      ['removeformat'],
-      ['strong', 'em','del'],
-      ['foreColor', 'backColor'],
-      ['link'],
-      ['image'],
-      ['noembed'],
-      ['align'],
-      ['list']
-    ],
-    plugins: {
-      upload: {
-        serverPath: '/backend/assets/wysiwyg',
-        fileFieldName: 'file',
-        urlPropertyName: 'url'
+      imageDefaultWidth: null,
+      showCharsCounter: false,
+      showWordsCounter: false,
+      spellcheck: false,
+      toolbarAdaptive: false,
+      toolbarSticky: true,
+      uploader: {
+        headers: {
+          'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+        },
+        url: '<%= Archangel::Engine.routes.url_helpers.wysiwyg_backend_assets_path %>'
       }
-    }
+    });
   });
 
 };