record_collection 0.7.5 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3ab00ef1adc5b2fba1f11c6775bdb5cedf3d131
-  data.tar.gz: 466e4feeaf5bbbee5f62dddf126159834a131c67
+  metadata.gz: 1c445bd0e2e9f8299f807585a29a41710e568714
+  data.tar.gz: 1545d0887d9a46ca4d263143195c21dc7168e045
 SHA512:
-  metadata.gz: be027edc729b7fb5c1bf0059c7bd6e874c68a788deb6970e0f648b1311549791479022306ab116df3bd6ae34cb1ae4f3e98951f08fb03bc6486013fd5b629962
-  data.tar.gz: 56cee9b7123367bcd065c0edb1be3cd1d576e584574943f9f29283ac3153796f4ce08e6cd0f05e9f1f8078a58fbbdb253f01de0c2ce75ee476a13ba6a9d36c41
+  metadata.gz: 507893a2c300a9010b35f37e6068976cc5a49d4080ed4b7185f40b8aec08f5d921bb6297c3981902d5b5424138cea274f44c016fe46cddd5e510598bc6a7fdc0
+  data.tar.gz: 04fc98678723024797e6cb10e9932d05d26e3cae59ab9914da957df93465d7e4e47dd880d5bd627f2ae760a4b7f31a9325c74056e66bd562e25b65e8def173e0

data/.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 rvm:
   - 2.1.6
   - 2.2.2
+env:
+  - RAILS_VERSION=4.1.12
+  - RAILS_VERSION=4.2.3
+  #- RAILS_VERSION=master
 addons:
   code_climate:
     repo_token: 22819b10ef9110a7fef884ab105239fc16fd0562ac79ae54c2204b5e07343919

data/Gemfile

@@ -3,6 +3,18 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in record_collection.gemspec
 gemspec
 
+#http://aaronmiler.com/blog/testing-your-rails-engine-with-multiple-versions-of-rails/
+rails_version = ENV["RAILS_VERSION"] || "default"
+rails = case rails_version
+  when "master" then {github: "rails/rails"}
+  when "default" then ">= 3.2.0"
+  else "~> #{rails_version}"
+end
+gem "rails", rails
+if rails_version == 'master'
+  gem 'arel', github: 'rails/arel'
+end
+
 group :test do
   gem "codeclimate-test-reporter", require: nil
 end

data/README.md

@@ -87,7 +87,7 @@ attribute definitions.
 ### Validations
 The validations for the collection are exactly the same as your
 active_model validations. The only difference is that the allow_nil:
-true option standard true is. Since a nil value of a collection attribute
+true option is standard set to true. Since a nil value of a collection attribute
 means you do not want to change that value for the individual records.
 To make an attribute explicitly required for a collection add the
 allow_nil option:
@@ -108,7 +108,7 @@ collection assumes that it is subclassed by the model, eg:
 class Project::Prince2::Collection < RecordCollection::Base
 end
 
-Project::Prince2.record_class #=> Project::Prince2
+Project::Prince2::Collection.record_class #=> Project::Prince2
 ```
 
 If this is not the case, you have to define the record_class manually:
@@ -177,8 +177,9 @@ gem where you can replace `f.input :attribute, ...etc` with
 `f.optional_input :attribute, ...etc`. Our current example works with
 the standard [form_helpers](http://guides.rubyonrails.org/form_helpers.html)<br>
 ### currently supported helpers:
-* `optional_boolean`
+* `optional_boolean` with alias `optional_check_box`
 * `optional_text_field`
+* `optional_text_area`
 * `optional_input` ([simple_form](https://github.com/plataformatec/simple_form))
 
 The form you create typically looks like [app/views/employees/collection_edit.html.slim](spec/dummy/app/views/employees/collection_edit.html.slim):

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

@@ -51,3 +51,6 @@ $unchecked-color: #999
         color: $unchecked-color
       .optional-boolean-toggle
         display: none
+  &:not(.disabled)
+    .optional-boolean-toggle
+      cursor: pointer

data/lib/record_collection/base.rb

@@ -139,5 +139,10 @@ module RecordCollection
     def ids
       @ids ||= map{|record| record.try(:id) }.compact
     end
+
+    # delegate model name to class
+    def model_name
+      self.class.model_name
+    end
   end
 end

data/lib/record_collection/rails/{form_options_helper.rb → form_builder.rb}

@@ -1,5 +1,4 @@
-require 'action_view/helpers/form_options_helper'
-class ActionView::Helpers::FormBuilder
+ActionView::Helpers::FormBuilder.class_eval do
   # This method adds the collection ids to the form if not already
   # added. For the lazy peaple that forget to add them manually and
   # use an optional tag
@@ -71,4 +70,3 @@ class ActionView::Helpers::FormBuilder
     active ? 'active' : 'inactive'
   end
 end
-

data/lib/record_collection/rails/form_helper.rb

@@ -0,0 +1,27 @@
+ActionView::Helpers::FormHelper.class_eval do
+  private
+
+  alias_method :old_apply_form_for_options!, :apply_form_for_options!
+  def apply_form_for_options!(record, object, options) #:nodoc:
+    if record.is_a?(RecordCollection::Base)
+        object = convert_to_model(object)
+
+        as = options[:as]
+        namespace = options[:namespace]
+        action, method = [:collection_update, :post]
+        options[:html].reverse_merge!(
+          class:  as ? "#{action}_#{as}" : dom_class(object, action),
+          id:     (as ? [namespace, action, as] : [namespace, dom_id(object, action)]).compact.join("_").presence,
+          method: method
+        )
+
+        options[:url] ||= if options.key?(:format)
+                            polymorphic_path([action, record], format: options.delete(:format))
+                          else
+                            polymorphic_path([action, record], {})
+                          end
+    else
+      old_apply_form_for_options!(record, object, options)
+    end
+  end
+end

data/lib/record_collection/version.rb

@@ -1,3 +1,3 @@
 module RecordCollection
-  VERSION = "0.7.5"
+  VERSION = "0.8.1"
 end

data/lib/record_collection.rb

@@ -4,7 +4,8 @@ require "record_collection/version"
 require "record_collection/name"
 require "record_collection/base"
 require 'record_collection/rails/routes'
-require 'record_collection/rails/form_options_helper'
+require 'record_collection/rails/form_builder'
+require 'record_collection/rails/form_helper'
 require 'record_collection/engine'
 
 module RecordCollection

data/record_collection.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "quiet_assets"
 
 
-  spec.add_runtime_dependency 'active_attr', '~> 0.8'
-  spec.add_runtime_dependency 'activemodel', '~> 4.1'
+  spec.add_runtime_dependency 'active_attr', '>= 0.8'
+  spec.add_runtime_dependency 'activemodel', '>= 4.1'
   spec.add_runtime_dependency "railties", ">= 3.1"
 end

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

@@ -0,0 +1,4 @@
+class DashboardController < ApplicationController
+  def home
+  end
+end

data/spec/dummy/app/views/dashboard/home.html.slim

@@ -0,0 +1 @@
+h2 Home page of the dummy app of the Record Collection gem

data/spec/dummy/app/views/layouts/application.html.slim

@@ -7,6 +7,18 @@ html
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = csrf_meta_tags
   body
+    nav.top-bar data-topbar="" role="navigation" 
+      ul.title-area
+        li.name
+          h1
+            a href="/" Record collection
+        li.toggle-topbar.menu-icon
+          a href="#" 
+            span Menu
+      section.top-bar-section
+        ul.left
+          li: a href=employees_path class=(controller_name=="employees" ? "active" : nil) Employees
+          li: a href=projects_path class=(controller_name=="projects" ? "active" : nil) Projects
     .row
       .small-12.columns
         - flash.each do |name, msg|

data/spec/dummy/config/application.rb

@@ -20,7 +20,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    config.active_record.raise_in_transactional_callbacks = true if Gem::Requirement.new(">= 4.2").satisfied_by?(Gem::Version.new(Rails.version))
   end
 end
 

data/spec/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
   collection_resources :employees
   collection_resources :projects
+  root to: 'dashboard#home'
 end

data/spec/rails/form_builder_spec.rb

@@ -14,7 +14,9 @@ describe ActionView::Helpers::FormBuilder do
 
   describe '.collection_ids' do
     it 'returns the collection ids as hidden fields' do
-      subject.collection_ids.should eq %{<input type="hidden" name="ids[]" value="#{employee.id}" />}
+      subject.collection_ids.should match /^<input/
+      subject.collection_ids.should match /name="ids\[\]"/
+      subject.collection_ids.should match /value="#{employee.id}"/
     end
 
     it "does not raise when the object is not a collection object" do
@@ -23,6 +25,18 @@ describe ActionView::Helpers::FormBuilder do
     end
   end
 
+  describe '#optional_input simple_form support' do
+    it "generates proper output" do
+      expect( subject ).to receive(:input).and_return "<simple-form-content>Simple Form Content</simple-form-content>".html_safe
+      html = subject.optional_input(:section)
+      doc = Nokogiri::HTML(html)
+      doc.css("[name='ids[]'][value='#{employee.id}']").should be_present # add ids if not yet set
+
+      optional_div = doc.css("div.optional-input.optional-attribute-container.section.active.one[data-attribute='section'][data-one=true]").first
+      optional_div.text.should eq 'Simple Form Content'
+    end
+  end
+
   describe '#get_optional_classes' do
 
     describe 'active/inactive' do
@@ -52,7 +66,7 @@ describe ActionView::Helpers::FormBuilder do
         subject.get_optional_classes(:section).should include'inactive'
       end
     end
-    
+
     describe 'one' do
       it "includes one if only one record is present" do
         subject.get_optional_classes(:section).should include'one'

data/spec/rails/form_for_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe 'form_for', type: :helper do
+  let(:form_html){ helper.form_for(subject){|f| f.text_field :section} }
+  let(:doc){ Nokogiri::HTML form_html }
+  let(:form){ doc.css('form').first }
+  let(:rails_form_method){ doc.css('[name="_method"]').first.try(:[], 'value') }
+  context 'record' do
+    context 'persisted' do
+      subject { Employee.create section: "SE1" }
+      it 'generates a proper route for a normal record' do
+        form['method'].should eq 'post'
+        form['action'].should eq "/employees/#{subject.id}"
+        rails_form_method.should eq 'patch'
+      end
+    end
+
+    context 'new record' do
+      subject { Employee.new section: "SE1" }
+      it 'generates a proper route for a normal record' do
+        form['method'].should eq 'post'
+        form['action'].should eq "/employees"
+        rails_form_method.should_not be_present
+      end
+    end
+  end
+
+  context 'collection' do
+    subject{ Employee::Collection.new([], section: 'SE9') }
+    it 'generates a proper form for a collection record' do
+      form['method'].should eq 'post'
+      form['action'].should eq "/employees/collection_update"
+      rails_form_method.should_not be_present
+    end
+
+    context "with format option" do
+      let(:form_html){ helper.form_for(subject, format: :json){|f| f.text_field :section } }
+      it "generates an action including format" do
+        form['method'].should eq 'post'
+        form['action'].should eq "/employees/collection_update.json"
+      end
+    end
+
+    context "with custom as: my_collection option" do
+      let(:form_html){ helper.form_for(subject, as: 'my_collection'){|f| f.text_field :section } }
+      it 'generates a proper form for a collection record with as param set' do
+        form['method'].should eq 'post'
+        form['action'].should eq "/employees/collection_update"
+        rails_form_method.should_not be_present
+        form['id'].should eq "collection_update_my_collection"
+        form['class'].should eq "collection_update_my_collection"
+
+        # Check field naming
+        doc.css('[name="my_collection[section]"]').first['value'].should eq 'SE9'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.1
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -308,28 +308,28 @@ dependencies:
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
@@ -392,7 +392,8 @@ files:
 - lib/record_collection/base.rb
 - lib/record_collection/engine.rb
 - lib/record_collection/name.rb
-- lib/record_collection/rails/form_options_helper.rb
+- lib/record_collection/rails/form_builder.rb
+- lib/record_collection/rails/form_helper.rb
 - lib/record_collection/rails/routes.rb
 - lib/record_collection/version.rb
 - record_collection.gemspec
@@ -415,6 +416,7 @@ files:
 - spec/dummy/app/assets/stylesheets/normalize.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/controllers/dashboard_controller.rb
 - spec/dummy/app/controllers/employees_controller.rb
 - spec/dummy/app/controllers/projects_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -426,6 +428,7 @@ files:
 - 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/dashboard/home.html.slim
 - spec/dummy/app/views/employees/_form.html.erb
 - spec/dummy/app/views/employees/collection_edit.html.slim
 - spec/dummy/app/views/employees/edit.html.erb
@@ -482,6 +485,7 @@ files:
 - spec/features/translations_spec.rb
 - spec/fixtures/collections.rb
 - spec/rails/form_builder_spec.rb
+- spec/rails/form_for_spec.rb
 - spec/record_selection/base_spec.rb
 - spec/record_selection/name_spec.rb
 - spec/spec_helper.rb
@@ -529,6 +533,7 @@ test_files:
 - spec/dummy/app/assets/stylesheets/normalize.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
+- spec/dummy/app/controllers/dashboard_controller.rb
 - spec/dummy/app/controllers/employees_controller.rb
 - spec/dummy/app/controllers/projects_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -540,6 +545,7 @@ test_files:
 - 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/dashboard/home.html.slim
 - spec/dummy/app/views/employees/_form.html.erb
 - spec/dummy/app/views/employees/collection_edit.html.slim
 - spec/dummy/app/views/employees/edit.html.erb
@@ -596,6 +602,7 @@ test_files:
 - spec/features/translations_spec.rb
 - spec/fixtures/collections.rb
 - spec/rails/form_builder_spec.rb
+- spec/rails/form_for_spec.rb
 - spec/record_selection/base_spec.rb
 - spec/record_selection/name_spec.rb
 - spec/spec_helper.rb