octopress-ink 1.0.0.alpha.15 → 1.0.0.alpha.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90fb70585fe1d4f7edbbaa1b3d2e3669b3014450
-  data.tar.gz: dda5c5f03ffc61784957309400887f79c8c7596a
+  metadata.gz: aa21d7ff884dfda2459b338edfe7d06fd6f18a7f
+  data.tar.gz: 6bc328cd1284b07ca85f7c5e002396ab3bdf5f55
 SHA512:
-  metadata.gz: 3d7e8812d7b06fa34355e92602bb3d57885012228132875f4877cf1e19b69ef7499dbe9fb84a55a1a026b714c5561b30bbd6de40df01a4342aaa8155ada7fee0
-  data.tar.gz: e4e7be648642fac3335e419dbdd45388b680b0a8fe87b2aceb29b9435d4cab13720235c7372634b7f1530c3e24762f193fa61f6cf87fc32b6e5eb54c877f4c99
+  metadata.gz: b1ab05f90a48f9f18161cdaf3bfc4b61e5b4669e85fe78d2b3ee30738d25ce591b59cae7e05e3c773075089e1c781a1fd2cd27cb83d80675cee29973d83ad098
+  data.tar.gz: 1d39ca6d799a822141411cfd64cb5a2b962c4c8cb21d4e2d386a60dae804605908b5166948863b5b67fa54dcb069cce266f64534035a80c5588f0d8cac12c795

data/lib/octopress-ink.rb

@@ -1,4 +1,5 @@
 require 'jekyll'
+require 'sass'
 require 'digest/md5'
 
 require 'octopress-ink/version'
@@ -6,7 +7,6 @@ require 'octopress-ink/generators/plugin_assets'
 require 'octopress-ink/jekyll/hooks'
 require 'octopress-ink/version'
 require 'octopress-ink/helpers/content_for'
-require 'pry-debugger'
 
 module Octopress
   CUSTOM_DIR = "_custom"
@@ -17,7 +17,7 @@ module Octopress
   autoload :Plugins,              'octopress-ink/plugins'
   autoload :Plugin,               'octopress-ink/plugin'
   autoload :Tags,                 'octopress-ink/tags'
-  autoload :SassPlugin,           'octopress-ink/plugins/sass'
+  autoload :StylesheetsPlugin,    'octopress-ink/plugins/stylesheets'
 
   def self.register_plugin(plugin, name, type='plugin')
     Plugins.register_plugin(plugin, name, type)
@@ -34,5 +34,5 @@ Liquid::Template.register_tag('scripts', Octopress::Tags::ScriptsBlock)
 Liquid::Template.register_tag('yield', Octopress::Tags::YieldTag)
 Liquid::Template.register_tag('wrap_yield', Octopress::Tags::WrapYieldBlock)
 
-Octopress.register_plugin(Octopress::SassPlugin, 'sass', 'local_plugin')
+Octopress.register_plugin(Octopress::StylesheetsPlugin, 'user stylesheets', 'local_plugin')
 

data/lib/octopress-ink/assets/asset.rb

@@ -6,7 +6,6 @@ module Octopress
         @file = file
         @type = type
         @plugin = plugin
-        @plugin_type = plugin.type
         @root = plugin.assets_path
         @dir = File.join(plugin.namespace, type)
         @exists = {}
@@ -20,7 +19,7 @@ module Octopress
         unless @found_file
           files = []
           files << user_path(site)
-          files << plugin_path unless @plugin_type == 'local_plugin'
+          files << plugin_path unless @plugin.type == 'local_plugin'
           files = files.flatten.reject { |f| !exists? f }
 
           unless files.size
@@ -65,7 +64,7 @@ module Octopress
       end
 
       def user_path(site)
-        if @plugin_type == 'local_plugin'
+        if @plugin.type == 'local_plugin'
           local_plugin_path(site)
         else
           user_override_path(site)
