Merge pull request #30 from blocknotes/minor-improvements

v1.0.0

Author: blocknotes

.fasterer.yml

@@ -2,5 +2,6 @@
 exclude_paths:
   - bin/*
   - db/schema.rb
+  - gemfiles/**/*
   - spec/dummy/**/*
   - vendor/**/*

.github/workflows/specs_rails60.yml

@@ -0,0 +1,42 @@
+---
+name: Specs Rails 6.0
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7']
+        gemfile: ['rails60_activeadmin22', 'rails60_activeadmin']
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec --profile
+
+      - name: On failure, archive screenshots as artifacts
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: test-failed-screenshots
+          path: spec/dummy/tmp/screenshots

.github/workflows/specs_rails61.yml

@@ -0,0 +1,42 @@
+---
+name: Specs Rails 6.1
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+        gemfile: ['rails61_activeadmin29', 'rails61_activeadmin']
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec --profile
+
+      - name: On failure, archive screenshots as artifacts
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: test-failed-screenshots
+          path: spec/dummy/tmp/screenshots

.github/workflows/specs.yml .github/workflows/specs_rails70.yml.github/workflows/specs.yml renamed to .github/workflows/specs_rails70.yml

@@ -1,22 +1,28 @@
 ---
-name: Specs
+name: Specs Rails 7.0
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
   pull_request:
-    branches: [master]
+    branches:
+      - master
 
 jobs:
-  specs:
+  tests:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        ruby: ['2.5', '2.6', '2.7']
+        ruby: ['2.7', '3.0']
+        gemfile: ['rails70_activeadmin']
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v2
 
       - name: Set up Ruby
@@ -26,9 +32,9 @@ jobs:
           bundler-cache: true
 
       - name: Run tests
-        run: bundle exec rake
+        run: bundle exec rspec --profile
 
-      - name: Archive screenshots for failed tests
+      - name: On failure, archive screenshots as artifacts
         uses: actions/upload-artifact@v2
         if: failure()
         with:

.rubocop.yml

@@ -12,33 +12,15 @@ AllCops:
   Exclude:
     - bin/*
     - db/schema.rb
+    - gemfiles/**/*
     - spec/dummy/**/*
     - vendor/**/*
   NewCops: enable
 
-Gemspec/RequiredRubyVersion:
-  Enabled: false
-
-Naming/FileName:
-  Enabled: false
-
-Layout/LineLength:
-  Enabled: true
-  Max: 120
-
 RSpec/ExampleLength:
   # default 5
   Max: 12
 
 RSpec/MultipleExpectations:
   # default 1
   Max: 4
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true

Appraisals

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+appraise 'rails52-activeadmin20' do
+  gem 'activeadmin', '~> 2.0.0'
+  gem 'rails', '~> 5.2.0'
+end
+
+appraise 'rails60-activeadmin22' do
+  gem 'activeadmin', '~> 2.2.0'
+  gem 'rails', '~> 6.0.0'
+  gem 'selenium-webdriver', require: false
+end
+
+appraise 'rails60-activeadmin' do
+  gem 'activeadmin'
+  gem 'rails', '~> 6.0.0'
+  gem 'selenium-webdriver', require: false
+end
+
+appraise 'rails61-activeadmin29' do
+  gem 'activeadmin', '~> 2.9.0'
+  gem 'rails', '~> 6.1.0'
+end
+
+appraise 'rails61-activeadmin' do
+  gem 'activeadmin'
+  gem 'rails', '~> 6.1.0'
+end
+
+appraise 'rails70-activeadmin' do
+  gem 'activeadmin'
+  gem 'rails', '~> 7.0.0'
+  gem 'sprockets-rails'
+end

CHANGELOG.md

@@ -0,0 +1,54 @@
+# Quill Editor for ActiveAdmin
+
+An Active Admin plugin to use Quill Rich Text Editor.
+
+## v1.0.0 - 2022-04-18
+
+- Set minimum Ruby version to 2.6.0
+- Remove `sassc` dependency
+- Enable Ruby 3.0 specs support
+- Enable Rails 7.0 specs support
+- Internal improvements
+
+## v0.3.4 - 2021-03-16
+
+- Fix editor loading with Turbolinks
+
+## v0.3.2 - 2021-03-14
+
+- Specs improvements
+- Minor internal changes
+
+## v0.3.0 - 2020-10-01
+
+- Add Webpacker support
+
+## v0.2.14 - 2020-09-10
+
+- JS: enable strict directive
+- Minor specs improvement
+
+## v0.2.12 - 2020-09-08
+
+- JS refactoring
+
+## v0.2.10 - 2020-09-05
+
+- Include Image Uploader plugin
+
+## v0.2.9 - 2020-09-04
+
+- Fix not working alignments (issue #8)
+- Fix empty editor problem which produces `<p><br></p>` (pull request #9)
+
+## v0.2.8 - 2020-09-03
+
+- Minor style improvements
+- Add specs for editor in nested resources
+- Add Rubocop and remove SimpleCov gems
+
+## v0.2.4 - 2020-09-01
+
+- Update Quill editor to version 1.3.7
+- Add minimum specs (using RSpec)
+- Minor internal changes

Gemfile

@@ -5,19 +5,18 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'activestorage', '~> 6.0'
-  gem 'capybara', '~> 3.33'
-  gem 'puma', '~> 4.3'
-  gem 'rspec_junit_formatter', '~> 0.4'
-  gem 'rspec-rails', '~> 4.0'
-  gem 'selenium-webdriver', '~> 3.142'
-  gem 'sprockets-rails', '~> 3.2'
-  gem 'sqlite3', '~> 1.4'
+  gem 'puma'
+  gem 'sassc'
+  gem 'sqlite3'
+
+  # Testing
+  gem 'capybara'
+  gem 'cuprite'
+  gem 'rspec_junit_formatter'
+  gem 'rspec-rails'
 
   # Linters
-  gem 'brakeman'
   gem 'fasterer'
-  gem 'reek'
   gem 'rubocop'
   gem 'rubocop-packaging'
   gem 'rubocop-performance'

LICENSE.txt

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

README.md

@@ -1,9 +1,13 @@
 # ActiveAdmin Quill Editor
-[![gem version](https://badge.fury.io/rb/activeadmin_quill_editor.svg)](https://badge.fury.io/rb/activeadmin_quill_editor) [![gem downloads](https://badgen.net/rubygems/dt/activeadmin_quill_editor)](https://rubygems.org/gems/activeadmin_quill_editor) [![Linters](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/linters.yml) [![specs](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/specs.yml)
+[![gem version](https://badge.fury.io/rb/activeadmin_quill_editor.svg)](https://badge.fury.io/rb/activeadmin_quill_editor)
+[![gem downloads](https://badgen.net/rubygems/dt/activeadmin_quill_editor)](https://rubygems.org/gems/activeadmin_quill_editor)
+[![linters](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/linters.yml)
+[![specs Rails 6.1](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/specs_rails61.yml/badge.svg)](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/specs_rails61.yml)
+[![specs Rails 7.0](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/specs_rails70.yml/badge.svg)](https://github.com/blocknotes/activeadmin_quill_editor/actions/workflows/specs_rails70.yml)
 
 An Active Admin plugin to use [Quill Rich Text Editor](https://github.com/quilljs/quill) in form fields.
 
-![screenshot](screenshot.png)
+![screenshot](extra/screenshot.png)
 
 Please :star: if you like it.
 
@@ -13,6 +17,7 @@ After installing Active Admin, add to your Gemfile: `gem 'activeadmin_quill_edit
 
 If you installed Active Admin without Webpacker support (default for now):
 
+- Add a SASS/SCSS gem to your Gemfile (ex. `gem 'sassc'`)
 - Add at the end of your Active Admin styles (_app/assets/stylesheets/active_admin.scss_):
 ```scss
 @import 'activeadmin/quill_editor/quill.snow';
@@ -92,6 +97,10 @@ Consider that this is just a basic example: images are uploaded as soon as they
 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).
 
+## Changelog
+
+The changelog is available [here](CHANGELOG.md).
+
 ## 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. My other [Active Admin components](https://github.com/blocknotes?utf8=✓&tab=repositories&q=activeadmin&type=source).