administrate-field-nested_has_many 0.0.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b2336e14b58c19c34cd27e3d18f6a64da56f97e0
-  data.tar.gz: 6638b8ec69dd50bb7bb4c0d0fb1987f314d4d790
+SHA256:
+  metadata.gz: 9b4e4495fbe9f39dff627f5b1ddf7d82bc89d5e3a05433cc318f12ab7f02d004
+  data.tar.gz: f328a1f6dea3d663ee0d80454bf04a4d55530b1d2a520f1c884c1c6d78b714e5
 SHA512:
-  metadata.gz: d100590240ed07f092bf2a7d0345fb14a4cf22be1474007e48dd23e680567dc9cd32c72e1d06cfd0cfe4cc23f6f27b5b5813af55c44898133e2412c6fbbff4fe
-  data.tar.gz: 39f13eef2ef5f7017981e7d4bf9dbd0c0b4bd3296cb6d3146e23cc0cdc1bf04538c317c66708b63c8575c61b4a30aa0927f478e77afe921acf2344c17bfe174a
+  metadata.gz: 5c1a6222bc8d033f871610444425f7c90b015f5b05c9ff2c47187d1f96b0a787a75dbf4f4442335c5f24788713c33f0f67e5e1d6d2677952e5970524366578d1
+  data.tar.gz: cc1b62f1e2eb55ca307c7ed7e1f41d5e6f172d604a8e8a986c98d05c0fa3115bdd3f2603d2a339af8c726a6c7404689fed09c4a483e56a24d513b91e0f733f18

data/.circleci/config.yml

@@ -0,0 +1,29 @@
+---
+version: 2
+jobs:
+  build:
+    working_directory: ~/administrate-field-nested_has_many
+    docker:
+      - 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: administrate-field-nested_has_many
+    steps:
+      - checkout
+
+      - run: bundle install
+      - run: bundle exec appraisal install
+
+      - run: dockerize -wait tcp://localhost:5432 -timeout 1m
+
+      - run: bundle exec rake db:setup
+
+      - run: bundle exec rake
+      - run: bundle exec appraisal rake

data/.gitignore

@@ -0,0 +1,4 @@
+Gemfile.lock
+gemfiles/.bundle
+pkg/
+.rspec

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.0

data/Appraisals

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+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

@@ -0,0 +1,71 @@
+# 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][])
+* Add missing accepts nested attributes to School.
+* Explicitly import administrate and field JS/CSS.
+* Add ru locale ([#26][]).
+* Add pt locale ([#25][]).
+* Add Circle CI.
+* Upgrade Ruby to 2.6.3.
+* Add a dummy test app ([#19][]).
+
+[#24]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/24
+[#26]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/26
+[#25]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/25
+[#19]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/19
+
+## 1.1.0
+
+* Add a `.ruby-version` file.
+* Adjust to upstream administrate changes.
+* Add Japanese locale.
+
+## 1.0.0
+
+* Add `rake` for testing and release tools ([#16][]).
+* Fixes for `administrate` 0.9.0 ([#11][]).
+* Ensure current data is injected into nested fields ([#10][]).
+* Remove direct dependency on Rails ([#10][]).
+* Add i18n support ([#10][]).
+* Make styling more consistent with `has_one` form ([#10][]).
+* Add missing Gemfile and missing dependency on RSpec ([#15][]).
+* Update gem location and authors ([#14][]).
+* Avoid circular dependencies by not including the full library in the Gemspec
+  ([#13][]).
+
+[#16]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/16
+[#15]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/15
+[#14]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/14
+[#13]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/13
+[#11]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/11
+[#10]: https://github.com/nickcharlton/administrate-field-nested_has_many/pull/10
+
+## 0.1.0
+
+* Updates for changes in `administrate` 0.2.1.
+* Import JavaScript automatically.
+
+## 0.0.2
+
+* Add missing import for `cocoon`.
+* Note stop gap fix for missing JavaScript imports.
+
+## 0.0.1
+
+* Initial Release.

data/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "pg"
+
+gemspec

data/README.md

@@ -13,14 +13,15 @@ gem "administrate-field-nested_has_many"
 Run:
 
 ```bash
-$bundle install
+$ bundle install
 ```
 
 Add to your `FooDashboard`:
+
 ```ruby
-ATTRIBUTE_TYPES = [
+ATTRIBUTE_TYPES = {
   bars: Field::NestedHasMany.with_options(skip: :foo),
-]
+}
 ```
 
 The `skip` option takes a single symbol or list of symbols.

data/Rakefile

@@ -0,0 +1,24 @@
+begin
+  require "bundler/setup"
+rescue LoadError
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
+end
+
+require "bundler/gem_tasks"
+
+require File.expand_path("../spec/dummy/config/application", __FILE__)
+
+Rails.application.load_tasks
+
+##
+# Configure the test suite.
+##
+require "rspec/core"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+##
+# By default, just run the tests.
+##
+task default: :spec

data/administrate-field-nested_has_many.gemspec

@@ -1,13 +1,12 @@
 $:.push File.expand_path("../lib", __FILE__)
 
-require "administrate/field/nested_has_many"
-
 Gem::Specification.new do |gem|
   gem.name = "administrate-field-nested_has_many"
-  gem.version = Administrate::Field::NestedHasMany::VERSION
-  gem.authors = ["Grayson Wright"]
-  gem.email = ["wright.grayson@gmail.com"]
-  gem.homepage = "https://github.com/graysonwright/administrate-field-nested_has_many"
+  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/" \
+      "administrate-field-nested_has_many"
   gem.summary = "Plugin for nested has_many forms in Administrate"
   gem.description = gem.summary
   gem.license = "MIT"
@@ -16,7 +15,15 @@ Gem::Specification.new do |gem|
   gem.files = `git ls-files`.split("\n")
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  gem.add_dependency "administrate", "~> 0.2.0"
-  gem.add_dependency "cocoon", "~> 1.2"
-  gem.add_dependency "rails", "~> 4.2"
+  gem.add_dependency "administrate", "> 0.8", "< 1"
+  gem.add_dependency "cocoon", "~> 1.2", ">= 1.2.11"
+
+  gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "selenium-webdriver"
+  gem.add_development_dependency "factory_bot"
+  gem.add_development_dependency "i18n-tasks"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec-rails"
+  gem.add_development_dependency "sqlite3"
 end

data/app/assets/stylesheets/administrate-field-nested_has_many/application.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree .
+ */

data/app/assets/stylesheets/administrate-field-nested_has_many/base.scss

@@ -0,0 +1,14 @@
+@import 'administrate/library/variables';
+@import 'administrate/library/clearfix';
+
+.field-unit--nested-has-many {
+  .nested-fields {
+    @include administrate-clearfix;
+    margin-bottom: $base-spacing;
+    padding-bottom: $base-spacing;
+  }
+
+  .remove_fields, .add_fields {
+    float: right;
+  }
+}

data/app/views/fields/nested_has_many/_fields.html.erb

@@ -1,11 +1,9 @@
-<div class="nested-fields" style="width:100%">
-
-  <% field.nested_fields.each do |attribute| -%>
+<div class="nested-fields">
+  <% field.nested_fields_for_builder(f).each do |attribute| -%>
     <div class="field-unit field-unit--<%= attribute.html_class %>">
       <%= render_field attribute, f: f %>
     </div>
   <% end -%>
 
-  <%# TODO I18n %>
-  <%= link_to_remove_association "Remove #{field.associated_class_name.titleize}", f %>
+  <%= link_to_remove_association I18n.t("administrate.fields.nested_has_many.remove", resource: field.associated_class_name.titleize), f %>
 </div>

data/app/views/fields/nested_has_many/_form.html.erb

@@ -1,23 +1,23 @@
-<div class="nested-fields" style="width: 40%; margin-left: 20%;">
-
+<fieldset class="field-unit--nested">
+  <legend><%= f.label field.attribute %></legend>
   <%= f.fields_for field.association_name do |nested_form| %>
-    <%= render(
-      partial: "fields/nested_has_many/fields",
-      locals: {
-        f: nested_form,
-        field: field,
-      },
-    ) %>
+      <%= render(
+        partial: "fields/nested_has_many/fields",
+        locals: {
+          f: nested_form,
+          field: field,
+        },
+      ) %>
   <% end %>
 
   <div>
     <%= link_to_add_association(
-      # TODO I18n
-      "Add #{field.associated_class_name.titleize}",
+      I18n.t("administrate.fields.nested_has_many.add", resource: field.associated_class_name.titleize),
       f,
       field.association_name,
+      class: 'button',
       partial: "fields/nested_has_many/fields",
       render_options: { locals: { field: field } },
     ) %>
   </div>
-</div>
+</fieldset>

data/app/views/fields/nested_has_many/_show.html.erb

@@ -1,40 +1,9 @@
-<%#
-# HasMany Show Partial
-
-This partial renders a has_many relationship,
-to be displayed on a resource's show page.
-
-By default, the relationship is rendered
-as a table of the first few associated resources.
-The columns of the table are taken
-from the associated resource class's dashboard.
-
-## Local variables:
-
-- `field`:
-  An instance of [Administrate::Field::HasMany][1].
-  Contains methods to help display a table of associated resources.
-
-[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasMany
+<%
+  current = Gem::Version.new(Administrate::VERSION)
+  v0_10 = Gem::Version.new("0.10")
 %>
-
-<% if field.resources.any? %>
-  <%= render(
-    "collection",
-    collection_presenter: field.associated_collection,
-    resources: field.resources
-  ) %>
-
-  <% if field.more_than_limit? %>
-    <span>
-      <%= t(
-        'administrate.fields.has_many.more',
-        count: field.limit,
-        total_count: field.data.count,
-      ) %>
-    </span>
-  <% end %>
-
+<% if current <= v0_10 %>
+  <%= render "fields/nested_has_many/show_old", **local_assigns %>
 <% else %>
-  <%= t("administrate.fields.has_many.none") %>
+  <%= render "fields/nested_has_many/show_current", **local_assigns %>
 <% end %>

data/app/views/fields/nested_has_many/_show_current.html.erb

@@ -0,0 +1,44 @@
+<%#
+# HasMany Show Partial
+
+This partial renders a has_many relationship,
+to be displayed on a resource's show page.
+
+By default, the relationship is rendered
+as a table of the first few associated resources.
+The columns of the table are taken
+from the associated resource class's dashboard.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::HasMany][1].
+  Contains methods to help display a table of associated resources.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasMany
+%>
+
+<% if field.resources.any? %>
+  <% order = field.order_from_params(params.fetch(field.name, {})) %>
+  <% page_number = params.fetch(field.name, {}).fetch(:page, nil) %>
+  <%= render(
+    "collection",
+    collection_presenter: field.associated_collection(order),
+    collection_field_name: field.name,
+    page: page,
+    resources: field.resources(page_number, order),
+    table_title: field.name,
+  ) %>
+
+  <% if field.more_than_limit? %>
+    <span>
+      <%= t(
+        'administrate.fields.has_many.more',
+        count: field.limit,
+        total_count: field.data.count,
+      ) %>
+    </span>
+  <% end %>
+<% else %>
+  <%= t("administrate.fields.has_many.none", default: "–") %>
+<% end %>

data/app/views/fields/nested_has_many/_show_old.html.erb

@@ -0,0 +1,36 @@
+<%#
+# HasMany Show Partial
+This partial renders a has_many relationship,
+to be displayed on a resource's show page.
+By default, the relationship is rendered
+as a table of the first few associated resources.
+The columns of the table are taken
+from the associated resource class's dashboard.
+## Local variables:
+- `field`:
+  An instance of [Administrate::Field::HasMany][1].
+  Contains methods to help display a table of associated resources.
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/HasMany
+%>
+
+<% if field.resources.any? %>
+  <%= render(
+    "collection",
+    collection_presenter: field.associated_collection,
+    resources: field.resources,
+    table_title: field.name
+  ) %>
+
+  <% if field.more_than_limit? %>
+    <span>
+      <%= t(
+        'administrate.fields.has_many.more',
+        count: field.limit,
+        total_count: field.data.count,
+      ) %>
+    </span>
+  <% end %>
+
+<% else %>
+  <%= t("administrate.fields.has_many.none", default: "–") %>
+<% end %>

data/bin/rails

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+APP_PATH = File.expand_path('../spec/dummy/config/application', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'