effective_bootstrap 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e413478812c30365ec0e7a5c84e8af1377dfd1
-  data.tar.gz: 47bdcbb54bf6c006657c502f75d36d9f03eda1d3
+  metadata.gz: c2469342de9d3e1a00a7bbda6ec5867dfcc246c3
+  data.tar.gz: 9f7a28c645d1ca83eb8ea50afe62f1fcb34948b9
 SHA512:
-  metadata.gz: b94edbf34d889568346e8bf49a15e96a7ffe0c8891e1286f5e4b510753224eca910a6e2e83475ac2350ebb028d8029d40c5db12745952160fbf725a1633df40d
-  data.tar.gz: 62a53f3d7b2daa9d765f349666e543609f1626aa1f477baf9c2e07b02e0165a31b8631a72261bbfb6fc04780eab455b89b716f7a771911d6c3391c023f56f958
+  metadata.gz: 03514b33df32c0cb77d801e4f24e93f327723271554329b4fe7a08a2cf43d6fd871ec75b44a8af7998d13dbc402e323d33bf2ef0a03832c930442e9c9a51d5cb
+  data.tar.gz: 09e81df8639a8e1933be6237e60cd74ea030164255bcb116f24105716628e5d4efb4bca3ab731fe1096c5c68bebe0d87259e2ff24762887829030ef8e2da1f8c

data/app/models/effective/form_input.rb

@@ -254,7 +254,8 @@ module Effective
     end
 
     def value
-      object.public_send(name) if object.respond_to?(name)
+      @_value ||= (options.delete(:value) || options[:input]&.delete(:value))
+      @_value ||= (object.public_send(name) if object.respond_to?(name))
     end
 
     def unique_id(item = nil)

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

@@ -32,12 +32,11 @@ module Effective
 
         checked = options[:input].delete(:checked)
         selected = options[:input].delete(:selected)
-        passed_value = options[:input].delete(:value)
         include_blank = options[:input].delete(:include_blank)
 
         @collection_options = {
-          checked: [checked, selected, passed_value, polymorphic_value, value].find { |value| value != nil },
-          selected: [selected, checked, passed_value, polymorphic_value, value].find { |value| value != nil },
+          checked: [checked, selected, polymorphic_value, value].find { |value| value != nil },
+          selected: [selected, checked, polymorphic_value, value].find { |value| value != nil },
           include_blank: include_blank
         }.compact
       end

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

@@ -13,15 +13,13 @@ module Effective
       def build_input(&block)
         content = if block_given?
           capture(&block)
-        elsif options[:input][:value]
-          options[:input].delete(:value)
         elsif resource_path
           link_to(value, resource_path, title: value.to_s)
         else
           value
         end
 
-        content_tag(:p, content, options[:input].except(:readonly, :required, :value).merge(id: tag_id))
+        content_tag(:p, content, options[:input].except(:readonly, :required).merge(id: tag_id))
       end
 
       def resource_path

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.4.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails