middleman-compass 4.0.0.rc.1 → 4.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba14e8c8156f749b1bdfd83c1d52dc032b89d802
-  data.tar.gz: c5b4556997d5e74c84ea7863f0a6f7c82b681008
+  metadata.gz: 840ce8abe18fce388d3d057d43a44ed372708741
+  data.tar.gz: 95a60246048790042fa573fb872f4d98d1f0426c
 SHA512:
-  metadata.gz: 64cdc0dc0629f0ab91c1ba77b3966d20410ea73e3f2fc3075b4836ed47824f17e83f4edd870707dad554f634063b2a4e275bf6fa14ab46849f8aeb6720c3b074
-  data.tar.gz: 15c5b39c6f4a7c5225c9e4f5992934f4cba9b91b5ffee32ff5c0d1f7dd5a1ff596c7b268dd01645d67918ca7699264476914d6a7bc0a60d9dd3354c9b69c3b1b
+  metadata.gz: 3bda0651a76a7f88c5106f330d5a79c0baa559e0991fa36b2c77b00e22c18649e4413880bc16176825adfb6ddb4e25c2b02faf02249ee7bc12c6402e2e1be318
+  data.tar.gz: 3b46bac470beaf0a2dd1805f5dc98fbcdaa7c46b608dfc89813e5d3fdaa1d428c3a3d36ac4edb90bac26b78293400b674eaad5439dfa39ee0e6cdc50d09788c9

data/.travis.yml

@@ -1,23 +1,23 @@
+language: ruby
+sudo: false
+cache: bundler
+before_script:
+  - bundle update
 rvm:
   - ruby-head
   - jruby-head
   - jruby-19mode
-  - 2.2
+  - 2.2.2
   - 2.1
   - 2.0
 os:
   - linux
   - osx
-gemfile:
-  - Gemfile
-
-script: "bundle exec rake test"
-
-env: TEST=true
-
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-19mode
-    - rvm: jruby-head
+    - rvm: jruby-head
+script: "bundle exec rake test"
+env: TEST=true

data/lib/middleman-compass/extension.rb

@@ -1,4 +1,34 @@
 require 'middleman-core/renderers/sass'
+require 'compass/import-once'
+
+GLOB = /\*|\[.+\]/
+
+# Hack around broken sass globs when combined with import-once
+# Targets compass-import-once 1.0.4
+# Tracking issue: https://github.com/chriseppstein/compass/issues/1529
+module Compass
+  module ImportOnce
+    module Importer
+      def find_relative(uri, base, options, *args)
+        if uri =~ GLOB
+          force_import = true
+        else
+          uri, force_import = handle_force_import(uri)
+        end
+        maybe_replace_with_dummy_engine(super(uri, base, options, *args), options, force_import)
+      end
+
+      def find(uri, options, *args)
+        if uri =~ GLOB
+          force_import = true
+        else
+          uri, force_import = handle_force_import(uri)
+        end
+        maybe_replace_with_dummy_engine(super(uri, options, *args), options, force_import)
+      end
+    end
+  end
+end
 
 module Middleman
   class CompassExtension < Extension
@@ -56,6 +86,8 @@ module Middleman
       # Tell Tilt to use it as well (for inline scss blocks)
       ::Tilt.register 'scss', CompassScssTemplate
       ::Tilt.prefer(CompassScssTemplate)
+
+      ::Compass::ImportOnce.activate!
     end
 
     # A Compass Sass template for Tilt, adding our options in

data/lib/middleman-compass/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Compass
-    VERSION = "4.0.0.rc.1"
+    VERSION = "4.0.0.rc.2"
   end
 end

data/middleman-compass.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\0")
   s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
-  s.add_dependency("middleman-core", [">= 4.0.0.rc.1"])
+  s.add_dependency("middleman-core", [">= 4.0.0.rc.2"])
   s.add_dependency('compass', ['>= 1.0.0', '< 2.0.0'])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-compass
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc.1
+  version: 4.0.0.rc.2
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc.1
+        version: 4.0.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc.1
+        version: 4.0.0.rc.2
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Compass support for Middleman