roger_sassc 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91b6039cbafc9ee6acdfd7800ee47ddcca4aa10a
-  data.tar.gz: e38dd16bd62dba9768eea6101fcd28b578f8e9f6
+  metadata.gz: b60d9ab78717d99ca86d35f7b82b1ffc3449215f
+  data.tar.gz: ef6e144662222e549bcca649fb7283bb2cdbdce1
 SHA512:
-  metadata.gz: 4e14ca200660ad01d1f04e7886f919f65097d651b03ca3660532bf41cfaeb6d66dbb331b68fc1cdc490d1f9874b2d35808b1f5681d9935a11bcda359ef17e455
-  data.tar.gz: 00fdc39be355f740160a9d660fc01e050afd314f4db22ae62ba6f3e0a96d59c7a19bb49ce2f939427fdf4e7f0b5cd1dbbf0abe0acea0e117cf028168e4d657cb
+  metadata.gz: f6480795dc4bfc30e09e93ee3380b78379e8d99d67b2d4271d5574a3a741216dadca54fe7af9a8a92f74e17d40c5ea33a85ada8bc997ce18ef0429a174b092e7
+  data.tar.gz: a51940be9fc2a9ee8da59767d8dd3bcf10457d283a85ac98c2ed99c5904e25df7157dba4c1938f9768220e3d3c0f647b1bb110668755b9291077e2fbb1bca423

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.ruby-version

data/lib/roger_sassc/middleware.rb

@@ -10,6 +10,7 @@ module RogerSassc
   # compiles (with the help of libsass) the scss.
   class Middleware
     attr_writer :resolver
+    attr_accessor :project
 
     def initialize(app, options = {})
       @app = app
@@ -22,7 +23,8 @@ module RogerSassc
     end
 
     def call(env)
-      @project = env["roger.project"]
+      @project ||= env["roger.project"]
+      @options[:roger_html_path] = @project.html_path
 
       url = ::Rack::Utils.unescape(env["PATH_INFO"].to_s).sub(%r{^/}, "")
 
@@ -34,7 +36,9 @@ module RogerSassc
         begin
           css = compile_scss(scss_path)
           respond(css)
-        rescue SassC::SyntaxError, SassC::NotRenderedError, SassC::InvalidStyleError => sassc_error
+        rescue ::SassC::SyntaxError,
+               ::SassC::NotRenderedError,
+               ::SassC::InvalidStyleError => sassc_error
           respond(debug_css(sassc_error))
         end
       else
@@ -57,7 +61,7 @@ module RogerSassc
       # Supply the filename for load path resolving
       @options[:filename] = scss_path.to_s
 
-      SassC::Engine.new(File.read(scss_path), @options).render
+      ::SassC::Engine.new(File.read(scss_path), @options).render
     end
 
     def debug_css(sassc_error)

data/lib/roger_sassc/processor.rb

@@ -19,6 +19,7 @@ module RogerSassc
     #   :build_files
     def call(release, options = {})
       @options = @options.update(options)
+      @options[:roger_html_path] = release.build_path
 
       match = @options.delete(:match)
       skip = @options.delete(:skip)
@@ -50,7 +51,7 @@ module RogerSassc
       scss = File.read(path)
 
       File.open(path.gsub(/\.scss$/, ".css"), "w+") do |file|
-        file.write(SassC::Engine.new(scss, @options).render)
+        file.write(::SassC::Engine.new(scss, @options).render)
       end
     end
   end

data/lib/roger_sassc/sassc/asset_functions.rb

@@ -0,0 +1,43 @@
+require "sassc"
+require "digest"
+
+module RogerSassc
+  module SassC
+    # Defintion of asset functions
+    module AssetFunctions
+      # The asset_path method will search for
+      # the file and if it exists will append a fingerprint
+      # hexdigest to the output url (?v=DIGEST)
+      def asset_path(path)
+        file = find_file(path)
+
+        if File.exist?(file)
+          digest = Digest::SHA256.file(file).hexdigest
+          finger_printed_path = "#{path}?v=#{digest}"
+        else
+          finger_printed_path = path.value
+        end
+
+        ::SassC::Script::String.new("url(#{finger_printed_path})", :identifier)
+      end
+
+      private
+
+      # Translate the given path to a path on disk
+      def find_file(path)
+        # Absolute url, starting with /
+        if path.value.match(%r{^\/[^\/]})
+          File.join(@options[:roger_html_path], path.value)
+        else
+          # Relative url - we can join from .scss position
+          File.join(File.dirname(@options[:filename]), path.value)
+        end
+      end
+    end
+  end
+end
+
+# SassC includes ruby functions for us
+module ::SassC::Script::Functions
+  include ::RogerSassc::SassC::AssetFunctions
+end

data/lib/roger_sassc/version.rb

@@ -1,4 +1,4 @@
 # Version number
 module RogerSassc
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
 end

data/lib/roger_sassc.rb

@@ -29,5 +29,9 @@ RogerSassc.load_paths = RogerSassc::DEFAULT_LOAD_PATHS.dup
 # supply assets such as bourbon and neat
 RogerSassc.append_path(Sass.load_paths) if defined?(Sass.load_paths)
 
+# Load our custom SASSC functions
+require "roger_sassc/sassc/asset_functions"
+
+# The middleware and processor
 require "roger_sassc/middleware"
 require "roger_sassc/processor"

data/test/asset_functions_test.rb

@@ -0,0 +1,60 @@
+require "test_helper"
+require "sassc"
+require "./lib/roger_sassc/sassc/asset_functions"
+
+module RogerSassc
+  # Test for AssetFunctions module
+  class TestAssetFunctions < ::Test::Unit::TestCase
+    def test_asset_path_fingerprinting_non_existing_file
+      scss_path = "test/fixtures/asset_functions/asset_path_non_existing.scss"
+      engine = get_engine_for(scss_path)
+
+      assert_equal <<-EXPECTED_SCSS, engine.render
+div {
+  background-image: url(./images/logo.svg); }
+      EXPECTED_SCSS
+    end
+
+    def test_asset_path_fingerprinting_relative_path
+      scss_path = "test/fixtures/asset_functions/asset_path_relative_path.scss"
+      engine = get_engine_for(scss_path)
+      # rubocop:disable LineLength
+      assert_equal <<-EXPECTED_SCSS, engine.render
+div {
+  background-image: url(../images/logo.svg?v=73001d8781487200a29e7d3602b59d2770060934fbd738bfdcd2bc06a2861464); }
+      EXPECTED_SCSS
+      # rubocop:enable LineLength
+    end
+
+    def test_asset_path_asset_fingerprinting_http_path
+      scss_path = "test/fixtures/asset_functions/asset_path_http_path.scss"
+      engine = get_engine_for(scss_path)
+
+      assert_equal <<-EXPECTED_SCSS, engine.render
+div {
+  background-image: url(http://google.com/images/logo.svg); }
+      EXPECTED_SCSS
+    end
+
+    def test_asset_path_fingerprinting_absolute_path
+      scss_path = "test/fixtures/asset_functions/asset_path_absolute_path.scss"
+      engine = get_engine_for(scss_path)
+
+      # rubocop:disable LineLength
+      assert_equal <<-EXPECTED_SCSS, engine.render
+div {
+  background-image: url(/images/logo.svg?v=73001d8781487200a29e7d3602b59d2770060934fbd738bfdcd2bc06a2861464); }
+      EXPECTED_SCSS
+      # rubocop:enable LineLength
+    end
+
+    private
+
+    def get_engine_for(scss_path)
+      options = {}
+      options[:roger_html_path] = Pathname.new("test/fixtures").expand_path
+      options[:filename] = scss_path.to_s
+      ::SassC::Engine.new(File.read(scss_path), options)
+    end
+  end
+end

data/test/fixtures/asset_functions/asset_path_absolute_path.scss

@@ -0,0 +1,3 @@
+div {
+  background-image: asset-path('/images/logo.svg');
+}

data/test/fixtures/asset_functions/asset_path_http_path.scss

@@ -0,0 +1,3 @@
+div {
+  background-image: asset-path('http://google.com/images/logo.svg');
+}

data/test/fixtures/asset_functions/asset_path_non_existing.scss

@@ -0,0 +1,3 @@
+div {
+  background-image: asset-path('./images/logo.svg');
+}

data/test/fixtures/asset_functions/asset_path_relative_path.scss

@@ -0,0 +1,3 @@
+div {
+  background-image: asset-path('../images/logo.svg');
+}

data/test/fixtures/images/logo.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0"
+  width="38" height="32"  viewBox="0 0 39.875 33.6667">
+<path style="stroke: none; fill: #323296;" d="M 10,0 L 30.5,0 39.875,17.5 30.5,33.6667 10,33.6667 L 0,17.5 L 10,0 z"/>
+</svg>

data/test/middleware_test.rb

@@ -1,4 +1,6 @@
 require "test_helper"
+require "roger/testing/mock_project"
+
 require "./lib/roger_sassc/middleware"
 
 module RogerSassc
@@ -11,9 +13,19 @@ module RogerSassc
       @app =  proc { [200, {}, ["YAM"]] } # Yet another middleware
       @middleware = Middleware.new @app
 
+      # Inject mock project
+      @middleware.project = Roger::Testing::MockProject.new
+
+      # Avoid side-effect of cwd dir of test_construct
+      @middleware.project.construct.revert_cwd
+
       @request = Rack::MockRequest.new(@middleware)
     end
 
+    def teardown
+      @middleware.project.destroy
+    end
+
     def test_middleware_can_be_called
       assert(@middleware.respond_to?(:call))
     end

data/test/processor_test.rb

@@ -1,5 +1,6 @@
 require "test_helper"
 require "fileutils"
+require "roger/testing/mock_release"
 require "./lib/roger_sassc/processor"
 
 module RogerSassc
@@ -7,39 +8,40 @@ module RogerSassc
   class TestProcessor < ::Test::Unit::TestCase
     include FixtureHelper
 
-    TEST_OUTPUT = "../../tmp/test/fixtures/"
-
     def setup
-      @processor = Processor.new {}
-      @processor.stubs(:build_path).returns("./")
-
-      # Copy fixtures files to fixtures/out
-      output_path = fixture_path(TEST_OUTPUT)
-      FileUtils.rm_rf output_path
-      FileUtils.mkdir_p output_path
-      FileUtils.cp_r fixture_path("."), output_path
+      @release = Roger::Testing::MockRelease.new
+      @release.project.construct.directory "build" do |dir|
+        @test_output = dir.directory "test/fixtures/"
+        FileUtils.cp_r fixture_path("."), @test_output
+      end
+
+      @processor = Processor.new
+    end
+
+    def teardown
+      @release.destroy
     end
 
     def test_processor_can_be_called
       assert_respond_to(@processor, :call)
     end
 
-    # Meh :(
     def test_call_processor
       files = [
-        fixture_path(TEST_OUTPUT + "general.scss"),
-        fixture_path(TEST_OUTPUT + "src/_variables.scss")
+        (@test_output + "general.scss").to_s,
+        (@test_output + "src/_variables.scss").to_s
       ]
 
-      release = release_mock(files)
+      stub_get_files(files)
+
       expected_css = fixture "output.css"
-      @processor.call release
+      @processor.call @release
 
       # File is created
-      assert_path_exist fixture_path(TEST_OUTPUT + "general.css")
+      assert_path_exist @test_output + "general.css"
 
       # And matches earlier output
-      assert_equal fixture(TEST_OUTPUT + "general.css"), expected_css
+      assert_equal File.read(@test_output + "general.css"), expected_css
 
       # Check clean up
       assert_path_not_exist files[0]
@@ -48,23 +50,22 @@ module RogerSassc
 
     def test_processor_raises_on_compilation_errors
       files = [
-        fixture_path(TEST_OUTPUT + "raise.scss")
+        (@test_output + "raise.scss").to_s
       ]
 
-      release = release_mock(files)
+      stub_get_files(files)
 
-      assert_raise SassC::SyntaxError do
-        @processor.call release
+      assert_raise ::SassC::SyntaxError do
+        @processor.call @release
       end
     end
 
     private
 
-    def release_mock(files)
-      release = mock(get_files: files,
-                     log: ->(_s, _m) {})
-
-      release
+    # Stub is used so we can controll what files
+    # are ran through the processor.
+    def stub_get_files(files)
+      @release.stubs(:get_files).returns(files)
     end
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: roger_sassc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Edwin van der Graaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: roger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.31.0
 description: 
@@ -129,10 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".hound.yml"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .hound.yml
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -140,12 +140,19 @@ files:
 - lib/roger_sassc.rb
 - lib/roger_sassc/middleware.rb
 - lib/roger_sassc/processor.rb
+- lib/roger_sassc/sassc/asset_functions.rb
 - lib/roger_sassc/version.rb
 - roger_sassc.gemspec
+- test/asset_functions_test.rb
+- test/fixtures/asset_functions/asset_path_absolute_path.scss
+- test/fixtures/asset_functions/asset_path_http_path.scss
+- test/fixtures/asset_functions/asset_path_non_existing.scss
+- test/fixtures/asset_functions/asset_path_relative_path.scss
 - test/fixtures/errors/import.scss
 - test/fixtures/errors/syntax.css
 - test/fixtures/errors/syntax.scss
 - test/fixtures/general.scss
+- test/fixtures/images/logo.svg
 - test/fixtures/output.css
 - test/fixtures/raise.scss
 - test/fixtures/src/_variables.scss
@@ -164,12 +171,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -179,10 +186,16 @@ signing_key:
 specification_version: 4
 summary: Sass plugin for Roger based on libsass
 test_files:
+- test/asset_functions_test.rb
+- test/fixtures/asset_functions/asset_path_absolute_path.scss
+- test/fixtures/asset_functions/asset_path_http_path.scss
+- test/fixtures/asset_functions/asset_path_non_existing.scss
+- test/fixtures/asset_functions/asset_path_relative_path.scss
 - test/fixtures/errors/import.scss
 - test/fixtures/errors/syntax.css
 - test/fixtures/errors/syntax.scss
 - test/fixtures/general.scss
+- test/fixtures/images/logo.svg
 - test/fixtures/output.css
 - test/fixtures/raise.scss
 - test/fixtures/src/_variables.scss