activeadmin_froala_editor 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4321e77420b7981e28df396b8b1a6c85825829a901af7819099009d85da91afb
-  data.tar.gz: 7c72cc86ae31d2350cfd6271e5386429fda8753cbcc7f5f201b695efc81ae57e
+  metadata.gz: 9749605f9f60196e6c2a7c5c4896dd542d0090d413efc70114005efa50756e8f
+  data.tar.gz: 31dd928db47987a934d114c200f6956a182191a009c8ba8e270f197f8294ea13
 SHA512:
-  metadata.gz: 98a8c4d52d8432177274b0a42ab84d18cddadb1d7d6333dde1dda4ec41e8bf24450b48ad36e28c7ad72c5a247437f95dece611726fe6ca60cc7ed39c19b20a93
-  data.tar.gz: 886e91d497d62485a76f6a9b0aeec9802bb97d3cee074808e71d662d14537cd6d47067839c68372c0bc4dba9618b6e1d648d819b6f380cd0ef0bc62b6df1aeed
+  metadata.gz: '084f552b2767fd5266427a42ee7b480ff57ae7ab6115bea21603936e9d636e31f2557b6ea3e6cda1976803f88043822abbd7136290362676ab7555198cc07779'
+  data.tar.gz: 0740ba637e5b9cf2bf7403423775243db8132afd8f9e148196c8f3454c5081bc1f36100e7d557349e3644ea08bbd2cfd4cd63fecdd3c6d13b0237b457eaf0aae

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Mattia Roccoberton
+Copyright (c) 2017-2020 Mattia Roccoberton
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,36 +1,35 @@
 # ActiveAdmin Froala Editor [![Gem Version](https://badge.fury.io/rb/activeadmin_froala_editor.svg)](https://badge.fury.io/rb/activeadmin_froala_editor) [![CircleCI](https://circleci.com/gh/blocknotes/activeadmin_froala_editor.svg?style=svg)](https://circleci.com/gh/blocknotes/activeadmin_froala_editor)
 
-An Active Admin plugin to use [Froala WYSIWYG editor](https://github.com/froala/wysiwyg-editor) (jQuery required, font-awesome required & included)
+An Active Admin plugin to use [Froala WYSIWYG editor](https://github.com/froala/wysiwyg-editor) (jQuery required, font-awesome required & included). For Froala license / pricing see Froala website.
 
-![screenshot](screenshot.jpg)
+Features:
+- permits to include an easy to use rich editor in Active Admin;
+- customizable options via data attributes in the form input;
+- plugins included, like images upload.
 
-For Froala license / pricing see Froala website.
+![screenshot](screenshot.png)
 
 ## Install
-
-- Update your Gemfile: `gem 'activeadmin_froala_editor'` (and execute *bundle*)
-- Add at the end of your ActiveAdmin styles (_app/assets/stylesheets/active_admin.scss_):
+- After installing Active Admin, add to your Gemfile: `gem 'activeadmin_froala_editor'` (and execute *bundle*)
+- Add at the end of your Active Admin styles (_app/assets/stylesheets/active_admin.scss_):
 ```css
 @import 'font-awesome/font-awesome';
 @import 'activeadmin/froala_editor_input';
 ```
-- Add at the end of your ActiveAdmin javascripts (_app/assets/javascripts/active_admin.js_):
+- Add at the end of your Active Admin javascripts (_app/assets/javascripts/active_admin.js_):
 ```js
 //= require activeadmin/froala_editor/froala_editor.pkgd.min
 //= require activeadmin/froala_editor_input
 ```
 - Use the input with `as: :froala_editor` in Active Admin model conf
 
-Why 2 separated scripts? In this way you can include a different version of *froala editor* if you like. The same for FontAwesome.
-
 ## Options
-
 **data-options**: permits to set *froala editor* options directly - see [options list](https://www.froala.com/wysiwyg-editor/docs/options)
 
 ## Examples
 
 ```ruby
-# ActiveAdmin article form conf:
+# Active Admin article form conf:
   form do |f|
     f.inputs 'Article' do
       f.input :title
@@ -47,24 +46,24 @@ Toolbar buttons configuration:
 f.input :description, as: :froala_editor, input_html: { data: { options: { toolbarButtons: ['undo', 'redo', '|', 'bold', 'italic'] } } }
 ```
 
-## Notes
+Froala upload plugin: for the relevant files of an upload example see [here](examples/upload_plugin_using_activestorage/).
+Consider that this is just a basic example: images are uploaded as soon as they are attached to the
+ editor (regardless of the form submit), it shows the editor only for an existing record (because of
+the *upload_admin_post_path*) and it doesn't provide a way to remove images (just deleting them from
+the editor will not destroy them, you'll need to implement a purge logic for that).
 
-- *Code View* function doesn't work properly with this plugin
-- For upload functions (Images, Documents, Files, etc.) see Froala docs
-- To use this plugins with ActiveAdmin 1.x please use the version 0.1.3
+## Notes
+- To use this plugins with Active Admin 1.x please use the version [0.1.3](https://github.com/blocknotes/activeadmin_froala_editor/releases/tag/v0.1.3)
 
 ## Do you like it? Star it!
-
 If you use this component just star it. A developer is more motivated to improve a project when there is some interest.
 
-Take a look at [other ActiveAdmin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source) that I made if you are curious.
+Take a look at [other Active Admin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source) that I made if you are curious.
 
 ## Contributors
-
 - [Mattia Roccoberton](http://blocknot.es): author
+- The good guys that opened issues and pull requests from time to time
 
 ## License
-
-Froala License: see Froala website
-
-Plugin License: [MIT](LICENSE.txt)
+- The gem is available as open-source under the terms of the [MIT](LICENSE.txt)
+- For Froala editor License: see [Froala website](https://froala.com/wysiwyg-editor/)

data/Rakefile

@@ -1,3 +1,3 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/app/assets/javascripts/activeadmin/froala_editor_input.js

@@ -4,6 +4,10 @@ function initFroalaEditors() {
       var name = $(this).attr('name');
       if(name) {
         var options = {
+          quickInsertButtons: ['table', 'ol', 'ul', 'hr'],
+          requestHeaders: {
+            'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
+          },
           toolbarButtons: {
             moreText: {
               buttons: ['bold', 'italic', 'underline', 'strikeThrough', 'subscript', 'superscript', 'fontFamily', 'fontSize', 'textColor', 'backgroundColor', 'inlineClass', 'inlineStyle', 'clearFormatting'],
@@ -25,8 +29,7 @@ function initFroalaEditors() {
               align: 'right',
               buttonsVisible: 3
             }
-          },
-          quickInsertButtons: ['table', 'ol', 'ul', 'hr']
+          }
         };
         options = $.extend({}, options, $(this).data('options'));
         new FroalaEditor('.froala-editor[name="' + name + '"]', options);

data/app/assets/stylesheets/activeadmin/_froala_editor_input.scss

@@ -1,36 +1,43 @@
 @import 'activeadmin/froala_editor/froala_editor.pkgd';
 @import 'activeadmin/froala_editor/froala_style';
 
-body.active_admin form .froala_editor {
+body.active_admin .froala_editor {
   button {
     box-shadow: none;
   }
+
   ol {
     list-style-type: decimal;
   }
+
   ul {
     list-style-type: disc;
   }
+
   .fr-action-buttons > button {
     font-weight: normal;
     text-shadow: none;
   }
+
   .fr-box {
     display: inline-block;
-    width: calc(80% - 22px);
+    width: calc(80% - 2px);
   }
+
   .fr-checkbox-line {
     >label {
       display: inline-block;
       float: none;
       width: auto;
     }
+
     >span {
       height: auto;
       padding: 0;
       width: auto;
     }
   }
+
   .fr-element {
     ul, ol {
       margin: 0 10px 15px 0;
@@ -40,17 +47,21 @@ body.active_admin form .froala_editor {
       padding: 0;
     }
   }
+
   .fr-input-line >label {
     font-weight: normal;
   }
+
   .fr-top {
-    border-radius: 4px 4px 0 0;
+    border-radius: 3px 3px 0 0;
   }
+
   .fr-wrapper {
     min-height: 150px;
     max-height: 300px;
     overflow-y: scroll;
   }
+
   .second-toolbar {
     border-radius: 0 0 4px 4px;
   }

data/lib/activeadmin/froala_editor.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'activeadmin/froala_editor/engine'

data/lib/activeadmin/froala_editor/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_admin'
 
 module ActiveAdmin

data/lib/activeadmin/froala_editor/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveAdmin
   module FroalaEditor
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.4'
   end
 end

data/lib/activeadmin_froala_editor.rb

@@ -1,3 +1,4 @@
-require 'activeadmin/froala_editor'
+# frozen_string_literal: true
 
+require 'activeadmin/froala_editor'
 require 'formtastic/inputs/froala_editor_input'

data/lib/formtastic/inputs/froala_editor_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Formtastic
   module Inputs
     class FroalaEditorInput < Formtastic::Inputs::TextInput

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_froala_editor
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -109,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: 0.90.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.142.7
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 3.142.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 3.142.7
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement