octopress-asset-pipeline 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed731c311f629bb538a58f8c51a10ec3bebff27
-  data.tar.gz: fe0e5496d05ed3830d80100c762fc47dff44abf1
+  metadata.gz: a65951d6238e41daed4a564bedaff22618bacada
+  data.tar.gz: 3cc274f658887d68b7aca538fe0a9d85f9bdd33b
 SHA512:
-  metadata.gz: 4213093d12803f32df1aa72c6cefd3ddea89d953104528a76fb8119d92a0df22f753fe2b69f04efc3334008f23261a7591bdf3ef2eedaa8e06d2850174af18ad
-  data.tar.gz: 0575497d3d8fa7019cea05b7f9316640f510f51ea1fd263b68dd0ddb2db5a1a089b581ed8357ccbde10491e039f101df44f34e9cf4cd74032de6114c8a58816e
+  metadata.gz: af99e603afd3502887161df5cfa999bab897d5133c05a3f018ef38f85e75e53433d958414ca21199f5721968891ab87fd64a2c8e1e42dc73468c68a88511fd07
+  data.tar.gz: 055b51b6c4c5946c36881ed44c54e7f687193ca45dbefff25ff39e1206e3e2a00a53e5265a462086035675c09cc85161d50efc9308e55a2f9c8c9d14949ebc41

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## Current version
+### 1.0.2 - 2014-08-11
+
+- Fix: Updated integration with latest Octopress Ink
+
+### 1.0.1 - 2014-07-19
+
+- Updated tests to reflect no longer rendering Sass through liquid.
 
 ### 1.0.0 - 2014-05-25
 

data/lib/octopress-asset-pipeline/assets/coffeescript.rb

@@ -3,15 +3,15 @@ module Octopress
     module Assets
       class LocalCoffeeScriptAsset < LocalJavaScriptAsset
         def read
-          compile
+          @compiled ||= compile
         end
 
-        def path
-          File.join(file.site.source, file.path)
+        def compile
+          ::CoffeeScript.compile(file.content)
         end
 
-        def compile
-          ::CoffeeScript.compile(render_page)
+        def path
+          Pathname.new File.join(Octopress.site.source, file.path)
         end
 
         def destination

data/lib/octopress-asset-pipeline/assets/css.rb

@@ -3,7 +3,7 @@ module Octopress
     module Assets
       class LocalCssAsset < LocalAsset
         def media
-          path.scan(/@(.+?)\./).flatten[0] || 'all'
+          path.to_s.scan(/@(.+?)\./).flatten[0] || 'all'
         end
 
         def destination
@@ -11,7 +11,7 @@ module Octopress
         end
 
         def tag
-          "<link href='#{Filters.expand_url(File.join(destination))}' media='#{media}' rel='stylesheet' type='text/css'>"
+          "<link href='#{Filters.expand_url(destination)}' media='#{media}' rel='stylesheet' type='text/css'>"
         end
       end
     end

data/lib/octopress-asset-pipeline/assets/local.rb

@@ -26,26 +26,16 @@ module Octopress
         end
 
         def path
-          file.path
+          Pathname.new file.path
         end
 
         def read
-          File.open(path).read
+          path.read
         end
 
         # Copy is unncessary with local assets
         #
         def copy(target_dir); end
-
-        private
-
-        def render_page
-          payload = Ink.site.site_payload
-          payload['page'] = file.data
-
-          render_liquid(file.content, payload)
-        end
-
       end
     end
   end

data/lib/octopress-asset-pipeline/assets/sass.rb

@@ -3,11 +3,11 @@ module Octopress
     module Assets
       class LocalSassAsset < LocalCssAsset
         def read
-          compile
+          @compiled ||= compile
         end
 
         def content
-          render_page
+          render
         end
 
         def ext
@@ -15,7 +15,7 @@ module Octopress
         end
 
         def path
-          File.join(file.site.source, file.path)
+          Pathname.new File.join(Octopress.site.source, file.path)
         end
 
         def destination

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

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
     module LocalAssetPipeline
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

data/lib/octopress-asset-pipeline.rb

@@ -29,8 +29,8 @@ module Octopress
           # This is necessary when Jekyll isn't being asked to build a site,
           # like when a user runs the list command to list assets
           #
-          if Ink.site.pages.empty? && Ink.site.posts.empty?
-            Ink.site.read_directories 
+          if Octopress.site.pages.empty? && Octopress.site.posts.empty?
+            Octopress.site.read_directories 
           end
 
           add_stylesheets
@@ -38,7 +38,7 @@ module Octopress
         end
 
         def config
-          Ink.config
+          Octopress.config
         end
 
         # Return stylesheets to be combined in the asset pipeline
@@ -89,7 +89,7 @@ module Octopress
           sorted = []
           config.each do |item|
             files.each do |file|
-              sorted << files.delete(file) if file.path.include? item
+              sorted << files.delete(file) if file.path.to_s.include? item
             end
           end
 
@@ -99,10 +99,10 @@ module Octopress
         # Finds all Sass files registered by Jekyll
         #
         def add_sass
-          Ink.site.pages.each do |f| 
+          Octopress.site.pages.each do |f| 
             if f.ext =~ /\.s[ca]ss/ 
               @sass << Assets::LocalSassAsset.new(self, f)
-              Ink.site.pages.delete(f) if combine_css
+              Octopress.site.pages.delete(f) if combine_css
             end
           end
         end
@@ -110,10 +110,10 @@ module Octopress
         # Finds all CSS files registered by Jekyll
         #
         def add_css
-          Ink.site.static_files.each do |f| 
+          Octopress.site.static_files.each do |f| 
             if f.path =~ /\.css$/ 
               @css << Assets::LocalCssAsset.new(self, f)
-              Ink.site.static_files.delete(f) if combine_css
+              Octopress.site.static_files.delete(f) if combine_css
             end
           end
         end
@@ -121,10 +121,10 @@ module Octopress
         # Finds all Coffeescript files registered by Jekyll
         #
         def add_coffee
-          Ink.site.pages.each do |f| 
+          Octopress.site.pages.each do |f| 
             if f.ext =~ /\.coffee$/ 
               @coffee << Assets::LocalCoffeeScriptAsset.new(self, f)
-              Ink.site.pages.delete(f) if combine_js
+              Octopress.site.pages.delete(f) if combine_js
             end
           end
         end
@@ -132,10 +132,10 @@ module Octopress
         # Finds all Javascript files registered by Jekyll
         #
         def add_js
-          Ink.site.static_files.each do |f| 
+          Octopress.site.static_files.each do |f| 
             if f.path =~ /\.js$/ 
               @js << Assets::LocalJavaScriptAsset.new(self, f)
-              Ink.site.static_files.delete(f) if combine_js
+              Octopress.site.static_files.delete(f) if combine_js
             end
           end
         end

data/octopress-asset-pipeline.gemspec

@@ -18,10 +18,11 @@ 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.11"
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0.0.rc.13"
   
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "clash", "~> 1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "octopress"
+  spec.add_development_dependency "pry-debugger"
 end

data/test/.clash.yml

@@ -1,8 +1,13 @@
 -
   build: true
-  compare: expected site
+  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: combine_false site
+  compare: expected/no_combining site

data/test/Gemfile

@@ -1,9 +1,4 @@
 source 'https://rubygems.org'
 
-group :octopress do
-  gem 'octopress'
-  gem 'octopress-ink'
-  gem 'octopress-asset-pipeline', path: '../'
-  gem 'pry-debugger'
-  gem 'clash'
-end
+gemspec path: '../'
+gem 'octopress-ink', path: '../../ink'

data/test/_combine_css_only.yml

@@ -0,0 +1 @@
+combine_js: false

data/test/expected/css_tag_only/index.html

@@ -0,0 +1,2 @@
+<link href='/stylesheets/all-.css' media='all' rel='stylesheet' type='text/css'>
+<script src='/blah.js'></script><script src='/foo.js'></script>

data/test/expected/no_combining/blah.js

@@ -0,0 +1 @@
+console.log("Yo I'm a javascript")

data/test/expected/no_combining/foo.js

@@ -0,0 +1,6 @@
+(function() {
+  if (!false) {
+    console.log('hi');
+  }
+
+}).call(this);

data/test/{combine_false → expected/no_combining}/index.html

@@ -1,2 +1,2 @@
-<script src='/foo.js'></script><script src='/blah.js'></script>
 <link href='/test.css' media='all' rel='stylesheet' type='text/css'><link href='/css-test.scss' media='all' rel='stylesheet' type='text/css'>
+<script src='/foo.js'></script><script src='/blah.js'></script>

data/test/expected/{index.html → standard/index.html}

@@ -1,2 +1,2 @@
-<script src='/javascripts/all-.js'></script>
 <link href='/stylesheets/all-.css' media='all' rel='stylesheet' type='text/css'>
+<script src='/javascripts/all-.js'></script>

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

@@ -0,0 +1 @@
+body{color:#444}body{background:black}

data/test/site/index.html

@@ -1,2 +1,2 @@
-<script src='/foo.js'></script><script src='/blah.js'></script>
 <link href='/test.css' media='all' rel='stylesheet' type='text/css'><link href='/css-test.scss' media='all' rel='stylesheet' type='text/css'>
+<script src='/foo.js'></script><script src='/blah.js'></script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.11
+        version: 1.0.0.rc.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.11
+        version: 1.0.0.rc.13
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,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: Combine and compress CSS and Sass, Javascript and Coffeescript to a single
   fingerprinted file.
 email:
@@ -116,16 +130,21 @@ files:
 - octopress-asset-pipeline.gemspec
 - test/.clash.yml
 - test/Gemfile
+- test/_combine_css_only.yml
 - test/_combine_false.yml
 - test/_config.yml
-- test/combine_false/blah.js
-- test/combine_false/foo.js
-- test/combine_false/index.html
-- test/combine_false/sass-test.css
-- test/combine_false/test.css
-- test/expected/index.html
-- test/expected/javascripts/all-.js
-- test/expected/stylesheets/all-.css
+- test/expected/css_tag_only/blah.js
+- test/expected/css_tag_only/foo.js
+- test/expected/css_tag_only/index.html
+- test/expected/css_tag_only/stylesheets/all-.css
+- test/expected/no_combining/blah.js
+- test/expected/no_combining/foo.js
+- test/expected/no_combining/index.html
+- test/expected/no_combining/sass-test.css
+- test/expected/no_combining/test.css
+- test/expected/standard/index.html
+- test/expected/standard/javascripts/all-.js
+- test/expected/standard/stylesheets/all-.css
 - test/site/blah.js
 - test/site/foo.js
 - test/site/index.html
@@ -165,16 +184,21 @@ summary: Combine and compress CSS and Sass, Javascript and Coffeescript to a sin
 test_files:
 - test/.clash.yml
 - test/Gemfile
+- test/_combine_css_only.yml
 - test/_combine_false.yml
 - test/_config.yml
-- test/combine_false/blah.js
-- test/combine_false/foo.js
-- test/combine_false/index.html
-- test/combine_false/sass-test.css
-- test/combine_false/test.css
-- test/expected/index.html
-- test/expected/javascripts/all-.js
-- test/expected/stylesheets/all-.css
+- test/expected/css_tag_only/blah.js
+- test/expected/css_tag_only/foo.js
+- test/expected/css_tag_only/index.html
+- test/expected/css_tag_only/stylesheets/all-.css
+- test/expected/no_combining/blah.js
+- test/expected/no_combining/foo.js
+- test/expected/no_combining/index.html
+- test/expected/no_combining/sass-test.css
+- test/expected/no_combining/test.css
+- test/expected/standard/index.html
+- test/expected/standard/javascripts/all-.js
+- test/expected/standard/stylesheets/all-.css
 - test/site/blah.js
 - test/site/foo.js
 - test/site/index.html