record_collection 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1221e77bb333dddfa1f9d2cfb8d6dae31aa3ef7f
-  data.tar.gz: d532989e28726b95921beb9450679af4003a8a10
+  metadata.gz: 4abda6b9b06f53f8caacf070513cfe5b3f7fa4be
+  data.tar.gz: beec42bfc69c04587a0baa1f722c6e0dd99ea6db
 SHA512:
-  metadata.gz: 11d725ea89a210e0486a91a3e5e47b9c1a2aecc1ef539bf95f25ed5cf8d5710436761a4c4a2d18890d808b38ab8eea6787c4c48867dcfed2b7ce046599524580
-  data.tar.gz: 37602afb6e7d8efa2c5ccbdd06b42367ca44b06929bc4f1e48b5f989ba374e936d805c9af17fea56a6f17980b64b3014e68f9869294c8daab38a143798d33a31
+  metadata.gz: 94846e1eb01ff6e90afd9b3f58d9d34bfc21d697b9a8e5f57c15883549201226dd3edb6aa537df4425f5eabbcab74bc2001190cfa01e8339d36c2cf886b5583f
+  data.tar.gz: c0b027639f916a9475a769f0c151c48e28d6a30f5ba1080202640866eedcda28f03c12e76a26debd9842e2b8ba6fed4e11763c986047c0a502d83418ab687955

data/app/assets/javascripts/record_collection/multi_select.js.coffee

@@ -1,8 +1,19 @@
 class MultiSelect
-  setup: (table) ->
+  callbacks: {}
+  on: (event, callback) ->
+    @callbacks[event] ||= []
+    @callbacks[event].push callback
+  trigger: (event)->
+    return unless @callbacks[event]
+    for callback in @callbacks[event]
+      callback.call(@)
+  setup: (table, options) ->
     return unless table and table.length
+    selector = @
     table.data 'multi_select', @
     @set 'table', table
+    @options = options
+    @on 'changed', options.changed if options.changed
 
     @set 'resource', table.data('resource')
     # Add an extra th to all header rows
@@ -20,6 +31,7 @@ class MultiSelect
       else
         table.find('td.selection .checker').removeClass('unchecked').addClass('checked')
         $(this).removeClass('unchecked').addClass('checked')
+      selector.trigger 'changed'
     table.find('thead tr:last th:first').append toggle_all
 
     # Create a toggle/checkbox for all records and add it to the row
@@ -29,6 +41,7 @@ class MultiSelect
         $(this).removeClass('checked').addClass('unchecked')
       else
         $(this).removeClass('unchecked').addClass('checked')
+      selector.trigger 'changed'
     record_td = $('<td></td>').addClass('selection').append(record_toggle)
     table.find('tbody tr').prepend record_td
 
@@ -41,19 +54,22 @@ class MultiSelect
   set: (path, value) -> @[path] = value
   get: (path) -> @[path]
 
+  selected_count: -> @table.find('td.selection .checked').length
+  total_count: -> @table.find('td.selection .checker').length
+
   #selected_records: -> @table.find("td.selection input:checked").map( -> $(this).parents('tr').data('record') )
   selected_records: -> @table.find("td.selection .checked").map( -> $(this).parents('tr').data('record') )
-  selected_ids: -> @selected_records().map( -> this.id ).toArray()
+  selected_ids: -> @selected_records().map( -> @id ).toArray()
 root = @
 root.MultiSelect = new MultiSelect()
-$.fn.multi_select = ->
+$.fn.multi_select = (options = {})->
   if @.hasClass('with-selection') or @.prop('tagName') is 'TABLE'
     select = new MultiSelect()
     root.MultiSelect = select
-    select.setup @
+    select.setup @, options
   else
     @.find('table.with-selection').each (i, el)->
       select = new MultiSelect()
       root.MultiSelect = select
-      select.setup $(el)
+      select.setup $(el), options
   select

data/app/assets/javascripts/record_collection/optionals.js.coffee

@@ -82,6 +82,13 @@ class Optionals
           #value_toggle.hide()
           container.removeClass('active').addClass('inactive')
       activator_label = $('<span></span>').addClass('optional-input-activator-label').text label_text
+      activator_label.click ->
+        if activator_container.hasClass('active')
+          # Focus on element
+          value_field.focus()
+        else
+          # Activate the optional
+          activator_toggle.click()
       activator_container.append activator_toggle
       activator_container.append activator_label
 

data/lib/record_collection/base.rb

@@ -125,7 +125,7 @@ module RecordCollection
     end
 
     def ids
-      @ids ||= map(&:id)
+      @ids ||= map{|record| record.try(:id) }.compact
     end
   end
 end

data/lib/record_collection/version.rb

@@ -1,3 +1,3 @@
 module RecordCollection
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/base/accessors_spec.rb

@@ -8,6 +8,11 @@ RSpec.describe RecordCollection::Base do
       described_class.new([employee]).ids.should eq [employee.id]
     end
 
+    it 'Filters out nil records' do
+      employee = Employee.create name: 'E1', section: 'ABC', admin: true, vegan: false
+      described_class.new([employee, nil]).ids.should eq [employee.id]
+    end
+
     it 'returns an empty array for an empty collection' do
       described_class.new.ids.should be_empty
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Benjamin ter Kuile