effective_bootstrap 0.9.28 → 0.9.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1fc4ca7c84ace7b7d118f7d0c2820192fd121c7e3dbc1f1a86a2018e91fb28d
-  data.tar.gz: 5146c6f244c97a850c8d749e14b8171c6e453980e98a7ac1c18db16add6444dd
+  metadata.gz: c7962cda76a99f9a2af980a67a9f876223b722d83ecafee967bc15cbd3da22a2
+  data.tar.gz: 7adf1ba3532157b54039e67a6faeb2675a5f6826c88271a0597aca25dfb121d7
 SHA512:
-  metadata.gz: ea08f202b403d071b2188c28b8231a6e31c242bf474ed552fe9175413e3466953d2aaea5e28381f4c8a98b87a23c5a3b2b2c38a148e25e582c44e6548bd801d0
-  data.tar.gz: 74b29d0657fae0f4362ab62fcad9fcf6c9093993c12081347f488467709263d85332f3e15f4832935b35e91792145b7c324030e20bc9b515862784af0c7bafde
+  metadata.gz: '079863a2874583e9d3080aea824fd847e1026c0d7c7ac6591a13a6b7927633e25c4f5ada8278d0aed219facebff6901ab06498d7c34794d256300701fb5b8e9e'
+  data.tar.gz: 352ccfac174eb0fed1f10627a881407e9f9f331a23968c72a259dac329e4abe46521588cb5aa0d40a4b280e86a2fcdaab0b9f8e84024a8f196eb5c701c24a877

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019 Code and Effect Inc.
+Copyright 2021 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/javascripts/effective_article_editor/initialize.js.coffee

@@ -0,0 +1,18 @@
+# https://imperavi.com/article/
+
+uploadActiveStorage = (editor, data) ->
+  for file in data.files
+    upload = new ActiveStorage.DirectUpload(file, '/rails/active_storage/direct_uploads')
+
+    upload.create (error, blob) =>
+      url = '/rails/active_storage/blobs/redirect/' + blob.signed_id + '/' + blob.filename
+      editor.complete({ file: { url: url }}, data.e)
+
+(this.EffectiveBootstrap || {}).effective_article_editor = ($element, options) ->
+
+  if options['active_storage']
+    options['image'] = {
+      upload: (editor, data) -> uploadActiveStorage(editor, data)
+    }
+
+  ArticleEditor($element, options)

data/app/assets/javascripts/effective_article_editor/input.js

@@ -0,0 +1 @@
+//= require ./initialize

data/app/assets/javascripts/effective_bootstrap.js

@@ -10,6 +10,7 @@
 //= require ./effective_time/input
 //= require ./effective_time_zone_select/input
 
+//= require ./effective_article_editor/input
 //= require ./effective_clear/input
 //= require ./effective_checks/input
 //= require ./effective_ck_editor/input

data/app/assets/stylesheets/effective_article_editor/input.scss

@@ -0,0 +1 @@
+@import 'overrides';

data/app/assets/stylesheets/effective_article_editor/overrides.scss

@@ -0,0 +1 @@
+body { padding-top: 0px !important; }

data/app/assets/stylesheets/effective_bootstrap_article_editor.scss

@@ -0,0 +1 @@
+@import 'effective_article_editor/input';

data/app/models/effective/form_builder.rb

@@ -22,6 +22,10 @@ module Effective
     alias_method :super_text_area, :text_area
     alias_method :super_hidden_field, :hidden_field
 
+    def article_editor(name, options = {}, &block)
+      Effective::FormInputs::ArticleEditor.new(name, options, builder: self).to_html(&block)
+    end
+
     def clear(name = 'Clear', options = {})
       (options = name; name = 'Clear') if name.kind_of?(Hash)
       Effective::FormInputs::Clear.new(name, options, builder: self).to_html

data/app/models/effective/form_inputs/article_editor.rb

@@ -0,0 +1,77 @@
+module Effective
+  module FormInputs
+    class ArticleEditor < Effective::FormInput
+
+      def build_input(&block)
+        @builder.super_text_area(name, options[:input])
+      end
+
+      def input_html_options
+        { class: 'effective_article_editor form-control', id: unique_id, autocomplete: 'off' }
+      end
+
+      def input_js_options
+        {
+          active_storage: active_storage,
+          css: '/assets/effective_article_editor/',
+          custom: {
+            css: ['/assets/application.css', '/assets/effective_bootstrap_article_editor.css']
+          },
+          classes: {
+            body: 'article-editor-body',
+            table: 'table'
+          },
+          grid: {
+            classname: 'row',
+            columns: 12,
+            gutter: '1px',
+            offset: {
+              left: '15px',
+              right: '15px',
+            },
+            patterns: {
+              '6|6': 'col-sm-6|col-sm-6',
+              '4|4|4': 'col-sm-4|col-sm-4|col-sm-4',
+              '3|3|3|3': 'col-sm-3|col-sm-3|col-sm-3|col-sm-3',
+              '2|2|2|2|2|2': 'col-sm-2|col-sm-2|col-sm-2|col-sm-2|col-sm-2|col-sm-2',
+              '3|6|3': 'col-sm-3|col-sm-6|col-sm-3',
+              '2|8|2': 'col-sm-2|col-sm-8|col-sm-2',
+              '5|7': 'col-sm-5|col-sm-7',
+              '7|5': 'col-sm-7|col-sm-5',
+              '4|8': 'col-sm-4|col-sm-8',
+              '8|4': 'col-sm-8|col-sm-4',
+              '3|9': 'col-sm-3|col-sm-9',
+              '9|3': 'col-sm-9|col-sm-3',
+              '2|10': 'col-sm-2|col-sm-10',
+              '10|2': 'col-sm-10|col-sm-2',
+              '12': 'col-sm-12'
+            }
+          },
+          plugins: ['blockcode', 'imageposition', 'imageresize', 'inlineformat', 'removeformat', 'reorder', 'style'],
+          quote: {
+            template: '<blockquote><p></p></blockquote>'
+          },
+          styles: {
+            table: {
+              'bordered': { title: 'Bordered', classname: 'table-bordered' },
+              'responsive': { title: 'Responsive', classname: 'table-responsive' },
+              'small': { title: 'Small', classname: 'table-sm' },
+              'striped': { title: 'Striped', classname: 'table-striped' },
+            }
+          }
+        }
+      end
+
+      def active_storage
+        return @active_storage unless @active_storage.nil?
+
+        @active_storage = if options.key?(:active_storage)
+          options.delete(:active_storage)
+        else
+          defined?(ActiveStorage).present?
+        end
+      end
+
+    end
+  end
+end

