administrate-field-nested_has_many 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4e6f4887d375faa443012dd432fc1dbf93ba0c54cf410cb94f0ed15dff2b1e
-  data.tar.gz: 46ba0a0fbafbe1dd43e5dc7e2db12a3025a5b92428515cec60fb1c0d67fd24f6
+  metadata.gz: f1171aa3d1c51333f3bd0812f7d17754e9c1be5b7f3cce5eaef08b5aa50408ab
+  data.tar.gz: dd9640cd1dfc968c82291bf749414b7637dfebf31991e95ae9684534dfb26dcb
 SHA512:
-  metadata.gz: 19ca8ea2726af27214269cf1720a261b9fea189f3e6baee3e1dbeb6d884898f0562fe8a626e21f4b9b5d384bc3e7da7060de087302b03e410bb126e0c2c7e305
-  data.tar.gz: 2fd50695bf285688a893181c6443854a513cea9a492bcc06d29ce2a3506fd99ca0807fdd966b59c48364a189fb758392776baed8ec0fd03e4de4af1af2f193c2
+  metadata.gz: c2bfe32cd2c831b376ee516ee28faa127449f5e1c96ec3398f7ecc4e65eb1f0d9cd609d31f863c0b4ebced16d10e8afbc2516623e3b954c4c45a3c5f015387cd
+  data.tar.gz: 1aef89b5241f65cc63580687b37465f686f03736b83b0fe5d5cdf7118b37ddead2c36bd969c2cecfd665ba7d702fdb74df655a6d25d1ff906edaee17212d7921

data/.circleci/config.yml

@@ -0,0 +1,28 @@
+---
+version: 2
+jobs:
+  build:
+    working_directory: ~/administrate-field-nested_has_many
+    docker:
+      - image: circleci/ruby:2.6.3
+        environment:
+          PGHOST: localhost
+          PGUSER: 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: ""
+    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

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

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+ruby-2.6.3

data/Appraisals

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+appraise "administrate-0.10" do
+  gem "administrate", "0.10.0"
+end
+
+appraise "administrate-master" do
+  gem "administrate", git: "https://github.com/thoughtbot/administrate", branch: "master"
+end

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 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.

data/Gemfile

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

data/Rakefile

@@ -6,6 +6,10 @@ end
 
 require "bundler/gem_tasks"
 
+require File.expand_path("../spec/dummy/config/application", __FILE__)
+
+Rails.application.load_tasks
+
 ##
 # Configure the test suite.
 ##

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.1.0"
+  gem.version = "1.2.0"
   gem.authors = ["Nick Charlton", "Grayson Wright"]
   gem.email = ["nick@nickcharlton.net", "wright.grayson@gmail.com"]
   gem.homepage = "https://github.com/nickcharlton/" \
@@ -18,7 +18,12 @@ Gem::Specification.new do |gem|
   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"
+  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/views/fields/nested_has_many/_show.html.erb

@@ -1,45 +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? %>
-  <% 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 %>
-
+<% if current <= v0_10 %>
+  <%= render "fields/nested_has_many/show_old", **local_assigns %>
 <% else %>
-  <%= t("administrate.fields.has_many.none", default: "–") %>
+  <%= 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'

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

@@ -0,0 +1,7 @@
+---
+pt:
+  administrate:
+    fields:
+      nested_has_many:
+        add: Adicionar %{resource}
+        remove: Remover %{resource}

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

@@ -0,0 +1,7 @@
+---
+ru:
+  administrate:
+    fields:
+      nested_has_many:
+        add: Добавить %{resource}
+        remove: Удалить %{resource}

data/gemfiles/administrate_0.10.gemfile

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

data/gemfiles/administrate_0.10.gemfile.lock

@@ -0,0 +1,214 @@
+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 (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
+      arel (>= 9.0)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    administrate (0.10.0)
+      actionpack (>= 4.2, < 6.0)
+      actionview (>= 4.2, < 6.0)
+      activerecord (>= 4.2, < 6.0)
+      autoprefixer-rails (>= 6.0)
+      datetime_picker_rails (~> 0.0.7)
+      jquery-rails (>= 4.0)
+      kaminari (>= 1.0)
+      momentjs-rails (~> 2.8)
+      sass-rails (~> 5.0)
+      selectize-rails (~> 0.6)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    ast (2.4.0)
+    autoprefixer-rails (9.1.4)
+      execjs
+    builder (3.2.3)
+    capybara (3.7.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    childprocess (3.0.0)
+    cocoon (1.2.14)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    datetime_picker_rails (0.0.7)
+      momentjs-rails (>= 2.8.1)
+    deepl-rb (2.1.0)
+    diff-lcs (1.3)
+    easy_translate (0.5.1)
+      thread
+      thread_safe
+    erubi (1.7.1)
+    execjs (2.7.0)
+    factory_bot (4.10.0)
+      activesupport (>= 3.0.0)
+    ffi (1.9.25)
+    highline (2.0.0)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
+    i18n-tasks (0.9.23)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
+      deepl-rb (>= 2.1.0)
+      easy_translate (>= 0.5.1)
+      erubi
+      highline (>= 1.7.3)
+      i18n
+      parser (>= 2.2.3.0)
+      rainbow (>= 2.2.2, < 4.0)
+      terminal-table (>= 1.5.1)
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.0)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    momentjs-rails (2.20.1)
+      railties (>= 3.1)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    pg (1.1.4)
+    public_suffix (3.0.3)
+    rack (2.0.5)
+    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.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubyzip (2.2.0)
+    sass (3.5.7)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selectize-rails (0.12.5)
+    selenium-webdriver (3.142.7)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (0.20.0)
+    thread (0.2.2)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.4.0)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  administrate (= 0.10.0)
+  administrate-field-nested_has_many!
+  appraisal
+  capybara
+  factory_bot
+  i18n-tasks
+  pg
+  rake
+  rspec-rails
+  selenium-webdriver
+  sqlite3
+
+BUNDLED WITH
+   1.17.3