simple_form_extension 1.3.17 → 1.3.18

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ac6b5b0ebf41918f6bd3081eac0de4cd523c8b1a
+  data.tar.gz: c745a93f5f169fb41c015a84587a7ce045bf3795
+SHA512:
+  metadata.gz: 974e96f1017ee2f057b71497bba44d417d33bd39392e029705be8fcaa6ea8dac4e3eb6df76b85c49e9aaca74c733d0c496a0ff88d8144f488beb0b8210c3d766
+  data.tar.gz: 5c6bd73e5cdc85c55009b36ea84265a51c3273f52d296792289519987a8292a8869788d7f15e91786ce6e4f119f8f81ae9a04834a44911a6afc652a96d0706db

data/lib/simple_form_extension/inputs/selectize_input.rb

@@ -17,23 +17,24 @@ module SimpleFormExtension
         input_html_options[:data] ||= {}
 
         input_html_options[:data].merge!(
-          :'selectize' => true,
-          :'value' => serialized_value,
-          :'creatable' => creatable?,
-          :'multi' => multi?,
+          :'selectize'       => true,
+          :'value'           => serialized_value,
+          :'creatable'       => creatable?,
+          :'multi'           => multi?,
           :'add-translation' => _translate('selectize.add'),
-          :'collection' => collection,
-          :'max-items' => max_items,
-          :'sort-field' => sort_field,
-          :'search-url' => search_url,
-          :'search-param' => search_param
+          :'collection'      => collection,
+          :'max-items'       => max_items,
+          :'sort-field'      => sort_field,
+          :'search-url'      => search_url,
+          :'search-param'    => search_param,
+          :'escape'          => escape
         )
 
         @builder.hidden_field attribute_name, input_html_options
       end
 
       def search_param
-        options[:search_param] ||= 'name'
+        options[:search_param] ||= 'q'
       end
 
       def search_url
@@ -44,6 +45,10 @@ module SimpleFormExtension
         !!options[:creatable]
       end
 
+      def escape
+        options[:escape]
+      end
+
       def multi?
         (options.key?(:multi) && !!options[:multi]) ||
           enumerable?(value)
@@ -59,7 +64,7 @@ module SimpleFormExtension
 
       def collection
         return if search_url
-        
+
         if (collection = options[:collection])
           if enumerable?(collection)
             collection.map(&method(:serialize_option))
@@ -74,12 +79,26 @@ module SimpleFormExtension
       end
 
       def serialized_value
+        return input_html_options[:data][:value] if input_html_options[:data][:value]
+
         if multi?
-          value.map do |item|
-            { text: item, value: item }
+          if relation?
+            value.map do |item|
+              if (resource = relation.find { |resource| resource.id == item.to_i }) && (text = text_from(resource))
+                serialize_value(item, text)
+              else
+                serialize_value(item)
+              end
+            end
+          else
+            value.map(&method(:serialize_value))
           end
         else
-          value && { text: value, value: value }
+          if relation? && relation && (text = text_from(relation))
+            serialize_value(value, text)
+          else
+            serialize_value(value)
+          end
         end
       end
 
@@ -87,6 +106,10 @@ module SimpleFormExtension
         @value ||= options_fetch(:value) { object.send(attribute_name) }
       end
 
+      def serialize_value(value, text = nil)
+        { text: (text || value), value: value }
+      end
+
       private
 
       def serialize_option(option)
@@ -119,6 +142,10 @@ module SimpleFormExtension
         option.try(:name) || options.try(:title) || option.to_s
       end
 
+      def relation
+        @relation ||= object.send(reflection.name) if relation?
+      end
+
       def relation?
         !!reflection
       end
@@ -136,6 +163,10 @@ module SimpleFormExtension
         when :has_many then :"#{ reflection.name.to_s.singularize }_ids"
         end
       end
+
+      def text_from(resource)
+        resource.try(:title) || resource.try(:name)
+      end
     end
   end
 end

data/lib/simple_form_extension/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormExtension
-  VERSION = "1.3.17"
+  VERSION = "1.3.18"
 end

data/vendor/assets/javascripts/simple_form_extension/selectize.coffee

@@ -12,9 +12,12 @@ class Selectize
   constructor: (@$el, @options) ->
     @single = @$el.data('multi') is false
     @el = @$el[0]
-
     @$el.val('')
 
+    @searchURL = @$el.data('search-url')
+    @searchParam = @$el.data('search-param')
+    @escape = @$el.data('escape') isnt false
+
     @$el.selectize($.extend @selectizeDefaults(), @options)
 
     if (value = @$el.data('value'))
@@ -35,21 +38,34 @@ class Selectize
     @el.selectize.addOption(data)
     @el.selectize.addItem(data.value)
 
-  searchURL: ->
-    @$el.data('search-url')
-
   load: (query, callback) =>
-    return callback() unless query.length && @searchURL()
+    return callback() unless query.length && @searchURL
+
+    data = {}
+    data[@searchParam] = query
+
     $.ajax
-      url: @searchURL()
+      url: @searchURL
       type: 'GET'
-      data: 
-        q: query
+      data: data
       error: -> callback()
-      success: (res) ->
-        callback(res)
+      success: callback
 
   renderOptions: ->
+    option: (data, escape) =>
+      """
+        <div data-value="#{ escape(data.value) }" class="item">
+          #{ if @escape then escape(data.text) else data.text }
+        </div>
+      """
+
+    item: (data, escape) =>
+      """
+        <div data-value="#{ escape(data.value) }" data-selectable="" class="option">
+          #{ if @escape then escape(data.text) else data.text }
+        </div>
+      """
+
     option_create: (data) =>
       """
         <div class="create" data-selectable="">

metadata

@@ -1,113 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_extension
 version: !ruby/object:Gem::Version
-  version: 1.3.17
-  prerelease: 
+  version: 1.3.18
 platform: ruby
 authors:
 - Glyph-fr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redactor-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: selectize-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'The following custom Simple Form inputs are available : boolean, collection_check_boxes,
+description: 'The following custom Simple Form inputs are available : boolean, collection_check_boxes,
   collection_radio_buttons, color, date_time, file, image, numeric, redactor, selectize
   and slider'
 email:
@@ -116,7 +103,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -178,26 +165,25 @@ files:
 homepage: http://www.glyph.fr
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gems adds custom common input types to simple form.
 test_files: []