data/config/effective_bootstrap.rb

@@ -1,26 +1,4 @@
 EffectiveBootstrap.setup do |config|
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If it raises an exception or returns false, an Effective::AccessDenied Error will be raised
-  #
-  # Use via Proc:
-  # Proc.new { |controller, action, resource| authorize!(action, resource) }       # CanCan
-  # Proc.new { |controller, action, resource| can?(action, resource) }             # CanCan with skip_authorization_check
-  # Proc.new { |controller, action, resource| authorize "#{action}?", resource }   # Pundit
-  # Proc.new { |controller, action, resource| current_user.is?(:admin) }           # Custom logic
-  #
-  # Use via Boolean:
-  # config.authorization_method = true  # Always authorized
-  # config.authorization_method = false # Always unauthorized
-  #
-  # Use via Method (probably in your application_controller.rb):
-  # config.authorization_method = :my_authorization_method
-  # def my_authorization_method(resource, action)
-  #   true
-  # end
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
-
   # Replaces rails_ujs data-confirm with a custom inline implementation.
   # You will need to recompile assets (or "rm -rf tmp/") if you change this.
   config.use_custom_data_confirm = true

data/lib/effective_bootstrap.rb

@@ -1,33 +1,14 @@
 require 'inline_svg'
+require 'effective_resources'
 require 'effective_bootstrap/engine'
 require 'effective_bootstrap/version'
 
 module EffectiveBootstrap
 
-  # The following are all valid config keys
-  mattr_accessor :authorization_method
-
-  mattr_accessor :use_custom_data_confirm
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [:use_custom_data_confirm]
   end
 
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
-  end
-
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
+  include EffectiveGem
 
 end

data/lib/effective_bootstrap/engine.rb

@@ -8,7 +8,11 @@ module EffectiveBootstrap
     end
 
     initializer 'effective_bootstrap.assets' do |app|
-      app.config.assets.precompile += ['effective_bootstrap_manifest.js', 'icons/*']
+      app.config.assets.precompile += [
+        'effective_bootstrap_manifest.js',
+        'effective_bootstrap_article_editor.css',
+        'icons/*'
+      ]
     end
 
     initializer 'effective_bootstrap.action_text' do |app|

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.28'.freeze
+  VERSION = '0.9.29'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.28
+  version: 0.9.29
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,18 +26,32 @@ dependencies:
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: inline_svg
   requirement: !ruby/object:Gem::Requirement
@@ -406,6 +420,8 @@ files:
 - app/assets/images/icons/zap.svg
 - app/assets/images/icons/zoom-in.svg
 - app/assets/images/icons/zoom-out.svg
+- app/assets/javascripts/effective_article_editor/initialize.js.coffee
+- app/assets/javascripts/effective_article_editor/input.js
 - app/assets/javascripts/effective_bootstrap.js
 - app/assets/javascripts/effective_bootstrap/base.js.coffee
 - app/assets/javascripts/effective_bootstrap/confirm.js.coffee.erb
@@ -595,11 +611,14 @@ files:
 - app/assets/javascripts/moment/locale/zh-hk.js
 - app/assets/javascripts/moment/locale/zh-tw.js
 - app/assets/javascripts/moment/moment.js
+- app/assets/stylesheets/effective_article_editor/input.scss
+- app/assets/stylesheets/effective_article_editor/overrides.scss
 - app/assets/stylesheets/effective_bootstrap.scss
 - app/assets/stylesheets/effective_bootstrap/base.scss
 - app/assets/stylesheets/effective_bootstrap/forms.scss
 - app/assets/stylesheets/effective_bootstrap/icons.scss
 - app/assets/stylesheets/effective_bootstrap/overrides.scss
+- app/assets/stylesheets/effective_bootstrap_article_editor.scss
 - app/assets/stylesheets/effective_bootstrap_editor.scss
 - app/assets/stylesheets/effective_checks/input.scss
 - app/assets/stylesheets/effective_datetime/bootstrap-datetimepicker.scss
@@ -625,6 +644,7 @@ files:
 - app/helpers/effective_icons_helper.rb
 - app/models/effective/form_builder.rb
 - app/models/effective/form_input.rb
+- app/models/effective/form_inputs/article_editor.rb
 - app/models/effective/form_inputs/check_box.rb
 - app/models/effective/form_inputs/checks.rb
 - app/models/effective/form_inputs/ck_editor.rb