godmin 2.0.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67092da8f88553787c49e63ffee072d0a6c3a726c8daec0f36b1f9e85db399b9
-  data.tar.gz: 04ed7ef417dbf573a0d882395a92cb8af1cf969a562c82b1b9d03710c23ad75d
+  metadata.gz: 48acefb7a163b19b58779a565c05f70f21c01be49dd45ded049826a7f5f39df7
+  data.tar.gz: e4306796ece713a6e24eba897fc18e4ea0f24f97bea075ca5e7a883739239113
 SHA512:
-  metadata.gz: d65bdb37843317f059d2ff74fc240e64fbfa91f8670f2c1a47982abcd6bc2d6598f51dbe80b245ff6d195c7bd388eda6db901c4c99ef986d37036c11aa089df7
-  data.tar.gz: 30b1c04eda1aa9990c2f6279db72de486f32787cea0ed2ce1d35e94b5b3c66a577e1b87b4beaba222c4066a5b12043ecf56547d28f1cf96b5341191e70dcbb90
+  metadata.gz: 16b5838830c7ff5f6662b166023bda316ba63faf2aba9d5968152db85a92e5bbcb3cf1634bb1f9e879113ea23e49245d732af7eef58357b9f822bf7ef92dd613
+  data.tar.gz: e12509e0e4efa91597e6cfdc4b578253647c0a1a4a8683d6f3c9714346f0a6ab9bc26ce5d4a8d35a78f814352f0e063b0f48d24a2075785c4de6230885bd3a04

data/.codeclimate.yml

@@ -6,8 +6,6 @@ engines:
     enabled: true
   csslint:
     enabled: true
-  bundler-audit:
-    enabled: true
 ratings:
   paths:
   - "**.rb"

data/.travis.yml

@@ -1,24 +1,21 @@
-bundler_args: --without debug
+bundler_args: "--without debug"
 cache: bundler
-script: "bundle exec rake test"
-sudo: false
-
+script: bundle exec rake test
+dist: focal
 rvm:
-  - 2.2.2
-  - 2.3.5
-  - 2.5.1
-
+  - 2.6.7
+  - 2.7.3
+  - 3.0.1
 gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_6.gemfile
 
 matrix:
   exclude:
-    - rvm: 2.2.2
-      gemfile: gemfiles/rails_6.gemfile
-    - rvm: 2.3.5
-      gemfile: gemfiles/rails_6.gemfile
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_5.gemfile
 
 addons:
   code_climate:
-    repo_token: 7e7ee66c976bdfe7a0d40d41958b97a1cf8a03b0462df5cba415f624c07c2071
+    repo_token:
+      secure: WBszVdtEvWM2KugFre9BpwkCduY6hjrmK7xo1GLiru4NMqr4ZoRXruQ5ijhZE79YqduR6zudKr72g9yG4R+4CK7ghYu4x5JB76IW8gFWpI9teTWrF4hdSbJgwxSH5JNkqWF4f6ic4Xr1Vgc43agzt+1KmA9imoGs2Q0EbAY3H2M=

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+### 2.2.2 - 2021-11-08
+
+Fix
+- Render values in columns (https://github.com/varvet/godmin/pull/263)
+- Correct README to match Godmin 2 (https://github.com/varvet/godmin/pull/262)
+
+### 2.2.1 - 2021-05-20
+
+Fix
+- Use Pundit >= 2.0.0 so that namespaces are handled correctly (https://github.com/varvet/godmin/pull/260)
+
+### 2.2.0 - 2021-05-20
+
+Other
+- Build and test against Ruby 3.0
+
+Bug fixes
+- Regression: within an Engine, always look for Pundit policies in the engine (https://github.com/varvet/godmin/pull/259)
+
+### 2.1.0 - 2021-05-10
+
+Bug fixes
+- Use symbol in path for compatibility with the latest Rails security patches (https://github.com/varvet/godmin/pull/256)
+
+Other
+- Build and test against Ruby 2.6 and 2.7
+- Stop building and testing against unsupported rubies (2.5 and older). These may still work and PRs may still be accepted.
+
 ### 2.0.0 - 2019-12-06
 
 Features

data/README.md

@@ -2,9 +2,8 @@
 
 [![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)
-
-**If you are looking for the current stable version, which is Rails 4+ compatible, see the [v1.5](https://github.com/varvet/godmin/tree/v1.5) branch**
+[![Code Climate](https://api.codeclimate.com/v1/badges/d8e5c7c54c1dba073689/maintainability)](https://codeclimate.com/github/varvet/godmin)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/d8e5c7c54c1dba073689/test_coverage)](https://codeclimate.com/github/varvet/godmin)
 
 Godmin is an admin framework for Rails 5+. 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.
 
@@ -734,7 +733,7 @@ module Admin
     include Godmin::ApplicationController
     include Godmin::Authentication
 
-    def authenticate_admin_user
+    def authenticate
       authenticate_user!
     end
 
@@ -873,6 +872,51 @@ class ArticlesController < ApplicationController
 end
 ```
 
+### Authorization in Engines
+
+When Godmin is installed as an engine, it expects policies to be defined
+within the engine: eg. `Admin::ArticlePolicy` defined in
+`admin/app/policies/article_policy.rb`.
+
+If your admin application is itself broken up into several engines, then
+either
+
+1. the policies for those engines need to live in the main engine, or
+2. those engines need to be namespaced under the namespace of the main engine.
+
+Here is one example of a directory structure for approach 2:
+
+```
+admin
+  ├── app
+  │   └── policies
+  │       └── admin
+  │           └── article_policy.rb
+  └── engines
+      └── content
+          └── policies
+              └── admin
+                  └── content
+                      └── text_block_policy.rb
+app
+  └── models
+      └── article.rb
+engines
+  └── content
+        └── models
+            └── content
+                └── text_block.rb
+```
+```ruby
+# admin/engines/content/policies/admin/content/text_block_policy.rb
+module Admin
+  module Content
+    class TextBlockPolicy < ::Admin::ApplicationPolicy
+    end
+  end
+end
+```
+
 ## Localization
 
 Godmin supports localization out of the box. For a list of translatable strings, [look here](https://github.com/varvet/godmin/blob/master/config/locales/en.yml).

data/Rakefile

@@ -36,14 +36,14 @@ namespace :sandbox do
   task :deploy do
     message = "Generated from: https://github.com/varvet/godmin/commit/#{`git rev-parse HEAD`.strip}"
     template_path = File.expand_path("../template.rb", __FILE__)
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       Dir.mktmpdir do |dir|
         Dir.chdir(dir)
-        system("git clone https://github.com/varvet/godmin-sandbox.git")
+        system("git clone git@github.com:varvet/godmin-sandbox.git")
         if $CHILD_STATUS.success?
           Dir.chdir("godmin-sandbox")
           system("rm -rf *")
-          system("rails new . -d postgresql -m #{template_path} --without-engine --skip-spring")
+          system("rails _5.2.5_ new . -d postgresql -m #{template_path} --without-engine --skip-spring")
           if $CHILD_STATUS.success?
             system("git add --all")
             system("git commit -m '#{message}'")

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_parents, @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.to_sym], class: "btn btn-default" %>
 <% end %>

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

@@ -27,14 +27,14 @@
 </div>
 <div class="pagination-entries pull-right hidden-xs">
   <% if @resources.length == 0 %>
-    <%= translate_scoped("pagination.entries.zero", {
+    <%= translate_scoped("pagination.entries.zero",
       resource: @resource_class.model_name.human(count: @resources.length).downcase
-    }) %>
+    ) %>
   <% else %>
-    <%= translate_scoped("pagination.entries.other", {
+    <%= translate_scoped("pagination.entries.other",
       resource: @resource_class.model_name.human(count: @resources.length).downcase,
       count: @resources.length,
       total: @resource_service.paginator.total_resources
-    }) %>
+    ) %>
   <% end %>
 </div>

data/gemfiles/rails_5.gemfile

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

data/gemfiles/rails_6.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "admin", path: "../test/dummy/admin", group: [:test, :development]
-gem "rails", "~> 6.0"
+gem "rails", "~> 6.1"
 
 gemspec path: "../"

data/godmin.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "csv_builder", "~> 2.1"
   gem.add_dependency "jquery-rails", [">= 4.0", "< 5.0"]
   gem.add_dependency "momentjs-rails", "~> 2.8"
-  gem.add_dependency "pundit", [">= 1.1", "< 2.0"]
+  gem.add_dependency "pundit", [">= 2.0.0", "< 3.0"]
   gem.add_dependency "rails", [">= 5.0", "< 7.0"]
   gem.add_dependency "sass-rails", [">= 5.0", "< 7.0"]
   gem.add_dependency "selectize-rails", "~> 0.12"

data/lib/godmin/authorization.rb

@@ -13,8 +13,42 @@ module Godmin
       end
     end
 
+    def policy(record)
+      policies[record] ||= Pundit.policy!(pundit_user, namespaced_record(record))
+    end
+
     def pundit_user
       admin_user
     end
+
+    def namespaced_record(record)
+      return record unless engine_wrapper.namespaced?
+
+      class_name = find_class_name(record)
+      if already_namespaced?(class_name)
+        record
+      else
+        engine_wrapper.namespaced_path.map(&:to_sym) << record
+      end
+    end
+
+    # Borrowed from Pundit::PolicyFinder
+    def find_class_name(subject)
+      if subject.respond_to?(:model_name)
+        subject.model_name
+      elsif subject.class.respond_to?(:model_name)
+        subject.class.model_name
+      elsif subject.is_a?(Class)
+        subject
+      elsif subject.is_a?(Symbol)
+        subject.to_s.camelize
+      else
+        subject.class
+      end
+    end
+
+    def already_namespaced?(subject)
+      subject.to_s.start_with?("#{engine_wrapper.namespace.name}::")
+    end
   end
 end

data/lib/godmin/helpers/tables.rb

@@ -33,7 +33,7 @@ module Godmin
             column_value = t(column_value.to_s)
           end
 
-          column_value
+          return column_value
         end
       end
     end

data/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "2.0.0"
+  VERSION = "2.2.2"
 end

data/template.rb

@@ -21,6 +21,7 @@ def install_standalone
     modify_author_service
     modify_article_controller
     modify_article_service
+    modify_readme
 
     migrate_and_seed
   end
@@ -64,6 +65,7 @@ def install_engine
     modify_author_service("admin")
     modify_article_controller("admin")
     modify_article_service("admin")
+    modify_readme
 
     migrate_and_seed
   end
@@ -308,6 +310,18 @@ def modify_author_service(namespace = nil)
   end
 end
 
+def modify_readme
+  readme_file = "README.md"
+  run "rm #{readme_file}"
+  readme_text = <<~README
+    # README
+
+    This is the source code for a demo application of the [Godmin](https://github.com/varvet/godmin) admin framework for Rails.
+    It is generated by running `rake sandbox:deploy` inside the Godmin repo.
+  README
+  File.open(readme_file, 'w') { |file| file.write(readme_text) }
+end
+
 def migrate_and_seed
   rake("db:migrate")
   rake("db:seed")

data/test/dummy/admin/app/controllers/admin/authorized_articles_controller.rb

@@ -8,6 +8,20 @@ module Admin
       "admin"
     end
 
+    def new
+      # The following calls to #policy are to check that the Authorization
+      # module can handle various different scenarios:
+      policy(Magazine).index?
+      policy(::Magazine).index?
+      policy(Magazine.new).index?
+      policy(Magazine.all).index?
+      policy(Admin::Magazine).index?
+      policy(Admin::Magazine.new).index?
+      policy(Admin::Magazine.where(name: "name")).index?
+
+      super
+    end
+
     def resource_service_class
       Admin::ArticleService
     end

data/test/dummy/admin/app/models/admin/magazine.rb

@@ -0,0 +1,4 @@
+module Admin
+  class Magazine < ::Magazine
+  end
+end

data/test/dummy/admin/app/policies/admin/article_policy.rb

@@ -3,5 +3,9 @@ module Admin
     def index?
       false
     end
+
+    def new?
+      true
+    end
   end
 end

data/test/dummy/admin/app/policies/admin/magazine_policy.rb

@@ -0,0 +1,4 @@
+module Admin
+  class MagazinePolicy < Godmin::Authorization::Policy
+  end
+end

data/test/dummy/admin/app/views/admin/shared/_navigation.html.erb

@@ -1 +1,6 @@
 <%= navbar_item Article %>
+<% if policy(Article).index? %>
+  Can index
+<% else %>
+  Can't index
+<% end %>

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

@@ -0,0 +1,2 @@
+class Magazine < ActiveRecord::Base
+end

data/test/dummy/db/migrate/20210519215502_create_magazines.rb

@@ -0,0 +1,9 @@
+class CreateMagazines < ActiveRecord::Migration[6.1]
+  def change
+    create_table :magazines do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -2,15 +2,15 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170207081043) do
+ActiveRecord::Schema.define(version: 2021_05_19_215502) do
 
   create_table "admin_users", force: :cascade do |t|
     t.string "email"
@@ -43,4 +43,11 @@ ActiveRecord::Schema.define(version: 20170207081043) do
     t.index ["article_id"], name: "index_comments_on_article_id"
   end
 
+  create_table "magazines", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
+  add_foreign_key "comments", "articles"
 end

data/test/generators/resource_generator_test.rb

@@ -6,6 +6,7 @@ module Godmin
     tests ResourceGenerator
     destination File.expand_path("../../tmp", __FILE__)
     setup :prepare_destination
+    teardown :prepare_destination
 
     def test_resource_generator_in_standalone_install
       system "cd #{destination_root} && rails new . --skip-test --skip-spring --skip-bundle --skip-git --quiet"

data/test/integration/authorization_test.rb

@@ -34,4 +34,12 @@ class AuthorizationTest < ActionDispatch::IntegrationTest
     visit admin.authorized_articles_path
     assert_equal 403, page.status_code
   end
+
+  def test_uses_engine_policy_in_engine?
+    visit admin.new_authorized_article_path
+
+    assert_equal 200, page.status_code
+
+    assert page.has_content?("Can't index"), "when used in an engine, the `policy` method is using the policy from the main app, not the engine"
+  end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Jens Ljungblad
 - Linus Pettersson
 - Varvet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -114,20 +114,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -432,7 +432,9 @@ files:
 - test/dummy/admin/app/controllers/admin/articles_controller.rb
 - test/dummy/admin/app/controllers/admin/authorized_articles_controller.rb
 - test/dummy/admin/app/models/admin/article.rb
+- test/dummy/admin/app/models/admin/magazine.rb
 - test/dummy/admin/app/policies/admin/article_policy.rb
+- test/dummy/admin/app/policies/admin/magazine_policy.rb
 - test/dummy/admin/app/services/admin/article_service.rb
 - test/dummy/admin/app/views/admin/articles/.keep
 - test/dummy/admin/app/views/admin/articles/columns/.keep
@@ -461,6 +463,7 @@ files:
 - test/dummy/app/models/another_admin_user.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/comment.rb
+- test/dummy/app/models/magazine.rb
 - test/dummy/app/policies/article_policy.rb
 - test/dummy/app/services/article_service.rb
 - test/dummy/app/services/comment_service.rb
@@ -494,6 +497,7 @@ files:
 - 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/migrate/20210519215502_create_magazines.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -534,7 +538,7 @@ homepage: https://github.com/varvet/godmin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -549,8 +553,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Godmin is an admin framework for Rails 5+
 test_files:
@@ -562,7 +566,9 @@ test_files:
 - test/dummy/admin/app/controllers/admin/articles_controller.rb
 - test/dummy/admin/app/controllers/admin/authorized_articles_controller.rb
 - test/dummy/admin/app/models/admin/article.rb
+- test/dummy/admin/app/models/admin/magazine.rb
 - test/dummy/admin/app/policies/admin/article_policy.rb
+- test/dummy/admin/app/policies/admin/magazine_policy.rb
 - test/dummy/admin/app/services/admin/article_service.rb
 - test/dummy/admin/app/views/admin/articles/.keep
 - test/dummy/admin/app/views/admin/articles/columns/.keep
@@ -591,6 +597,7 @@ test_files:
 - test/dummy/app/models/another_admin_user.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/comment.rb
+- test/dummy/app/models/magazine.rb
 - test/dummy/app/policies/article_policy.rb
 - test/dummy/app/services/article_service.rb
 - test/dummy/app/services/comment_service.rb
@@ -624,6 +631,7 @@ test_files:
 - 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/migrate/20210519215502_create_magazines.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep