jekyll-compass 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6b72faa6c232bd50fa6c797650ca19e6a8be46
-  data.tar.gz: af2150a2f28661efce7de3b9f65b6a2da6539a84
+  metadata.gz: a4f08a754e0245590b9fb9cadd5185c6eebfc1d2
+  data.tar.gz: 01bfe21b9ff8e152de5f104d0f3056016797aa56
 SHA512:
-  metadata.gz: 32c346c04caf83b403b0b7385243bdbf78202c9be03d166cdc91a61df20bf17cd2bbd4c9167fe89a9a3a592dc4f1db0f2abc61a59e2de094337fb3293de3b96d
-  data.tar.gz: c2df57c0f974093a4c353c7bb0952a3de53d854c5e33bc25723103bf84612ab7e2b3ab6322570477d1b6da4cb775075ba704554a90195ec358f7523d4cf771da
+  metadata.gz: 4891eb6b6c8fdb020c675fa0e94436722738fc39e501189bfda816b1d03511fc73621a6f2cfd587cba6e628e4112969f3f64624a06308779dd4c7b8d24517bbf
+  data.tar.gz: 81b74704078e9a640e23ba6c592eb7caec613a24d6c3124a0ecc3f8d0a87f2b806832d0532d87b8a7e4c396de523cbede8f430cdba8af1970ec867d697d7a81f

data/lib/jekyll/compass/core_ext.rb

@@ -0,0 +1,30 @@
+class Hash
+  # Merges self with another hash, recursively.
+  #
+  # Returns the merged self.
+  def deep_merge!(hash)
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        self[key] = self[key].deep_merge!(hash[key])
+        next
+      end
+
+      self[key] = hash[key]
+    end
+
+    self
+  end
+
+  # Turn all String keys of into symbols, and return in other Hash.
+  #
+  # Returns the symbolized copy of self.
+  def symbolize_keys
+    target = self.dup
+
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+
+    target
+  end
+end

data/lib/jekyll/compass.rb

@@ -4,6 +4,8 @@ require 'compass'
 require 'compass/commands'
 require 'fileutils'
 
+require 'jekyll/compass/core_ext'
+
 module Jekyll
   class CompassFile < StaticFile
     def write(destination)
@@ -17,54 +19,68 @@ module Jekyll
     priority :high
 
     def generate(site)
-      input = File.join(site.source, '_sass')
+      @site = site
+      input_directory = File.join(@site.source, '_sass')
 
-      return unless File.exist? input
+      return unless File.exist? input_directory
       puts
 
-      output = File.join(site.config['destination'], 'css')
+      config = configuration(@site.source, input_directory, File.join(@site.config['destination'], 'css'))
+      configure_compass(config)
+
+      ::Compass::Commands::UpdateProject.new(site.config['source'], config).execute
+      nil
+    end
+
+    private
 
+    def configuration(source, input_directory, output_directory)
       config = {
-          :project_path => site.source,
+          :project_path => source,
           :http_path => '/',
-          :sass_path => input,
-          :css_path => output,
-          :images_path => File.join(site.source, 'images'),
-          :javascripts_path => File.join(site.source, 'js'),
-          :line_comments => false,
+          :sass_path => input_directory,
+          :css_path => output_directory,
+          :images_path => File.join(source, 'images'),
+          :javascripts_path => File.join(source, 'js'),
           :environment => :production,
           :output_style => :compact,
-          :force => true,
-          #:quiet => true,
-          :sass_options => {
-              :unix_newlines => true,
-          },
       }
 
+      user_config = @site.config['compass']
+      config.deep_merge!(user_config.symbolize_keys) if user_config
+      user_data = @site.data['compass']
+      config.deep_merge!(user_data.symbolize_keys) if user_data
+
+      config
+    end
+
+    def configure_compass(config)
       ::Compass.add_configuration(config, 'Jekyll::Compass')
-      ::Compass.configuration.on_sprite_saved do |filename|
-        site.static_files << StaticFile.new(site, site.source, File.dirname(filename)[site.source.length..-1], File.basename(filename))
-      end
-      ::Compass.configuration.on_stylesheet_saved do |filename|
-        source = site.config['destination']
-        site.static_files << CompassFile.new(site, source, File.dirname(filename)[source.length..-1], File.basename(filename))
-      end
 
-      # Manually mangle the output directory to keep it in sync with what Compass expects and Jekyll produces
-      ::Compass.configuration.on_sprite_removed do |filename|
-        site.static_files = site.static_files.select do |p|
-          if p.path == filename
-            sprite_output = p.destination(site.config['destination'])
-            File.delete sprite_output if File.exist? sprite_output
-            false
-          else
-            true
-          end
+      ::Compass.configuration.on_stylesheet_saved &method(:on_stylesheet_saved)
+      ::Compass.configuration.on_sprite_saved &method(:on_sprite_saved)
+      ::Compass.configuration.on_sprite_removed &method(:on_sprite_removed)
+    end
+
+    def on_stylesheet_saved(filename)
+      source = @site.config['destination']
+      @site.static_files << CompassFile.new(@site, source, File.dirname(filename)[source.length..-1], File.basename(filename))
+    end
+
+    def on_sprite_saved(filename)
+        @site.static_files << StaticFile.new(@site, @site.source, File.dirname(filename)[@site.source.length..-1], File.basename(filename))
+    end
+
+    def on_sprite_removed(filename)
+      @site.static_files = @site.static_files.select do |p|
+        if p.path == filename
+          sprite_output = p.destination(@site.config['destination'])
+          File.delete sprite_output if File.exist? sprite_output
+          false
+        else
+          true
         end
       end
-
-      ::Compass::Commands::UpdateProject.new(site.config['source'], config).execute
-      nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compass
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -46,6 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/jekyll/compass/core_ext.rb
 - lib/jekyll/compass.rb
 - lib/jekyll-compass.rb
 - README.md