record_collection 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3fe45579a3c799ef4243d149102f0a79bb47378
-  data.tar.gz: ba95029f191c2412f2a0489418acd0d8735c974c
+  metadata.gz: 3a59adda39d602d7f6bfb8f52d621249aa2abcc4
+  data.tar.gz: d1944bc51f5c50f874af1e2c75ec449986a77e45
 SHA512:
-  metadata.gz: 6234774ce4b5adfe5fc245e11f7331aa2c48ed38cc6e7e5ab21b6f38898754f22691a82ccba789c70ae4f09b58a73617be460b1ac47b425b8768549b892ee443
-  data.tar.gz: 0e72b14a8c8b3cb8ec56872cb2ce0b856220678dd63d37a9797652e030120fbbb8dc9a4c467365d283b5c71f6d251fd88efc00d49fd5847aea6caf24562a6454
+  metadata.gz: d65cd419233c8bf56f0b1d447dcc02e774e967eaecd8f9cda0d350453faee3ea45b37c2012c0666e04ff67a2da9aaff0cce402d105ba2d88270b60da1ad56cf2
+  data.tar.gz: d1656f30b70811c497236c87300fccfd2a367c646aee2c42566deace1934c9f7fc3821675e0c06525e2bc32e33d8cb40a9ee8e95b55fa11496971b586fb4bf03

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

@@ -44,6 +44,7 @@ class Optionals
 
     value_toggle = $('<span></span>').addClass('optional-boolean-toggle').click ->
       return if container.hasClass('inactive')
+      return if container.data('disabled')
       if $(@).hasClass('active')
         value_field.val(0)
         $(@).removeClass('active').addClass('inactive')

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

@@ -37,6 +37,12 @@ $unchecked-color: #999
         &.inactive
           color: $unchecked-color
           @extend .fa, .fa-2x, .fa-square-o
+      &.disabled
+        .optional-boolean-toggle
+          &.active
+            color: $unchecked-color
+          &.inactive
+            color: $unchecked-color
     &.inactive
       display: block
       .optional-boolean-activator-toggle

data/lib/record_collection/base.rb

@@ -105,6 +105,10 @@ module RecordCollection
       false
     end
 
+    def to_ary(*)
+      self
+    end
+
     # This method returns nil when the values of `attr` in the collection
     # are mixed. Otherwise the value itself. For boolean attributes the
     # check is wether the values are truthy or falsy. If the

data/lib/record_collection/rails/form_options_helper.rb

@@ -15,36 +15,38 @@ class ActionView::Helpers::FormBuilder
     object.map{|record| @template.hidden_field_tag('ids[]', record.id, id: nil) }.join.html_safe
   end
 
-  def optional_boolean(attr)
-    classes = get_optional_classes(attr, base_class: 'optional-boolean')
+  def optional_boolean(attr, options = {})
+    classes = get_optional_classes(attr, options.merge(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: get_data_attributes(attr))
+    add_collection_ids @template.content_tag(:div, label_tag + check_box_tag , class: classes, data: get_data_attributes(attr, options))
   end
 
-  def optional_check_box(attr)
-    optional_boolean(attr)
+  def optional_check_box(attr, options = {})
+    optional_boolean(attr, options)
   end
 
   def optional_input(attr, options = {})
-    classes = get_optional_classes(attr, base_class: 'optional-input')
+    classes = get_optional_classes(attr, options.reverse_merge(base_class: 'optional-input'))
     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')
+    classes = get_optional_classes(attr, options.reverse_merge(base_class: 'optional-text-field'))
     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')
+    classes = get_optional_classes(attr, options.reverse_merge(base_class: 'optional-text-area'))
     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 = true
     one = object.one? if object.is_a? RecordCollection::Base
-    {attribute: attr, one: one}
+    attrs = {attribute: attr, one: one}
+    attrs[:disabled] = true if options[:disabled]
+    attrs
   end
 
   def get_optional_classes(attr, options = {})
@@ -57,6 +59,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 << 'disabled' if options[:disabled]
     if object.is_a? RecordCollection::Base
       classes << 'one' if object.one?
     else

data/lib/record_collection/version.rb

@@ -1,3 +1,3 @@
 module RecordCollection
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/base/{delegation_spec.rb → behaviour_spec.rb}

@@ -81,5 +81,10 @@ RSpec.describe Employee::Collection do
       end
     end
   end
+
+  describe "array like behaviour" do
+    collection = described_class.new([1])
+    Array.wrap( collection ).should == collection
+  end
 end
 

data/spec/dummy/app/controllers/employees_controller.rb

@@ -68,6 +68,6 @@ class EmployeesController < ApplicationController
 
   # Only allow a trusted parameter "white list" through.
   def employee_params
-    params.require(:employee).permit(:name, :section)
+    params.require(:employee).permit(:name, :section, :vegan)
   end
 end

data/spec/dummy/app/controllers/projects_controller.rb

@@ -0,0 +1,73 @@
+class ProjectsController < ApplicationController
+  before_action :set_project, only: [:show, :edit, :update, :destroy]
+
+  # GET /projects
+  def index
+    @projects = Project.all
+  end
+
+  # GET /projects/1
+  def show
+  end
+
+  # GET /projects/new
+  def new
+    @project = Project.new
+  end
+
+  # GET /projects/1/edit
+  def edit
+  end
+
+  # POST /projects
+  def create
+    @project = Project.new(project_params)
+
+    if @project.save
+      redirect_to @project, notice: 'Project was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /projects/1
+  def update
+    if @project.update(project_params)
+      redirect_to @project, notice: 'Project was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /projects/1
+  def destroy
+    @project.destroy
+    redirect_to projects_url, notice: 'Project was successfully destroyed.'
+  end
+
+  def collection_edit
+    @collection = Project::Collection.find(params[:ids])
+    redirect_to projects_path, alert: 'No projects selected' if @collection.empty?
+  end
+
+  def collection_update
+    @collection = Project::Collection.find(params[:ids])
+    if @collection.update params[:collection]
+      redirect_to projects_path, notice: 'Collection is updated'
+    else
+      render 'collection_edit'
+    end
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_project
+    @project = Project.find(params[:id])
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def project_params
+    params.require(:project).permit(:name)
+  end
+end

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

@@ -0,0 +1,3 @@
+class Project::Collection < RecordCollection::Base
+  attribute :finished, type: Boolean
+end

data/spec/dummy/app/views/projects/_form.html.erb

@@ -0,0 +1,21 @@
+<%= form_for(@project) do |f| %>
+  <% if @project.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@project.errors.count, "error") %> prohibited this project from being saved:</h2>
+
+      <ul>
+      <% @project.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %><br>
+    <%= f.text_field :name %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

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

@@ -0,0 +1,9 @@
+h1 Edit multiple employees
+= form_for @collection, url: [:collection_update, @collection] do |f|
+  = render 'form_errors', target: @collection
+  .form-inputs= f.optional_boolean :finished, disabled: true
+  .form-actions= f.submit
+.page-actions
+  = link_to 'Back', employees_path
+
+

data/spec/dummy/app/views/projects/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Project</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @project %> |
+<%= link_to 'Back', projects_path %>

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

@@ -0,0 +1,20 @@
+h1 Listing Projects
+table.with-selection
+  thead
+    tr
+      th Name
+      th Finished?
+      th colspan=3
+  tbody
+    - @projects.each do |project|
+      tr data-record=project.attributes.to_json
+        td= project.name
+        td.finished= project.finished ? 'yes' : 'no'
+        td= link_to 'Show', project
+        td= link_to 'Edit', edit_project_path(project)
+        td= link_to 'Destroy', project, method: :delete, data: {confirm: 'Are you sure?' }
+br
+.page-actions
+  button.actions-button.button.warning onclick="window.location = Routes.collection_edit_projects_path({ids: MultiSelect.selected_ids()})" Actions
+  span.devider
+  = link_to 'New Project', new_project_path, class: 'info button'

data/spec/dummy/app/views/projects/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Project</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', projects_path %>

data/spec/dummy/app/views/projects/show.html.erb

@@ -0,0 +1,14 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Name:</strong>
+  <%= @project.name %>
+</p>
+
+<p>
+  <strong>Finished:</strong>
+  <%= @project.finished ? 'yes' : 'no' %>
+</p>
+
+<%= link_to 'Edit', edit_project_path(@project) %> |
+<%= link_to 'Back', projects_path %>

data/spec/dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
   collection_resources :employees
+  collection_resources :projects
 end

data/spec/features/disabled_boolean_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+RSpec.feature "Disabled booleans", type: :feature do
+  scenario "Selecting all", js: true do
+    project = Project.create name: 'P1', finished: true
+    visit collection_edit_projects_path(ids: [project.id])
+
+    toggle = find('.optional-attribute-container.finished .optional-boolean-toggle')
+    toggle['class'].should include 'active'
+    toggle.click
+    find('[name="commit"]').click
+
+    project.reload
+
+    # Should not be changed by the click
+    project.finished.should be true
+  end
+
+end

data/spec/features/optional_boolean_with_normal_resource_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+RSpec.feature "Optional  text_field with normal record", type: :feature do
+  scenario "Selecting all", js: true do
+    employee = Employee.create name: 'E1', admin: true, vegan: false
+    visit collection_edit_employees_path(ids: [employee.id])
+
+    find('#collection_section').set 'SEC' # this is an optional
+    toggle = find('.optional-attribute-container.vegan .optional-boolean-toggle')
+    toggle.click
+    find('[name="commit"]').click
+
+    employee.reload
+
+    employee.section.should == 'SEC'
+    employee.admin.should be true
+    employee.vegan.should be true
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -384,7 +384,7 @@ files:
 - record_collection.gemspec
 - spec/base/accessors_spec.rb
 - spec/base/after_record_update_spec.rb
-- spec/base/delegation_spec.rb
+- spec/base/behaviour_spec.rb
 - spec/base/finding_records_spec.rb
 - spec/base/validations_spec.rb
 - spec/dummy/README.rdoc
@@ -401,6 +401,7 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/employees_controller.rb
+- spec/dummy/app/controllers/projects_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
@@ -408,6 +409,7 @@ files:
 - spec/dummy/app/models/employee.rb
 - spec/dummy/app/models/employee/collection.rb
 - spec/dummy/app/models/project.rb
+- spec/dummy/app/models/project/collection.rb
 - spec/dummy/app/views/application/_form_errors.html.slim
 - spec/dummy/app/views/employees/_form.html.erb
 - spec/dummy/app/views/employees/collection_edit.html.slim
@@ -416,6 +418,12 @@ files:
 - spec/dummy/app/views/employees/new.html.erb
 - spec/dummy/app/views/employees/show.html.erb
 - spec/dummy/app/views/layouts/application.html.slim
+- spec/dummy/app/views/projects/_form.html.erb
+- spec/dummy/app/views/projects/collection_edit.html.slim
+- spec/dummy/app/views/projects/edit.html.erb
+- spec/dummy/app/views/projects/index.html.slim
+- spec/dummy/app/views/projects/new.html.erb
+- spec/dummy/app/views/projects/show.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -450,7 +458,9 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/features/disabled_boolean_spec.rb
 - spec/features/multi_select_spec.rb
+- spec/features/optional_boolean_with_normal_resource_spec.rb
 - spec/features/optional_text_field_with_normal_resource_spec.rb
 - spec/features/optionals_with_one_record_spec.rb
 - spec/features/translations_spec.rb
@@ -485,7 +495,7 @@ summary: Manage collections of records in Ruby on Rails
 test_files:
 - spec/base/accessors_spec.rb
 - spec/base/after_record_update_spec.rb
-- spec/base/delegation_spec.rb
+- spec/base/behaviour_spec.rb
 - spec/base/finding_records_spec.rb
 - spec/base/validations_spec.rb
 - spec/dummy/README.rdoc
@@ -502,6 +512,7 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
 - spec/dummy/app/controllers/employees_controller.rb
+- spec/dummy/app/controllers/projects_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
@@ -509,6 +520,7 @@ test_files:
 - spec/dummy/app/models/employee.rb
 - spec/dummy/app/models/employee/collection.rb
 - spec/dummy/app/models/project.rb
+- spec/dummy/app/models/project/collection.rb
 - spec/dummy/app/views/application/_form_errors.html.slim
 - spec/dummy/app/views/employees/_form.html.erb
 - spec/dummy/app/views/employees/collection_edit.html.slim
@@ -517,6 +529,12 @@ test_files:
 - spec/dummy/app/views/employees/new.html.erb
 - spec/dummy/app/views/employees/show.html.erb
 - spec/dummy/app/views/layouts/application.html.slim
+- spec/dummy/app/views/projects/_form.html.erb
+- spec/dummy/app/views/projects/collection_edit.html.slim
+- spec/dummy/app/views/projects/edit.html.erb
+- spec/dummy/app/views/projects/index.html.slim
+- spec/dummy/app/views/projects/new.html.erb
+- spec/dummy/app/views/projects/show.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -551,7 +569,9 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/features/disabled_boolean_spec.rb
 - spec/features/multi_select_spec.rb
+- spec/features/optional_boolean_with_normal_resource_spec.rb
 - spec/features/optional_text_field_with_normal_resource_spec.rb
 - spec/features/optionals_with_one_record_spec.rb
 - spec/features/translations_spec.rb
@@ -559,3 +579,4 @@ test_files:
 - spec/rails/form_builder_spec.rb
 - spec/record_selection/base_spec.rb
 - spec/spec_helper.rb
+has_rdoc: