administrate-field-nested_has_many 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2cb29d90820122048ad397c50a5f663381a06975
-  data.tar.gz: f0f0d555baa0f4f2dc0e414b509cb415e1bb74c8
+SHA256:
+  metadata.gz: dd88637ffa9a205a64a76b0c72b2af2a9aea05331094d563ad055f0347dcb49c
+  data.tar.gz: '021851337256c69a63d69045caf809bad66f998949d6cf50433961290db4c726'
 SHA512:
-  metadata.gz: a07b34b7debeba156a264e191b0b7d4ab054519ee12fd71d536b3e50fbd68536050f49cc5e7375c802a9f68900195bf6f3167b620bbedcaa035c8c517d7b6ed5
-  data.tar.gz: ca68e9204dfcc2e472ec7e1da8d5039b1bcbc11e3d90b80f3dc0fc37c6d2bf48d04d440e343ac6dc1c611776ffb29002e0f2a7e3e75303674058b3369b2b2dd5
+  metadata.gz: 2d6c8787987ca3ebe4c5e4cd93fd8008b71107759612816e7f31eb0adc752b8cd9d174c42052ebcec9bded051447a40a2226723e4628134a95dbfeccd9b31e95
+  data.tar.gz: 24417b0d9eb65d813f9b898ee3cd776ee22129bb37f865bd20eb0e0ec20b853112308af7931789b601c52486b1fce69aca8d3aa5c46adf427cce80b71e02eb08

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/CHANGELOG.md

@@ -0,0 +1,35 @@
+# CHANGELOG
+
+## 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,3 @@
+source "https://rubygems.org"
+
+gemspec

data/README.md

@@ -7,7 +7,7 @@ A plugin for nested has_many forms in [Administrate].
 Add to your `Gemfile`:
 
 ```ruby
-gem "administrate-field-nested_has_many", "~> 0.0.2"
+gem "administrate-field-nested_has_many"
 ```
 
 Run:
@@ -17,6 +17,7 @@ $ bundle install
 ```
 
 Add to your `FooDashboard`:
+
 ```ruby
 ATTRIBUTE_TYPES = [
   bars: Field::NestedHasMany.with_options(skip: :foo),
@@ -34,20 +35,4 @@ Otherwise, Administrate will try to render a field
 for the order's `:customer` attribute,
 which breaks the nested form logic.
 
-## Stopgap fix for javascript
-
-At the moment, Administrate doesn't automatically load javascripts from plugins.
-To fix this, you need to generate the Administrate javascript file:
-
-```bash
-$ rails g administrate:views:layout
-```
-
-And then add a line to `app/views/admin/application/_javascript.html.erb`
-to input the javascript for this gem:
-
-```
-<%= javascript_include_tag "administrate-field-nested_has_many/application" %>
-```
-
 [Administrate]: https://github.com/thoughtbot/administrate

data/Rakefile

@@ -0,0 +1,20 @@
+begin
+  require "bundler/setup"
+rescue LoadError
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
+end
+
+require "bundler/gem_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.0.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,9 @@ 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 "rake"
+  gem.add_development_dependency "rspec"
 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

@@ -22,7 +22,8 @@ from the associated resource class's dashboard.
   <%= render(
     "collection",
     collection_presenter: field.associated_collection,
-    resources: field.resources
+    resources: field.resources,
+    table_title: field.name    
   ) %>
 
   <% if field.more_than_limit? %>
@@ -36,5 +37,5 @@ from the associated resource class's dashboard.
   <% end %>
 
 <% else %>
-  <%= t("administrate.fields.has_many.none") %>
+  <%= t("administrate.fields.has_many.none", default: "–") %>
 <% end %>

data/config/locales/administrate-field-nested_has_many.en.yml

@@ -0,0 +1,7 @@
+---
+en:
+  administrate:
+    fields:
+      nested_has_many:
+        add: "Add %{resource}"
+        remove: "Remove %{resource}"

data/lib/administrate/field/nested_has_many.rb

@@ -1,17 +1,22 @@
 require "administrate/field/has_many"
 require "administrate/page/form"
 require "rails"
+require "administrate/engine"
 require "cocoon"
 
 module Administrate
   module Field
     class NestedHasMany < Administrate::Field::HasMany
-      VERSION = "0.0.2"
-
       class Engine < ::Rails::Engine
+        Administrate::Engine.add_javascript(
+          "administrate-field-nested_has_many/application",
+        )
+        Administrate::Engine.add_stylesheet(
+          "administrate-field-nested_has_many/application",
+        )
       end
 
-      DEFAULT_ATTRIBUTES = [:id, :_destroy].freeze
+      DEFAULT_ATTRIBUTES = %i(id _destroy).freeze
 
       def nested_fields
         associated_form.attributes.reject do |nested_field|
@@ -19,6 +24,21 @@ module Administrate
         end
       end
 
+      def nested_fields_for_builder(form_builder)
+        return nested_fields unless form_builder.index.is_a? Integer
+
+        nested_fields.each do |nested_field|
+          next if nested_field.resource.blank?
+
+          # inject current data into field
+          resource = nested_field.resource[form_builder.index]
+          nested_field.instance_variable_set(
+            "@data",
+            resource.send(nested_field.attribute),
+          )
+        end
+      end
+
       def to_s
         data
       end
@@ -32,7 +52,7 @@ module Administrate
           dashboard_for_resource(associated_resource).new.permitted_attributes
       end
 
-      def self.permitted_attribute(associated_resource)
+      def self.permitted_attribute(associated_resource, _options = nil)
         {
           "#{associated_resource}_attributes".to_sym =>
           associated_attributes(associated_resource),
@@ -48,7 +68,7 @@ module Administrate
       end
 
       def associated_form
-        Administrate::Page::Form.new(associated_dashboard, association_name)
+        Administrate::Page::Form.new(associated_dashboard, data)
       end
 
       private

metadata

@@ -1,29 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-nested_has_many
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
+- Nick Charlton
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: cocoon
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +38,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,37 +48,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.11
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: 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: '4.2'
+        version: '0'
 description: Plugin for nested has_many forms in Administrate
 email:
+- nick@nickcharlton.net
 - wright.grayson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- CHANGELOG.md
+- Gemfile
 - README.md
+- Rakefile
 - administrate-field-nested_has_many.gemspec
 - app/assets/javascripts/administrate-field-nested_has_many/application.js
+- app/assets/stylesheets/administrate-field-nested_has_many/application.css
+- app/assets/stylesheets/administrate-field-nested_has_many/base.scss
 - app/views/fields/nested_has_many/_fields.html.erb
 - app/views/fields/nested_has_many/_form.html.erb
 - app/views/fields/nested_has_many/_index.html.erb
 - app/views/fields/nested_has_many/_show.html.erb
+- config/locales/administrate-field-nested_has_many.en.yml
 - lib/administrate/field/nested_has_many.rb
 - spec/lib/administrate/field/nested_has_many_spec.rb
-homepage: https://github.com/graysonwright/administrate-field-nested_has_many
+homepage: https://github.com/nickcharlton/administrate-field-nested_has_many
 licenses:
 - MIT
 metadata: {}
@@ -88,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Plugin for nested has_many forms in Administrate