record_collection 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ee07c5d52e0e54488e931828ea1e6fa5fcfcf11
-  data.tar.gz: 287f65ae03ea2093b1f8bfa8fecde2d5acb3d9c4
+  metadata.gz: f3fe45579a3c799ef4243d149102f0a79bb47378
+  data.tar.gz: ba95029f191c2412f2a0489418acd0d8735c974c
 SHA512:
-  metadata.gz: af0f6e48b22e6456ceb5b74f3c8989df45e0cf8b19f67650aea3bcd2ed8d99aa15b9a7cbbaccafe7ba47ac1fd3be00c99937e138511ca0550e8d14e0e3293de1
-  data.tar.gz: 302c8acc483678b28be818e928d6f5ad193c8a71f36ce1c3c94fb270f83bb90916701aed6c7f2ad8a75dc185bd17d7cbf13544ffd404f68f434da3084f7ab8ea
+  metadata.gz: 6234774ce4b5adfe5fc245e11f7331aa2c48ed38cc6e7e5ab21b6f38898754f22691a82ccba789c70ae4f09b58a73617be460b1ac47b425b8768549b892ee443
+  data.tar.gz: 0e72b14a8c8b3cb8ec56872cb2ce0b856220678dd63d37a9797652e030120fbbb8dc9a4c467365d283b5c71f6d251fd88efc00d49fd5847aea6caf24562a6454

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

@@ -15,7 +15,6 @@ class MultiSelect
     @options = options
     @on 'changed', options.changed if options.changed
 
-    @set 'resource', table.data('resource')
     # Add an extra th to all header rows
     table.find('thead tr').each -> $(this).prepend("<th></th>")
 

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

@@ -102,7 +102,7 @@ class Optionals
 
       container.find('label').remove()
 
-      activator_toggle.click() if container.hasClass('active')
+      activator_toggle.click() if container.hasClass('active') or one
       activator_toggle.hide() if one
 
 root = @

data/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = './spec/dummy'

data/lib/record_collection/rails/form_options_helper.rb

@@ -42,7 +42,8 @@ class ActionView::Helpers::FormBuilder
   end
 
   def get_data_attributes(attr, options = {})
-    one = object.respond_to?(:one?) && object.one?
+    one = true
+    one = object.one? if object.is_a? RecordCollection::Base
     {attribute: attr, one: one}
   end
 
@@ -56,7 +57,12 @@ 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?
+    if object.is_a? RecordCollection::Base
+      classes << 'one' if object.one?
+    else
+      # Assume normal record, this always behaves like one
+      classes << 'one'
+    end
     classes << 'error' if object.errors[attr].present?
     classes
   end

data/lib/record_collection/version.rb

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

data/record_collection.gemspec

@@ -32,10 +32,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "jquery-rails"
   spec.add_development_dependency "js-routes"
   spec.add_development_dependency "capybara"
+  spec.add_development_dependency "capybara-screenshot"
   spec.add_development_dependency "poltergeist"
   spec.add_development_dependency "launchy"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "spring"
+  spec.add_development_dependency "spring-commands-rspec"
+  spec.add_development_dependency "quiet_assets"
 
 
   spec.add_runtime_dependency 'active_attr', '~> 0.8'

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

@@ -17,7 +17,7 @@
   </div>
   <div class="field">
     <%= f.label :section %><br>
-    <%= f.text_field :section %>
+    <%= f.optional_text_field :section %>
   </div>
   <div class="actions">
     <%= f.submit %>

data/spec/features/multi_select_spec.rb

@@ -20,4 +20,5 @@ RSpec.feature "Multi select", type: :feature do
     Employee.pluck(:admin).should be_none
 
   end
+
 end

data/spec/features/optional_text_field_with_normal_resource_spec.rb

@@ -0,0 +1,16 @@
+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 edit_employee_path(employee.id)
+
+    find('#employee_section').set 'SEC' # this is an optional
+    find('[name="commit"]').click
+
+    employee.reload
+
+    employee.section.should == 'SEC'
+  end
+
+end

data/spec/features/optionals_with_one_record_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+RSpec.feature "Optionals with one 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'
+    find('[name="commit"]').click
+
+    employee.reload
+
+    employee.section.should == 'SEC'
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +262,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: spring-commands-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: quiet_assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +356,7 @@ files:
 - app/controllers/record_collection/application_controller.rb
 - app/helpers/record_collection/application_helper.rb
 - app/views/layouts/record_collection/application.html.erb
+- config/spring.rb
 - lib/generators/collection_scaffold/collection_scaffold_generator.rb
 - lib/generators/collection_scaffold/templates/_form.html.haml
 - lib/generators/collection_scaffold/templates/_form.html.slim
@@ -408,6 +451,8 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/features/multi_select_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
 - spec/fixtures/collections.rb
 - spec/rails/form_builder_spec.rb
@@ -507,6 +552,8 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/features/multi_select_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
 - spec/fixtures/collections.rb
 - spec/rails/form_builder_spec.rb