effective_bootstrap 0.11.0 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1483d8802c16a38a151708060665d5fbf2a47b33f41d09eafdf2cc289ab398e
-  data.tar.gz: c215f00abcb30632e41c2ad85c2e7c235649dc61d8faf39795137fc5aa9b2c38
+  metadata.gz: 72c48edcadc713215002d5ae870cee436b886c3a1918de8564e33d91e7104404
+  data.tar.gz: 016bd24058640f34bf36a4b8ccb5435a1c4bf478f3abb4a1bae0398d6238c40f
 SHA512:
-  metadata.gz: dfe6422310d0bfcb92ffe81cbdadd49cb5327030903b9ddca48c8f51eb0bff479b1fd561f84fb0aa1b2ae60fb85e5ddcf24371ad7f7a914d2eeb5d690d0ddd9d
-  data.tar.gz: c17eeb42ce4a4dd2d3869cf0c0822987fa689ba10135a859308e850d92fbbb35a4c6b10f26682cf39636eb8b023dde32200997e403de150363c90e22d4f91ef0
+  metadata.gz: a57d9fee9a0864bb0b5f51fc29afea8a27b03c6c0e15ae5ba252a1d87b78b25401ae881ba77deee5698b598fa723e806158d41389ce7e1a19eeb2be427c472d6
+  data.tar.gz: 7e47e151514ce87587a9bb2098f7a57aec95832cae0718371eafb7bba7c95de217af5ab1f1a9789468d6208c318a60d827b2dc8024e89ef38487c6a3bcd879ed

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

@@ -1,19 +1,45 @@
 # https://imperavi.com/article/
 
+sendMarkPublicRequest = (editor, blob, authenticity_token) ->
+  editor.ajax.post(
+    url: "/storage/#{blob.signed_id}/mark_public",
+    data: {
+      id: blob.signed_id,
+      authenticity_token: authenticity_token
+    }
+  )
+
 uploadActiveStorage = (editor, data) ->
   rails_url = '/rails/active_storage/blobs/redirect/'
 
+  # The editor is actually the popup form
+  $form = editor.$element.closest('form')
+
+  if $form.length == 0
+    $form = editor.$element.closest('.arx-popup')
+
+  permission_public = $form.find("input[name=public_permission]").val() || false
+
+  # This is an effective_form with the article editor in it
+  $parentForm = editor.app.$element.closest('form')
+  authenticity_token = $parentForm.find("input[name=authenticity_token]").val() || 'missing authenticity token'
+
+  # Attachment classes
+  classes = (if permission_public then 'effective-article-editor-attachment effective-article-editor-attachment-permission-public' else 'effective-article-editor-attachment')
+
   for file in data.files
     upload = new ActiveStorage.DirectUpload(file, '/rails/active_storage/direct_uploads')
 
     upload.create (error, blob) =>
+      sendMarkPublicRequest(editor, blob, authenticity_token) if permission_public
+
       url = rails_url + blob.signed_id + '/' + blob.filename
       editor.complete({ file: { url: url, name: blob.filename, content_type: blob.content_type }}, data.e)
 
       # We append this nested attachment html
       attachment = $('<action-text-attachment>')
         .attr('sgid', blob.attachable_sgid)
-        .attr('class', 'effective-article-editor-attachment')
+        .attr('class', classes)
 
       attachment = $('<div>').append(attachment).html()
 
@@ -22,12 +48,12 @@ uploadActiveStorage = (editor, data) ->
       doc
         .find("img[src^='#{rails_url}']:not(.effective-article-editor-attachment)")
         .after(attachment)
-        .addClass('effective-article-editor-attachment')
+        .addClass(classes)
 
       doc
         .find("a[data-file][data-name='#{file.name}']:not(.action-text-attachment)")
         .after(attachment)
-        .addClass('effective-article-editor-attachment')
+        .addClass(classes)
         .removeAttr('data-file')
         .removeAttr('data-name')
 

data/app/assets/stylesheets/effective_bootstrap/forms.scss

@@ -74,5 +74,6 @@ div.form-group > label + .btn-group { display: block; }
 // Has Many
 .form-has-many .has-many-remove {
   margin-top: 0;
+  margin-bottom: 1rem;
   .eb-icon { height: 1.5rem; width: 1.5rem; }
 }

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

@@ -4,7 +4,6 @@
   .has-many-remove-disabled { opacity: 0; cursor: default !important; }
 
   .has-many-actions { margin-bottom: 0.75rem; }
-  .has-many-remove { margin-top: 1rem; }
   .has-many-move { margin-top: 1.5rem; }
 }
 
@@ -19,3 +18,13 @@
   .has-many-remove { margin-top: 0; }
   .has-many-move { margin-top: 0.5rem; }
 }
+
+.form-has-many .has-many-remove {
+  margin-top: 0;
+  .eb-icon { height: $font-size-sm; width: $font-size-sm; margin-bottom: 2px; }
+}
+
+.form-has-many .has-many-add {
+  margin-top: 0;
+  .eb-icon { height: $font-size-sm; width: $font-size-sm; margin-bottom: 2px; }
+}

data/app/helpers/effective_bootstrap_helper.rb

@@ -43,6 +43,23 @@ module EffectiveBootstrapHelper
     end
   end
 
+  # https://getbootstrap.com/docs/4.0/components/badge/
+  # = badge('Warning', :secondary)
+  # Can pass class or a context
+  def badge(value = nil, opts = {})
+    value = Array(value) - [nil, '']
+    return if value.blank?
+
+    badge_opts = opts
+    badge_opts = {context: opts} unless badge_opts.kind_of?(Hash)
+
+    context = badge_opts[:context].to_s.sub('badge-', '').presence || 'secondary'
+    badge_opts[:class] ||= "badge badge-#{context}"
+
+    value.map { |value| content_tag(:span, value, badge_opts) }.join(' ').html_safe
+  end
+  alias_method :badges, :badge
+
   # https://getbootstrap.com/docs/4.0/components/card/
   # = card('title do')
   #   %p Stuff

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

@@ -126,7 +126,7 @@ module Effective
       def has_many_links_for(block)
         return BLANK unless add? || reorder?
 
-        content_tag(:div, class: 'has-many-links text-center mt-2') do
+        content_tag(:div, class: 'has-many-links mt-2') do
           [*(link_to_add(block) if add?), *(link_to_reorder(block) if reorder?)].join(' ').html_safe
         end
       end
@@ -171,7 +171,7 @@ module Effective
             content_tag(:div, content, class: 'col mr-auto') do
               content_tag(:div, class: 'card') do
                 content_tag(:div, class: 'card-body') do
-                  content_tag(:div, remove, class: 'float-right') + content
+                  content_tag(:div, remove, class: 'd-flex justify-content-end') + content
                 end
               end
             end
@@ -205,7 +205,7 @@ module Effective
         content_tag(
           :button,
           icon('plus-circle') + 'Add Another',
-          class: 'has-many-add btn btn-secondary',
+          class: 'has-many-add btn btn-sm btn-secondary',
           title: 'Add Another',
           data: {
             'effective-form-has-many-add': true,
@@ -227,7 +227,7 @@ module Effective
         content_tag(
           (tag || :button),
           (label || (icon('plus-circle') + 'Insert Another')),
-          class: 'has-many-insert ' + (html_class || 'btn btn-secondary'),
+          class: 'has-many-insert ' + (html_class || 'btn btn-sm btn-secondary'),
           title: (title || 'Insert Another'),
           data: {
             'effective-form-has-many-insert': true,
@@ -257,8 +257,8 @@ module Effective
 
         content_tag(
           (tag || :button),
-          (label || icon('trash-2')),
-          class: 'has-many-remove ' + (html_class || 'btn btn-danger'),
+          (label || (icon('trash-2') + 'Remove')),
+          class: 'has-many-remove ' + (html_class || 'btn btn-sm btn-danger'),
           title: (title || 'Remove'),
           data: {
             'confirm': "Remove #{resource}?",
@@ -271,7 +271,7 @@ module Effective
         content_tag(
           :button,
           icon('trash-2'),
-          class: 'has-many-remove-disabled btn btn-danger',
+          class: 'has-many-remove-disabled btn btn-sm btn-danger',
           title: 'Remove',
           data: {
             'effective-form-has-many-remove-disabled': true,

data/app/models/effective/form_logics/hide_if.rb

@@ -29,11 +29,12 @@ module Effective
       end
 
       def validate!(args)
+        return if args.third.kind_of?(Hash) && args.third[:validate] == false
         raise "expected object to respond to #{args.first}" unless object.respond_to?(args.first)
       end
 
       def hide?
-        (object.send(args.first) == args.second) || (object.send(args.first).to_s == args.second.to_s)
+        (object.try(args.first) == args.second) || (object.try(args.first).to_s == args.second.to_s)
       end
 
     end

data/app/models/effective/form_logics/show_if.rb

@@ -29,11 +29,12 @@ module Effective
       end
 
       def validate!(args)
+        return if args.third.kind_of?(Hash) && args.third[:validate] == false
         raise "expected object to respond to #{args.first}" unless object.respond_to?(args.first)
       end
 
       def show?
-        (object.send(args.first) == args.second) || (object.send(args.first).to_s == args.second.to_s)
+        (object.try(args.first) == args.second) || (object.try(args.first).to_s == args.second.to_s)
       end
 
     end

data/app/models/effective/form_logics/show_if_any.rb

@@ -29,12 +29,13 @@ module Effective
       end
 
       def validate!(args)
+        return if args.third.kind_of?(Hash) && args.third[:validate] == false
         raise "expected object to respond to #{args.first}" unless object.respond_to?(args.first)
       end
 
       def show?
         Array(args.second).any? do |value|
-          selected = object.send(args.first)
+          selected = object.try(args.first)
           selected == value || selected.to_s == value.to_s
         end
       end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.11.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails