effective_bootstrap 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef5c490c21c811d0bab4b33f68d2b45a49e71e5
-  data.tar.gz: fd13c727e25be05f6dd021fa0fa3165562dcf7f8
+  metadata.gz: 4253e5912bdb4bd1ee2046f404c40a108d6baf41
+  data.tar.gz: e1acfb6e5c27e969801f47bb3989a8eb796744d7
 SHA512:
-  metadata.gz: 365573317df114f67454c6331f58fdc869b89c7b5f13ced477098a2b87582395dbfca0d34683805162dfb49b4499cb9a8769fa9afd100ba905d69f2878942efd
-  data.tar.gz: c857d13f1b2e978f363eab1514c2a2936560b802d87418143da60a4d41e1f0f0446061c4dd151cd2fe50fdc92c1986d49834fbaf20a04ef3b9ec67b9cea3bbe4
+  metadata.gz: a4682dab51bfb9812ca8afee9dc146b324e776dedc31e1902e3017c8ec62d9978eac8ed070e3572866ad03752605ca365b011565ddaeaa51c149c06acb5b385b
+  data.tar.gz: 2351f437787f0bbf3e8969076299acac707dc7756883cda27e1cfca8ad4c86047d6c701bd5eaa408b6f91aae7fbacc8624d6cd7014e7e1b843f1a951967d1933

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

@@ -21,14 +21,20 @@
 
   if content_mode == 'code'
     quill.formatText(0, quill.getLength(), 'code-block', true)
-    quill.on 'text-change', -> $element.val(quill.getText())
+
+    quill.on 'text-change', ->
+      $element.val(quill.getText())
+      $element.trigger('change')
   else if content_mode == 'html'
     quill.on 'text-change', ->
       html = $(editor).children('.ql-editor').html()
       html = '' if html == '<p><br></p>' || html == '<p></p>'
       $element.val(html)
+      $element.trigger('change')
   else
-    quill.on 'text-change', -> $element.val(JSON.stringify(quill.getContents()))
+    quill.on 'text-change', ->
+      $element.val(JSON.stringify(quill.getContents()))
+      $element.trigger('change')
 
   $element.on 'quill:focus', (event) -> quill.focus()
 

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

@@ -36,8 +36,8 @@ module Effective
         include_blank = options[:input].delete(:include_blank)
 
         @collection_options = {
-          checked: (checked || selected || passed_value || polymorphic_value || value),
-          selected: (selected || checked || passed_value || polymorphic_value || value),
+          checked: [checked, selected, passed_value, polymorphic_value, value].find { |value| value != nil },
+          selected: [selected, checked, passed_value, polymorphic_value, value].find { |value| value != nil },
           include_blank: include_blank
         }.compact
       end
@@ -78,14 +78,10 @@ module Effective
       # This is a grouped polymorphic collection
       # [["Clinics", [["Clinc 50", "Clinic_50"], ["Clinic 43", "Clinic_43"]]], ["Contacts", [["Contact 544", "Contact_544"]]]]
       def assign_options_collection!
-        collection = options[:input].delete(:collection)
+        collection = options[:input].delete(:collection) || raise('Please include a collection')
 
         grouped = collection.kind_of?(Hash) && collection.values.first.respond_to?(:to_a)
 
-        if collection.nil?
-          raise "Please include a collection"
-        end
-
         if grouped? && !grouped && collection.present?
           raise "Grouped collection expecting a Hash {'Posts' => Post.all, 'Events' => Event.all} or a Hash {'Posts' => [['Post A', 1], ['Post B', 2]], 'Events' => [['Event A', 1], ['Event B', 2]]}"
         end
@@ -96,15 +92,27 @@ module Effective
 
         @options_collection = (
           if polymorphic?
-            collection.inject({}) { |h, (k, group)| h[k] = group.map { |obj| [obj.to_s, "#{obj.class.model_name}_#{obj.id}"] }; h }
+            collection.inject({}) { |h, (k, group)| h[k] = translate(group).map { |obj| [obj.to_s, "#{obj.class.model_name}_#{obj.id}"] }; h }
           elsif grouped
-            collection.inject({}) { |h, (k, group)| h[k] = group.map { |obj| obj }; h }
+            collection.inject({}) { |h, (k, group)| h[k] = translate(group).map { |obj| obj }; h }
           else
-            collection.map { |obj| obj }
+            translate(collection).map { |obj| obj }
           end
         )
       end
 
+      # Apply ActsAsArchived behavior. That's all for now.
+      def translate(collection)
+        return collection unless object.respond_to?(:new_record?)
+        return collection unless collection.respond_to?(:klass) && collection.klass.respond_to?(:acts_as_archived?)
+
+        if object.new_record?
+          collection.unarchived
+        else
+          collection.unarchived.or(collection.archived.where(collection.klass.primary_key => value))
+        end
+      end
+
       def assign_options_collection_methods!
         options[:input].reverse_merge!(
           if polymorphic?

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails