administrate-field-nested_has_many 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1171aa3d1c51333f3bd0812f7d17754e9c1be5b7f3cce5eaef08b5aa50408ab
-  data.tar.gz: dd9640cd1dfc968c82291bf749414b7637dfebf31991e95ae9684534dfb26dcb
+  metadata.gz: 9b4e4495fbe9f39dff627f5b1ddf7d82bc89d5e3a05433cc318f12ab7f02d004
+  data.tar.gz: f328a1f6dea3d663ee0d80454bf04a4d55530b1d2a520f1c884c1c6d78b714e5
 SHA512:
-  metadata.gz: c2bfe32cd2c831b376ee516ee28faa127449f5e1c96ec3398f7ecc4e65eb1f0d9cd609d31f863c0b4ebced16d10e8afbc2516623e3b954c4c45a3c5f015387cd
-  data.tar.gz: 1aef89b5241f65cc63580687b37465f686f03736b83b0fe5d5cdf7118b37ddead2c36bd969c2cecfd665ba7d702fdb74df655a6d25d1ff906edaee17212d7921
+  metadata.gz: 5c1a6222bc8d033f871610444425f7c90b015f5b05c9ff2c47187d1f96b0a787a75dbf4f4442335c5f24788713c33f0f67e5e1d6d2677952e5970524366578d1
+  data.tar.gz: cc1b62f1e2eb55ca307c7ed7e1f41d5e6f172d604a8e8a986c98d05c0fa3115bdd3f2603d2a339af8c726a6c7404689fed09c4a483e56a24d513b91e0f733f18

data/.circleci/config.yml

@@ -4,16 +4,17 @@ jobs:
   build:
     working_directory: ~/administrate-field-nested_has_many
     docker:
-      - image: circleci/ruby:2.6.3
+      - image: circleci/ruby:2.7.0-node-browsers
         environment:
           PGHOST: localhost
           PGUSER: administrate-field-nested_has_many
+          PGPASSWORD: administrate-field-nested_has_many
           RAILS_ENV: test
       - image: postgres:11
         environment:
           POSTGRES_USER: administrate-field-nested_has_many
           POSTGRES_DB: administrate-field-nested_has_many_test
-          POSTGRES_PASSWORD: ""
+          POSTGRES_PASSWORD: administrate-field-nested_has_many
     steps:
       - checkout
 

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.7.0

data/Appraisals

@@ -4,6 +4,10 @@ appraise "administrate-0.10" do
   gem "administrate", "0.10.0"
 end
 
+appraise "administrate-0.13" do
+  gem "administrate", "0.13.0"
+end
+
 appraise "administrate-master" do
   gem "administrate", git: "https://github.com/thoughtbot/administrate", branch: "master"
 end

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 1.3.0
+
+* Cover more test cases ([#43][])
+* Update form constructor to avoid undefined method ([#34][])
+* Upgrade Ruby to 2.7.0 ([#27][])
+* We need to use a node-browsers to run features ([#30][])
+* Fix CI by explicitly setting a Postgres password ([#29][])
+
+[#43]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/43
+[#34]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/34
+[#27]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/27
+[#30]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/30
+[#29]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/29
+
 ## 1.2.0
 
 * Add support for namespaced models ([#24][])

data/administrate-field-nested_has_many.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = "administrate-field-nested_has_many"
-  gem.version = "1.2.0"
+  gem.version = "1.3.0"
   gem.authors = ["Nick Charlton", "Grayson Wright"]
   gem.email = ["nick@nickcharlton.net", "wright.grayson@gmail.com"]
   gem.homepage = "https://github.com/nickcharlton/" \

data/gemfiles/administrate_0.13.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pg"
+gem "administrate", "0.13.0"
+
+gemspec path: "../"

data/gemfiles/administrate_0.13.gemfile.lock

@@ -0,0 +1,207 @@
+PATH
+  remote: ..
+  specs:
+    administrate-field-nested_has_many (1.2.0)
+      administrate (> 0.8, < 1)
+      cocoon (~> 1.2, >= 1.2.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activesupport (6.0.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    administrate (0.13.0)
+      actionpack (>= 4.2)
+      actionview (>= 4.2)
+      activerecord (>= 4.2)
+      autoprefixer-rails (>= 6.0)
+      datetime_picker_rails (~> 0.0.7)
+      jquery-rails (>= 4.0)
+      kaminari (>= 1.0)
+      momentjs-rails (~> 2.8)
+      sassc-rails (~> 2.1)
+      selectize-rails (~> 0.6)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.0)
+    autoprefixer-rails (9.7.4)
+      execjs
+    builder (3.2.4)
+    capybara (3.31.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    childprocess (3.0.0)
+    cocoon (1.2.14)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    datetime_picker_rails (0.0.7)
+      momentjs-rails (>= 2.8.1)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    execjs (2.7.0)
+    factory_bot (5.1.1)
+      activesupport (>= 4.2.0)
+    ffi (1.12.2)
+    highline (2.0.3)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    i18n-tasks (0.9.31)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      erubi
+      highline (>= 2.0.0)
+      i18n
+      parser (>= 2.2.3.0)
+      rails-i18n
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
+    jquery-rails (4.3.5)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    kaminari (1.2.0)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.2.0)
+      kaminari-activerecord (= 1.2.0)
+      kaminari-core (= 1.2.0)
+    kaminari-actionview (1.2.0)
+      actionview
+      kaminari-core (= 1.2.0)
+    kaminari-activerecord (1.2.0)
+      activerecord
+      kaminari-core (= 1.2.0)
+    kaminari-core (1.2.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.2)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    momentjs-rails (2.20.1)
+      railties (>= 3.1)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    parser (2.7.0.4)
+      ast (~> 2.4.0)
+    pg (1.2.2)
+    public_suffix (4.0.3)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    rails-i18n (6.0.0)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 7)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.7.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubyzip (2.3.0)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    selectize-rails (0.12.6)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    sprockets (4.0.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  administrate (= 0.13.0)
+  administrate-field-nested_has_many!
+  appraisal
+  capybara
+  factory_bot
+  i18n-tasks
+  pg
+  rake
+  rspec-rails
+  selenium-webdriver
+  sqlite3
+
+BUNDLED WITH
+   1.17.2

data/lib/administrate/field/nested_has_many.rb

@@ -32,7 +32,7 @@ module Administrate
           next if nested_field.resource.blank?
 
           # inject current data into field
-          resource = nested_field.resource[form_builder.index]
+          resource = data[form_builder.index]
           nested_field.instance_variable_set(
             "@data",
             resource.send(nested_field.attribute),
@@ -73,11 +73,15 @@ module Administrate
       end
 
       def associated_form
-        Administrate::Page::Form.new(associated_dashboard, data)
+        Administrate::Page::Form.new(associated_dashboard, new_resource)
       end
 
       private
 
+      def new_resource
+        @new_resource ||= associated_class_name.constantize.new
+      end
+
       def skipped_fields
         Array(options[:skip])
       end

data/spec/dummy/app/models/school.rb

@@ -1,4 +1,4 @@
 class School < ApplicationRecord
   has_many :students, class_name: "Foo::Student"
-  accepts_nested_attributes_for :students
+  accepts_nested_attributes_for :students, allow_destroy: true
 end

data/spec/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  root to: redirect("/admin/schools")
   namespace :admin do
     root to: redirect("/admin/schools")
     resources :schools

data/spec/features/has_many_spec.rb

@@ -38,4 +38,31 @@ feature "Has many" do
     expect(page).to have_text("La Ferme du Bec Hellouin")
     expect(page).to have_text("Sébastien")
   end
+
+  scenario "edit" do
+    school = FactoryBot.create(:school)
+    FactoryBot.create_list(:student, 2, school: school)
+    visit edit_admin_school_path(school)
+    expect(page).to have_content("Edit #{school.name}")
+  end
+
+  scenario "update", js: true do
+    school = FactoryBot.create(:school)
+    student = FactoryBot.create(:student, school: school)
+    visit edit_admin_school_path(school)
+    click_link "Add Foo/Student"
+
+    within(all(".nested-fields").last) do
+      fill_in "Name", with: "Sébastien"
+    end
+
+    within(all(".nested-fields").first) do
+      click_link "Remove Foo/Student"
+    end
+
+    click_button "Update School"
+
+    expect(page).to have_text("Sébastien")
+    expect(page).not_to have_text(student.name)
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-nested_has_many
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Nick Charlton
 - Grayson Wright
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -197,6 +197,8 @@ files:
 - config/locales/administrate-field-nested_has_many.ru.yml
 - gemfiles/administrate_0.10.gemfile
 - gemfiles/administrate_0.10.gemfile.lock
+- gemfiles/administrate_0.13.gemfile
+- gemfiles/administrate_0.13.gemfile.lock
 - gemfiles/administrate_master.gemfile
 - gemfiles/administrate_master.gemfile.lock
 - lib/administrate/field/nested_has_many.rb
@@ -277,7 +279,7 @@ homepage: https://github.com/nickcharlton/administrate-field-nested_has_many
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -292,8 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Plugin for nested has_many forms in Administrate
 test_files: