- Remove deprecated SASS and use plain CSS

Author: DannyBen

Gemfile

@@ -17,9 +17,10 @@ group :development do
   gem 'rspec_approvals'
   gem 'runfile'
   gem 'runfile-tasks'
+  gem 'sasstool'
   gem 'simplecov'
   gem 'yard'
-  
+
 end
 
 gemspec

README.md

@@ -248,6 +248,14 @@ option.
 $ madness --theme my_theme
 ```
 
+Note that the generated theme contains the SCSS files in the `styles`
+subfolder, and the rendered CSS files in the `public/css` subfolder.
+
+If you wish to use the SCSS files, you will need to render them yourself
+to the location of your theme styles (e.g. `public/css`) - you can use
+any tool to do so, or if you do not have a preference, use
+[SassTool][sasstool].
+
 
 ### Option 2: Change CSS only
 
@@ -300,4 +308,5 @@ For more information about the docker image, see:
 [dockerfile]: https://github.com/DannyBen/docker-madness
 [css]: app/public/css/main.css
 [app]: app
+[sasstool]: https://github.com/DannyBen/sasstool
 

Runfile

@@ -1,4 +1,5 @@
 require_relative 'lib/madness'
+require "sasstool"
 require "runfile-tasks"
 
 title   "Madness Runfile"
@@ -9,6 +10,13 @@ RunfileTasks::RubyGems.all 'madness'
 RunfileTasks::Testing.rspec
 RunfileTasks::Docs.rdoc
 
+help   "Generate public CSS"
+action :css do
+  target = "app/public/css"
+  Sasstool::Renderer.new("app/styles/main.scss").save target
+  say "Saved #{target}"
+end
+
 help   "Run YARD server"
 action :yard do
   run "yard server -p3000 -B0.0.0.0 -r"

app/public/css/main.css

@@ -1,7 +1,5 @@
 # require 'sinatra/reloader'
 require 'rack/ssl'
-require 'sass'
-require 'sass/plugin/rack'
 require 'sinatra/base'
 require 'slim'
 
@@ -14,20 +12,10 @@ class ServerBase < Sinatra::Application
     helpers ServerHelper
 
     Slim::Engine.set_options pretty: true
-    use Sass::Plugin::Rack
     use Rack::SSL if ENV['MADNESS_FORCE_SSL']
     set :root, File.expand_path('../../', __dir__)
-    set :server, :puma
     set :environment, ENV['MADNESS_ENV'] || :production
-
-    # TODO: Uncomment when the upstream issue is resolved
-    # At this time, we cannot use reloader, since it prints deprecation
-    # warnings in Ruby 2.7
-    # ref: https://github.com/sinatra/sinatra/issues/1590
-    # configure :development do
-    #   register Sinatra::Reloader
-    #   also_reload "#{__dir__}/*.rb"
-    # end
+    set :server, :puma
 
     # Since we cannot use any config values in the main body of the class,
     # since they will be updated later, we need to set anything that relys
@@ -48,8 +36,6 @@ def self.set_tempalate_locations
 
       set :views, theme.views_path
       set :public_folder, theme.public_path
-      Sass::Plugin.options[:template_location] = theme.css_source_path
-      Sass::Plugin.options[:css_location] = theme.css_target_path
     end
 
     def self.set_basic_auth

app/public/css/main.css.map

@@ -14,14 +14,6 @@ def public_path
       custom? ? "#{path}/public" : File.expand_path('../../app/public', __dir__)
     end
 
-    def css_source_path
-      custom? ? "#{path}/styles" : 'app/styles'
-    end
-
-    def css_target_path
-      custom? ? "#{path}/public/css" : 'app/public/css'
-    end
-
     def custom?
       @custom ||= (path and Dir.exist? path)
     end

lib/madness/server_base.rb

@@ -22,13 +22,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'commonmarker', '~> 0.20'
   s.add_runtime_dependency 'docopt', '~> 0.6'
   s.add_runtime_dependency 'ferret', '~> 0.11'
-  s.add_runtime_dependency 'json', '~> 2.1'
   s.add_runtime_dependency 'naturally', '~> 2.2'
   s.add_runtime_dependency 'os', '~> 1.0'
   s.add_runtime_dependency 'puma', '~> 5.1'
   s.add_runtime_dependency 'rack-ssl', '~> 1.4'
   s.add_runtime_dependency 'requires', '~> 0.1'
-  s.add_runtime_dependency 'sass', '~> 3.7'
   s.add_runtime_dependency 'sinatra', '~> 2.0', '>= 2.0.5'
   s.add_runtime_dependency 'slim', '~> 4.0'
   s.add_runtime_dependency 'extended_yaml', '~> 0.2'

lib/madness/theme.rb

@@ -1,5 +1,8 @@
 ---
 - tmp/theme-test/public
+- tmp/theme-test/public/css
+- tmp/theme-test/public/css/main.css
+- tmp/theme-test/public/css/main.css.map
 - tmp/theme-test/public/favicon.ico
 - tmp/theme-test/public/fonts
 - tmp/theme-test/public/fonts/fontello.eot