record_collection 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4abda6b9b06f53f8caacf070513cfe5b3f7fa4be
-  data.tar.gz: beec42bfc69c04587a0baa1f722c6e0dd99ea6db
+  metadata.gz: 9ee07c5d52e0e54488e931828ea1e6fa5fcfcf11
+  data.tar.gz: 287f65ae03ea2093b1f8bfa8fecde2d5acb3d9c4
 SHA512:
-  metadata.gz: 94846e1eb01ff6e90afd9b3f58d9d34bfc21d697b9a8e5f57c15883549201226dd3edb6aa537df4425f5eabbcab74bc2001190cfa01e8339d36c2cf886b5583f
-  data.tar.gz: c0b027639f916a9475a769f0c151c48e28d6a30f5ba1080202640866eedcda28f03c12e76a26debd9842e2b8ba6fed4e11763c986047c0a502d83418ab687955
+  metadata.gz: af0f6e48b22e6456ceb5b74f3c8989df45e0cf8b19f67650aea3bcd2ed8d99aa15b9a7cbbaccafe7ba47ac1fd3be00c99937e138511ca0550e8d14e0e3293de1
+  data.tar.gz: 302c8acc483678b28be818e928d6f5ad193c8a71f36ce1c3c94fb270f83bb90916701aed6c7f2ad8a75dc185bd17d7cbf13544ffd404f68f434da3084f7ab8ea

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

@@ -16,12 +16,13 @@ class Optionals
     check_box = container.find('input')
     initially_checked = check_box.is(':checked')
     field_name = check_box.attr('name')
+    one = container.data('one')
 
     label_text = container.find('label').text()
 
     value_field = $('<input>').attr('type', 'hidden').val(0)
     # Set name based on activated state
-    if container.hasClass('active')
+    if one or container.hasClass('active')
       value_field.attr 'name', field_name
     else
       value_field.attr 'name', "disabled_#{field_name}"
@@ -29,8 +30,6 @@ class Optionals
     # Clear the container and initialize to inactive
     container.html('')
 
-    label = $('<span></span>').addClass('optional-boolean-label').text label_text
-
     activator_toggle = $('<span></span>').addClass('optional-boolean-activator-toggle').click ->
       container.toggleClass('active').toggleClass('inactive')
       if container.hasClass('active')
@@ -38,6 +37,11 @@ class Optionals
       else
         value_field.attr 'name', "disabled_#{value_field.attr('name')}"
 
+    label = $('<span></span>').addClass('optional-boolean-label').text label_text
+    label.click ->
+      if container.hasClass('inactive')
+        activator_toggle.click()
+
     value_toggle = $('<span></span>').addClass('optional-boolean-toggle').click ->
       return if container.hasClass('inactive')
       if $(@).hasClass('active')
@@ -57,12 +61,14 @@ class Optionals
     container.append label
     container.append value_toggle
     container.append value_field
+    activator_toggle.hide() if one
 
   prependActivator: (container)->
       value_field = container.find('select,input')
       # INITIAL STATE IS DISABLED, Activation by triggering click if needed
       value_field.attr 'name', "disabled_#{value_field.attr('name')}"
       container.addClass('inactive')
+      one = container.data('one')
 
       label_text = container.find('label').text()
 
@@ -97,6 +103,7 @@ class Optionals
       container.find('label').remove()
 
       activator_toggle.click() if container.hasClass('active')
+      activator_toggle.hide() if one
 
 root = @
 root.Optionals = new Optionals()

data/lib/generators/collection_scaffold/templates/controller.rb

@@ -47,7 +47,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # DELETE <%= route_url %>/1
   def destroy
     @<%= orm_instance.destroy %>
-    redirect_to <%= index_helper %>_url, notice: t('action.destroy.successful', model: <%= class_name %>.model_name.human)
+    redirect_to <%= index_helper %>_path, notice: t('action.destroy.successful', model: <%= class_name %>.model_name.human)
   end
 
   # GET <%= route_url %>/collection_edit
@@ -59,25 +59,26 @@ class <%= controller_class_name %>Controller < ApplicationController
   def collection_update
     @collection = <%= class_name %>::Collection.find(params[:ids])
     if @collection.update params[:collection]
-      redirect_to <%= index_helper %>_url, notice: t('action.collection_update.successful', model: <%= class_name %>.model_name.human)
+      redirect_to <%= index_helper %>_path, notice: t('action.collection_update.successful', model: <%= class_name %>.model_name.human)
     else
       render :collection_edit
     end
   end
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
-    end
 
-    # Only allow a trusted parameter "white list" through.
-    def <%= "#{singular_table_name}_params" %>
-      <%- if attributes_names.empty? -%>
-      params[:<%= singular_table_name %>]
-      <%- else -%>
-      params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
-      <%- end -%>
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_<%= singular_table_name %>
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def <%= "#{singular_table_name}_params" %>
+    <%- if attributes_names.empty? -%>
+    params[:<%= singular_table_name %>]
+    <%- else -%>
+    params.require(:<%= singular_table_name %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+    <%- end -%>
+  end
 end
 <% end -%>

data/lib/record_collection/base.rb

@@ -91,6 +91,11 @@ module RecordCollection
       self
     end
 
+    # Return a hash of the changed attributes of the collection:
+    #   {
+    #     name: 'Ben',
+    #     ....etc...
+    #   }
     def changed_attributes
       @changed_attributes ||= attributes.reject{|attr, val| val.nil? }
     end

data/lib/record_collection/rails/form_options_helper.rb

@@ -19,7 +19,7 @@ class ActionView::Helpers::FormBuilder
     classes = get_optional_classes(attr, base_class: 'optional-boolean')
     label_tag = label(attr, options[:label])
     check_box_tag = check_box(attr, options)
-    add_collection_ids @template.content_tag(:div, label_tag + check_box_tag , class: classes, data: { attribute: attr })
+    add_collection_ids @template.content_tag(:div, label_tag + check_box_tag , class: classes, data: get_data_attributes(attr))
   end
 
   def optional_check_box(attr)
@@ -28,17 +28,22 @@ class ActionView::Helpers::FormBuilder
 
   def optional_input(attr, options = {})
     classes = get_optional_classes(attr, base_class: 'optional-input')
-    add_collection_ids @template.content_tag(:div, input(attr, options), class: classes, data: { attribute: attr })
+    add_collection_ids @template.content_tag(:div, input(attr, options), class: classes, data: get_data_attributes(attr))
   end
 
   def optional_text_field(attr, options={})
     classes = get_optional_classes(attr, base_class: 'optional-text-field')
-    add_collection_ids @template.content_tag(:div, label(attr, options[:label]) + text_field(attr, options), class: classes, data: { attribute: attr })
+    add_collection_ids @template.content_tag(:div, label(attr, options[:label]) + text_field(attr, options), class: classes, data: get_data_attributes(attr))
   end
 
   def optional_text_area(attr, options={})
     classes = get_optional_classes(attr, base_class: 'optional-text-area')
-    add_collection_ids @template.content_tag(:div, label(attr, options[:label]) + text_area(attr, options), class: classes, data: { attribute: attr })
+    add_collection_ids @template.content_tag(:div, label(attr, options[:label]) + text_area(attr, options), class: classes, data: get_data_attributes(attr))
+  end
+
+  def get_data_attributes(attr, options = {})
+    one = object.respond_to?(:one?) && object.one?
+    {attribute: attr, one: one}
   end
 
   def get_optional_classes(attr, options = {})
@@ -51,6 +56,7 @@ class ActionView::Helpers::FormBuilder
     active = true unless object.public_send(attr).nil? # Activate if collection attribute is not nil
     classes = [options[:base_class] || 'optional-input', 'optional-attribute-container', attr]
     classes << (active ? 'active' : 'inactive')
+    classes << 'one' if object.respond_to?(:one?) and object.one?
     classes << 'error' if object.errors[attr].present?
     classes
   end

data/lib/record_collection/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler