rack-sassc 0.0.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b6576825c66fc983efbdb31c7c9f140f6b6d75bfcdf7b5b4ca05f98ccccbe8
-  data.tar.gz: fc2728ba84d1ea93577ed8e40da1492d84541fb83d35edf9bf76769094aa2ec5
+  metadata.gz: 59d53b05df35a17dd7d243d6a3e917b55ced842e9d3ff235ee799bb0315dba55
+  data.tar.gz: fb4b77417231cbda166a2666ee61a6c000ee8fab4d8fb1c800d8905896f396df
 SHA512:
-  metadata.gz: 44aa927dc2e90882201445447589ab5df67c538c212ca2777dd72f604e933bc0be7e539f1f33c57d1b06bc0153145a074ff07ea93094f8144e8dcf2c22c1f36f
-  data.tar.gz: 29ce04609231b501f4028a7c53c93af24793b843ea6692f489e6e4a07e7f844507a48c8245b1f4976f258e449858ad9fa7d2aa90008c5cce24e4834a9d0b9dbf
+  metadata.gz: 7adc86dfe36ffa21510368f3d480d79d9bdfac8da4ef4a9b97dc56598dce2d1a479c523ab1737f999723a384d30bf3dbdd9fb9ab279a6d2f0ab346c66572ec08
+  data.tar.gz: fa8ad12fadebac9e501d92d30d97a052939a9eb29265cdb4f9061e73360c31464225c19d62565a1b6b1ce505594a71ef89d2b8ea0c8a0d9edd9430f27d3a1964

data/README.md

@@ -11,10 +11,6 @@ The files are processed each time they are requested. Since by default it does
 it only when not in production, the speed penalty is kind of acceptable. But I 
 intend to improve it and use modification time.
 
-The location of the public directory and directory names for CSS and SCSS are 
-editable, but both are assumed to be directly placed inside the public 
-directory.
-
 The files cannot be nested, they are assumed to be directly inside the SCSS 
 directory, and the generated files are therefore created directly inside the CSS 
 directory.
@@ -62,10 +58,9 @@ require 'rack/sassc'
 
 use Rack::SassC, {
   check: ENV['RACK_ENV'] != 'production',
-  public_location: 'public',
   syntax: :scss,
-  css_dirname: :css,
-  scss_dirname: :scss,
+  css_location: 'public/css',
+  scss_location: 'public/scss',
   create_map_file: true,
 }
 ```
@@ -77,11 +72,8 @@ equivalent to not having the middleware at all. By default it is `true` if the
 rack environment is NOT `production`. The value of `check` can also be a Proc 
 which receives the `env` on each request.
 
-`public_location` is where you serve static files on your app. It is set to 
-"public" by default. Whatever path you set it to will be expanded.
-
-`scss_dirname` and `css_dirname` are just the name of the directories in which 
-we search for template files and we generate css/map files.
+`scss_location` and `css_location` are just the name of the directories in which 
+we search for template files and we generate css/map files. These paths are expanded.
 
 `syntax` is `:scss` or `:sass`. It is used for the engine, but also for the 
 extension of template files, which means they have to match.
@@ -105,7 +97,7 @@ The default options for the engine are the following:
 {
   style: :compressed, 
   syntax: @opts[:syntax],
-  load_paths: [location(@opts[:scss_dirname])],
+  load_paths: [@opts[:scss_location]],
 }
 ```
 
@@ -115,12 +107,19 @@ Or this when no map file is to be created:
 {
   style: :compressed, 
   syntax: @opts[:syntax],
-  load_paths: [location(@opts[:scss_dirname])],
+  load_paths: [@opts[:scss_location]],
   source_map_file: "#{filename}.css.map",
   source_map_contents: true,
 }
 ```
 
+Changelog
+---------
+
+**0.0.0** All new
+
+**0.1.0** `:public_location`, `:css_dirname` and `:scss_dirname` 3 options where all replaced by 2 options: `:css_location` and `:scss_location`. Meaning the locations can be outside of the public directory (for scss/sass). They also can be absolute or will be expanded from current directory. The behaviour of default options remains unchanged: css is assumed to be in `'public/css'` and scss in `'public/scss'`. The update is based on a [conversation about a pull request](https://github.com/mig-hub/rack-sassc/pull/1) by [@straight-shoota](https://github.com/straight-shoota).
+
 Alternatives
 ------------
 

data/lib/rack/sassc/version.rb

@@ -1,6 +1,6 @@
 module Rack
   class SassC
-    VERSION = '0.0.0'
+    VERSION = '0.1.1'
   end
 end
 

data/lib/rack/sassc.rb

@@ -10,27 +10,29 @@ module Rack
 
       @opts = {
         check: ENV['RACK_ENV'] != 'production',
-        public_location: 'public',
         syntax: :scss,
-        css_dirname: :css,
-        scss_dirname: :scss,
+        css_location: 'public/css',
+        scss_location: 'public/scss',
         create_map_file: true,
       }.merge(opts)
 
-      @opts[:public_location] = ::File.expand_path @opts[:public_location]
+      @opts[:css_location] = ::File.expand_path @opts[:css_location]
+      @opts[:scss_location] = ::File.expand_path @opts[:scss_location]
     end
 
     def call env
-      handle_path(env['PATH_INFO']) if must_check?(env)
-      @app.call env
+      dup._call env
     end
 
-    def location dirname
-      ::File.join @opts[:public_location], dirname.to_s
+    def _call env
+      handle_path(env['PATH_INFO']) if must_check?(env)
+      @app.call env
     end
 
-    def filepath dirname, filename, ext
-      ::File.join location(dirname), "#{filename}.#{ext}"
+    def filepath filename, type
+      location = @opts[type==:css ? :css_location : :scss_location]
+      ext = type==:scss ? @opts[:syntax] : type
+      ::File.join location, "#{filename}.#{ext}"
     end
 
     private
@@ -44,15 +46,16 @@ module Rack
     end
 
     def handle_path path_info
-      return unless path_info[/\/#{@opts[:css_dirname]}\/[^\/]+\.css$/]
 
       filename = ::File.basename path_info, '.*'
-      scss_filepath = filepath(@opts[:scss_dirname], filename, @opts[:syntax])
+      scss_filepath = filepath(filename, :scss)
       return unless ::File.exist?(scss_filepath)
 
+      css_filepath = filepath(filename, :css)
+      return unless css_filepath[/#{path_info}/]
+
       scss = ::File.read(scss_filepath)
       engine = ::SassC::Engine.new(scss, build_engine_opts(filename))
-      css_filepath = filepath(@opts[:css_dirname], filename, :css)
 
       ::File.open(css_filepath, 'w') do |css_file|
         css_file.write(engine.render)
@@ -69,7 +72,7 @@ module Rack
       engine_opts = {
         style: :compressed, 
         syntax: @opts[:syntax],
-        load_paths: [location(@opts[:scss_dirname])],
+        load_paths: [@opts[:scss_location]],
       }
 
       if @opts[:create_map_file]

data/rack-sassc.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rack', '>= 1.0'
+  s.add_dependency 'rack', '~> 2.0'
   s.add_dependency 'sassc', '~> 2.0'
   s.add_development_dependency 'minitest', '~> 5.8'
-  s.add_development_dependency 'rack-test', '~> 0.6'
+  s.add_development_dependency 'rack-test', '~> 2'
   s.add_development_dependency "rake"
   s.add_development_dependency "bundler"
 end

data/test/other-public/stylesheets/already.css

@@ -0,0 +1 @@
+.already{color:yellow}

data/test/test_rack_sassc.rb

@@ -23,9 +23,17 @@ class TestRackSassC < MiniTest::Test
     Dir.children('public/css').each do |f|
       ::File.delete("public/css/#{f}") unless KEEP_IN_CSS_DIR.include?(f)
     end
+    if ::File.directory?( 'other-public/stylesheets' )
+      Dir.children('other-public/stylesheets').each do |f|
+        ::File.delete("other-public/stylesheets/#{f}") unless KEEP_IN_CSS_DIR.include?(f)
+      end
+    end
     if ::File.exist? "public/scss/tmp.scss"
       ::File.delete "public/scss/tmp.scss"
     end
+    if ::File.exist? "other-public/sassc/tmp.scss"
+      ::File.delete "other-public/sassc/tmp.scss"
+    end
   end
 
   def app
@@ -136,32 +144,38 @@ class TestRackSassC < MiniTest::Test
     assert_css_dir_untouched
   end
 
-  def test_public_location_option_is_expanded
-    local_opts = {public_location: 'other-public'}
+  def test_css_location_option_is_expanded
+    local_opts = {css_location: 'other-public/stylesheets'}
     local_app = Rack::SassC.new(inner_app, local_opts)
-    assert_equal ::File.expand_path('other-public'), local_app.opts[:public_location]
+    assert_equal ::File.expand_path('other-public/stylesheets'), local_app.opts[:css_location]
     # Make sure the original opts hash is unchanged
-    assert_equal 'other-public', local_opts[:public_location]
+    assert_equal 'other-public/stylesheets', local_opts[:css_location]
   end
 
-  def test_location_returns_expanded_path_in_public
-    local_opts = {public_location: 'other_public'}
+  def test_scss_location_option_is_expanded
+    local_opts = {scss_location: 'other-public/sassc'}
     local_app = Rack::SassC.new(inner_app, local_opts)
-    assert_equal ::File.join(::File.expand_path('other_public'), 'dir'), local_app.location(:dir)
+    assert_equal ::File.expand_path('other-public/sassc'), local_app.opts[:scss_location]
+    # Make sure the original opts hash is unchanged
+    assert_equal 'other-public/sassc', local_opts[:scss_location]
   end
 
-  def test_filepath_returns_expanded_path_in_public
-    local_opts = {public_location: 'other_public'}
+  def test_filepath
+    local_opts = {
+      css_location: 'other-public/stylesheets', 
+      scss_location: 'other-public/sassc',
+      syntax: :sass
+    }
     local_app = Rack::SassC.new(inner_app, local_opts)
-    assert_equal ::File.join(::File.expand_path('other_public'), 'dir', 'main.sass'), local_app.filepath(:dir, :main, :sass)
+    assert_equal ::File.join(::File.expand_path('other-public/stylesheets'), 'main.css'), local_app.filepath(:main, :css)
+    assert_equal ::File.join(::File.expand_path('other-public/sassc'), 'main.sass'), local_app.filepath(:main, :scss)
   end
 
-  def test_works_with_different_dirnames_and_syntax
+  def test_works_with_different_locations_and_syntax
     @inner_app = inner_app_other
     @app_options = {
-      public_location: 'other-public',
-      css_dirname: :stylesheets,
-      scss_dirname: :sassc,
+      css_location: 'other-public/stylesheets',
+      scss_location: 'other-public/sassc',
       syntax: :sass
     }
     get "/stylesheets/main.css"
@@ -172,6 +186,20 @@ class TestRackSassC < MiniTest::Test
     assert_created_in_css_dir "main.css", "main.css.map"
   end
 
+  def test_works_with_absolute_paths
+    # @inner_app = inner_app_other
+    @app_options = {
+      scss_location: ::File.expand_path('other-public/sassc'),
+      syntax: :sass
+    }
+    get "/css/main.css"
+    assert_equal 200, last_response.status
+    assert_equal 'text/css', last_response.headers['Content-Type']
+    assert last_response.body[/body\{color:blue\}/]
+    assert last_response.body[/sourceMappingURL=main\.css\.map/]
+    assert_created_in_css_dir "main.css", "main.css.map"
+  end
+
   private
 
   # This will assert the files were created
@@ -179,9 +207,9 @@ class TestRackSassC < MiniTest::Test
   # are not passed as argument. Therefore the list 
   # of files created needs to be exhaustive.
   def assert_created_in_css_dir *created_files
-    if @app_options.has_key?(:public_location) and @app_options.has_key?(:css_dirname)
-      possible_files = created_files.dup
-      path = "#{@app_options[:public_location]}/#{@app_options[:css_dirname]}"
+    if @app_options.has_key?(:css_location)
+      possible_files = KEEP_IN_CSS_DIR + created_files.dup
+      path = @app_options[:css_location]
     else
       possible_files = KEEP_IN_CSS_DIR + created_files
       path = 'public/css'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack-sassc
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mickael Riga
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +112,7 @@ files:
 - lib/rack/sassc/version.rb
 - rack-sassc.gemspec
 - test/other-public/sassc/main.sass
-- test/other-public/stylesheets/main.css
-- test/other-public/stylesheets/main.css.map
+- test/other-public/stylesheets/already.css
 - test/public/css/already.css
 - test/public/scss/main.scss
 - test/test_rack_sassc.rb
@@ -121,7 +120,7 @@ homepage: https://github.com/mig-hub/rack-sassc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +135,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.3.7
+signing_key:
 specification_version: 4
 summary: Rack middleware for SassC
 test_files: []

data/test/other-public/stylesheets/main.css

@@ -1,3 +0,0 @@
-body{color:blue}
-
-/*# sourceMappingURL=main.css.map */

data/test/other-public/stylesheets/main.css.map

@@ -1,12 +0,0 @@
-{
-	"version": 3,
-	"file": "stdin.css",
-	"sources": [
-		"stdin"
-	],
-	"sourcesContent": [
-		"body {\n  color: blue; }\n\n"
-	],
-	"names": [],
-	"mappings": "AAAA,AAAA,IAAI,AAAC,CACH,KAAK,CAAE,IAAI,CAAG"
-}