godmin 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67092da8f88553787c49e63ffee072d0a6c3a726c8daec0f36b1f9e85db399b9
-  data.tar.gz: 04ed7ef417dbf573a0d882395a92cb8af1cf969a562c82b1b9d03710c23ad75d
+  metadata.gz: 9a084849cf4dd5f729b2f5ca0dabdcec727ef1172eb1cb19baf9de27ca822950
+  data.tar.gz: 8b655c6dad3b1a1fc95d88b08cf2f25e848b646266fd63808dffad77b47f767e
 SHA512:
-  metadata.gz: d65bdb37843317f059d2ff74fc240e64fbfa91f8670f2c1a47982abcd6bc2d6598f51dbe80b245ff6d195c7bd388eda6db901c4c99ef986d37036c11aa089df7
-  data.tar.gz: 30b1c04eda1aa9990c2f6279db72de486f32787cea0ed2ce1d35e94b5b3c66a577e1b87b4beaba222c4066a5b12043ecf56547d28f1cf96b5341191e70dcbb90
+  metadata.gz: f0fec37368ae0548a3e3adb1b662f214aff97756f916d11da1907acbc7caa43304b920844f9a1f8ebb500a35d7f261c060fd8e605e5cb841e7fdafb9da8a744b
+  data.tar.gz: d6a218a707bafe5ac68611b13c74e6975c13702562d5a804514faad4af0100544b5bf722e252077af89653f2702deb932e36f1c5131855b2604af86247b069fe

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,13 @@
-bundler_args: --without debug
+bundler_args: "--without debug"
 cache: bundler
-script: "bundle exec rake test"
-sudo: false
-
+script: bundle exec rake test
 rvm:
-  - 2.2.2
-  - 2.3.5
-  - 2.5.1
-
+  - 2.6.7
+  - 2.7.3
 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
-
 addons:
   code_climate:
-    repo_token: 7e7ee66c976bdfe7a0d40d41958b97a1cf8a03b0462df5cba415f624c07c2071
+    repo_token:
+      secure: WBszVdtEvWM2KugFre9BpwkCduY6hjrmK7xo1GLiru4NMqr4ZoRXruQ5ijhZE79YqduR6zudKr72g9yG4R+4CK7ghYu4x5JB76IW8gFWpI9teTWrF4hdSbJgwxSH5JNkqWF4f6ic4Xr1Vgc43agzt+1KmA9imoGs2Q0EbAY3H2M=

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+### 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/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/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/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 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")

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 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-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -534,7 +534,7 @@ homepage: https://github.com/varvet/godmin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -549,8 +549,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.4
+signing_key:
 specification_version: 4
 summary: Godmin is an admin framework for Rails 5+
 test_files: