comfortable_mexican_sofa 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab2c176d43e3783a684bd7245eb28f889af9ad8d1bd38665e4847e0fdefdbf08
-  data.tar.gz: d214102f49f6965873628fac4e9aec36a486c537d6548d6f0e76a5ffe027e208
+  metadata.gz: b4189f8584e5fbfcc3083d72b892dee0d17407e1893674eed30927e6e5c6d336
+  data.tar.gz: '02964679fbddf7a9f1c46dc35482d11a6a3736409a32daa4a137d0600a921d3d'
 SHA512:
-  metadata.gz: 301bd06b86f9d7e6080edeed4aa0c39add0e83a8ffdebc799ef03507fedd09dbf2ac4d28adb46a45656991e68b361f5f300e54dba24d06a5996f6f63a6cbe4cb
-  data.tar.gz: 6768a98127dfde9834afd18e5085644db61d76e4e6629ddef4a50a480d588ada9c79cb56bf9958dc11f2693289737d3f227eadf2a266ec3a3dcb727aadd1ce41
+  metadata.gz: 47387e45ccebcad1bc3429c6b64633dfd9cc8f0810f7c28745dc578f391404e57a16fb8bd1ecd221acdd6701710aded9ee318eb2b110f7d7374e63063fc472b0
+  data.tar.gz: d16d2d2aaeb92e761c6b3559816f33e1339dd239f8691d6b8194bc5cf60d67ec0dbe34aae18ee2cc2a4f1bf24b15edc4105812bcd4427d04b048a850bc339819

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   Exclude:
     - bin/*
     - db/schema.rb

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.9
   - 2.3.6
   - 2.4.3
   - 2.5.0
+  - ruby-head
 gemfile:
   - test/gemfiles/5.2.gemfile
 branches:
@@ -19,7 +19,7 @@ before_install:
   - gem update --system
   - gem update bundler
 before_script:
-  - wget http://chromedriver.storage.googleapis.com/2.34/chromedriver_linux64.zip
+  - wget http://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
   - unzip chromedriver_linux64.zip
   - sudo apt-get install libnss3
   - sudo apt-get --only-upgrade install google-chrome-stable
@@ -33,3 +33,6 @@ script:
   - bundle exec rake test
   - SKIP_COV=true bundle exec rake test:system
   - bundle exec rubocop
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec
 
 group :development, :test do
+  gem "autoprefixer-rails", "~> 8.1.0"
   gem "byebug",             "~> 10.0.0", platforms: %i[mri mingw x64_mingw]
   gem "capybara",           "~> 2.17.0"
   gem "kaminari",           "~> 1.1.1"
@@ -19,6 +22,8 @@ end
 
 group :test do
   gem "coveralls",                "~> 0.8.21", require: false
+  gem "diffy",                    "~> 3.2.0"
+  gem "equivalent-xml",           "~> 0.6.0"
   gem "mocha",                    "~> 1.3.0", require: false
   gem "rails-controller-testing", "~> 1.0.2"
 end

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "config/application"
 
 Rails.application.load_tasks

data/app/assets/javascripts/comfy/admin/cms/application.js

@@ -0,0 +1,40 @@
+//= require rails-ujs
+//= require jquery3
+
+//= require comfy/vendor/codemirror
+//= require comfy/vendor/codemirror/mode/css/css
+//= require comfy/vendor/codemirror/mode/htmlmixed/htmlmixed
+//= require comfy/vendor/codemirror/mode/javascript/javascript
+//= require comfy/vendor/codemirror/mode/markdown/markdown
+//= require comfy/vendor/codemirror/mode/xml/xml
+//= require comfy/vendor/codemirror/addon/edit/closetag
+//= require comfy/vendor/sortable.min
+//= require comfy/vendor/popper.min
+//= require comfy/vendor/bootstrap.min
+//= require comfy/vendor/diff/diff_match_patch.min
+//= require comfy/vendor/diff/pretty_text_diff
+//= require comfy/vendor/fontawesome
+//= require comfy/vendor/redactor
+//= require comfy/vendor/redactor/filemanager
+//= require comfy/vendor/redactor/imagemanager
+//= require comfy/vendor/redactor/definedlinks
+//= require comfy/vendor/redactor/table
+//= require comfy/vendor/redactor/video
+//= require_directory ../../vendor/redactor/i18n/
+//= require comfy/vendor/flatpickr.min
+//= require_directory ../../vendor/flatpickr/i18n/
+
+//= require comfy/admin/cms/base
+//= require comfy/admin/cms/categories
+//= require comfy/admin/cms/codemirror
+//= require comfy/admin/cms/diff
+//= require comfy/admin/cms/file_link
+//= require comfy/admin/cms/file_upload
+//= require comfy/admin/cms/files_modal
+//= require comfy/admin/cms/page_fragments
+//= require comfy/admin/cms/sortable_list
+//= require comfy/admin/cms/slugify
+//= require comfy/admin/cms/timepicker
+//= require comfy/admin/cms/wysiwyg
+
+//= require comfy/admin/cms/custom

data/app/assets/javascripts/comfy/admin/cms/base.js

@@ -0,0 +1,46 @@
+(() => {
+  if (!window.CMS) window.CMS = {};
+  const CMS = window.CMS;
+
+  // TODO(glebm): Use the battle-tested universal onPageLoad code and enable Turbolinks+async in the demo app.
+  // See: https://gist.github.com/glebm/2496daf445877055447a6fac46509d9a
+  const isTurbolinks = 'Turbolinks' in window && window.Turbolinks.supported;
+  if (isTurbolinks) {
+    document.addEventListener('turbolinks:load', () => {
+      window.CMS.init();
+    });
+    document.addEventListener('turbolinks:before-cache', () => {
+      window.CMS.dispose();
+    });
+  } else {
+    document.addEventListener('DOMContentLoaded', () => {
+      window.CMS.init();
+    });
+  }
+
+  CMS.init = () => {
+    CMS.current_path = window.location.pathname;
+    CMS.slugify();
+    CMS.codemirror.init();
+    CMS.wysiwyg.init();
+    CMS.sortableList.init();
+    CMS.timepicker.init();
+    CMS.pageFragments();
+    CMS.categories();
+    CMS.files.init();
+    CMS.fileLinks();
+    CMS.fileUpload.init();
+    CMS.diff();
+  };
+
+  CMS.dispose = () => {
+    CMS.codemirror.dispose();
+    CMS.wysiwyg.dispose();
+    CMS.files.dispose();
+    CMS.fileUpload.dispose();
+    CMS.sortableList.dispose();
+    CMS.timepicker.dispose();
+  };
+
+  CMS.getLocale = () => document.querySelector('meta[name="cms-locale"]').content;
+})();

data/app/assets/javascripts/comfy/admin/cms/categories.js

@@ -0,0 +1,17 @@
+(() => {
+  window.CMS.categories = (root = document) => {
+    const widget = root.querySelector('.categories-widget');
+    if (widget === null) return;
+    const readSection = widget.querySelector('.read');
+    const editSection = widget.querySelector('.editable');
+    widget.querySelector('.read button.toggle-cat-edit').addEventListener('click', () => {
+      readSection.style.display = 'none';
+      editSection.style.display = 'block';
+    });
+    widget.querySelector('.editable button.toggle-cat-edit').addEventListener('click', () => {
+      editSection.style.display = 'none';
+      readSection.style.display = 'block';
+    });
+  };
+})();
+

data/app/assets/javascripts/comfy/admin/cms/codemirror.js

@@ -0,0 +1,31 @@
+(() => {
+  const codeMirrorInstances = [];
+  window.CMS.codemirror = {
+    init(root = document) {
+      for (const textarea of root.querySelectorAll('textarea[data-cms-cm-mode]')) {
+        const codemirror = CodeMirror.fromTextArea(textarea, {
+          mode: textarea.dataset.cmsCmMode,
+          tabSize: 2,
+          lineWrapping: true,
+          autoCloseTags: true,
+          lineNumbers: true,
+          viewportMargin: Infinity
+        });
+        codeMirrorInstances.push(codemirror);
+      }
+
+      const tabsRoot = root.id === 'form-fragments' ? root : root.querySelector('#form-fragments');
+      jQuery(tabsRoot).find('a[data-toggle="tab"]').on('shown.bs.tab', () => {
+        for (const codemirror of codeMirrorInstances) {
+          codemirror.refresh();
+        }
+      });
+    },
+    dispose() {
+      for (const codemirror of codeMirrorInstances) {
+        codemirror.toTextArea();
+      }
+      codeMirrorInstances.length = 0;
+    }
+}
+})();

data/app/assets/javascripts/comfy/admin/cms/custom.js

@@ -0,0 +1 @@
+// Custom JS for the admin area

data/app/assets/javascripts/comfy/admin/cms/diff.js

@@ -0,0 +1,10 @@
+(() => {
+  window.CMS.diff = () => {
+    jQuery('.revision').prettyTextDiff({
+      cleanup: true,
+      originalContainer: '.original',
+      changedContainer: '.current',
+      diffContainer: '.diff .content',
+    });
+  }
+})();

data/app/assets/javascripts/comfy/admin/cms/file_link.js

@@ -0,0 +1,67 @@
+(() => {
+  const isFirefox = /\bFirefox\//.test(navigator.userAgent);
+
+  class FileLink {
+    constructor(link) {
+      this.link = link;
+      this.isImage = !!link.dataset.cmsFileThumbUrl;
+
+      link.addEventListener('dragstart', (evt) => {
+        evt.dataTransfer.setData('text/plain', this.link.dataset.cmsFileLinkTag);
+      });
+
+      if (this.isImage) {
+        new bootstrap.Popover(link, {
+          container: link.parentElement,
+          trigger: 'hover',
+          placement: 'top',
+          content: this.buildFileThumbnail(),
+          html: true
+        });
+
+        link.addEventListener('dragstart', (evt) => {
+          evt.dataTransfer.setDragImage(this.buildFileThumbnail(), 4, 2);
+          this.getPopover().hide();
+        });
+
+        this.workAroundFirefoxPopoverGlitch();
+      }
+    }
+
+    buildFileThumbnail() {
+      const img = new Image();
+      img.src = this.link.dataset.cmsFileThumbUrl;
+      return img;
+    }
+
+    // To work around a Firefox bug causing the popover to re-appear after the drop:
+    // https://github.com/comfy/comfortable-mexican-sofa/pull/799#issuecomment-369124161
+    //
+    // Possibly related to:
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=505521
+    workAroundFirefoxPopoverGlitch() {
+      if (!isFirefox) return;
+      this.link.addEventListener('dragstart', () => {
+        this.getPopover().disable();
+      });
+      this.link.addEventListener('dragend', () => {
+        setTimeout(() => {
+          const popover = this.getPopover();
+          popover.enable();
+          popover.hide();
+        }, 300);
+      });
+    }
+
+    // We can't keep a reference to the Popover object, because Bootstrap re-creates it internally.
+    getPopover() {
+      return jQuery(this.link).data(bootstrap.Popover.DATA_KEY);
+    }
+  }
+
+  window.CMS.fileLinks = (root = document) => {
+    for (const link of root.querySelectorAll('[data-cms-file-link-tag]')) {
+      new FileLink(link);
+    }
+  };
+})();

data/app/assets/javascripts/comfy/admin/cms/file_upload.js

@@ -0,0 +1,194 @@
+//= require comfy/vendor/moxie.min
+//= require comfy/vendor/plupload.dev
+
+(() => {
+  const DROP_TARGET_ACTIVE_CLASS = 'cms-uploader-drag-drop-target-active';
+
+  class FileUpload {
+    constructor(container, settings) {
+      if (!container.id) container.id = plupload.guid();
+      settings = Object.assign(FileUpload.defaultUploaderSettings(container.id), settings);
+      this.ui = {
+        container,
+        list: container.querySelector('.cms-uploader-filelist'),
+        dropElement: container.querySelector(`#${settings.drop_element}`),
+      };
+      this.cleanupFns = [];
+      this.uploader = new plupload.Uploader(settings);
+      this.uploader.bind('PostInit', () => this.onUploaderPostInit());
+      this.uploader.bind('Error', (_uploader, error) => this.onUploaderError(error));
+      this.uploader.bind('FilesAdded', (_uploader, files) => this.onUploaderFilesAdded(files));
+      this.uploader.bind('UploadProgress', (_uploader, file) => this.onUploaderUploadProgress(file));
+      this.uploader.bind('FileUploaded', (_uploader, file, info) => this.onUploaderFileUploaded(file, info));
+      this.uploader.bind('FilesRemoved', (_uploader, files) => this.onUploaderFilesRemoved(files));
+      this.uploader.init();
+      if (settings.setup) {
+        settings.setup(this.uploader);
+      }
+    }
+
+    destroy() {
+      this.uploader.destroy();
+      for (const cleanupFn of this.cleanupFns) {
+        cleanupFn();
+      }
+    }
+
+    addCleanup(cleanupFn) {
+      this.cleanupFns.push(cleanupFn);
+    }
+
+    onUploaderPostInit() {
+      // Show drag and drop info and attach events only if drag and drop is enabled and supported.
+      if (!this.uploader.settings.dragdrop || !this.uploader.features.dragdrop) {
+        this.ui.container.querySelector('.cms-uploader-drag-drop-info').style.display = 'none';
+        return;
+      }
+      // When dragging over the document add a class to the drop target that puts it on top of every element and remove
+      // that class when dropping or leaving the drop target. Otherwise the dragleave event would fire whenever we drag
+      // over a child element inside the drop target such as text nodes.
+      const onDragEnter = (e) => {
+        // Only react to drag'n'drops that contain a file. See:
+        // https://developer.mozilla.org/en-US/docs/Web/API/DataTransfer/types
+        if (e.dataTransfer.types.includes('Files')) {
+          this.ui.dropElement.classList.add(DROP_TARGET_ACTIVE_CLASS);
+        }
+      };
+      document.addEventListener('dragenter', onDragEnter);
+      this.addCleanup(() => {
+        document.removeEventListener('dragenter', onDragEnter);
+      });
+      for (const eventName of ['drop', 'dragleave']) {
+        this.ui.dropElement.addEventListener(eventName, () => {
+          this.ui.dropElement.classList.remove(DROP_TARGET_ACTIVE_CLASS);
+        });
+      }
+    }
+
+    onUploaderError(error) {
+      if (error.code === plupload.INIT_ERROR) {
+        window.alert('Error: Initialisation error. Reload to try again.');
+        return;
+      }
+      const file = error.file;
+      if (!file) return;
+      // Get error message from the server response. Not all runtimes support this.
+      let message = error.response;
+      // If no error message is in the server response get standard plupload error messages.
+      // This will have descriptive error message for something like file size or file format errors but for
+      // server errors it will only display a general error message.
+      if (!message) {
+        message = error.message;
+        if (error.details) message += ` (${error.details})`;
+      }
+      file.status = plupload.FAILED;
+      file.error_message = message;
+      this.updateFileStatus(file);
+    }
+
+    onUploaderFilesAdded(files) {
+      for (const file of files) {
+        this.addFile(file);
+      }
+      // Auto start upload when files are added.
+      this.uploader.start();
+    }
+
+    onUploaderUploadProgress(file) {
+      this.updateFileStatus(file);
+    }
+
+    onUploaderFileUploaded(file, info) {
+      // Replace the dummy file entry in the file list with the the entry from the server response.
+      const template = document.createElement('template');
+      template.innerHTML = info.response;
+      const newListItem = template.content.firstElementChild;
+      this.ui.list.replaceChild(newListItem, this.fileListItem(file));
+      window.CMS.fileLinks(newListItem);
+    }
+
+    onUploaderFilesRemoved(files) {
+      for (const file of files) {
+        this.removeFile(file);
+      }
+    }
+
+    addFile(file) {
+      this.ui.list.insertAdjacentHTML('afterbegin', FileUpload.buildListItemHTML(file));
+      this.fileListItem(file).querySelector('.cms-uploader-file-delete').addEventListener('click', (evt) => {
+        evt.preventDefault();
+        this.uploader.removeFile(file);
+      });
+      this.updateFileStatus(file);
+    }
+
+    removeFile(file) {
+      this.fileListItem(file).remove();
+    }
+
+    updateFileStatus(file) {
+      const progressBar = this.fileListItem(file).querySelector('.progress-bar');
+      switch (file.status) {
+        case plupload.UPLOADING:
+          progressBar.style.width = `${file.percent}%`;
+          break;
+        case plupload.FAILED:
+          progressBar.style.width = '100%';
+          progressBar.classList.add('progress-bar-danger');
+          progressBar.querySelector('span').innerHTML = file.error_message;
+          break;
+      }
+    }
+
+    fileListItem({id}) {
+      return this.ui.container.querySelector(`#${id}`);
+    }
+
+    static buildListItemHTML({id, name}) {
+      return `<li id='${id}' class='row temp'>
+        <div class='col-md-9 d-flex align-items-center'>
+          <div class='progress'>
+            <div class='progress-bar progress-bar-striped progress-bar-animated'>
+              <span>${name}</span>
+            </div>
+          </div>
+        </div>
+        <div class='col-md-3 d-flex align-items-center justify-content-md-end'>
+          <a class='btn btn-sm btn-danger float-right cms-uploader-file-delete' href='#'>Delete</a>
+        </div>
+      </li>`;
+    }
+
+    static defaultUploaderSettings(id) {
+      return {
+        runtimes: 'html5,browserplus,silverlight,flash,gears',
+        dragdrop: true,
+        drop_element: `${id}-drag-drop-target`,
+        browse_button: `${id}-browse`,
+        container: id,
+        file_data_name: 'file[file]',
+      };
+    }
+  }
+
+  const uploaders = [];
+  window.CMS.fileUpload = {
+    init(root = document) {
+      const el = root.querySelector('#cms-uploader');
+      if (el === null) return;
+      uploaders.push(new FileUpload(el, {
+        url: el.dataset.cmsUploaderUrl,
+        multipart_params: {
+          [el.dataset.cmsUploaderTokenName]: el.dataset.cmsUploaderTokenValue,
+          [el.dataset.cmsUploaderSessionName]: el.dataset.cmsUploaderSessionValue
+        }
+      }));
+    },
+    dispose() {
+      for (const uploader of uploader) {
+        uploader.dispose();
+      }
+      uploaders.length = 0;
+    }
+  };
+})();