octopress-asset-pipeline 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62fce7058e1b17e7aa1b8de26478df11d3a43cbd
-  data.tar.gz: 06d06bc000368335c92d3bc083d91fc8d7e78552
+  metadata.gz: 8fb1495d68766f134895a4514df1881e8132540f
+  data.tar.gz: 987fcf763524fddab67048970d9130a0e6db4ff3
 SHA512:
-  metadata.gz: b28d5a2360ddd8234e36fb6fcbfa98b3a1fcad7cc0be010bf8085ef3aa89763c2cc3f978d28764cece1edcef17cbc0a78aa2d29ec72a03e463d69d7038d4627c
-  data.tar.gz: 27890ac7fb53dcb054dcc07ea07e7b3935e368e26e3859fb1034ec971b13efd4b5a926fb088a3cb034485bfdf94ab0725ed1044facbaffff5f4e082904cdff08
+  metadata.gz: e84e14427e76c8f18849650e639af612d98a828871411e807dca21e67e7aa9fdb0f2dbfa577915a980778865ec7a587db83017500996adc03f13ca9d6f61f784
+  data.tar.gz: 13325ce37ebf786e541ad460aa580598d4f548ec6f2333ad2dedac898f5cd185e31d12f199d745f17e85ff793f596d1798a8cbda3e823f521319b9a56c3af526

data/.clash.yml

@@ -0,0 +1,20 @@
+-
+  title: Typical build (combined and compressed)
+  build: true
+  compare: expected/standard site
+-
+  title: Combine CSS only
+  build: true
+  config:
+    jekyll:
+      - _config.yml
+      - _combine_css_only.yml
+  compare: expected/css_tag_only site
+-
+  title: Separate asset files
+  build: true
+  config: 
+    jekyll:
+      - _config.yml
+      - _combine_false.yml
+  compare: expected/no_combining site

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-script: cd test && bundle exec clash
+script: bundle exec clash test

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.1.0 - 2015-01-01
+
+- Now reads configuration from _config.yml under `asset_pipeline`.
+
 ### 1.0.3 - 2014-08-17
 
 - Updated to latest Octopress Ink.

data/README.md

@@ -49,7 +49,7 @@ When Jekyll is compiled these will be replaced with something like this.
 ## Configuration
 
 This plugin integrates with the core asset pipeline system in Octopress Ink, therefore
-the configurations are set in the `_octopress.yml` configuration file.
+the configurations are set in the `_config.yml` configuration file under the `asset_pipeline` key.
 
 | Option               | Description                               | Default     |
 |:---------------------|:------------------------------------------|:------------|
@@ -67,13 +67,14 @@ By default when scripts and stylesheets are combined, they added based on
 their order in the file system. You can manually specify order like this:
 
 ```
-order_js
- - jquery.js
- - kittens.coffee
-
-order_css
- - normalize.css
- - site.sass
+asset_pipeline:
+  order_js:
+   - jquery.js
+   - kittens.coffee
+
+  order_css:
+   - normalize.css
+   - site.sass
 ```
 Assets will ordered as specified. Any additional assets will be appended based on their order in the file system.
 

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

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
     module LocalAssetPipeline
-      VERSION = "1.0.4"
+      VERSION = "1.1.0"
     end
   end
 end

data/lib/octopress-asset-pipeline.rb

@@ -1,3 +1,4 @@
+require 'octopress'
 require 'octopress-ink'
 require 'octopress-asset-pipeline/version'
 
@@ -15,11 +16,11 @@ module Octopress
           {
             name:          "Octopress Asset Pipeline",
             slug:          "octopress-asset-pipeline",
-            assets_path:   File.expand_path(File.join(File.dirname(__FILE__), "../../../assets")),
+            path:          File.expand_path(File.join(File.dirname(__FILE__), "../")),
             type:          "plugin",
             version:       Octopress::Ink::LocalAssetPipeline::VERSION,
             description:   "Combine and compress CSS and Sass, Javascript and Coffeescript to a single fingerprinted file.",
-            website:       "https://github.com/octopress/asset-pipeline",
+            source_url:    "https://github.com/octopress/asset-pipeline",
             local: true
           }
         end
@@ -38,7 +39,9 @@ module Octopress
         end
 
         def config
-          Octopress.config
+          @config ||= begin
+            Ink.configuration['asset_pipeline'].merge({'disable' => {}})
+          end
         end
 
         # Return stylesheets to be combined in the asset pipeline

data/octopress-asset-pipeline.gemspec

@@ -18,11 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "octopress-ink", "~> 1.0.0.rc.15"
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0.0.rc"
   
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "clash", "~> 1.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "clash"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "octopress"
-  spec.add_development_dependency "pry-debugger"
+
+  if RUBY_VERSION >= "2"
+    spec.add_development_dependency "pry-byebug"
+  end
 end

