diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml index a3fee401..2e78cd95 100644 --- a/.github/workflows/rubyonrails.yml +++ b/.github/workflows/rubyonrails.yml @@ -14,7 +14,6 @@ jobs: - "3.2" - "3.3" rails-version: - - "6.1" - "7.1" - "7.2" continue-on-error: [true] diff --git a/README.md b/README.md index 7984ef24..9ab2dcca 100644 --- a/README.md +++ b/README.md @@ -6,29 +6,28 @@ # ComfortableMediaSurfer -ComfortableMediaSurfer is a powerful Ruby 6.1+ CMS (Content Management System) Engine, picking up where [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) left off. +ComfortableMediaSurfer is a powerful Ruby 7.0+ CMS (Content Management System) Engine, picking up where [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) left off. ## Features -* Simple drop-in integration with Rails 6.1+ apps with minimal configuration -* The CMS keeps clear from the rest of your application -* Powerful page templating capability using [Content Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Content-Tags) -* [Multiple Sites](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Sites) from a single installation -* Multi-Language Support (i18n) (ca, cs, da, de, en, es, fi, fr, gr, hr, it, ja, nb, nl, pl, pt-BR, ru, sv, tr, uk, zh-CN, zh-TW) and page localization. -* [CMS Seeds](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-CMS-Seeds) for initial content population -* [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Revisions) to revert changes -* [Extendable Admin Area](https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Reusing-Admin-Area) built with [Bootstrap 4](http://getbootstrap.com) (responsive design). Using [CodeMirror](http://codemirror.net) for HTML and Markdown highlighing and [Redactor](http://imperavi.com/redactor) as the WYSIWYG editor. +- Simple drop-in integration with Rails 7.0+ apps with minimal configuration +- The CMS keeps clear from the rest of your application +- Powerful page templating capability using [Content Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Content-Tags) +- [Multiple Sites](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Sites) from a single installation +- Multi-Language Support (i18n) (ca, cs, da, de, en, es, fi, fr, gr, hr, it, ja, nb, nl, pl, pt-BR, ru, sv, tr, uk, zh-CN, zh-TW) and page localization. +- [CMS Seeds](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-CMS-Seeds) for initial content population +- [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Revisions) to revert changes +- [Extendable Admin Area](https://github.com/comfy/comfortable-mexican-sofa/wiki/HowTo:-Reusing-Admin-Area) built with [Bootstrap 4](http://getbootstrap.com) (responsive design). Using [CodeMirror](http://codemirror.net) for HTML and Markdown highlighing and [Redactor](http://imperavi.com/redactor) as the WYSIWYG editor. ## Dependencies -* File attachments are handled by [ActiveStorage](https://github.com/rails/rails/tree/master/activestorage). Make sure that you can run appropriate migrations by running: `rails active_storage:install` -* Image resizing is done with with [ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed. -* Pagination is handled by [kaminari](https://github.com/amatsuda/kaminari) or [will_paginate](https://github.com/mislav/will_paginate). Please add one of those to your Gemfile. +- File attachments are handled by [ActiveStorage](https://github.com/rails/rails/tree/master/activestorage). Make sure that you can run appropriate migrations by running: `rails active_storage:install` +- Image resizing is done with with [ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed. +- Pagination is handled by [kaminari](https://github.com/amatsuda/kaminari) or [will_paginate](https://github.com/mislav/will_paginate). Please add one of those to your Gemfile. ## Compatibility -- Ruby >= 3.0 with Rails >= 6.1 -- On Ruby 3.x, Rails 7.x + is recommended, since performance is noticably better than on 6.x +On Ruby 3.x, Rails 7.x + ## Installation @@ -55,7 +54,7 @@ comfy_route :cms, path: "/" After finishing installation you should be able to navigate to http://localhost:3000/admin -Default username and password is 'user' and 'pass'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable\_media\_surfer.rb](https://github.com/shakacode/comfortable-media-surfer/blob/master/config/initializers/comfortable_media_surfer.rb) +Default username and password is 'user' and 'pass'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable_media_surfer.rb](https://github.com/shakacode/comfortable-media-surfer/blob/master/config/initializers/comfortable_media_surfer.rb) Before creating pages and populating them with content we need to create a Site. Site defines a hostname, content path and its language. @@ -96,7 +95,6 @@ in Github releases. ComfortableMediaSurfer can run like any Rails application in development. It's as easy to work on as any other Rails app. For more detail see [CONTRIBUTING](CONTRIBUTING.md) - #### Testing - `bin/rails db:migrate RAILS_ENV=test` diff --git a/comfortable_media_surfer.gemspec b/comfortable_media_surfer.gemspec index 0993d478..95a354e7 100644 --- a/comfortable_media_surfer.gemspec +++ b/comfortable_media_surfer.gemspec @@ -9,8 +9,8 @@ Gem::Specification.new do |spec| spec.authors = ['Oleg Khabarov', 'Andrew vonderLuft', 'ShakaCode'] spec.email = ['justin@shakacode.com'] spec.homepage = 'https://github.com/shakacode/comfortable-media-surfer' - spec.summary = 'Rails 6.1-7.1+ CMS Engine' - spec.description = 'ComfortableMediaSurfer is a powerful Rails 6.1-7.1+ CMS Engine' + spec.summary = 'Rails 7.0+ CMS Engine' + spec.description = 'ComfortableMediaSurfer is a powerful Rails 7.0+ CMS Engine' spec.license = 'MIT' spec.files = `git ls-files -z`.split("\x0").reject do |f| @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'kramdown', '~> 2.4', '>= 2.4.0' spec.add_dependency 'mimemagic', '~> 0.4', '>= 0.4.3' spec.add_dependency 'mini_magick', '~> 4.12', '>= 4.12.0' - spec.add_dependency 'rails', '>= 6.1.0' + spec.add_dependency 'rails', '>= 7.0.0' spec.add_dependency 'rails-i18n', '>= 6.0.0' spec.add_dependency 'sassc-rails', '~> 2.1', '>= 2.1.2' spec.add_dependency 'sprockets-rails', '~> 3.4', '>= 3.4.2' diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile deleted file mode 100644 index f127de8c..00000000 --- a/gemfiles/6.1.gemfile +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '../' - -gem 'rails', '~> 6.1.0' - -group :development, :test do - gem 'autoprefixer-rails', '~> 10.4.16.0' - gem 'byebug', '~> 11.1.0', platforms: %i[mri mingw x64_mingw] - gem 'image_processing', '>= 1.12.0' - gem 'sqlite3', '~> 1.6.7' -end - -group :test do - gem 'brakeman', '~> 6.1.2' - gem 'bundler-audit', '~> 0.9.1' - gem 'coveralls_reborn', '~> 0.28.0', require: false - gem 'cuprite', '>= 0.15' - gem 'equivalent-xml', '~> 0.6.0' - gem 'minitest', '>= 5.23.0' - gem 'minitest-reporters', '>= 1.6.1' - gem 'mocha', '>= 2.3.0', require: false - gem 'rails-controller-testing', '~> 1.0.5' - gem 'rubocop', '~> 1.63.0', require: false - gem 'rubocop-minitest' - gem 'rubocop-rails' - gem 'simplecov', '~> 0.22.0', require: false -end