activeadmin_trumbowyg 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39bc4ba3b6f2e02ceae34f4eb6387d202244ae79ddb3ddf055284e7cdb6cd5d
-  data.tar.gz: 0bd93b2b9731ccc6435fb78aadef63278056d0d3a62467ffce24914b6f4ffb1b
+  metadata.gz: 2135ec8b6b680c3eaa9aa9ad24dcb095c8ecb8a3818f24eda7204ef9120805f2
+  data.tar.gz: dd969ae0f3d7ef14ae838704edb09ee55b992b9187da9377c640dfde4007722d
 SHA512:
-  metadata.gz: 9e60dc5fb8ac876242f7b79fed94cf9e823250613dc0474f023332e0815a00f83d0335b967bd3ab08b04d4999c0cc4cb1db75db7cbb26028a2a262c35e3f3376
-  data.tar.gz: a8cbca238c44daa9216b78c9b991cfba591a8be46612cf6653a2c44e14e3aca09e510d4d436360cfb4232f0bf54ab707cb0b65b60a2b2a59254a0fe15fc91fbe
+  metadata.gz: e9f58979d6e70d1deb175a4393eb12513c6f9c05248efeff7586c06bc43136d0d9d578fb8c5a50f2e62ede2175e6a75ac1adfb1e14b674c5f36bafa47e071fed
+  data.tar.gz: fff726c5cf4423c19dabcc20ed9681ea505479df1fa4b8895c93694b666187f6104dd0e68ad93b5a235358294e755e09380e78ea641663ae6db8e494edd3d5b7

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,4 +1,4 @@
-# ActiveAdmin Trumbowyg [![Gem Version](https://badge.fury.io/rb/activeadmin_trumbowyg.svg)](https://badge.fury.io/rb/activeadmin_trumbowyg)
+# ActiveAdmin Trumbowyg [![Gem Version](https://badge.fury.io/rb/activeadmin_trumbowyg.svg)](https://badge.fury.io/rb/activeadmin_trumbowyg) [![CircleCI](https://circleci.com/gh/blocknotes/activeadmin_trumbowyg.svg?style=svg)](https://circleci.com/gh/blocknotes/activeadmin_trumbowyg)
 
 An Active Admin plugin to use [Trumbowyg Editor](https://alex-d.github.io/Trumbowyg/)
 
@@ -22,6 +22,8 @@ An Active Admin plugin to use [Trumbowyg Editor](https://alex-d.github.io/Trumbo
 
 Why 2 separated scripts? In this way you can include a different version of *trumbowyg editor* if you like.
 
+> **UPDATE FROM VERSION < 2.0**: please change the Trumbowyg line in your _app/assets/stylesheets/active_admin.scss_ to: `@import 'activeadmin/trumbowyg/trumbowyg';`
+
 ## Options
 
 **data-options**: permits to set *trumbowyg editor* options directly - see [options list](https://alex-d.github.io/Trumbowyg/documentation/)

data/Rakefile

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

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

@@ -0,0 +1,67 @@
+body.active_admin {
+  .trumbowyg-box {
+    border: 1px solid #c9d0d6;
+    border-radius: 3px;
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 0;
+    width: calc(80% - 2px);
+
+    button {
+      background: transparent;
+      border-radius: 0;
+      box-shadow: none;
+      color: #222;
+      text-shadow: none;
+    }
+
+    textarea {
+      border: 0 none;
+      display: block;
+    }
+
+    >.trumbowyg-editor {
+      background-color: #fff;
+
+      // reset internal elements
+      * {
+        margin: initial;
+        padding: initial;
+        text-align: initial;
+      }
+
+      p {
+        margin-bottom: 1em;
+      }
+
+      ol {
+        list-style-type: decimal;
+      }
+
+      ul {
+        list-style-type: disc;
+      }
+
+      ul, ol {
+        margin: 0 1.5em 1.5em 0;
+        padding-left: 1.5em;
+      }
+    }
+
+    .trumbowyg-button-pane {
+      background: transparent;
+      border-bottom: 0 none;
+    }
+  }
+
+  .trumbowyg-modal {
+    .trumbowyg-modal-button {
+      line-height: initial;
+      text-shadow: none;
+    }
+  }
+
+  .field_with_errors >.trumbowyg-box {
+    border: 1px solid #932419;
+  }
+}

data/lib/activeadmin/trumbowyg.rb

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

data/lib/activeadmin/trumbowyg/engine.rb

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

data/lib/activeadmin/trumbowyg/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveAdmin
   module Trumbowyg
-    VERSION = '0.2.0'
+    VERSION = '0.2.4'
   end
 end

data/lib/activeadmin_trumbowyg.rb

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

data/lib/formtastic/inputs/trumbowyg_input.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Formtastic
   module Inputs
     class TrumbowygInput < Formtastic::Inputs::TextInput
       def to_html
         input_wrapping do
-          label_html <<
-          builder.text_area( method, input_html_options.merge( class: 'trumbowyg-textarea' ) )
+          label_html << builder.text_area(method, input_html_options.merge(class: 'trumbowyg-textarea'))
         end
       end
     end

data/lib/tasks/trumbowyg.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 namespace :trumbowyg do
@@ -6,13 +8,13 @@ namespace :trumbowyg do
     # include ActionView::Helpers::AssetUrlHelper
     # p font_path( 'active_admin-trumbowyg.svg' )
 
-    fingerprint = /\-[0-9a-f]{32,64}\./
+    fingerprint = /-[0-9a-f]{32,64}\./
     path = Rails.root.join( 'public/assets/active_admin-trumbowyg*' )
 
     Dir[path].each do |file|
       next unless file =~ fingerprint
-      nondigest = file.sub fingerprint, '.'
 
+      nondigest = file.sub fingerprint, '.'
       if !File.exist?(nondigest) || File.mtime(file) > File.mtime(nondigest)
         FileUtils.cp file, nondigest, verbose: true, preserve: true
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_trumbowyg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-02 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
@@ -323,7 +323,7 @@ files:
 - app/assets/javascripts/activeadmin/trumbowyg/trumbowyg.js
 - app/assets/javascripts/activeadmin/trumbowyg/trumbowyg.min.js
 - app/assets/javascripts/activeadmin/trumbowyg_input.js
-- app/assets/stylesheets/activeadmin/_trumbowyg_input.sass
+- app/assets/stylesheets/activeadmin/_trumbowyg_input.scss
 - app/assets/stylesheets/activeadmin/trumbowyg/trumbowyg.scss
 - lib/activeadmin/trumbowyg.rb
 - lib/activeadmin/trumbowyg/engine.rb

data/app/assets/stylesheets/activeadmin/_trumbowyg_input.sass

@@ -1,56 +0,0 @@
-@font-face
-  font-family: 'trumbowyg-icons'
-  font-weight: normal
-  font-style: normal
-  src: font-url('active_admin-trumbowyg.svg')
-
-body.active_admin form .trumbowyg-box
-  display: inline-block
-  width: calc(80% - 22px)
-  button
-    background: transparent
-    border-radius: 0
-    box-shadow: none
-    color: #222
-    text-shadow: none
-    // &:hover, &.trumbowyg-active, &.trumbowyg-active-button
-    //   background: transparent
-  textarea
-    border: 0 none
-    display: block
-  >.trumbowyg-editor
-    background-color: #fff
-    // reset internal elements
-    *
-      margin: initial
-      padding: initial
-      text-align: initial
-    p
-      margin-bottom: 1em
-    ol
-      list-style-type: decimal
-    ul
-      list-style-type: disc
-    ul, ol
-      margin: 0 1.5em 1.5em 0
-      padding-left: 1.5em
-  .trumbowyg-button-pane
-    background: transparent
-    border-bottom: 0 none
-  .trumbowyg-dropdown >button:hover
-    background-color: #ecf0f1
-  .trumbowyg-modal
-    input[type="text"]
-      border: 1px solid #DEDEDE
-      height: 27px
-      min-width: auto
-      width: 70%
-    label
-      float: none
-      font-weight: normal
-      height: 27px
-      width: auto
-  .trumbowyg-modal-button
-    line-height: initial
-    &.trumbowyg-modal-submit
-      color: #fff