middleman-compass 4.0.0.alpha.3 → 4.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f83ae5546e59f90323055c0660271743b0349c
-  data.tar.gz: 92a57acfa6a6583e0d4c82c11e563120cb8caf49
+  metadata.gz: a91b27049e163e53e7161737f06d7609b22a75ec
+  data.tar.gz: f40e123f0fd729beb730529d887447f5b7c17bf9
 SHA512:
-  metadata.gz: bd0f8bb54cd767a8f1657ea3fba78ba002d842f5b46cadec8ea0fd6132c38cdd5e82bc99d2bcfd4ff0e2396fbd39c410904f2eb0cef2309ae6f720f8f727ba9c
-  data.tar.gz: 697994856fe001ffe2eab930f9b6b70d83fb120dfd1da180debb0bda65605fbafe490e375927cdd1ecfda216c96af309311c39fe8fa01d1281767ed7b01871fd
+  metadata.gz: 6460aad0722d054367f391f37863be159cf2666f998ac053d0254ad6df7922a7468ff9246f9f6422676af0bdfa84aef1a3175bb11ddbe913554e42f42bf48a67
+  data.tar.gz: cd63fc549f2a2a2be1aa604fb10c81ec912a50b4e6b9e52c66f7406affb0928af73fd7ce8dd6d5e8c425cdcd54757b2dfb711513f311159b03829ce057cdc8f4

data/features/slim.feature

@@ -8,4 +8,4 @@ Feature: Support slim templating language
     When I go to "/sass.html"
     Then I should see "html, body, div"
     When I go to "/error.html"
-    Then I should see "Syntax error"
+    Then I should see "Invalid CSS"

data/lib/middleman-compass/extension.rb

@@ -1,14 +1,26 @@
+require 'middleman-core/renderers/sass'
+
 module Middleman
   class CompassExtension < Extension
     def initialize(app, options_hash={}, &block)
-      require 'middleman-core/renderers/sass'
-      require 'compass/core'
+      require 'compass'
+      @compass_config_callbacks = []
 
       super
+    end
+
+    def before_configuration
+      app.add_to_config_context :compass_config, &method(:compass_config)
+    end
 
-      # Hooks to manually update the compass config after we're
-      # done with it
-      app.define_hook :compass_config
+    def compass_config(&block)
+      @compass_config_callbacks << block
+    end
+
+    def execute_compass_config_callbacks(config)
+      @compass_config_callbacks.each do |b|
+        instance_exec(config, &b)
+      end
     end
 
     def after_configuration
@@ -36,7 +48,7 @@ module Middleman
       end
 
       # Call hook
-      app.run_hook_for :compass_config, app, ::Compass.configuration
+      execute_compass_config_callbacks(::Compass.configuration)
 
       # Tell Tilt to use it as well (for inline sass blocks)
       ::Tilt.register 'sass', CompassSassTemplate

data/lib/middleman-compass/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Compass
-    VERSION = "4.0.0.alpha.3"
+    VERSION = "4.0.0.beta.1"
   end
 end

data/middleman-compass.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.require_paths = ["lib"]
   s.add_dependency("middleman-core", [">= 4.0.0.alpha.1"])
-  s.add_dependency('compass-core', ['>= 1.0.0', '< 2.0.0'])
+  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.alpha.3
+  version: 4.0.0.beta.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -27,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0.alpha.1
 - !ruby/object:Gem::Dependency
-  name: compass-core
+  name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="