godmin 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec0d4e9f977de0473f9c482b30fe336208e58adb
-  data.tar.gz: f266d7bfba24bdc6947934bf1df1a970dbfe433b
+  metadata.gz: 0a7bcd5f755d209ec853fc0ce1464aa52041367b
+  data.tar.gz: 63b8a83f08ef476be9e328d361776a327f4077e5
 SHA512:
-  metadata.gz: 3fe30fb7f586871bea01de9696db6a9f40c5b6ce516388844f0de96a04c8f51a05444b7c178ea0176ff38bac6c9d260614be81a952f31b144f67b46496f6550a
-  data.tar.gz: 9581339c532af064381e0a56bae194919d9cfe8b52ba65e642ee309e3e7413c291eede9c2dcc0465050d967b99416bc79cc0243e2391ff0ac0fa256be746683e
+  metadata.gz: f9dd7fec83fba49b6dddb6378c77a82c94c6d0ecd5e5b1ada53e9456207cbd5156380c446226deeeb14435dce61cb4bdfa6f65a8666c7dcd0d965ed332aac998
+  data.tar.gz: 4ab047ea311a45c24857b6ca5a71f6741705917892c58ca76016a37653501d752626400703a74ec8ae1c36d8e9415ed181eb74132e90a123cee324e59acf90b0

data/Appraisals

@@ -1,5 +1,5 @@
 appraise "rails-4" do
-  gem "rails", "~> 4.0"
+  gem "rails", "4.2.0"
 end
 
 appraise "rails-5" do

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.5.0 - 2017-02-17
+Features
+- Support for nested resources (https://github.com/varvet/godmin/pull/189)
+
 ### 1.4.0 - 2017-02-15
 Features
 - Support group queries in scopes and filters (https://github.com/varvet/godmin/pull/208)

data/Gemfile

@@ -13,4 +13,3 @@ gemspec
 # The dummy app loads whatever is specified in this gemfile, therefore
 # we add the admin engine used by the dummy app here
 gem "admin", path: "test/dummy/admin", group: [:test, :development]
-gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](http://img.shields.io/gem/v/godmin.svg)](https://rubygems.org/gems/godmin)
 [![Build Status](https://img.shields.io/travis/varvet/godmin/master.svg)](https://travis-ci.org/varvet/godmin)
 [![Code Climate](https://img.shields.io/codeclimate/github/varvet/godmin.svg)](https://codeclimate.com/github/varvet/godmin)
-[![Test Coverage](https://codeclimate.com/github/varvet/godmin/badges/coverage.svg)](https://codeclimate.com/github/varvet/godmin/coverage)
 
 Godmin is an admin framework for Rails 4+. Use it to build dedicated admin sections for your apps, or stand alone admin apps such as internal tools. It has support for common features such as scoping, filtering and performing batch actions on your models. Check out the [demo app](http://godmin-sandbox.herokuapp.com) and its [source code](https://github.com/varvet/godmin-sandbox) to get a feel for how it works.
 
@@ -25,6 +24,7 @@ Godmin differs from tools like [ActiveAdmin](http://activeadmin.info/) and [Rail
   - [Redirecting](#redirecting)
   - [Pagination](#pagination)
   - [Exporting](#exporting)
+  - [Nested resources](#nested-resources)
 - [Views](#views)
   - [Forms](#forms)
   - [Navigation](#navigation)
@@ -511,7 +511,7 @@ If you wish to change the number of resources per page, you can override the `pe
 
 ```ruby
 class ArticlesService
-  include Godmin::Resources::Service
+  include Godmin::Resources::ResourceService
 
   def per_page
     50
@@ -525,12 +525,36 @@ The `attrs_for_export` method in the service object makes it possible to mark at
 
 ```ruby
 class ArticlesService
-  include Godmin::Resources::Service
+  include Godmin::Resources::ResourceService
 
   attrs_for_export :id, :title, :created_at, :updated_at
 end
 ```
 
+### Nested resources
+
+Nested resources can be implemented by nesting your routes:
+
+```ruby
+resources :blogs do
+  resources :blog_posts
+end
+```
+
+This will set up scoping of the nested resource as well as correct links in the breadcrumb.
+
+If you want to add a link to the nested resource from the parent's show and edit pages, you can add the following to the service object:
+
+```ruby
+class BlogService
+  include Godmin::Resources::ResourceService
+
+  has_many :blog_posts
+end
+```
+
+Otherwise, simply add links as you see fit using partial overrides.
+
 ## Views
 
 It's easy to override view templates and partials in Godmin, both globally and per resource. All you have to do is place a file with an identical name in your `app/views` directory. For instance, to override the `godmin/resource/index.html.erb` template for all resources, place a file under `app/views/resource/index.html.erb`. If you only wish to override it for articles, place it instead under `app/views/articles/index.html.erb`.

data/app/views/godmin/resource/_breadcrumb.html.erb

@@ -1,12 +1,22 @@
 <div id="breadcrumb">
   <ol class="breadcrumb">
+    <% if @resource_parents %>
+      <% @resource_parents.each do |parent| %>
+        <li>
+          <%= link_to parent.class.model_name.human(count: 2), parent.class %>
+        </li>
+        <li>
+          <%= link_to parent.to_s, parent %>
+        </li>
+      <% end %>
+    <% end %>
     <% if action_name == "index" %>
       <li class="active">
         <%= @resource_class.model_name.human(count: 2) %>
       </li>
     <% else %>
       <li>
-        <%= link_to @resource_class.model_name.human(count: 2), @resource_class %>
+        <%= link_to @resource_class.model_name.human(count: 2), [*@resource_parents, @resource_class] %>
       </li>
       <li class="active">
         <% if @resource.new_record? %>
@@ -16,29 +26,7 @@
         <% end %>
       </li>
       <% if @resource.persisted? %>
-        <li class="dropdown pull-right">
-          <a href="#" data-toggle="dropdown" role="button">
-            <%= translate_scoped("actions.label") %> <span class="caret"></span>
-          </a>
-          <ul class="dropdown-menu">
-            <% if policy(@resource).show? && action_name != "show" %>
-              <li>
-                <%= link_to translate_scoped("actions.show"), @resource %>
-              </li>
-            <% end %>
-            <% if policy(@resource).edit? && action_name != "edit" %>
-              <li>
-                <%= link_to translate_scoped("actions.edit"), [:edit, @resource]  %>
-              </li>
-            <% end %>
-            <% if policy(@resource).destroy? %>
-              <li>
-                <%= link_to translate_scoped("actions.destroy"), @resource, method: :delete,
-                  data: { confirm: translate_scoped("actions.confirm_message") } %>
-              </li>
-            <% end %>
-          </ul>
-        </li>
+        <%= render partial: "breadcrumb_actions" %>
       <% end %>
     <% end %>
   </ol>

data/app/views/godmin/resource/_breadcrumb_actions.html.erb

@@ -0,0 +1,41 @@
+<li class="dropdown pull-right">
+  <a href="#" data-toggle="dropdown">
+    <%= translate_scoped("actions.label") %> <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <% if policy(@resource).show? && action_name != "show" %>
+      <li>
+        <%= link_to translate_scoped("actions.show"), [*@resource_parents, @resource] %>
+      </li>
+    <% end %>
+    <% if policy(@resource).edit? && action_name != "edit" %>
+      <li>
+        <%= link_to translate_scoped("actions.edit"), [:edit, *@resource_parents, @resource]  %>
+      </li>
+    <% end %>
+    <% if policy(@resource).destroy? %>
+      <li>
+        <%= link_to translate_scoped("actions.destroy"), [*@resource_parents, @resource], method: :delete,
+          data: { confirm: translate_scoped("actions.confirm_message") } %>
+      </li>
+    <% end %>
+  </ul>
+</li>
+
+<% if @resource_service.has_many_map.present? %>
+  <li class="dropdown pull-right">
+    <a href="#" data-toggle="dropdown">
+      <%= translate_scoped("associations.label") %> <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <% @resource_service.has_many_map.each do |name, options| %>
+        <% if policy(options[:class_name].constantize).index? %>
+          <li>
+            <%= link_to(options[:class_name].constantize.model_name.human(count: 2),
+              send("#{@resource_class.name.underscore}_#{name}_path", @resource)) %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  </li>
+<% end %>

data/app/views/godmin/resource/_button_actions.html.erb

@@ -1,3 +1,3 @@
 <% if policy(@resource_service.build_resource({})).new? %>
-  <%= link_to t("helpers.submit.create", model: @resource_class.model_name.human), [:new, @resource_class.model_name.singular_route_key], class: "btn btn-default" %>
+  <%= link_to t("helpers.submit.create", model: @resource_class.model_name.human), [:new, *@resource_parents, @resource_class.model_name.singular_route_key], class: "btn btn-default" %>
 <% end %>

data/app/views/godmin/resource/columns/_actions.html.erb

@@ -2,7 +2,7 @@
   <% if policy(resource).show? %>
     <%= link_to(
       translate_scoped("actions.show"),
-      resource,
+      [*@resource_parents, resource],
       class: "btn btn-default",
       title: translate_scoped("actions.show_title", resource: resource)
     ) %>
@@ -10,7 +10,7 @@
   <% if policy(resource).edit? %>
     <%= link_to(
       translate_scoped("actions.edit"),
-      [:edit, resource],
+      [:edit, *@resource_parents, resource],
       class: "btn btn-default",
       title: translate_scoped("actions.edit_title", resource: resource)
     ) %>
@@ -18,7 +18,7 @@
   <% if policy(resource).destroy? %>
     <%= link_to(
       translate_scoped("actions.destroy"),
-      resource,
+      [*@resource_parents, resource],
       method: :delete,
       class: "btn btn-default",
       title: translate_scoped("actions.destroy_title", resource: resource),

data/app/views/godmin/resource/show.html.erb

@@ -1,6 +1,6 @@
 <%= render partial: "breadcrumb" %>
 
-<table class="table table-striped">
+<table class="table">
   <% @resource_service.attrs_for_show.each do |attr| %>
     <tr>
       <th><%= @resource_class.human_attribute_name(attr) %></th>

data/config/locales/en.yml

@@ -25,6 +25,8 @@ en:
       confirm_message: Are you sure?
       export: Export
       export_as: As
+    associations:
+      label: Nested resources
     sessions:
       sign_in: Sign in
       sign_out: Sign out

data/config/locales/pt-BR.yml

@@ -25,6 +25,8 @@ pt-BR:
       confirm_message: Você tem certeza?
       export: Exportar
       export_as: Como
+    associations:
+      label: Nested resources
     sessions:
       sign_in: Entrar
       sign_out: Sair

data/config/locales/sv.yml

@@ -25,6 +25,8 @@ sv:
       confirm_message: Är du säker?
       export: Exportera
       export_as: Som
+    associations:
+      label: Nästlade resurser
     sessions:
       sign_in: Logga in
       sign_out: Logga ut

data/gemfiles/rails_4.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "admin", :path => "../test/dummy/admin", :group => [:test, :development]
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "rails", "~> 4.0"
+gem "rails", "4.2.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "admin", :path => "../test/dummy/admin", :group => [:test, :development]
-gem "codeclimate-test-reporter", :group => :test, :require => nil
 gem "rails", "~> 5.0"
 
 gemspec :path => "../"

data/godmin.gemspec

@@ -26,16 +26,15 @@ Gem::Specification.new do |gem|
   gem.add_dependency "csv_builder", "~> 2.1"
   gem.add_dependency "jquery-rails", [">= 3.0", "< 5.0"]
   gem.add_dependency "momentjs-rails", "~> 2.8"
-  gem.add_dependency "rails", [">= 4.0", "< 6.0"]
+  gem.add_dependency "rails", [">= 4.2.0", "< 6.0"]
   gem.add_dependency "sass-rails", [">= 4.0", "< 6.0"]
   gem.add_dependency "selectize-rails", "~> 0.12"
 
-  gem.add_development_dependency "appraisal", "~> 2.1"
-  gem.add_development_dependency "capybara", "~> 2.4"
-  gem.add_development_dependency "m", "~> 1.3"
-  gem.add_development_dependency "minitest-reporters", "~> 1.0"
-  gem.add_development_dependency "minitest", "~> 5.5"
-  gem.add_development_dependency "poltergeist", "~> 1.7"
-  gem.add_development_dependency "pry", "~> 0.10"
-  gem.add_development_dependency "sqlite3", "~> 1.3"
+  gem.add_development_dependency "appraisal", "~> 0"
+  gem.add_development_dependency "capybara", "~> 0"
+  gem.add_development_dependency "minitest-reporters", "~> 0"
+  gem.add_development_dependency "minitest", "~> 0"
+  gem.add_development_dependency "poltergeist", "~> 0"
+  gem.add_development_dependency "pry", "~> 0"
+  gem.add_development_dependency "sqlite3", "~> 0"
 end

data/lib/godmin/helpers/batch_actions.rb

@@ -6,7 +6,7 @@ module Godmin
 
         link_to(
           translate_scoped("batch_actions.labels.#{name}", default: name.to_s.titleize),
-          @resource_class,
+          [*@resource_parents, @resource_class],
           method: :patch,
           class: "btn btn-default hidden",
           data: {

data/lib/godmin/helpers/forms.rb

@@ -2,7 +2,11 @@ module Godmin
   module Helpers
     module Forms
       def form_for(record, options = {}, &block)
-        super(record, { builder: FormBuilders::FormBuilder, inline_errors: false }.merge(options), &block)
+        super(record, {
+          url: [*@resource_parents, record],
+          builder: FormBuilders::FormBuilder,
+          inline_errors: false
+        }.merge(options), &block)
       end
     end
   end

data/lib/godmin/resources/resource_controller.rb

@@ -17,6 +17,7 @@ module Godmin
 
         before_action :set_resource_service
         before_action :set_resource_class
+        before_action :set_resource_parents
         before_action :set_resources, only: :index
         before_action :set_resource, only: [:show, :new, :edit, :create, :update, :destroy]
       end
@@ -83,6 +84,10 @@ module Godmin
         @resource_class = resource_class
       end
 
+      def set_resource_parents
+        @resource_parents = resource_parents
+      end
+
       def set_resources
         @resources = resources
         authorize(@resources) if authorization_enabled?
@@ -98,17 +103,31 @@ module Godmin
       end
 
       def resource_service
+        resource_service = resource_service_class.new
+
         if authentication_enabled?
-          resource_service_class.new(admin_user: admin_user)
-        else
-          resource_service_class.new
+          resource_service.options[:admin_user] = admin_user
+        end
+
+        if resource_parents.present?
+          resource_service.options[:resource_parent] = resource_parents.last
         end
+
+        resource_service
       end
 
       def resource_class
         @resource_service.resource_class
       end
 
+      def resource_parents
+        params.to_unsafe_h.each_with_object([]) do |(name, value), parents|
+          if name =~ /(.+)_id$/
+            parents << $1.classify.constantize.find(value)
+          end
+        end
+      end
+
       def resources
         @resource_service.resources(params)
       end
@@ -151,11 +170,11 @@ module Godmin
       end
 
       def redirect_after_save
-        @resource
+        [*@resource_parents, @resource]
       end
 
       def redirect_after_destroy
-        resource_class.model_name.route_key.to_sym
+        [*@resource_parents, resource_class.model_name.route_key.to_sym]
       end
 
       def redirect_flash_message

data/lib/godmin/resources/resource_service.rb

@@ -1,3 +1,4 @@
+require "godmin/resources/resource_service/associations"
 require "godmin/resources/resource_service/batch_actions"
 require "godmin/resources/resource_service/filters"
 require "godmin/resources/resource_service/ordering"
@@ -9,6 +10,7 @@ module Godmin
     module ResourceService
       extend ActiveSupport::Concern
 
+      include Associations
       include BatchActions
       include Filters
       include Ordering
@@ -21,7 +23,6 @@ module Godmin
         @options = options
       end
 
-      # TODO: should this raise its own error?
       def resource_class
         @options[:resource_class] || resource_class_name.constantize
       end
@@ -31,7 +32,11 @@ module Godmin
       end
 
       def resources_relation
-        resource_class.all
+        if options[:resource_parent].present?
+          resource_class.where(options[:resource_parent].class.name.underscore => options[:resource_parent])
+        else
+          resource_class.all
+        end
       end
 
       def resources(params)

data/lib/godmin/resources/resource_service/associations.rb

@@ -0,0 +1,23 @@
+module Godmin
+  module Resources
+    module ResourceService
+      module Associations
+        extend ActiveSupport::Concern
+
+        delegate :has_many_map, to: "self.class"
+
+        module ClassMethods
+          def has_many_map
+            @has_many_map ||= {}
+          end
+
+          def has_many(attr, options = {})
+            has_many_map[attr] = {
+              class_name: attr.to_s.singularize.classify
+            }.merge(options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/dummy/app/controllers/comments_controller.rb

@@ -0,0 +1,3 @@
+class CommentsController < ApplicationController
+  include Godmin::Resources::ResourceController
+end

data/test/dummy/app/models/article.rb

@@ -1,5 +1,6 @@
 class Article < ActiveRecord::Base
   belongs_to :admin_user
+  has_many :comments
 
   def non_orderable_column
     "Not orderable"

data/test/dummy/app/models/comment.rb

@@ -0,0 +1,7 @@
+class Comment < ActiveRecord::Base
+  belongs_to :article
+
+  def to_s
+    title
+  end
+end

data/test/dummy/app/services/article_service.rb

@@ -5,6 +5,8 @@ class ArticleService
   attrs_for_show :id, :title, :body, :admin_user, :published
   attrs_for_form :title, :body, :admin_user, :published
 
+  has_many :comments
+
   def order_by_admin_user(resources, direction)
     resources.joins(:admin_users).order("admin_users.email #{direction}")
   end

data/test/dummy/app/services/comment_service.rb

@@ -0,0 +1,7 @@
+class CommentService
+  include Godmin::Resources::ResourceService
+
+  attrs_for_index :id, :title
+  attrs_for_show :id, :title, :body
+  attrs_for_form :title, :body
+end

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/config/application.rb

@@ -1,23 +1,11 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)
 
-require 'rails/all'
+require "rails/all"
 
 Bundler.require(*Rails.groups)
 require "godmin"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
   end
 end
-

data/test/dummy/config/locales/en.yml

@@ -0,0 +1,9 @@
+en:
+  activerecord:
+    models:
+      article:
+        one: Article
+        other: Articles
+      comment:
+        one: Comment
+        other: Comments

data/test/dummy/config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
-  resources :articles
+  resources :articles do
+    resources :comments
+  end
   resources :authenticated_articles
   resources :authorized_articles
   resource :session, only: [:new, :create, :destroy]

data/test/dummy/db/migrate/20160713134238_create_comment.rb

@@ -0,0 +1,9 @@
+class CreateComment < ActiveRecord::Migration
+  def change
+    create_table :comments do |t|
+      t.references :article, index: true, foreign_key: true
+      t.string :title
+      t.text :body
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -35,4 +35,11 @@ ActiveRecord::Schema.define(version: 20170207081043) do
     t.datetime "updated_at",                    null: false
   end
 
+  create_table "comments", force: :cascade do |t|
+    t.integer "article_id"
+    t.string  "title"
+    t.text    "body"
+    t.index ["article_id"], name: "index_comments_on_article_id"
+  end
+
 end

data/test/integration/authentication_test.rb

@@ -17,7 +17,13 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
 
   def test_sign_in_with_non_default_user
     AnotherAdminUser.create!(email: "another_admin@example.com", password: "password")
-    post another_admin_session_path, another_admin_user: { email: "another_admin@example.com", password: "password" }
+
+    case Rails::VERSION::MAJOR
+    when 4
+      post another_admin_session_path, another_admin_user: { email: "another_admin@example.com", password: "password" }
+    when 5
+      post another_admin_session_path, params: { another_admin_user: { email: "another_admin@example.com", password: "password" } }
+    end
 
     assert_redirected_to root_path
   end

data/test/integration/nested_resources_test.rb

@@ -0,0 +1,47 @@
+require "test_helper"
+
+class NestedResourcesTest < ActionDispatch::IntegrationTest
+  def test_list_nested_resources
+    article = Article.create! title: "foo", comments: [
+      Comment.new(title: "bar")
+    ]
+
+    visit articles_path
+    within "[data-resource-id='#{article.id}']" do
+      click_link "Show"
+    end
+    click_link "Comments"
+
+    assert_equal article_comments_path(article), current_path
+    assert page.has_content? "bar"
+  end
+
+  def test_list_nested_resources_scoping
+    article = Article.create! title: "foo", comments: [
+      Comment.new(title: "bar")
+    ]
+    Comment.create! title: "baz"
+
+    visit article_comments_path(article)
+
+    assert page.has_content? "bar"
+    assert page.has_no_content? "baz"
+  end
+
+  def test_create_nested_resource
+    article = Article.create! title: "foo"
+
+    visit new_article_comment_path(article)
+
+    fill_in "Title", with: "bar"
+    click_button "Create Comment"
+
+    assert_equal article_comment_path(article, Comment.last), current_path
+
+    within "#breadcrumb" do
+      click_link "Comments"
+    end
+
+    assert page.has_content? "bar"
+  end
+end

data/test/test_helper.rb

@@ -1,11 +1,6 @@
-# TODO: This does not work anymore. We need to update this according to:
-# https://docs.codeclimate.com/docs/ruby
-#
-# require "codeclimate-test-reporter"
-# CodeClimate::TestReporter.start
-
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
+ENV["DISABLE_DATABASE_ENVIRONMENT_CHECK"] = "1"
 
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 require "rails/test_help"
@@ -14,7 +9,6 @@ require "capybara/poltergeist"
 require "minitest/reporters"
 require "pry"
 
-# TODO: what to call these?
 require File.expand_path("../fakes/article.rb", __FILE__)
 require File.expand_path("../fakes/article_service.rb", __FILE__)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -128,7 +128,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -182,112 +182,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 description: Godmin is an admin framework for Rails 4+. Use it to build dedicated
   admin sections for your apps, or stand alone admin apps such as internal tools.
 email:
@@ -318,6 +304,7 @@ files:
 - app/views/godmin/resource/_actions.html.erb
 - app/views/godmin/resource/_batch_actions.html.erb
 - app/views/godmin/resource/_breadcrumb.html.erb
+- app/views/godmin/resource/_breadcrumb_actions.html.erb
 - app/views/godmin/resource/_button_actions.html.erb
 - app/views/godmin/resource/_errors.html.erb
 - app/views/godmin/resource/_export_actions.html.erb
@@ -380,6 +367,7 @@ files:
 - lib/godmin/resources/resource_controller.rb
 - lib/godmin/resources/resource_controller/batch_actions.rb
 - lib/godmin/resources/resource_service.rb
+- lib/godmin/resources/resource_service/associations.rb
 - lib/godmin/resources/resource_service/batch_actions.rb
 - lib/godmin/resources/resource_service/filters.rb
 - lib/godmin/resources/resource_service/ordering.rb
@@ -415,13 +403,16 @@ files:
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/authenticated_articles_controller.rb
 - test/dummy/app/controllers/authorized_articles_controller.rb
+- test/dummy/app/controllers/comments_controller.rb
 - test/dummy/app/controllers/sessions_controller.rb
 - test/dummy/app/models/.keep
 - test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/another_admin_user.rb
 - test/dummy/app/models/article.rb
+- test/dummy/app/models/comment.rb
 - test/dummy/app/policies/article_policy.rb
 - test/dummy/app/services/article_service.rb
+- test/dummy/app/services/comment_service.rb
 - test/dummy/app/views/articles/.keep
 - test/dummy/app/views/articles/columns/.keep
 - test/dummy/app/views/articles/filters/.keep
@@ -446,9 +437,11 @@ files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20150717121532_create_articles.rb
 - test/dummy/db/migrate/20150907133753_create_admin_users.rb
+- test/dummy/db/migrate/20160713134238_create_comment.rb
 - test/dummy/db/migrate/20170207081043_create_another_admin_user.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
@@ -465,6 +458,7 @@ files:
 - test/integration/column_ordering_test.rb
 - test/integration/crud_test.rb
 - test/integration/filters_test.rb
+- test/integration/nested_resources_test.rb
 - test/integration/scopes_test.rb
 - test/integration/view_overriding/column_overriding_test.rb
 - test/integration/view_overriding/filter_overriding_test.rb
@@ -536,13 +530,16 @@ test_files:
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/authenticated_articles_controller.rb
 - test/dummy/app/controllers/authorized_articles_controller.rb
+- test/dummy/app/controllers/comments_controller.rb
 - test/dummy/app/controllers/sessions_controller.rb
 - test/dummy/app/models/.keep
 - test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/another_admin_user.rb
 - test/dummy/app/models/article.rb
+- test/dummy/app/models/comment.rb
 - test/dummy/app/policies/article_policy.rb
 - test/dummy/app/services/article_service.rb
+- test/dummy/app/services/comment_service.rb
 - test/dummy/app/views/articles/.keep
 - test/dummy/app/views/articles/columns/.keep
 - test/dummy/app/views/articles/filters/.keep
@@ -567,9 +564,11 @@ test_files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20150717121532_create_articles.rb
 - test/dummy/db/migrate/20150907133753_create_admin_users.rb
+- test/dummy/db/migrate/20160713134238_create_comment.rb
 - test/dummy/db/migrate/20170207081043_create_another_admin_user.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
@@ -586,6 +585,7 @@ test_files:
 - test/integration/column_ordering_test.rb
 - test/integration/crud_test.rb
 - test/integration/filters_test.rb
+- test/integration/nested_resources_test.rb
 - test/integration/scopes_test.rb
 - test/integration/view_overriding/column_overriding_test.rb
 - test/integration/view_overriding/filter_overriding_test.rb