jekyll-compass 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc734c3951787df164f485ec108768f42e63455e
-  data.tar.gz: a1d70d24c2c9cd71cf8a490a7c94010a8ea75ca7
+  metadata.gz: 2b48486097b59cef67758554dd741e1520d1872a
+  data.tar.gz: a9dcd89043b048a3bf01ee0180ba7ede6cc50c2c
 SHA512:
-  metadata.gz: 17f2e9358d732a149e6d4bd3031007fc01edd67470244816b78a0f7fde16f181e1920b7761cd19e4fb1a3476ede481c7acffa312051d3c1896a0f6192726ed35
-  data.tar.gz: 9863583fe8ffb6d13e628563e6151da9614a4029edaf2bccd249ba077506e75fb856727430288d9c497939d834e1593cf6bab8b9b76a987a950b6ef5b453b030
+  metadata.gz: ab489d313433d8c11c68db1094f214b73b4ef55025749d3e673f35760a116114fde70f6059770c71662721c679b196734994714e6cf3e65b7b21377603068f79
+  data.tar.gz: 62bb9c6363569e5f76fe3400fef75af7298132cce56d09ae2857debf8db738034fac8dadda0cface9931ea2fc642a0f18293b54ebfbb1c2a47fb1e38ab80be44

data/lib/jekyll/compass/generator.rb

@@ -22,20 +22,21 @@ module Jekyll
       # @return [void]
       def generate(site)
         @site = site
-        input_directory = File.join(@site.source, '_sass')
 
-        return unless File.exist? input_directory
-        puts
-
-        config = configuration(
-            @site.source,
-            input_directory,
-            File.join(@site.config['destination'], 'css')
-        )
+        config = configuration(@site.source)
+        puts "\rGenerating Compass: #{config[:sass_path]}" +
+                 " => #{config[:css_path]}"
+        unless File.exist? config[:sass_path]
+          print "      Generating... "
+          return
+        end
         configure_compass(config)
 
         ::Compass::Commands::UpdateProject.new(site.config['source'], config).
             execute
+
+        puts
+        print "      Generating... "
         nil
       end
 
@@ -45,19 +46,16 @@ module Jekyll
       # from `_config.yml` as well as `_data/compass.yml`.
       #
       # @param source [String] The project source folder
-      # @param input_directory [String] The folder containing the Sass files
-      # @param output_directory [String] The folder to output CSS files to
       # @return [Hash]
-      def configuration(source, input_directory, output_directory)
+      def configuration(source)
         config = {
             :project_path => source,
             :http_path => '/',
-            :sass_path => input_directory,
-            :css_path => output_directory,
+            :sass_dir => '_sass',
+            :css_dir => 'css',
             :images_path => File.join(source, 'images'),
             :javascripts_path => File.join(source, 'js'),
             :environment => :production,
-            :output_style => :compact,
             :force => true,
         }
 
@@ -66,6 +64,33 @@ module Jekyll
         user_data = @site.data['compass']
         config = deep_merge!(config, symbolize_keys(user_data)) if user_data
 
+        unless config.key? :sass_path
+          config[:sass_path] =
+              File.join(source, config[:sass_dir])
+        end
+        unless config.key? :css_path
+          config[:css_path] =
+              File.join(@site.config['destination'], config[:css_dir])
+        end
+
+        symbolize_configuration!(config)
+      end
+
+      # Symbolize values for configuration values which require it.
+      #
+      # @param config [Hash]
+      # @return [Hash]
+      def symbolize_configuration!(config)
+        [
+            :project_type,
+            :environment,
+            :output_style,
+            :preferred_syntax,
+            :sprite_engine,
+        ].each do |k|
+          config[k] = config[k].to_sym if config.key? k
+        end
+
         config
       end
 
@@ -162,7 +187,11 @@ module Jekyll
         target = hash.dup
 
         target.keys.each do |key|
-          target[(key.to_sym rescue key) || key] = target.delete(key)
+          value = target.delete(key)
+          if value.is_a? Hash
+            value = symbolize_keys(value)
+          end
+          target[(key.to_sym rescue key) || key] = value
         end
 
         target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compass
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -28,14 +28,14 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 description: |2