octopress-asset-pipeline 1.1.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ced752758764404dd6615c838cce1b38652f2b
-  data.tar.gz: a158ae6dc1ec401c138c27122144f5be0cac02c4
+  metadata.gz: 9262a0c33a0c7c88bbe9306d6e7563c832cb172b
+  data.tar.gz: 160c46f0cfa00af04a5afcc573ef3aed152b9a58
 SHA512:
-  metadata.gz: 61fa65441c3a9756af0b1265d69a419a0d72bbcf749e11e5eade3a47135bc3636ffa1d786a014a568eccc68d0e448641c2fc15b1954979baac834b6d6259cef6
-  data.tar.gz: d4cc5d32193f506c8f5e7791528081af39b74ca2c30d79249980c068ca36c97566ee5233ffb40f973ca991b89dc1691c2f9ea10fd60c9e336667ef1063d2b248
+  metadata.gz: 6d6f0b53e2eb6fd4cc187cb304e8e47a06a95ac7c9508ff2e680b36ab44e7560ebe6231202746d8c5f26a8218e66a8b2fb909642d13138a95bc8e0d9f9007164
+  data.tar.gz: 5b7ae968ad75c3ef5e7cfa1671e947c71c86e4e9a7cc8790c210532c90ca1c08649b5c40baa5eb27e15a7f8c03a602852c2cff008289883de53bbe98605b57ca

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 2.0.0 - 2015-01-15
+
+- Change: Reads stylesheets from: `css/` and `stylesheets/`.
+- Change: Reads javascripts from: `js/` and `javascripts/`.
+- New: set asset directories with configurations: `stylesheets_dir` and `javascripts_dir`.
+
 ### 1.1.7 - 2015-01-14
 
 - Minified js support - file.min.js isn't compressed again, and is added first to build.

data/README.md