@@ -77,6 +76,18 @@ module Octopress
         alt_ext = ext == 'scss' ? 'sass' : 'scss'
         @file.sub(/\.#{ext}/, ".#{alt_ext}")
       end
+      
+      # Remove files from Jekyll's static_files array so it doesn't end up in the
+      # compiled site directory. 
+      #
+      def remove_jekyll_asset(site)
+        site.static_files.clone.each do |sf|
+          if sf.kind_of?(Jekyll::StaticFile) && sf.path == path(site).to_s
+            site.static_files.delete(sf)
+          end
+        end
+      end
+
 
       def exists?(file)
         @exists[file] ||= File.exists?(file)

data/lib/octopress-ink/assets/include.rb

@@ -3,9 +3,9 @@ module Octopress
     class Include < Asset
 
       def initialize(plugin, type)
-        @plugin_type = plugin.type
         @root = plugin.assets_path
         @type = type
+        @plugin = plugin
         @dir = File.join(plugin.namespace, type)
         @exists = {}
       end

data/lib/octopress-ink/assets/sass.rb

@@ -1,22 +1,18 @@
 module Octopress
   module Assets
-    class Sass < Asset
+    class Sass < Stylesheet
       def initialize(plugin, type, file, media)
-        @file = file
+        @plugin = plugin
         @type = type
-        @plugin_type = plugin.type
+        @file = file
+        @media = media || 'all'
         @root = plugin.assets_path
         @dir = File.join(plugin.namespace, type)
         @exists = {}
-        @media = media || 'all'
-      end
-
-      def media
-        @media
       end
 
       def tag
-        "<link href='/#{File.join(@dir, @file)}' media='#{@media}' rel='stylesheet' type='text/css'>"
+        "<link href='/#{File.join(@dir, @file)}' media='#{media}' rel='stylesheet' type='text/css'>"
       end
 
       # TODO: choose user path before local path.
@@ -28,22 +24,10 @@ module Octopress
         File.expand_path(File.join(@root, @type))
       end
 
-      # Remove sass files from Jekyll's static_files array so it doesn't end up in the
-      # compiled site directory. 
-      #
-      def remove_static_file(site)
-        site.static_files.clone.each do |sf|
-          if sf.kind_of?(Jekyll::StaticFile) && sf.path == path(site).to_s
-            site.static_files.delete(sf)
-          end
-        end
-      end
-
       def compile(site)
         unless @compiled
           options = Plugins.sass_options(site)
-          if @plugin_type == 'local_plugin'
-            remove_static_file(site)
+          if @plugin.type == 'local_plugin'
             @compiled = Plugins.compile_sass_file(path(site).to_s, options)
           else
             # If the plugin isn't a local plugin, add source paths to allow overrieds on @imports.

data/lib/octopress-ink/assets/stylesheet.rb

@@ -2,21 +2,29 @@ module Octopress
   module Assets
     class Stylesheet < Asset
       def initialize(plugin, type, file, media)
+        @plugin = plugin
         @file = file
         @type = type
+        @media = media || 'all'
         @root = plugin.assets_path
         @dir = File.join(plugin.namespace, type)
-        @plugin_type = plugin.type
-        @media = media || 'all'
         @exists = {}
       end
 
       def media
-        @media
+        m = @media
+        if @file =~ /@(.+?)\./
+          m = $1
+        end
+        m
+      end
+
+      def destination
+        File.join(@dir, @file.sub(/@(.+?)\./,'.'))
       end
 
       def tag
-        "<link href='/#{File.join(@dir, @file)}' media='#{@media}' rel='stylesheet' type='text/css'>"
+        "<link href='/#{File.join(@dir, @file)}' media='#{media}' rel='stylesheet' type='text/css'>"
       end
     end
   end

data/lib/octopress-ink/plugin.rb

@@ -44,11 +44,6 @@ module Octopress
     end
 
     def add_sass(file, media=nil)
-      begin
-        require 'sass'
-      rescue LoadError
-        raise IOError.new "The #{@name} #{@type} uses the Sass gem. You'll need to add it to your Gemfile or run `gem install sass`"
-      end
       @sass << Assets::Sass.new(self, @stylesheets_dir, file, media)
     end
 
@@ -69,6 +64,10 @@ module Octopress
       end
     end
 
+    def remove_jekyll_assets(files, site)
+      files.each {|f| f.remove_jekyll_asset(site) }
+    end
+
     def add_includes
       @includes = Assets::Include.new(self, @includes_dir)
     end

data/lib/octopress-ink/plugins.rb

@@ -11,9 +11,11 @@ module Octopress
       if name == 'theme'
         @theme
       else
-        @plugins.concat(@local_plugins).each do |p|
-          return p if p.name == name
+        found = plugins.reject { |p| p.name != name }
+        if found.empty?
+          raise IOError.new "No Theme or Plugin with the name '#{name}' was found."
         end
+        found.first
       end
     end
 
@@ -22,18 +24,20 @@ module Octopress
     end
 
     def self.include(name, file, site)
-      plugin(name).include(file, site)
+      p = plugin(name)
+      p.include(file, site)
     end
 
     def self.register_plugin(plugin, name, type='plugin')
       new_plugin = plugin.new(name, type)
 
-      if type == 'theme'
+      case type
+      when 'theme'
         @theme = new_plugin
-      elsif type == 'local_plugin'
-        @plugins << new_plugin
-      else
+      when 'local_plugin'
         @local_plugins << new_plugin
+      else
+        @plugins << new_plugin
       end
     end
 
@@ -74,8 +78,8 @@ module Octopress
     end
 
     def self.sass_config(site, item, default)
-      if site.config['sass'] && site.config['sass'][item]
-        site.config['sass'][item]
+      if site.config['octopress'] && site.config['octopress']['sass'] && site.config['octopress']['sass'][item]
+        site.config['octopress']['sass'][item]
       else
         default
       end
@@ -109,7 +113,11 @@ module Octopress
         css = {}
         paths = {}
         plugins.each do |plugin|
-          plugin_header = "/* #{name} #{plugin.type} */\n"
+          if plugin.type == 'theme'
+            plugin_header = "/* Theme: #{plugin.name} */\n"
+          else
+            plugin_header = "/* Plugin: #{plugin.name} */\n"
+          end
           stylesheets = plugin.stylesheets.clone.concat plugin.sass
           stylesheets.each do |file|
             css[file.media] ||= {}
@@ -179,11 +187,19 @@ module Octopress
     end
 
     def self.concat_css(site)
-      site.config['octopress'] && site.config['octopress']['concat_css'] != false
+      if site.config['octopress'] && !site.config['octopress']['concat_css'].nil?
+        site.config['octopress']['concat_css'] != false
+      else
+        true
+      end
     end
 
     def self.concat_js(site)
-      site.config['octopress'] && site.config['octopress']['concat_js'] != false
+      if site.config['octopress'] && !site.config['octopress']['concat_js'].nil?
+        site.config['octopress']['concat_js'] != false
+      else
+        true
+      end
     end
 
     def self.javascript_tags(site)
@@ -205,25 +221,15 @@ module Octopress
     end
 
     def self.copy_stylesheets(site)
-      plugins.each do |plugin| 
-        stylesheets = plugin.stylesheets.clone.concat plugin.sass
-        copy(stylesheets, site)
-      end
-    end
-
-    def self.local_sass_files(site)
-      if site.config['octopress'] && site.config['octopress']['sass'] && site.config['octopress']['sass']['files']
-        sass_files = site.config['octopress']['sass']['files'] || []
-      else
-        files = Dir.glob(File.join(site.source, 'stylesheets', '**/*.s[ca]ss')).reject { |f| File.basename(f) =~ /^_/ }
-        sass_files = files.map { |f| f.split('stylesheets/').last}
-      end
-      sass_files
+      stylesheets = plugins.clone.map { 
+        |p| p.stylesheets.clone.concat(p.sass) 
+      }.flatten
+      copy(stylesheets, site)
     end
 
     def self.add_static_files(site)
      
-      plugin('sass').add_files(local_sass_files(site))
+      plugin('user stylesheets').add_files(site)
  
       # Copy/Generate Stylesheets
       #

data/lib/octopress-ink/plugins/stylesheets.rb

@@ -0,0 +1,52 @@
+# The CSS assets for this plugin are populated at runtime by the add_static_files method of
+# the Plugins module.
+#
+module Octopress
+  class StylesheetsPlugin < Octopress::Plugin
+    def add_files(site)
+
+      add_stylesheets(local_stylesheets(site))
+
+      remove_jekyll_assets(@sass, site)
+
+      if Plugins.concat_css(site)
+        remove_jekyll_assets(@stylesheets, site)
+      end
+    end
+
+    def add_stylesheets(files)
+      files = [files] unless files.is_a? Array
+      files.each do |file|
+        # accept ['file', 'media_type']
+        if file.is_a? Array
+          if file.first =~ /\.css/
+            add_stylesheet file.first, file.last
+          else
+            add_sass file.first, file.last
+          end
+        # accept 'file'
+        else
+          if file =~ /\.css/
+            add_stylesheet file
+          else
+            add_sass file
+          end
+        end
+      end
+      files
+    end
+
+    def local_stylesheets(site)
+      if site.config['octopress'] && site.config['octopress']['stylesheets']
+        site.config['octopress']['stylesheets'] || []
+      else
+        dir = File.join(site.source, 'stylesheets/')
+        css = Dir.glob(File.join(dir, '**/*.css'))
+        sass = Dir.glob(File.join(dir, '**/*.s[ca]ss')).reject { |f| File.basename(f) =~ /^_.*?s[ac]ss/ }
+        files = css.concat sass
+        files.map { |f| f.split(dir).last }
+      end
+    end
+  end
+end
+

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.15"
+    VERSION = "1.0.0.alpha.17"
   end
 end

data/octopress-ink.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry-debugger"
 end
 

data/test/_concat_css_false.yml

@@ -0,0 +1,3 @@
+# Sass configurations 
+octopress:
+  concat_css: false

data/test/_config.yml

@@ -3,19 +3,3 @@ markdown: redcarpet
 pygments: true
 source: source
 destination: site
-exclude:
-  - Gemfile
-  - Gemfile.lock
-  - test.rb
-  
-# Sass configurations 
-octopress:
-  sass: 
-    #output_style: compact
-    #line_numbers: true
-    files:
-      - [site.sass, all]
-
-#gem:
-  #- octopress-plugins
-

data/test/_sass_compact.yml

@@ -0,0 +1,6 @@
+# Sass configurations 
+octopress:
+  sass: 
+    output_style: compact
+    line_numbers: true
+

data/test/_sass_expanded.yml

@@ -0,0 +1,5 @@
+# Sass configurations 
+octopress:
+  sass: 
+    output_style: expanded
+

data/test/concat_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css

@@ -0,0 +1 @@
+body{margin:2px;padding:2px}.main{color:#444}body{background:#000}.plugin-widget{background:red;color:#fff}.css-plugin{background:#fed}body{display:table}body{background:#aaa111}div{display:table}

data/test/concat_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css

@@ -0,0 +1 @@
+*{background:none;color:#000}article a:after{content:attr(href)}

data/test/concat_css_false/awesome-sauce/stylesheets/plugin-media-test.css

@@ -0,0 +1,3 @@
+article a:after {
+  content: attr(href);
+}

data/test/concat_css_false/awesome-sauce/stylesheets/plugin-test.css

@@ -0,0 +1,4 @@
+.plugin-widget {
+  background: red;
+  color: #fff;
+}

data/test/concat_css_false/stylesheets/site.css

@@ -0,0 +1 @@
+body{display:table}body{background:#aaa111}div{display:table}

data/test/concat_css_false/stylesheets/test.css

@@ -0,0 +1 @@
+.css-plugin { background: #fed; }

data/test/concat_css_false/theme/stylesheets/theme-media-test.css

@@ -0,0 +1 @@
+* { background: none; color: #000; }

data/test/concat_css_false/theme/stylesheets/theme-test.css

@@ -0,0 +1,4 @@
+body {
+  margin: 2px;
+  padding: 2px;
+}

data/test/concat_css_false/theme/stylesheets/theme-test2.css

@@ -0,0 +1,3 @@
+.main {
+  color: #444;
+}

data/test/expected/index.html

@@ -10,8 +10,6 @@
     <div class='local-override'><p>Test plugin assets and overrides:</p>
 
 <ul>
-<li>layouts</li>
-<li>includes</li>
 <li>stylesheets</li>
 <li>javascripts</li>
 <li>files</li>
@@ -28,13 +26,6 @@
 <li>concat_css</li>
 <li>concat_js</li>
 </ul>
-
-<p>Test: markdown
-<strong>Hello World!</strong></p>
-
-<p>Test: head tag</p>
-
-<p>Testing Include booga</p>
 </div>
 
   </body>

data/test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css

@@ -0,0 +1,22 @@
+/* Theme: classic */
+body { margin: 2px; padding: 2px; }
+
+.main { color: #444; }
+
+/* line 2 */
+body { background: black; }
+
+/* Plugin: awesome-sauce */
+.plugin-widget { background: red; color: #fff; }
+
+/* Plugin: user stylesheets */
+.css-plugin { background: #fed; }
+
+/* line 1, /Users/imathis/workspace/octodev/ink/test/source/stylesheets/_foo.scss */
+body { display: table; }
+
+/* line 4, /Users/imathis/workspace/octodev/ink/test/source/stylesheets/site.sass */
+body { background: #aaa111; }
+
+/* line 6, /Users/imathis/workspace/octodev/ink/test/source/stylesheets/site.sass */
+div { display: table; }

data/test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css

@@ -0,0 +1,3 @@
+* { background: none; color: #000; }
+
+article a:after { content: attr(href); }

data/test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css

@@ -0,0 +1,36 @@
+/* Theme: classic */
+body {
+  margin: 2px;
+  padding: 2px;
+}
+
+.main {
+  color: #444;
+}
+
+body {
+  background: black;
+}
+
+/* Plugin: awesome-sauce */
+.plugin-widget {
+  background: red;
+  color: #fff;
+}
+
+/* Plugin: user stylesheets */
+.css-plugin {
+  background: #fed;
+}
+
+body {
+  display: table;
+}
+
+body {
+  background: #aaa111;
+}
+
+div {
+  display: table;
+}

data/test/sass_expanded/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css

@@ -0,0 +1,8 @@
+* {
+  background: none;
+  color: #000;
+}
+
+article a:after {
+  content: attr(href);
+}

data/test/site/index.html

@@ -10,8 +10,6 @@
     <div class='local-override'><p>Test plugin assets and overrides:</p>
 
 <ul>
-<li>layouts</li>
-<li>includes</li>
 <li>stylesheets</li>
 <li>javascripts</li>
 <li>files</li>
@@ -28,13 +26,6 @@
 <li>concat_css</li>
 <li>concat_js</li>
 </ul>
-
-<p>Test: markdown
-<strong>Hello World!</strong></p>
-
-<p>Test: head tag</p>
-
-<p>Testing Include booga</p>
 </div>
 
   </body>

data/test/site/stylesheets/all-5f4148b9fde2541e99deb55ebf3fe695.css

@@ -0,0 +1,36 @@
+/* Theme: classic */
+body {
+  margin: 2px;
+  padding: 2px;
+}
+
+.main {
+  color: #444;
+}
+
+body {
+  background: black;
+}
+
+/* Plugin: awesome-sauce */
+.plugin-widget {
+  background: red;
+  color: #fff;
+}
+
+/* Plugin: user stylesheets */
+.css-plugin {
+  background: #fed;
+}
+
+body {
+  display: table;
+}
+
+body {
+  background: #aaa111;
+}
+
+div {
+  display: table;
+}

data/test/site/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css

@@ -0,0 +1,8 @@
+* {
+  background: none;
+  color: #000;
+}
+
+article a:after {
+  content: attr(href);
+}

data/test/source/_custom/theme/stylesheets/_colors.sass

@@ -0,0 +1 @@
+$bg: black

data/test/source/_custom/theme/stylesheets/theme-test.css

@@ -0,0 +1,4 @@
+body {
+  margin: 2px;
+  padding: 2px;
+}

data/test/source/_plugins/awesome-sauce/stylesheets/plugin-media-test.css

@@ -0,0 +1,3 @@
+article a:after {
+  content: attr(href);
+}

data/test/source/_plugins/awesome-sauce/stylesheets/plugin-test.css

@@ -0,0 +1,4 @@
+.plugin-widget {
+  background: red;
+  color: #fff;
+}

data/test/source/_plugins/bundler.rb

@@ -1,27 +1,30 @@
 require 'octopress-ink'
 
-class ClassicTheme < Octopress::Plugin
+class TestTheme < Octopress::Plugin
   def initialize(name, type)
-    @assets_path = File.expand_path(File.join(File.dirname(__FILE__), 'theme'))
+    @assets_path = File.expand_path(File.join(File.dirname(__FILE__), 'test-theme'))
     super
   end
-
   def add_assets
-    add_stylesheets ['site.css','foo.css'], 'all'
-    add_stylesheet 'print.css', 'print'
-    add_javascripts ['foo.js', 'bar.js']
-    add_sass 'bar.scss'
-    add_file 'test.html'
+    add_stylesheets ['theme-test.css', 'theme-test2.css']
+    add_stylesheet 'theme-media-test@print.css'
+    add_sass 'main.scss'
   end
 end
 
-class AwesomeSauce < Octopress::Plugin
+class TestPlugin < Octopress::Plugin
   def initialize(name, type)
     @assets_path = File.expand_path(File.join(File.dirname(__FILE__), 'awesome-sauce'))
     super
   end
+
+  def add_assets
+    add_stylesheet 'plugin-test.css'
+    add_stylesheet 'plugin-media-test.css', 'print'
+    super
+  end
 end
 
-Octopress.register_plugin(ClassicTheme, 'classic', 'theme')
-Octopress.register_plugin(AwesomeSauce, 'awesome-sauce')
+Octopress.register_plugin(TestTheme, 'classic', 'theme')
+Octopress.register_plugin(TestPlugin, 'awesome-sauce')
 

data/test/source/_plugins/test-theme/stylesheets/_colors.scss

@@ -0,0 +1 @@
+$bg: white;

data/test/source/_plugins/test-theme/stylesheets/main.scss

@@ -0,0 +1,2 @@
+@import 'colors';
+body { background: $bg; }

data/test/source/_plugins/test-theme/stylesheets/theme-media-test@print.css

@@ -0,0 +1 @@
+* { background: none; color: #000; }

data/test/source/_plugins/{theme/stylesheets/site.css → test-theme/stylesheets/theme-test.css}

@@ -1,3 +1,4 @@
 body {
   margin: 0;
+  padding: 0;
 }

data/test/source/_plugins/test-theme/stylesheets/theme-test2.css

@@ -0,0 +1,3 @@
+.main {
+  color: #444;
+}

data/test/source/stylesheets/test.css

@@ -0,0 +1 @@
+.css-plugin { background: #fed; }

data/test/test.rb

@@ -1,14 +1,9 @@
 require 'colorator'
 
-has_failed   = false
-config       = File.read("_config.yml")
-disabled     = "#{config}minify_html: false"
-minify       = "#{config}env: production"
-override_off = "#{config}env: production\nminify_html: false"
-override_on  = "#{config}env: development\nminify_html: true"
-
-def test(file)
-  if diff = diff_file(file)
+has_failed = false
+
+def test(file, dir)
+  if diff = diff_file(file, dir)
     puts "Failed #{file}".red
     puts diff
     has_failed = true
@@ -17,26 +12,64 @@ def test(file)
   end
 end
 
-def build
-  `rm -rf site && bundle exec jekyll build --trace`
+def build(config='')
+  config = ['_config.yml'] << config
+  `rm -rf site && bundle exec jekyll build --config #{config.join(',')}`
 end
 
-def diff_file(file)
-  diff = `diff expected/#{file} site/#{file}`
-  if diff.size > 0 && File.exist?("site/#{file}")
-    diff
+def diff_file(file, dir='expected')
+  if File.exist?(Dir.glob("site/#{file}").first)
+    diff = `diff #{dir}/#{file} site/#{file}`
+    if diff.size > 0
+      diff
+    else
+      false
+    end
   else
-    false
+    "File: site/#{file}: No such file or directory."
   end
 end
 
 build
 
-tags = %w{content_for footer head include include_plugin include_theme include_theme_override scripts}
-tags.each { |tag| test("tag_tests/#{tag}.html") }
+def test_tags(dir)
+  tags = %w{content_for footer head include include_plugin include_theme include_theme_override scripts}
+  tags.each { |file| test("tag_tests/#{file}.html", dir) }
+end
+
+def test_layouts(dir)
+  layouts = %w{local plugin_layout theme theme_override}
+  layouts.each { |file| test("layout_tests/#{file}.html", dir) }
+end
+
+def test_stylesheets(dir, concat_css=true)
+  if concat_css
+    stylesheets = %w{all-* print-*}
+    stylesheets.each { |file| test("stylesheets/#{file}.css", dir) }
+  else
+    local_stylesheets = %w{site test}
+    local_stylesheets.each { |file| test("stylesheets/#{file}.css", dir) }
+
+    plugin_stylesheets = %w{plugin-media-test plugin-test}
+    plugin_stylesheets.each { |file| test("awesome-sauce/stylesheets/#{file}.css", dir) }
+
+    theme_stylesheets = %w{theme-media-test theme-test theme-test2}
+    theme_stylesheets.each { |file| test("theme/stylesheets/#{file}.css", dir) }
+  end
+end
+
+test_tags('expected')
+test_layouts('expected')
+test_stylesheets('concat_css')
+
+build '_concat_css_false.yml'
+test_stylesheets('concat_css_false', false)
+
+build '_sass_compact.yml'
+test_stylesheets('sass_compact')
 
-layouts = %w{local plugin_layout theme theme_override}
-layouts.each { |tag| test("layout_tests/#{tag}.html") }
+build '_sass_expanded.yml'
+test_stylesheets('sass_expanded')
 
 abort if has_failed
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.15
+  version: 1.0.0.alpha.17
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A starting point for creating gem-based Jekyll themes and plugins
 email:
 - brandon@imathis.com
@@ -95,7 +109,7 @@ files:
 - lib/octopress-ink/jekyll/hooks.rb
 - lib/octopress-ink/plugin.rb
 - lib/octopress-ink/plugins.rb
-- lib/octopress-ink/plugins/sass.rb
+- lib/octopress-ink/plugins/stylesheets.rb
 - lib/octopress-ink/tags.rb
 - lib/octopress-ink/tags/content_for.rb
 - lib/octopress-ink/tags/footer.rb
@@ -109,15 +123,24 @@ files:
 - lib/octopress-ink/version.rb
 - octopress-ink.gemspec
 - test/Gemfile
+- test/_concat_css_false.yml
 - test/_config.yml
+- test/_sass_compact.yml
+- test/_sass_expanded.yml
+- test/concat_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/concat_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
+- test/concat_css_false/awesome-sauce/stylesheets/plugin-media-test.css
+- test/concat_css_false/awesome-sauce/stylesheets/plugin-test.css
+- test/concat_css_false/stylesheets/site.css
+- test/concat_css_false/stylesheets/test.css
+- test/concat_css_false/theme/stylesheets/theme-media-test.css
+- test/concat_css_false/theme/stylesheets/theme-test.css
+- test/concat_css_false/theme/stylesheets/theme-test2.css
 - test/expected/index.html
-- test/expected/javascripts/d41d8cd98f00b204e9800998ecf8427e.js
 - test/expected/layout_tests/local.html
 - test/expected/layout_tests/plugin_layout.html
 - test/expected/layout_tests/theme.html
 - test/expected/layout_tests/theme_override.html
-- test/expected/stylesheets/all-f769b23f68363155b7ab58ba178c0f53.css
-- test/expected/stylesheets/print-8f4e66fc8350adcb4482cebe140f212d.css
 - test/expected/tag_tests/content_for.html
 - test/expected/tag_tests/footer.html
 - test/expected/tag_tests/head.html
@@ -126,15 +149,17 @@ files:
 - test/expected/tag_tests/include_theme.html
 - test/expected/tag_tests/include_theme_override.html
 - test/expected/tag_tests/scripts.html
-- test/expected/theme/files/test.html
+- test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
+- test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/sass_expanded/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/site/index.html
-- test/site/javascripts/d41d8cd98f00b204e9800998ecf8427e.js
 - test/site/layout_tests/local.html
 - test/site/layout_tests/plugin_layout.html
 - test/site/layout_tests/theme.html
 - test/site/layout_tests/theme_override.html
-- test/site/stylesheets/all-f769b23f68363155b7ab58ba178c0f53.css
-- test/site/stylesheets/print-8f4e66fc8350adcb4482cebe140f212d.css
+- test/site/stylesheets/all-5f4148b9fde2541e99deb55ebf3fe695.css
+- test/site/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/site/tag_tests/content_for.html
 - test/site/tag_tests/footer.html
 - test/site/tag_tests/head.html
@@ -143,30 +168,31 @@ files:
 - test/site/tag_tests/include_theme.html
 - test/site/tag_tests/include_theme_override.html
 - test/site/tag_tests/scripts.html
-- test/site/theme/files/test.html
 - test/source/.gitignore
 - test/source/_custom/theme/includes/bar.html
 - test/source/_custom/theme/layouts/test.html
-- test/source/_custom/theme/stylesheets/_baz.sass
-- test/source/_custom/theme/stylesheets/site.css
+- test/source/_custom/theme/stylesheets/_colors.sass
+- test/source/_custom/theme/stylesheets/theme-test.css
 - test/source/_includes/foo.html
 - test/source/_layouts/default.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/includes/some-include.html
 - test/source/_plugins/awesome-sauce/layouts/test-layout.html
+- test/source/_plugins/awesome-sauce/stylesheets/plugin-media-test.css
+- test/source/_plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/source/_plugins/bundler.rb
-- test/source/_plugins/theme/files/test.html
-- test/source/_plugins/theme/includes/bar.html
-- test/source/_plugins/theme/includes/foo.html
-- test/source/_plugins/theme/javascripts/bar.js
-- test/source/_plugins/theme/javascripts/foo.js
-- test/source/_plugins/theme/layouts/default.html
-- test/source/_plugins/theme/layouts/test.html
-- test/source/_plugins/theme/stylesheets/_baz.scss
-- test/source/_plugins/theme/stylesheets/bar.scss
-- test/source/_plugins/theme/stylesheets/foo.css
-- test/source/_plugins/theme/stylesheets/print.css
-- test/source/_plugins/theme/stylesheets/site.css
+- test/source/_plugins/test-theme/files/test.html
+- test/source/_plugins/test-theme/includes/bar.html
+- test/source/_plugins/test-theme/includes/foo.html
+- test/source/_plugins/test-theme/javascripts/bar.js
+- test/source/_plugins/test-theme/javascripts/foo.js
+- test/source/_plugins/test-theme/layouts/default.html
+- test/source/_plugins/test-theme/layouts/test.html
+- test/source/_plugins/test-theme/stylesheets/_colors.scss
+- test/source/_plugins/test-theme/stylesheets/main.scss
+- test/source/_plugins/test-theme/stylesheets/theme-media-test@print.css
+- test/source/_plugins/test-theme/stylesheets/theme-test.css
+- test/source/_plugins/test-theme/stylesheets/theme-test2.css
 - test/source/index.md
 - test/source/layout_tests/local.html
 - test/source/layout_tests/plugin_layout.html
@@ -174,6 +200,7 @@ files:
 - test/source/layout_tests/theme_override.html
 - test/source/stylesheets/_foo.scss
 - test/source/stylesheets/site.sass
+- test/source/stylesheets/test.css
 - test/source/tag_tests/content_for.html
 - test/source/tag_tests/footer.html
 - test/source/tag_tests/head.html
@@ -209,15 +236,24 @@ specification_version: 4
 summary: A starting point for creating gem-based Jekyll themes and plugins
 test_files:
 - test/Gemfile
+- test/_concat_css_false.yml
 - test/_config.yml
+- test/_sass_compact.yml
+- test/_sass_expanded.yml
+- test/concat_css/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/concat_css/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
+- test/concat_css_false/awesome-sauce/stylesheets/plugin-media-test.css
+- test/concat_css_false/awesome-sauce/stylesheets/plugin-test.css
+- test/concat_css_false/stylesheets/site.css
+- test/concat_css_false/stylesheets/test.css
+- test/concat_css_false/theme/stylesheets/theme-media-test.css
+- test/concat_css_false/theme/stylesheets/theme-test.css
+- test/concat_css_false/theme/stylesheets/theme-test2.css
 - test/expected/index.html
-- test/expected/javascripts/d41d8cd98f00b204e9800998ecf8427e.js
 - test/expected/layout_tests/local.html
 - test/expected/layout_tests/plugin_layout.html
 - test/expected/layout_tests/theme.html
 - test/expected/layout_tests/theme_override.html
-- test/expected/stylesheets/all-f769b23f68363155b7ab58ba178c0f53.css
-- test/expected/stylesheets/print-8f4e66fc8350adcb4482cebe140f212d.css
 - test/expected/tag_tests/content_for.html
 - test/expected/tag_tests/footer.html
 - test/expected/tag_tests/head.html
@@ -226,15 +262,17 @@ test_files:
 - test/expected/tag_tests/include_theme.html
 - test/expected/tag_tests/include_theme_override.html
 - test/expected/tag_tests/scripts.html
-- test/expected/theme/files/test.html
+- test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
+- test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
+- test/sass_expanded/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/site/index.html
-- test/site/javascripts/d41d8cd98f00b204e9800998ecf8427e.js
 - test/site/layout_tests/local.html
 - test/site/layout_tests/plugin_layout.html
 - test/site/layout_tests/theme.html
 - test/site/layout_tests/theme_override.html
-- test/site/stylesheets/all-f769b23f68363155b7ab58ba178c0f53.css
-- test/site/stylesheets/print-8f4e66fc8350adcb4482cebe140f212d.css
+- test/site/stylesheets/all-5f4148b9fde2541e99deb55ebf3fe695.css
+- test/site/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/site/tag_tests/content_for.html
 - test/site/tag_tests/footer.html
 - test/site/tag_tests/head.html
@@ -243,30 +281,31 @@ test_files:
 - test/site/tag_tests/include_theme.html
 - test/site/tag_tests/include_theme_override.html
 - test/site/tag_tests/scripts.html
-- test/site/theme/files/test.html
 - test/source/.gitignore
 - test/source/_custom/theme/includes/bar.html
 - test/source/_custom/theme/layouts/test.html
-- test/source/_custom/theme/stylesheets/_baz.sass
-- test/source/_custom/theme/stylesheets/site.css
+- test/source/_custom/theme/stylesheets/_colors.sass
+- test/source/_custom/theme/stylesheets/theme-test.css
 - test/source/_includes/foo.html
 - test/source/_layouts/default.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/includes/some-include.html
 - test/source/_plugins/awesome-sauce/layouts/test-layout.html
+- test/source/_plugins/awesome-sauce/stylesheets/plugin-media-test.css
+- test/source/_plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/source/_plugins/bundler.rb
-- test/source/_plugins/theme/files/test.html
-- test/source/_plugins/theme/includes/bar.html
-- test/source/_plugins/theme/includes/foo.html
-- test/source/_plugins/theme/javascripts/bar.js
-- test/source/_plugins/theme/javascripts/foo.js
-- test/source/_plugins/theme/layouts/default.html
-- test/source/_plugins/theme/layouts/test.html
-- test/source/_plugins/theme/stylesheets/_baz.scss
-- test/source/_plugins/theme/stylesheets/bar.scss
-- test/source/_plugins/theme/stylesheets/foo.css
-- test/source/_plugins/theme/stylesheets/print.css
-- test/source/_plugins/theme/stylesheets/site.css
+- test/source/_plugins/test-theme/files/test.html
+- test/source/_plugins/test-theme/includes/bar.html
+- test/source/_plugins/test-theme/includes/foo.html
+- test/source/_plugins/test-theme/javascripts/bar.js
+- test/source/_plugins/test-theme/javascripts/foo.js
+- test/source/_plugins/test-theme/layouts/default.html
+- test/source/_plugins/test-theme/layouts/test.html
+- test/source/_plugins/test-theme/stylesheets/_colors.scss
+- test/source/_plugins/test-theme/stylesheets/main.scss
+- test/source/_plugins/test-theme/stylesheets/theme-media-test@print.css
+- test/source/_plugins/test-theme/stylesheets/theme-test.css
+- test/source/_plugins/test-theme/stylesheets/theme-test2.css
 - test/source/index.md
 - test/source/layout_tests/local.html
 - test/source/layout_tests/plugin_layout.html
@@ -274,6 +313,7 @@ test_files:
 - test/source/layout_tests/theme_override.html
 - test/source/stylesheets/_foo.scss
 - test/source/stylesheets/site.sass
+- test/source/stylesheets/test.css
 - test/source/tag_tests/content_for.html
 - test/source/tag_tests/footer.html
 - test/source/tag_tests/head.html

data/lib/octopress-ink/plugins/sass.rb

@@ -1,20 +0,0 @@
-# The sass assets for this plugin are populated at runtime by the add_static_files method of
-# the Plugins module.
-#
-module Octopress
-  class SassPlugin < Octopress::Plugin
-    def add_files(files)
-      files = [files] unless files.is_a? Array
-      files.each do |file|
-        # accept ['file', 'media_type']
-        if file.is_a? Array
-          add_sass file.first, file.last
-        # accept 'file'
-        else
-          add_sass file
-        end
-      end
-    end
-  end
-end
-

data/test/expected/javascripts/d41d8cd98f00b204e9800998ecf8427e.js

@@ -1,2 +0,0 @@
-console.log('omg')
-console.log('bar')

data/test/expected/stylesheets/all-f769b23f68363155b7ab58ba178c0f53.css

@@ -1 +0,0 @@
-body{color:black}div{display:block}body{background:#fff}body{display:table}body{background:#aaa111}div{display:table}

data/test/expected/stylesheets/print-8f4e66fc8350adcb4482cebe140f212d.css

@@ -1 +0,0 @@
-.omg{display:none}

data/test/site/javascripts/d41d8cd98f00b204e9800998ecf8427e.js

@@ -1,2 +0,0 @@
-console.log('omg')
-console.log('bar')

data/test/site/stylesheets/all-f769b23f68363155b7ab58ba178c0f53.css

@@ -1 +0,0 @@
-body{color:black}div{display:block}body{background:#fff}body{display:table}body{background:#aaa111}div{display:table}

data/test/site/stylesheets/print-8f4e66fc8350adcb4482cebe140f212d.css

@@ -1 +0,0 @@
-.omg{display:none}

data/test/site/theme/files/test.html

@@ -1 +0,0 @@
-<strong>test</strong>

data/test/source/_custom/theme/stylesheets/_baz.sass

@@ -1 +0,0 @@
-$bg: white

data/test/source/_custom/theme/stylesheets/site.css

@@ -1 +0,0 @@
-body { color: black; }

data/test/source/_plugins/theme/files/test.html

@@ -1 +0,0 @@
-<strong>test</strong>

data/test/source/_plugins/theme/stylesheets/_baz.scss

@@ -1 +0,0 @@
-$bg: green;

data/test/source/_plugins/theme/stylesheets/bar.scss

@@ -1,4 +0,0 @@
-@import 'baz';
-body {
-  background: $bg;
-}

data/test/source/_plugins/theme/stylesheets/foo.css

@@ -1 +0,0 @@
-div { display: block; }

data/test/source/_plugins/theme/stylesheets/print.css

@@ -1 +0,0 @@
-.omg { display: none; }