dassets-sass 0.1.0 → 0.2.0

data/Gemfile

@@ -4,4 +4,3 @@ gemspec
 
 gem 'rake'
 gem 'pry'
-gem 'dassets', :github => 'redding/dassets'

data/README.md

@@ -1,4 +1,4 @@
-# DassetsSass
+# Dassets::Sass
 
 Dassets [engine](https://github.com/redding/dassets#compiling) for compiling [Sass](http://sass-lang.com/) css sources.
 
@@ -12,18 +12,26 @@ require 'dassets'
 require 'dassets-sass'
 
 Dassets.configure do |c|
-  c.root_path '/some/root/path'
 
-  # register for `scss` syntax
-  c.engine 'scss', Dassets::Sass::Engine, :syntax => 'scss'
+  c.source "/path/to/assets") do |s|
+    # register for `scss` syntax
+    s.engine 'scss', Dassets::Sass::Engine, :syntax => 'scss'
 
-  # register for `sass` syntax
-  c.engine 'sass', Dassets::Sass::Engine, :syntax => 'sass'
+    # register for `sass` syntax
+    s.engine 'sass', Dassets::Sass::Engine, :syntax => 'sass'
+
+    # by default `/path/to/assets` is in the load paths, but
+    # you can specify additional custom load paths to use with `@import`s
+    s.engine 'scss', Dassets::Sass::Engine, {
+      :syntax => 'scss',
+      :load_paths => ['/custom/load/path']
+    }
+  end
 
 end
 ```
 
-Put your `.scss` and `.sass` source files in your source path and digest them.  Dassets will compile their content using Sass, switch their extension to `.css`, and write the output to the output path.
+Put your `.scss` and `.sass` source files in your source path.  Dassets will compile their content using Sass, switch their extension to `.css`, and write the output to the output path.
 
 ## Installation
 

data/dassets-sass.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |gem|
   gem.description = %q{Dassets engine for compiling Sass}
   gem.summary     = %q{Dassets engine for compiling Sass}
   gem.homepage    = "http://github.com/redding/dassets-sass"
+  gem.license     = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert")
+  gem.add_development_dependency("assert", ["~> 2.12"])
 
   # lock in to Sass 3.1 and up b/c this is earliest version implementing
   # the expected `Sass.compile` api:

data/lib/dassets-sass.rb

@@ -10,12 +10,20 @@ module Dassets::Sass
       (self.opts[:syntax] || self.opts['syntax'] || 'scss').to_s
     end
 
+    def load_paths
+      @load_paths ||= ([self.opts['source_path']] +
+                       [*(self.opts[:load_paths] || self.opts['load_paths'] || [])])
+    end
+
     def ext(input_ext)
       'css'
     end
 
     def compile(input_content)
-      ::Sass.compile(input_content, :syntax => self.syntax.to_sym)
+      ::Sass.compile(input_content, {
+        :syntax => self.syntax.to_sym,
+        :load_paths => self.load_paths
+      })
     end
 
   end

data/lib/dassets-sass/version.rb

@@ -1,4 +1,4 @@
 module Dassets; end
 module Dassets::Sass
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/helper.rb

@@ -8,9 +8,6 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 require 'pry'
 
 ENV['DASSETS_TEST_MODE']   = 'yes'
-ENV['DASSETS_ASSETS_FILE'] = 'test/support/config/assets'
-require 'dassets'
-Dassets.init
 
 require 'test/support/factory'
 class Assert::Context

data/test/unit/engine_tests.rb

@@ -1,17 +1,20 @@
 require 'assert'
-require 'dassets/engine'
 require 'dassets-sass'
 
+require 'dassets/engine'
+
 class Dassets::Sass::Engine
 
-  class BaseTests < Assert::Context
-    desc "the Dassets::Sass engine"
+  class UnitTests < Assert::Context
+    desc "Dassets::Sass::Engine"
     setup do
+      @lp1 = '/a-load-path-1'
+      @lp2 = '/a-load-path-2'
       @engine = Dassets::Sass::Engine.new
     end
     subject{ @engine }
 
-    should have_instance_method :syntax
+    should have_imeths :syntax, :load_paths
 
     should "be a Dassets engine" do
       assert_kind_of Dassets::Engine, subject
@@ -27,6 +30,25 @@ class Dassets::Sass::Engine
       assert_equal 'sass', Dassets::Sass::Engine.new(:syntax => 'sass').syntax
     end
 
+    should "default the load paths to be just the source path" do
+      assert_equal [subject.opts['source_path']], subject.load_paths
+    end
+
+    should "allow specifying custom load paths, always including the source path" do
+      engine = Dassets::Sass::Engine.new(:load_paths => @lp1)
+      assert_includes @lp1, engine.load_paths
+      assert_includes subject.opts['source_path'], engine.load_paths
+
+      engine = Dassets::Sass::Engine.new('load_paths' => [@lp1])
+      assert_includes @lp1, engine.load_paths
+      assert_includes subject.opts['source_path'], engine.load_paths
+
+      engine = Dassets::Sass::Engine.new('load_paths' => [@lp1, @lp2])
+      assert_includes @lp1, engine.load_paths
+      assert_includes @lp2, engine.load_paths
+      assert_includes subject.opts['source_path'], engine.load_paths
+    end
+
     should "transform any input extension to `css`" do
       assert_equal 'css', subject.ext('scss')
       assert_equal 'css', subject.ext('sass')
@@ -34,6 +56,25 @@ class Dassets::Sass::Engine
       assert_equal 'css', subject.ext('whatever')
     end
 
+    should "use its syntax and load paths when compiling" do
+      compiled_with_options = false
+      input = @factory.sass
+      syntax = :sass
+      sass_engine = Dassets::Sass::Engine.new({
+        :syntax => syntax,
+        :load_paths => [@lp1]
+      })
+      load_paths = sass_engine.load_paths
+
+      Assert.stub(::Sass, :compile).with(input, {
+        :syntax => syntax,
+        :load_paths => load_paths
+      }){ compiled_with_options = true }
+
+      sass_engine.compile(input)
+      assert_true compiled_with_options
+    end
+
     should "compile any input content as Sass css" do
       assert_equal @factory.scss_compiled, subject.compile(@factory.scss)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dassets-sass
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,25 +16,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-01 00:00:00 Z
+date: 2014-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: assert
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 12
+        version: "2.12"
   type: :development
+  name: assert
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sass
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +45,10 @@ dependencies:
         - 1
         version: "3.1"
   type: :runtime
+  name: sass
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dassets
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,7 +59,9 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  name: dassets
   version_requirements: *id003
+  prerelease: false
 description: Dassets engine for compiling Sass
 email: 
 - kelly@kellyredding.com
@@ -82,18 +83,12 @@ files:
 - lib/dassets-sass/version.rb
 - log/.gitkeep
 - test/helper.rb
-- test/support/app/assets/from_sass.sass
-- test/support/app/assets/from_scss.scss
-- test/support/config/assets.rb
 - test/support/factory.rb
-- test/support/public/from_sass-7173fff1fe11e06f1339beceaf4a9857.css
-- test/support/public/from_scss-ffcdabded94a78022e9c92e06e311f69.css
-- test/system/digest_tests.rb
 - test/unit/engine_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/dassets-sass
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -120,17 +115,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Dassets engine for compiling Sass
 test_files: 
 - test/helper.rb
-- test/support/app/assets/from_sass.sass
-- test/support/app/assets/from_scss.scss
-- test/support/config/assets.rb
 - test/support/factory.rb
-- test/support/public/from_sass-7173fff1fe11e06f1339beceaf4a9857.css
-- test/support/public/from_scss-ffcdabded94a78022e9c92e06e311f69.css
-- test/system/digest_tests.rb
 - test/unit/engine_tests.rb

data/test/support/app/assets/from_sass.sass

@@ -1,2 +0,0 @@
-table.hl
-  margin: 2em 0

data/test/support/app/assets/from_scss.scss

@@ -1,7 +0,0 @@
-$blue: #3bbfce;
-$margin: 16px;
-.border {
-  padding: $margin / 2;
-  margin: $margin / 2;
-  border-color: $blue;
-}

data/test/support/config/assets.rb

@@ -1,11 +0,0 @@
-require 'dassets'
-require 'dassets-sass'
-
-Dassets.configure do |c|
-  c.root_path File.expand_path("../..", __FILE__)
-  c.engine 'scss', Dassets::Sass::Engine, :syntax => 'scss'
-  c.engine 'sass', Dassets::Sass::Engine, :syntax => 'sass'
-  c.cache = nil
-  c.file_store 'public'
-
-end

data/test/support/public/from_sass-7173fff1fe11e06f1339beceaf4a9857.css

@@ -1,2 +0,0 @@
-table.hl {
-  margin: 2em 0; }

data/test/support/public/from_scss-ffcdabded94a78022e9c92e06e311f69.css

@@ -1,4 +0,0 @@
-.border {
-  padding: 8px;
-  margin: 8px;
-  border-color: #3bbfce; }

data/test/system/digest_tests.rb

@@ -1,52 +0,0 @@
-require 'assert'
-require 'fileutils'
-require 'dassets'
-require 'dassets-sass'
-
-module Dassets::Sass
-
-  class DigestScssTests < Assert::Context
-    desc "digesting a scss source file with the sass engine registered"
-    setup do
-      @source_file = File.join(Dassets.config.source_path, "from_scss.scss")
-      File.open(@source_file, 'w'){ |f| f.write(@factory.scss) }
-      @compiled_file = File.join(Dassets.config.root_path, "public/from_scss-ffcdabded94a78022e9c92e06e311f69.css")
-      @exp_compiled_content = @factory.scss_compiled
-
-      FileUtils.rm_f @compiled_file
-    end
-
-    should "produce a css file with the source scss compiled to css" do
-      assert_file_exists @source_file
-      assert_not_file_exists @compiled_file
-      Dassets.digest_source_files
-
-      assert_file_exists @compiled_file
-      assert_equal @exp_compiled_content, File.read(@compiled_file)
-    end
-
-  end
-
-  class DigestSassTests < Assert::Context
-    desc "digesting a sass source file with the sass engine registered"
-    setup do
-      @source_file = File.join(Dassets.config.source_path, "from_sass.sass")
-      File.open(@source_file, 'w'){ |f| f.write(@factory.sass) }
-      @compiled_file = File.join(Dassets.config.root_path, "public/from_sass-7173fff1fe11e06f1339beceaf4a9857.css")
-      @exp_compiled_content = @factory.sass_compiled
-
-      FileUtils.rm_f @compiled_file
-    end
-
-    should "produce a css file with the source sass compiled to css" do
-      assert_file_exists @source_file
-      assert_not_file_exists @compiled_file
-      Dassets.digest_source_files
-
-      assert_file_exists @compiled_file
-      assert_equal @exp_compiled_content, File.read(@compiled_file)
-    end
-
-  end
-
-end