data/test/_combine_css_only.yml

@@ -1 +1,2 @@
-combine_js: false
+asset_pipeline:
+  combine_js: false

data/test/_combine_false.yml

@@ -1,4 +1,5 @@
-order_js:
-  - foo.coffee
-combine_js: false
-combine_css: false
+asset_pipeline:
+  order_js:
+    - foo.coffee
+  combine_js: false
+  combine_css: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink
@@ -16,44 +16,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.15
+        version: 1.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.15
+        version: 1.0.0.rc
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: clash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: octopress
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,6 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".clash.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -109,8 +96,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- assets/docs/changelog.markdown
-- assets/docs/index.markdown
 - demo/Gemfile
 - demo/_config.yml
 - demo/_octopress.yml
@@ -128,7 +113,6 @@ files:
 - lib/octopress-asset-pipeline/assets/sass.rb
 - lib/octopress-asset-pipeline/version.rb
 - octopress-asset-pipeline.gemspec
-- test/.clash.yml
 - test/Gemfile
 - test/_combine_css_only.yml
 - test/_combine_false.yml
@@ -182,7 +166,6 @@ specification_version: 4
 summary: Combine and compress CSS and Sass, Javascript and Coffeescript to a single
   fingerprinted file.
 test_files:
-- test/.clash.yml
 - test/Gemfile
 - test/_combine_css_only.yml
 - test/_combine_false.yml

data/assets/docs/changelog.markdown

@@ -1,10 +0,0 @@
----
-title: "Changelog"
-permalink: /changelog/
----
-
-## Current version
-
-### 1.0.0 - 2014-05-25
-
-- Initial release 

data/assets/docs/index.markdown

@@ -1,106 +0,0 @@
----
-title: "Octopress Asset Pipeline"
----
-
-Combine and compress and fingerprint Stylesheets (CSS and Sass) and Javascripts (JS and Coffeescript) to a single fingerprinted .css or .js file.
-
-**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
-the necessary script or link tags.
-
-## Installation
-
-Add this line to your site's Gemfile:
-
-    gem 'octopress-asset-pipeline'
-
-And then execute:
-
-    $ bundle
-
-Or install it manually:
-
-    $ gem install octopress-asset-pipeline
-
-
-### Add gem to Jekyll
-
-Add the gem to Jekyll's configuration file:
-
-```yaml
-gems:
-  - octopress-asset-pipeline
-```
-
-## Liquid tags
-
-Include these tags in your site's layout.
-
-```
-{% css_asset_tag %}
-{% js_asset_tag %}
-```
-
-When Jekyll is compiled these will be replaced with something like this.
-
-```
-<link href='/stylesheets/all-b5c56f2652600cde201589531c453ba1.css' media='all' rel='stylesheet' type='text/css'>
-<script src='/javascripts/all-75489c7b2da6efce7ee1bc45795d400b.js'></script>
-```
-
-## Configuration
-
-This plugin integrates with the core asset pipeline system in Octopress Ink, therefore
-the configurations are set in the `_octopress.yml` configuration file.
-
-| Option               | Description                               | Default     |
-|:---------------------|:------------------------------------------|:------------|
-| `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        |
-| `compress_js`        | Compress Javascripts for production       | true        |
-| `order_js`           | Order for .js and .coffee files           | []          |
-| `order_css`          | Order for .css, .scss, and .sass          | []          |
-| `uglifier`           | Settings for Javascript Uglifier. [Documentaion](https://github.com/lautis/uglifier).  | {}          |
-
-### Ordering assets
-
-By default when scripts and stylesheets are combined, they added based on
-their order in the file system. You can manually specify order like this:
-
-```
-order_js
- - jquery.js
- - kittens.coffee
-
-order_css
- - normalize.css
- - site.sass
-```
-Assets will ordered as specified. Any additional assets will be appended based on their order in the file system.
-
-Note: It is not necessary to write full paths in these configurations. An asset at `javascripts/lib/jquery.js` will match `jquery.js` and be ordered accordingly.
-
-## Media files
-
-Usually it's better to define print styles inside of the main CSS file beneath a print media query, like this.
-
-```
-@media print {
-  * { background: none }
-  * { color: #000 }
-  ...
-}
-```
-
-If you want to specify a separate print stylesheet, include `@print` in your filename, before the extension. 
-
-When your site is compiled, this file will be written separately and its `<link>` tag will include a `media='print'` attribute.
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/octopress-asset-pipeline/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/test/.clash.yml

@@ -1,13 +0,0 @@
--
-  build: true
-  compare: expected/standard site
--
-  build: true
-  config:
-    octopress: _combine_css_only.yml
-  compare: expected/css_tag_only site
--
-  build: true
-  config:
-    octopress: _combine_false.yml
-  compare: expected/no_combining site