@@ -5,8 +5,7 @@ Combine and compress and fingerprint Stylesheets (CSS and Sass) and Javascripts
 [![Build Status](https://travis-ci.org/octopress/asset-pipeline.png?branch=master)](https://travis-ci.org/octopress/asset-pipeline)
 [![Gem Version](https://badge.fury.io/rb/octopress-asset-pipeline.png)](http://badge.fury.io/rb/octopress-asset-pipeline)
 
-**How it works:** This plugin will automatically search Jekyll's site index for .js, .coffee, .css, .scss and .sass
-files and combine, compress and fingerprint them so they're ready for deployment. Then add the liquid tags to your site layout to write
+**How it works:** This plugin will automatically read .js, .coffee, .css, .scss and .sass files from your site, combine, compress and fingerprint them so they're ready for deployment. Then add the liquid tags to your site layout to write
 the necessary script or link tags.
 
 ## Installation
@@ -32,6 +31,18 @@ Then add the gem to your Jekyll configuration.
     gems:
       -octopress-asset-pipeline
 
+## Basic usage
+
+This should be very simple to use.
+
+1. Ass Sass or CSS to `stylesheets/` or `css/` directory in your site's source.
+1. Ass Coffeescript or JS to `stylesheets/` or `css/` directory in your site's source.
+2. Put Coffeescript and JS in `[source]/javascripts/`.
+3. Add a liquid tags to your sites layout.
+4. Build.
+
+If you want, you can configure which directories this plugin reads from. See the configuration section below.
+
 ## Liquid tags
 
 Include these tags in your site's layout.
@@ -41,7 +52,7 @@ Include these tags in your site's layout.
 {% js_asset_tag %}
 ```
 
-When Jekyll is compiled these will be replaced with something like this.
+When Jekyll builds your site, these will be replaced with something like this.
 
 ```
 <link href='/stylesheets/all-b5c56f2652600cde201589531c453ba1.css' media='all' rel='stylesheet' type='text/css'>
@@ -55,6 +66,8 @@ the configurations are set in the `_config.yml` configuration file under the `as
 
 | Option               | Description                               | Default     |
 |:---------------------|:------------------------------------------|:------------|
+| `stylesheets_dir`    | Directory to read stylesheets from        | ['css', 'stylesheets'] |
+| `javascripts_dir`    | Directory to read javascripts from        | ['js', 'javascripts'] |
 | `combine_css`        | Combine all .css, .scss and .sass files   | true        |
 | `combine_js`         | Combine all .js and .coffee files         | true        |
 | `compress_css`       | Compress stylesheets for production       | true        |

data/lib/octopress-asset-pipeline.rb

@@ -42,13 +42,19 @@ module Octopress
           Octopress.site.read_directories 
         end
 
+        add_static_files
+        add_page_files
         add_stylesheets
         add_javascripts
       end
 
       def config
         @config ||= begin
-          Ink.configuration['asset_pipeline'].merge({'disable' => {}})
+          c = Ink.configuration['asset_pipeline']
+          {
+            'stylesheets_dir' => ['stylesheets', 'css'],
+            'javascripts_dir' => ['javascripts', 'js']
+          }.merge(c).merge({ 'disable' => {} })
         end
       end
 
@@ -63,30 +69,31 @@ module Octopress
 
       private
 
-      def combine_js
-        config['combine_js']
+      def asset_dirs
+        [config['stylesheets_dir'], config['javascripts_dir']].flatten
+      end
+
+      def css_dirs
+        config['stylesheets_dir']
       end
 
       def combine_css
         config['combine_css']
       end
 
-      def add_stylesheets
-        add_css
-        add_sass
+      def combine_js
+        config['combine_js']
+      end
 
+      def add_stylesheets
         if !combine_css
           # Add tags for {% css_asset_tag %}
           stylesheets.each { |f| Ink::Plugins.add_css_tag(f.tag) }
           @css.clear
         end
-
       end
 
       def add_javascripts
-        add_js
-        add_coffee
-
         if !combine_js
           # Add tags for {% js_asset_tag %}
           javascripts.each { |f| Ink::Plugins.add_js_tag(f.tag) }
@@ -106,53 +113,63 @@ module Octopress
         sorted.concat files
       end
 
-      # Finds all Sass files registered by Jekyll
+      # Finds css and js files files registered by Jekyll
       #
-      def add_sass
-        Octopress.site.pages.dup.sort_by(&:path).each do |f| 
-          if f.ext =~ /\.s[ca]ss/ 
-            @sass << Sass.new(self, f)
-            Octopress.site.pages.delete(f)
-          end
-        end
-      end
+      def add_static_files
+        find_static_assets(asset_dirs, '.js', '.css').each do |f|
+          if f.path =~ /\.js$/ 
+            if f.path =~ /\.min\.js$/i
+              @no_compress_js << Javascript.new(self, f)
+            else f.path =~ /\.js$/ 
+              @js << Javascript.new(self, f)
+            end
+            Octopress.site.static_files.delete(f) if combine_js
 
-      # Finds all CSS files registered by Jekyll
-      #
-      def add_css
-        Octopress.site.static_files.dup.sort_by(&:path).each do |f| 
-          if f.path =~ /\.css$/ 
+          elsif f.path =~ /\.css$/
             @css << Css.new(self, f)
             Octopress.site.static_files.delete(f) if combine_css
           end
         end
       end
 
-      # Finds all Coffeescript files registered by Jekyll
+      # Finds Sass and Coffeescript files files registered by Jekyll
       #
-      def add_coffee
-        Octopress.site.pages.dup.sort_by(&:path).each do |f| 
+      def add_page_files
+        find_page_assets(asset_dirs, '.scss', '.sass', '.coffee').each do |f|
           if f.ext =~ /\.coffee$/ 
             @coffee << Coffeescript.new(self, f)
             Octopress.site.pages.delete(f) if combine_js
+          elsif f.ext =~ /\.s[ca]ss/ 
+            @sass << Sass.new(self, f)
+            Octopress.site.pages.delete(f) if combine_css
           end
         end
       end
 
-      # Finds all Javascript files registered by Jekyll
-      #
-      def add_js
-        Octopress.site.static_files.dup.sort_by(&:path).each do |f| 
-          if f.path =~ /\.js$/ 
-            if f.path =~ /\.min\.js$/i
-              @no_compress_js << Javascript.new(self, f)
-            else
-              @js << Javascript.new(self, f)
-            end
-            Octopress.site.static_files.delete(f) if combine_js
+      def find_static_assets(dirs, *extensions)
+        assets = Octopress.site.static_files.dup.sort_by(&:path)
+        find_assets(assets, dirs, extensions)
+      end
+
+      def find_page_assets(dirs, *extensions)
+        assets = Octopress.site.pages.dup.sort_by(&:path)
+        find_assets(assets, dirs, extensions)
+      end
+
+      def find_assets(assets, dirs, extensions)
+        assets.select do |f| 
+          if extensions.include?(File.extname(f.path))
+            path = f.path.sub(File.join(Octopress.site.source, ''), '')
+            in_dir?(path, dirs)
           end
         end
       end
+
+      def in_dir?(file, *dirs)
+        dirs.flatten.select do |d| 
+          file.match(/^#{d}\//) 
+        end.size > 0
+      end
     end
   end
 end

data/lib/octopress-asset-pipeline/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module AssetPipeline
-    VERSION = "1.1.7"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink