effective_form_inputs 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73018ef84c08c044734ce1588e09044e9b7879b5
-  data.tar.gz: c304c9be743476829d43660d857c53902840001a
+  metadata.gz: b1058617858590b805f30854d0afcda08271934e
+  data.tar.gz: 75034585c0a9f74ae5d7818c6742f68f85eb0e2a
 SHA512:
-  metadata.gz: 1e44b1ee96ea3b93918b28ced09b3bd7bf8c8b96a489d93195ef646c7332f5ac5f965b8ce860ee1f2738bdeac702ca67e24e65f1fd38aa4d1b5097ee8ee5abb7
-  data.tar.gz: ab87a091e9b9ce2405b05b2d8d0170a795830810c72e60cd924047ce544fdeaad37a271cd0138f59685aeaca45bd0395b8393cc0d9976d9e23c0f0d12de92283
+  metadata.gz: bcdd07ec86ed2174b07fc61f74305ec43ab102fbc8ba33170ceea929a5799feb5b07355cc9d446fbbc5c6f3b2491c39fa6db12d2f54c3097f819779af10149d4
+  data.tar.gz: 752fe22d30b2e1fbd4d76ace82b261a60003224922ca60d42d9e6e79357244e4c3b52bd9f55140e2af3cf9800509823b86151ef857dc5930fb77c31b151172be

data/app/models/inputs/effective_select_input.rb

@@ -13,6 +13,26 @@ if defined?(SimpleForm)
 
       Inputs::EffectiveSelect::Input.new(object, object_name, template, attribute_name, input_options, (merge_wrapper_options(input_html_options, wrapper_options) || {})).to_html
     end
+
+    # Apply ActsAsArchived behavior.
+    def collection
+      @collection ||= begin
+        collection = translate(options.delete(:collection)) || self.class.boolean_collection
+        collection.respond_to?(:call) ? collection.call : collection.to_a
+      end
+    end
+
+    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 => object.send(attribute_name)))
+      end
+    end
+
   end
 
 end

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '1.2.7'.freeze
+  VERSION = '1.2.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-13 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails