godmin 1.5.0 → 2.0.0

data/test/fakes/article.rb

@@ -5,7 +5,7 @@ module Fakes
     end
 
     def self.column_names
-      ["id", "title"]
+      %w[id title]
     end
   end
 end

data/test/fakes/article_service.rb

@@ -13,8 +13,8 @@ module Fakes
     scope :published
 
     filter :title
-    filter :country, as: :select, collection: %w(Sweden Canada)
-    filter :tags, as: :multiselect, collection: %w(Apple Banana)
+    filter :country, as: :select, collection: %w[Sweden Canada]
+    filter :tags, as: :multiselect, collection: %w[Apple Banana]
 
     batch_action :unpublish
     batch_action :publish, confirm: true, only: [:unpublished], except: [:published]
@@ -24,12 +24,8 @@ module Fakes
       @called_methods = { scopes: {}, filters: {}, batch_actions: {}, ordering: {} }
     end
 
-    def resource_class
-      Fakes::Article
-    end
-
     def resources_relation
-      [:foo, :bar, :baz]
+      %i[foo bar baz]
     end
 
     def order_by_foobar(resources, direction)

data/test/generators/resource_generator_test.rb

@@ -0,0 +1,77 @@
+require "test_helper"
+require "generators/godmin/resource/resource_generator"
+
+module Godmin
+  class ResourceGeneratorTest < ::Rails::Generators::TestCase
+    tests ResourceGenerator
+    destination File.expand_path("../../tmp", __FILE__)
+    setup :prepare_destination
+
+    def test_resource_generator_in_standalone_install
+      system "cd #{destination_root} && rails new . --skip-test --skip-spring --skip-bundle --skip-git --quiet"
+      system "cd #{destination_root} && bin/rails generate godmin:install --quiet"
+      system "cd #{destination_root} && bin/rails generate godmin:resource foo bar --quiet"
+
+      assert_file "config/routes.rb", /resources :foos/
+      assert_file "app/views/shared/_navigation.html.erb", /<%= navbar_item Foo %>/
+
+      assert_file "app/controllers/foos_controller.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          class FoosController < ApplicationController
+            include Godmin::Resources::ResourceController
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+
+      assert_file "app/services/foo_service.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          class FooService
+            include Godmin::Resources::ResourceService
+
+            attrs_for_index :bar
+            attrs_for_show :bar
+            attrs_for_form :bar
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+    end
+
+    def test_resource_generator_in_engine_install
+      system "cd #{destination_root} && rails new . --skip-test --skip-spring --skip-bundle --skip-git --quiet"
+      system "cd #{destination_root} && bin/rails plugin new fakemin --mountable --quiet"
+      system "cd #{destination_root} && fakemin/bin/rails generate godmin:install --quiet"
+      system "cd #{destination_root} && fakemin/bin/rails generate godmin:resource foo bar --quiet"
+
+      assert_file "fakemin/config/routes.rb", /resources :foos/
+      assert_file "fakemin/app/views/fakemin/shared/_navigation.html.erb", /<%= navbar_item Foo %>/
+
+      assert_file "fakemin/app/controllers/fakemin/foos_controller.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          module Fakemin
+            class FoosController < ApplicationController
+              include Godmin::Resources::ResourceController
+            end
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+
+      assert_file "fakemin/app/services/fakemin/foo_service.rb" do |content|
+        expected_content = <<-CONTENT.strip_heredoc
+          module Fakemin
+            class FooService
+              include Godmin::Resources::ResourceService
+
+              attrs_for_index :bar
+              attrs_for_show :bar
+              attrs_for_form :bar
+            end
+          end
+        CONTENT
+        assert_match expected_content, content
+      end
+    end
+  end
+end

data/test/integration/authentication_test.rb

@@ -17,14 +17,9 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
 
   def test_sign_in_with_non_default_user
     AnotherAdminUser.create!(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
-
+    post another_admin_session_path, params: {
+      another_admin_user: { email: "another_admin@example.com", password: "password" }
+    }
     assert_redirected_to root_path
   end
 end

data/test/integration/authorization_test.rb

@@ -29,4 +29,9 @@ class AuthorizationTest < ActionDispatch::IntegrationTest
     page.driver.delete authorized_article_path(article)
     assert_equal 403, page.status_code
   end
+
+  def test_cannot_index_in_engine?
+    visit admin.authorized_articles_path
+    assert_equal 403, page.status_code
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,36 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: bootstrap_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -55,25 +47,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: csv_builder
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -104,7 +90,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
@@ -122,46 +108,66 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: pundit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: selectize-rails
   requirement: !ruby/object:Gem::Requirement
@@ -180,101 +186,143 @@ dependencies:
   name: appraisal
   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'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: bootsnap
   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'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: byebug
   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'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  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'
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  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'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
+- !ruby/object:Gem::Dependency
+  name: puma
+  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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: Godmin is an admin framework for Rails 4+. Use it to build dedicated
+description: 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.
 email:
 - info@varvet.se
@@ -332,8 +380,8 @@ files:
 - config/locales/pt-BR.yml
 - config/locales/sv.yml
 - config/routes.rb
-- gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
+- gemfiles/rails_6.gemfile
 - godmin.gemspec
 - lib/generators/godmin/authentication/authentication_generator.rb
 - lib/generators/godmin/authentication/templates/sessions_controller.rb
@@ -342,6 +390,7 @@ files:
 - lib/generators/godmin/policy/templates/policy.rb
 - lib/generators/godmin/resource/resource_generator.rb
 - lib/generators/godmin/resource/templates/resource_controller.rb
+- lib/generators/godmin/resource/templates/resource_model.rb
 - lib/generators/godmin/resource/templates/resource_service.rb
 - lib/godmin.rb
 - lib/godmin/application_controller.rb
@@ -350,7 +399,6 @@ files:
 - lib/godmin/authentication/user.rb
 - lib/godmin/authorization.rb
 - lib/godmin/authorization/policy.rb
-- lib/godmin/authorization/policy_finder.rb
 - lib/godmin/engine.rb
 - lib/godmin/engine_wrapper.rb
 - lib/godmin/generators/base.rb
@@ -374,7 +422,6 @@ files:
 - lib/godmin/resources/resource_service/pagination.rb
 - lib/godmin/resources/resource_service/scopes.rb
 - lib/godmin/version.rb
-- lib/tasks/godmin_tasks.rake
 - screenshot.png
 - template.rb
 - test/dummy/Rakefile
@@ -383,6 +430,9 @@ files:
 - test/dummy/admin/app/assets/stylesheets/admin/application.css
 - test/dummy/admin/app/controllers/admin/application_controller.rb
 - 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/policies/admin/article_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
@@ -396,6 +446,7 @@ files:
 - test/dummy/admin/lib/admin.rb
 - test/dummy/admin/lib/admin/engine.rb
 - test/dummy/admin/lib/admin/version.rb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/another_admin_sessions_controller.rb
@@ -452,6 +503,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/fakes/article.rb
 - test/fakes/article_service.rb
+- test/generators/resource_generator_test.rb
 - test/integration/authentication_test.rb
 - test/integration/authorization_test.rb
 - test/integration/batch_actions_test.rb
@@ -465,18 +517,17 @@ files:
 - test/integration/view_overriding/partial_overriding_test.rb
 - test/integration/view_overriding/template_overriding_test.rb
 - test/integration/welcome_test.rb
-- test/lib/godmin/engine_wrapper_test.rb
-- test/lib/godmin/helpers/filters_test.rb
-- test/lib/godmin/paginator_test.rb
-- test/lib/godmin/policy_finder_test.rb
-- test/lib/godmin/resolver_test.rb
-- test/lib/godmin/resources/resource_service/batch_actions_test.rb
-- test/lib/godmin/resources/resource_service/filters_test.rb
-- test/lib/godmin/resources/resource_service/ordering_test.rb
-- test/lib/godmin/resources/resource_service/pagination_test.rb
-- test/lib/godmin/resources/resource_service/scopes_test.rb
-- test/lib/godmin/resources/resource_service_test.rb
 - test/test_helper.rb
+- test/unit/engine_wrapper_test.rb
+- test/unit/helpers/filters_test.rb
+- test/unit/paginator_test.rb
+- test/unit/resolver_test.rb
+- test/unit/resources/resource_service/batch_actions_test.rb
+- test/unit/resources/resource_service/filters_test.rb
+- test/unit/resources/resource_service/ordering_test.rb
+- test/unit/resources/resource_service/pagination_test.rb
+- test/unit/resources/resource_service/scopes_test.rb
+- test/unit/resources/resource_service_test.rb
 - vendor/assets/javascripts/bootstrap-datetimepicker.js
 - vendor/assets/stylesheets/bootstrap-datetimepicker.css
 homepage: https://github.com/varvet/godmin
@@ -498,11 +549,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Godmin is an admin framework for Rails 4+
+summary: Godmin is an admin framework for Rails 5+
 test_files:
 - test/dummy/Rakefile
 - test/dummy/admin/admin.gemspec
@@ -510,6 +560,9 @@ test_files:
 - test/dummy/admin/app/assets/stylesheets/admin/application.css
 - test/dummy/admin/app/controllers/admin/application_controller.rb
 - 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/policies/admin/article_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
@@ -523,6 +576,7 @@ test_files:
 - test/dummy/admin/lib/admin.rb
 - test/dummy/admin/lib/admin/engine.rb
 - test/dummy/admin/lib/admin/version.rb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/another_admin_sessions_controller.rb
@@ -579,6 +633,7 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/fakes/article.rb
 - test/fakes/article_service.rb
+- test/generators/resource_generator_test.rb
 - test/integration/authentication_test.rb
 - test/integration/authorization_test.rb
 - test/integration/batch_actions_test.rb
@@ -592,15 +647,14 @@ test_files:
 - test/integration/view_overriding/partial_overriding_test.rb
 - test/integration/view_overriding/template_overriding_test.rb
 - test/integration/welcome_test.rb
-- test/lib/godmin/engine_wrapper_test.rb
-- test/lib/godmin/helpers/filters_test.rb
-- test/lib/godmin/paginator_test.rb
-- test/lib/godmin/policy_finder_test.rb
-- test/lib/godmin/resolver_test.rb
-- test/lib/godmin/resources/resource_service/batch_actions_test.rb
-- test/lib/godmin/resources/resource_service/filters_test.rb
-- test/lib/godmin/resources/resource_service/ordering_test.rb
-- test/lib/godmin/resources/resource_service/pagination_test.rb
-- test/lib/godmin/resources/resource_service/scopes_test.rb
-- test/lib/godmin/resources/resource_service_test.rb
 - test/test_helper.rb
+- test/unit/engine_wrapper_test.rb
+- test/unit/helpers/filters_test.rb
+- test/unit/paginator_test.rb
+- test/unit/resolver_test.rb
+- test/unit/resources/resource_service/batch_actions_test.rb
+- test/unit/resources/resource_service/filters_test.rb
+- test/unit/resources/resource_service/ordering_test.rb
+- test/unit/resources/resource_service/pagination_test.rb
+- test/unit/resources/resource_service/scopes_test.rb
+- test/unit/resources/resource_service_test.rb