simple_form_extension 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a367630360bbe1d54b2f59d2a4ccf38b949a35b
-  data.tar.gz: 769fbc0efd2becb79c147e3558019bc76a9d7f59
+  metadata.gz: c9ed7a20a6896f059604491974a53e303a86c76a
+  data.tar.gz: 348fd0e432cca498201bbaa8e7173bc72915c337
 SHA512:
-  metadata.gz: 30af5740b63676c7cf594918515d3e2253888c83b46abec1c6da9de0988c1f929e7dcf4ee6996b03ca7b5d27d98b5935879342c167ba49cf1dad244e220c6a40
-  data.tar.gz: cc0ad96f2cd6025a9a3c90f4ce1fdffdc57c1cd1910abd8d5b43a6a4fc048a2f00767ba2885ebef02f0f86be0074da67d37ad335679ded32db827f6a09cdb6db
+  metadata.gz: 58eb6c567ed00b012d833d116100fddd57547bfb94a6232d2c73353f39b752280b1676fa1d1ba77e8b29ea6f956351db6e76f47831c1d885a8cb95be645bd023
+  data.tar.gz: ea95c4b677f723bb8144adfd7473639cdf8131e3bf7302eaada2406134df95afc36f2c9958a960455191ebbacc425aa964b62ff766a394bc7bdf794bf306922f

data/lib/simple_form_extension/inputs/selectize_input.rb

@@ -14,7 +14,6 @@ module SimpleFormExtension
       #
       def input(wrapper_options = {})
         @attribute_name = foreign_key if relation?
-        set_sort_field!
 
         input_html_options[:data] ||= {}
 
@@ -60,18 +59,16 @@ module SimpleFormExtension
         options[:max_items]
       end
 
-      def set_sort_field!
-        options[:sort_field] = if enum?
+      def sort_field
+        if (sort_field = options[:sort_field]).present?
+          sort_field
+        elsif enum?
           'position'
         else
           'text'
         end
       end
 
-      def sort_field
-        options[:sort_field] ||= 'text'
-      end
-
       def collection
         return if search_url
 
@@ -146,8 +143,11 @@ module SimpleFormExtension
         block ? block.call : nil
       end
 
-      def enumerable?(object)
-        object.class.include?(Enumerable) || ActiveRecord::Relation === object
+      # Check if the given target object is enumerable. Used internally to
+      # check wether :collection or :value arguments are collections.
+      #
+      def enumerable?(target)
+        target.class.include?(Enumerable) || ActiveRecord::Relation === target
       end
 
       def name_for(option)
@@ -163,17 +163,17 @@ module SimpleFormExtension
       end
 
       def reflection
-        @reflection ||= if object.class.respond_to?(:reflect_on_association)
-          object.class.reflect_on_association(attribute_name)
+        @reflection ||= if object_class.respond_to?(:reflect_on_association)
+          object_class.reflect_on_association(attribute_name)
         end
       end
 
       def enum?
-        @is_enum ||= object.class.defined_enums.key?(attribute_name.to_s)
+        object_class.defined_enums.key?(attribute_name.to_s)
       end
 
       def enum_options
-        object.class.defined_enums[attribute_name.to_s].map do |key, value|
+        object_class.defined_enums[attribute_name.to_s].map do |key, value|
           path = [object.model_name.i18n_key, attribute_name, key].join('.')
           translation = ::I18n.t("activerecord.enums.#{ path }", default: '')
 
@@ -192,6 +192,19 @@ module SimpleFormExtension
       def text_from(resource)
         resource.try(:title) || resource.try(:name)
       end
+
+      # Retrieve actual model class even when the form object is a proxy like
+      # for Ransack::Search or ActiveRecord::Relation classes
+      #
+      def object_class
+        @object_class ||= if ((object_class = object.class) < ActiveRecord::Base)
+          object_class
+        elsif (klass = object.try(:klass))
+          klass
+        else
+          object_class
+        end
+      end
     end
   end
 end

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Glyph-fr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails