administrate-field-nested_has_many 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd88637ffa9a205a64a76b0c72b2af2a9aea05331094d563ad055f0347dcb49c
-  data.tar.gz: '021851337256c69a63d69045caf809bad66f998949d6cf50433961290db4c726'
+  metadata.gz: dc4e6f4887d375faa443012dd432fc1dbf93ba0c54cf410cb94f0ed15dff2b1e
+  data.tar.gz: 46ba0a0fbafbe1dd43e5dc7e2db12a3025a5b92428515cec60fb1c0d67fd24f6
 SHA512:
-  metadata.gz: 2d6c8787987ca3ebe4c5e4cd93fd8008b71107759612816e7f31eb0adc752b8cd9d174c42052ebcec9bded051447a40a2226723e4628134a95dbfeccd9b31e95
-  data.tar.gz: 24417b0d9eb65d813f9b898ee3cd776ee22129bb37f865bd20eb0e0ec20b853112308af7931789b601c52486b1fce69aca8d3aa5c46adf427cce80b71e02eb08
+  metadata.gz: 19ca8ea2726af27214269cf1720a261b9fea189f3e6baee3e1dbeb6d884898f0562fe8a626e21f4b9b5d384bc3e7da7060de087302b03e410bb126e0c2c7e305
+  data.tar.gz: 2fd50695bf285688a893181c6443854a513cea9a492bcc06d29ce2a3506fd99ca0807fdd966b59c48364a189fb758392776baed8ec0fd03e4de4af1af2f193c2

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.5.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 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][]).

data/README.md

@@ -19,9 +19,9 @@ $ 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/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.0.0"
+  gem.version = "1.1.0"
   gem.authors = ["Nick Charlton", "Grayson Wright"]
   gem.email = ["nick@nickcharlton.net", "wright.grayson@gmail.com"]
   gem.homepage = "https://github.com/nickcharlton/" \
@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "i18n-tasks"
 end

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

@@ -19,11 +19,15 @@ from the associated resource class's dashboard.
 %>
 
 <% 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,
-    resources: field.resources,
-    table_title: field.name    
+    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? %>

data/config/i18n-tasks.yml

@@ -0,0 +1,8 @@
+base_locale: en
+
+data:
+  read:
+    - config/locales/administrate-field-nested_has_many.%{locale}.yml
+
+ignore:
+  - 'administrate.fields.has_many.*'

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

@@ -3,5 +3,5 @@ en:
   administrate:
     fields:
       nested_has_many:
-        add: "Add %{resource}"
-        remove: "Remove %{resource}"
+        add: Add %{resource}
+        remove: Remove %{resource}

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

@@ -0,0 +1,7 @@
+---
+ja:
+  administrate:
+    fields:
+      nested_has_many:
+        add: "%{resource}を追加"
+        remove: "%{resource}を削除"

data/spec/i18n_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "i18n/tasks"
+
+RSpec.describe "I18n" do
+  let(:i18n) { I18n::Tasks::BaseTask.new }
+  let(:missing_keys) { i18n.missing_keys }
+  let(:unused_keys) { i18n.unused_keys }
+
+  it "does not have missing keys" do
+    expect(missing_keys).to be_empty,
+                            "Missing #{missing_keys.leaves.count} i18n keys,
+                             run `i18n-tasks missing' to show them"
+  end
+
+  it "does not have unused keys" do
+    expect(unused_keys).to be_empty,
+                           "#{unused_keys.leaves.count} unused i18n keys,
+                            run `i18n-tasks unused' to show them"
+  end
+
+  it "files are normalized" do
+    non_normalized = i18n.non_normalized_paths
+    message = "The following files need to be normalized:\n" \
+              "#{non_normalized.map { |path| "  #{path}" }.join("\n")}\n" \
+              "Please run `i18n-tasks normalize` to fix"
+    expect(non_normalized).to be_empty, message
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-nested_has_many
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -79,6 +79,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n-tasks
+  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'
 description: Plugin for nested has_many forms in Administrate
 email:
 - nick@nickcharlton.net
@@ -88,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -100,8 +115,11 @@ files:
 - 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/i18n-tasks.yml
 - config/locales/administrate-field-nested_has_many.en.yml
+- config/locales/administrate-field-nested_has_many.ja.yml
 - lib/administrate/field/nested_has_many.rb
+- spec/i18n_spec.rb
 - spec/lib/administrate/field/nested_has_many_spec.rb
 homepage: https://github.com/nickcharlton/administrate-field-nested_has_many
 licenses:
@@ -123,9 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Plugin for nested has_many forms in Administrate
 test_files:
+- spec/i18n_spec.rb
 - spec/lib/administrate/field/nested_has_many_spec.rb