effective_form_inputs 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4569c203c0939b4299583c21b84cdbb8899f0a1
-  data.tar.gz: 6b96dd9835ce3866ed6d5fd174ab7eee5e463e7b
+  metadata.gz: dfe1f299c36eb92e01218a5cfa7fd64cbef52398
+  data.tar.gz: 0ace3f60cc9f9790719fb07c3be576f4d0f82cf7
 SHA512:
-  metadata.gz: 7684f263fbbaa59b318d5c6c790045d487480d2074d3d0ad58a5685b4a5f7440c61fc15b83f666ba56afa9ce7b100f097c12b642671e07324b7784eafc40bdd7
-  data.tar.gz: 1acda55bd40537351041c4400cba4a1ebfef0013205549806a8cd6302d230fa83aea0d0a71ffa80e787df03ff7cbec422eedabaa4b0b05270f83265d05d88574
+  metadata.gz: a94bfe9d38b9bf0ba806c2bd6088fbac47df703bbbc0c3702da11485c81fdef311fa32dea86cf5b86b0bb454533218d4dd95769ce3e357e5e320c54fd2b6b36e
+  data.tar.gz: 27b5de98a8a592ad3efafa7c6f68704b5926e5c0b523baf197dfd5c8585ed83fa9fc3ae0cc8ac4fc09510eae2ac3738aa5a7cb27091545764ab7e94945dec483

data/app/models/effective/form_input.rb

@@ -32,6 +32,7 @@ module Effective
 
       # Set the value to avoid options craziness
       @value = (@opts.delete(:value) || @html_opts.delete(:value) || (@object.send(@method) if @object.respond_to?(@method)))
+      @value = @value.to_a if @value.kind_of?(ActiveRecord::Relation)
     end
 
     def field_name

data/app/models/inputs/effective_select/input.rb

@@ -86,8 +86,8 @@ module Inputs
         @method.to_s.sub('_id', '') + '_id'
       end
 
-      def polymorphic_value
-        "#{value.model_name}_#{value.to_param}" if value.present?
+      def polymorphic_value(obj)
+        "#{obj.model_name}_#{obj.to_param}" if obj.present?
       end
 
       def polymorphic_type_value
@@ -99,12 +99,30 @@ module Inputs
       end
 
       def options
-        super().tap do |options|
-          options[:selected] = value if value
-
+        @effective_select_options ||= super().tap do |options|
           options[:multiple] = true if (options[:tags] == true)
           options[:include_blank] = (options[:multiple] != true)
-          options[:selected] = polymorphic_value if options[:polymorphic]
+
+          # Fix the selected value, depending on our use case
+          if value.present?
+            case value
+            when Array
+              if options[:polymorphic]
+                options[:selected] = value.map { |value| (polymorhpic_value(value) rescue value) }
+              elsif value.first.respond_to?(options[:value_method])  # This is probably a belongs_to ActiveRecord object
+                options[:selected] = value.map { |value| (value.public_send(options[:value_method]) rescue value) }
+              end
+            else  # Value is not an Array
+              if options[:polymorphic]
+                options[:selected] = polymorphic_value(value)
+              elsif value.respond_to?(options[:value_method])  # This is probably a belongs_to ActiveRecord object
+                options[:selected] = value.public_send(options[:value_method])
+              end
+            end
+
+            options[:selected] ||= value
+          end
+
         end
       end
 

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '0.7.4'.freeze
+  VERSION = '0.7.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails