Merge pull request #8 from blocknotes/v1.0.0

blocknotes · web-flow · commit 76a9274d3d4e · 2022-04-29T09:04:52.000+02:00
v1.0.0
diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml
@@ -1,5 +1,5 @@
 ---
-name: Specs
+name: Specs Rails 6
 
 on:
   push:
diff --git a/.github/workflows/specs2.yml b/.github/workflows/specs2.yml
@@ -0,0 +1,42 @@
+---
+name: Specs Rails 7
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.7', '3.0']
+        gemfile: ['rails70_administrate016', 'rails70_administrate']
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec --profile
+
+      - name: On failure, archive screenshots as artifacts
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: test-failed-screenshots
+          path: spec/dummy/tmp/screenshots
diff --git a/Appraisals b/Appraisals
@@ -3,12 +3,12 @@
 appraise 'rails60-administrate016' do
   gem 'administrate', '~> 0.16.0'
   gem 'rails', '~> 6.0.0'
-  gem 'selenium-webdriver', require: false # Fix
+  # gem 'selenium-webdriver', require: false # Fix
 end
 
 appraise 'rails60-administrate' do # latest administrate
   gem 'rails', '~> 6.0.0'
-  gem 'selenium-webdriver', require: false # Fix
+  # gem 'selenium-webdriver', require: false # Fix
 end
 
 appraise 'rails61-administrate016' do
@@ -20,11 +20,11 @@ appraise 'rails61-administrate' do # latest administrate
   gem 'rails', '~> 6.1.0'
 end
 
-# appraise 'rails70-administrate016' do
-#   gem 'administrate', '~> 0.16.0'
-#   gem 'rails', '~> 7.0.0'
-# end
+appraise 'rails70-administrate016' do
+  gem 'administrate', '~> 0.16.0'
+  gem 'rails', '~> 7.0.0'
+end
 
-# appraise 'rails70-administrate' do # latest administrate
-#   gem 'rails', '~> 7.0.0'
-# end
+appraise 'rails70-administrate' do # latest administrate
+  gem 'rails', '~> 7.0.0'
+end
diff --git a/MIT-LICENSE b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright 2020 Mattia Roccoberton
+Copyright 2022 Mattia Roccoberton
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
@@ -13,12 +13,13 @@ Features:
 - customizable via SASS variables;
 - allow to use *Materialize* components in the admin.
 
-![screenshot](screenshot.png)
+![screenshot](extra/screenshot.png)
 
 Please :star: if you like it.
 
 ## Installation
 
+- Add a SASS/SCSS gem to your Gemfile (ex. `gem 'sassc'`)
 - After installing Administrate, add to *Gemfile*: `gem 'administrate-materialize-theme'` (and execute `bundle`)
 - Edit *app/assets/config/manifest.js*, adding at the end:
 
diff --git a/administrate-materialize-theme.gemspec b/administrate-materialize-theme.gemspec
@@ -16,19 +16,15 @@ Gem::Specification.new do |spec|
   spec.description = "A Material Design theme for Administrate using Materialize framework"
   spec.license     = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+  spec.required_ruby_version = '>= 2.6.0'
+
+  spec.metadata['homepage_uri']          = spec.homepage
+  spec.metadata['source_code_uri']       = spec.homepage
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir["{app,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
-  spec.add_runtime_dependency 'administrate', '~> 0.14'
-  spec.add_runtime_dependency 'sassc', '~> 2.4'
+  spec.add_runtime_dependency 'administrate', '~> 0.16'
 
   spec.add_development_dependency 'appraisal', '~> 2.4'
 end
diff --git a/extra/screenshot.png b/extra/screenshot.png
diff --git a/gemfiles/rails60_administrate.gemfile b/gemfiles/rails60_administrate.gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 6.0.0"
-gem "selenium-webdriver", require: false
 
 group :development, :test do
   gem "puma"
diff --git a/gemfiles/rails60_administrate.gemfile.lock b/gemfiles/rails60_administrate.gemfile.lock
@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    administrate-materialize-theme (0.2.4)
-      administrate (~> 0.14)
-      sassc (~> 2.4)
+    administrate-materialize-theme (1.0.0)
+      administrate (~> 0.16)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails60_administrate016.gemfile b/gemfiles/rails60_administrate016.gemfile
@@ -4,7 +4,6 @@ source "https://rubygems.org"
 
 gem "administrate", "~> 0.16.0"
 gem "rails", "~> 6.0.0"
-gem "selenium-webdriver", require: false
 
 group :development, :test do
   gem "puma"
diff --git a/gemfiles/rails60_administrate016.gemfile.lock b/gemfiles/rails60_administrate016.gemfile.lock
@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    administrate-materialize-theme (0.2.4)
-      administrate (~> 0.14)
-      sassc (~> 2.4)
+    administrate-materialize-theme (1.0.0)
+      administrate (~> 0.16)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails61_administrate.gemfile.lock b/gemfiles/rails61_administrate.gemfile.lock
@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    administrate-materialize-theme (0.2.4)
-      administrate (~> 0.14)
-      sassc (~> 2.4)
+    administrate-materialize-theme (1.0.0)
+      administrate (~> 0.16)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails61_administrate016.gemfile.lock b/gemfiles/rails61_administrate016.gemfile.lock
@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    administrate-materialize-theme (0.2.4)
-      administrate (~> 0.14)
-      sassc (~> 2.4)
+    administrate-materialize-theme (1.0.0)
+      administrate (~> 0.16)
 
 GEM
   remote: https://rubygems.org/
diff --git a/gemfiles/rails70_administrate.gemfile b/gemfiles/rails70_administrate.gemfile
@@ -0,0 +1,24 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+
+group :development, :test do
+  gem "puma"
+  gem "sassc"
+  gem "sqlite3"
+  gem "capybara"
+  gem "rspec_junit_formatter"
+  gem "rspec-rails"
+  gem "selenium-webdriver"
+  gem "fasterer"
+  gem "rubocop"
+  gem "rubocop-packaging"
+  gem "rubocop-performance"
+  gem "rubocop-rails"
+  gem "rubocop-rspec"
+  gem "pry-rails"
+end
+
+gemspec path: "../"
diff --git a/gemfiles/rails70_administrate.gemfile.lock b/gemfiles/rails70_administrate.gemfile.lock
diff --git a/gemfiles/rails70_administrate016.gemfile b/gemfiles/rails70_administrate016.gemfile
diff --git a/gemfiles/rails70_administrate016.gemfile.lock b/gemfiles/rails70_administrate016.gemfile.lock
diff --git a/lib/administrate-materialize-theme/version.rb b/lib/administrate-materialize-theme/version.rb
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 ---
 -name: Specs
 +name: Specs Rails 6
 on:
   push:
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2020 Mattia Roccoberton`
	`1`	`+Copyright 2022 Mattia Roccoberton`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining`
`4`	`4`	`a copy of this software and associated documentation files (the`