record_collection 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e654f6b5c7b1ed264fc6ef308f6796cd2f2d2d73
-  data.tar.gz: 34ab6394a4d3f8f48b9f586e9affbbe6857f6f06
+  metadata.gz: 3d074f869d99ecf6e034ce94c81bbf041cab5416
+  data.tar.gz: 34655d94e3c4d2fe95771cca7f7bcb2c6a70d863
 SHA512:
-  metadata.gz: f9857ed54b6d7fb8afa92a60214288914cb480446cc377ad4666237103dca381b4e8082244475ac43210e167c3079be55f2d4bda5a8646050e05f45e2ac9cafc
-  data.tar.gz: fa18d0aa9fe61206460f21e1aec97076231922fd292abaf50c4e801c019e136c66c505f0ea3dddfdb068297e3f41a3a46c74f0ded91eb6c69ab2cc6c21f28f4b
+  metadata.gz: ea293bbdd54ed4184d60495c139b1cb83707d7a9e13227b384787825c485285cccd8a98f6774505dca4baa1a8b9ffdcf8d014616cb3b805850cb76bece422360
+  data.tar.gz: 803da8176458262709b914ef5f57fc167f260071ba0bd4ea35f67de4639d898fd47e97c95a45adac6731eae53f5051da19080c8b93aee42970d11e3dc712e71c

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2015-12-26 - v0.10.1
+--------------------
+### Added
+* Add hint option for optional booleans
+
 2015-12-25 - v0.10.0
 --------------------
 ### Changed

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

@@ -11,12 +11,13 @@ class Optionals
         @prependActivator(container)
 
   # Replace the <input type="checkbox"> for a <input type="hidden" # value="0|1"> fields
-  # managed by the javascript
+  # managed by the javascript. The strategy is to completely rebuild the html structure
   optionalBoolean: (container)->
     check_box = container.find('input')
     initially_checked = check_box.is(':checked')
     field_name = check_box.attr('name')
     one = container.data('one')
+    hint_field = container.find('.optional-attribute-hint')
 
     label_text = container.find('label').text()
 
@@ -62,6 +63,7 @@ class Optionals
     container.append label
     container.append value_toggle
     container.append value_field
+    container.append hint_field if hint_field.length
     activator_toggle.hide() if one
 
   prependActivator: (container)->

data/app/assets/stylesheets/record_collection/optionals.sass

@@ -54,3 +54,29 @@ $unchecked-color: #999
   &:not(.disabled)
     .optional-boolean-toggle
       cursor: pointer
+  .optional-attribute-hint
+    @extend .fa, .fa-2x, .fa-info-circle
+    margin-left: 10px
+    color: #888
+    cursor: pointer
+    position: relative
+    &::after
+      content: attr(data-hint)
+      font-size: 10px
+      position: absolute
+      z-index: 999
+      white-space: nowrap
+      bottom: 9999px
+      left: 80%
+      background-color: #000
+      color: #e0e0e0
+      padding: 0px 7px
+      line-height: 24px
+      height: 24px
+      opacity: 0
+      transition: opacity 0.4s ease-out
+    &:hover
+      color: #3636BD
+      &::after
+        opacity: 1
+        bottom: 0

data/lib/record_collection/rails/form_builder.rb

@@ -46,7 +46,13 @@ ActionView::Helpers::FormBuilder.class_eval do
 
   def optional_form_element(element, attr, options = {})
     classes = get_optional_classes(attr, options.reverse_merge(base_class: 'optional-text-area'))
-    add_collection_ids @template.content_tag(:div, label(attr, options[:label]) + send(element, attr, options), class: classes, data: get_data_attributes(attr, options))
+    label_tag = label(attr, options[:label])
+    element_tag = send(element, attr, options)
+    content = label_tag + element_tag
+    # Hint tag is empty to make it easy to implement using js. Adding it as text is a better option than hiding the text.
+    # Graceful Degradation is not an option anyway
+    content += @template.content_tag(:span, nil, class: 'optional-attribute-hint', data: {hint: options[:hint]}) if options[:hint].present?
+    add_collection_ids @template.content_tag(:div, content, class: classes, data: get_data_attributes(attr, options))
   end
 
   private

data/lib/record_collection/version.rb

@@ -1,3 +1,3 @@
 module RecordCollection
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/dummy/app/models/project/collection.rb

@@ -1,5 +1,6 @@
 class Project::Collection < RecordCollection::Base
   attribute :finished, type: Boolean
+  attribute :hint_visible, type: Boolean
   attribute :start_date, type: Date
   attribute :description
 end

data/spec/dummy/app/views/projects/collection_edit.html.slim

@@ -2,8 +2,9 @@ h1 Edit multiple projects
 = simple_form_for @collection, url: [:collection_update, @collection] do |f|
   = render 'form_errors', target: @collection
   .form-inputs= f.optional_boolean :finished, disabled: true
+  .form-inputs= f.optional_boolean :hint_visible, hint: "Check this one if the hint is visible. Hint testing"
   .form-inputs= f.optional_input :start_date
-  .form-inputs= f.optional_input :description
+  .form-inputs= f.optional_input :description, hint: "Hint normal display for other attributes, use .optional-attribute-hint with data-hint='abc' in your simple_form config to use the record_collection styling"
   .form-actions= f.submit
 .page-actions
   = link_to 'Back', employees_path

data/spec/dummy/db/migrate/20151226083300_add_hint_visible_to_projects.rb

@@ -0,0 +1,5 @@
+class AddHintVisibleToProjects < ActiveRecord::Migration
+  def change
+    add_column :projects, :hint_visible, :boolean, null: false, default: false
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151225113902) do
+ActiveRecord::Schema.define(version: 20151226083300) do
 
   create_table "employees", force: :cascade do |t|
     t.string   "name"
@@ -27,10 +27,11 @@ ActiveRecord::Schema.define(version: 20151225113902) do
     t.string   "name"
     t.boolean  "finished"
     t.string   "state"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.datetime "created_at",                   null: false
+    t.datetime "updated_at",                   null: false
     t.text     "description"
     t.date     "start_date"
+    t.boolean  "hint_visible", default: false, null: false
   end
 
 end

data/spec/features/optional_boolean_hint_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+RSpec.feature "Hint with optional boolean", type: :feature do
+  scenario "Seeing the hint", js: true do
+    project = Project.create name: 'P1', finished: true
+    visit collection_edit_projects_path(ids: [project.id])
+
+    page.should have_selector '.optional-attribute-container.hint_visible .optional-attribute-hint'
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -504,6 +504,7 @@ files:
 - spec/dummy/db/migrate/20150721122805_add_description_to_projects.rb
 - spec/dummy/db/migrate/20151215123553_add_project_id_to_employees.rb
 - spec/dummy/db/migrate/20151225113902_add_start_date_to_projects.rb
+- spec/dummy/db/migrate/20151226083300_add_hint_visible_to_projects.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -513,6 +514,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/features/disabled_boolean_spec.rb
 - spec/features/multi_select_spec.rb
+- spec/features/optional_boolean_hint_spec.rb
 - spec/features/optional_boolean_with_normal_resource_spec.rb
 - spec/features/optional_date_field_all_nil_spec.rb
 - spec/features/optional_text_field_with_normal_resource_spec.rb
@@ -627,6 +629,7 @@ test_files:
 - spec/dummy/db/migrate/20150721122805_add_description_to_projects.rb
 - spec/dummy/db/migrate/20151215123553_add_project_id_to_employees.rb
 - spec/dummy/db/migrate/20151225113902_add_start_date_to_projects.rb
+- spec/dummy/db/migrate/20151226083300_add_hint_visible_to_projects.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -636,6 +639,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/features/disabled_boolean_spec.rb
 - spec/features/multi_select_spec.rb
+- spec/features/optional_boolean_hint_spec.rb
 - spec/features/optional_boolean_with_normal_resource_spec.rb
 - spec/features/optional_date_field_all_nil_spec.rb
 - spec/features/optional_text_field_with_normal_resource_spec.rb