jekyll-compass 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93609ebf6e64e59366da721574af95ec2006cad
-  data.tar.gz: 666426f2543bab3764d4145cc51661f16fc4a326
+  metadata.gz: ffa827930be0e2098c716ef4fa62a74c2b5ef41b
+  data.tar.gz: 9839292d3ef5da2f8dfecdb1dc3f63f56ee6fbd3
 SHA512:
-  metadata.gz: 034f87ad90df979c6c1f1174268c634ae4d070c0ea556f02d5e98971e9a0f798514e2f83592a2fb105dd48137f49a37c8228b578c9894a65adce3f87060b153e
-  data.tar.gz: fac5293a83e1b23269d420b9c34167842f03586b7dc38e4bdd4e37505a0ef3f550a03d9e6676940b17872888ede1abcee27dd4e6ccecafda7df344849345371d
+  metadata.gz: af45a1cd54f3c1e9d77fc68e19384a71c5503b7100ccfde0683c14ef7579df9e5d2ddb5cc450b2bf4b79c9f8327dba5ba64622aa5ccaf6b052a32ca58250a70c
+  data.tar.gz: ef1ddc47d7396cb221172e67c6dc620641691b57fc782664c718e6053bc6e5e6d458b471debd9b57796456afc0b4a43ca515c171f808c02d19b4060b7c1b813d

data/lib/jekyll-compass.rb

@@ -1,4 +1,5 @@
 
-# This is simply a router file. We don't do anything here except require what need to for the plugin to work.
-# This is the file that jekyll requires by default.
+# This is simply a router file. We don't do anything here except require the *actual* file for our gem
+# This is the file that jekyll requires by default. Ideally it shouldn't exist.
+# @see http://guides.rubygems.org/name-your-gem/
 require 'jekyll/compass'

data/lib/jekyll/compass.rb

@@ -1,86 +1,4 @@
 
-require 'sass/plugin'
-require 'compass'
-require 'compass/commands'
-require 'fileutils'
-
+require 'jekyll/compass/compass_file'
 require 'jekyll/compass/core_ext'
-
-module Jekyll
-  class CompassFile < StaticFile
-    def write(destination)
-      # Short-circuit to the inevitable
-      false
-    end
-  end
-
-  class Compass < Generator
-    safe true
-    priority :high
-
-    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'))
-      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 => source,
-          :http_path => '/',
-          :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,
-      }
-
-      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_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
-    end
-  end
-end
+require 'jekyll/compass/generator'

data/lib/jekyll/compass/compass_file.rb

@@ -0,0 +1,11 @@
+
+module Jekyll
+  module Compass
+    class CompassFile < StaticFile
+      def write(destination)
+        # Short-circuit to the inevitable
+        false
+      end
+    end
+  end
+end

data/lib/jekyll/compass/generator.rb

@@ -0,0 +1,80 @@
+
+require 'sass/plugin'
+require 'compass'
+require 'compass/commands'
+require 'fileutils'
+
+module Jekyll
+  module Compass
+    class Generator < ::Jekyll::Generator
+      safe true
+      priority :high
+
+      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'))
+        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 => source,
+            :http_path => '/',
+            :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,
+        }
+
+        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_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
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-compass
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matthew Scharley
@@ -46,7 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/jekyll/compass/compass_file.rb
 - lib/jekyll/compass/core_ext.rb
+- lib/jekyll/compass/generator.rb
 - lib/jekyll/compass.rb
 - lib/jekyll-compass.rb
 - README.md