octopress-asset-pipeline 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65951d6238e41daed4a564bedaff22618bacada
-  data.tar.gz: 3cc274f658887d68b7aca538fe0a9d85f9bdd33b
+  metadata.gz: e2a8a4164aec8a28dc9f9cb06499f226e8dbc4ed
+  data.tar.gz: 70ac0a34c2a3a50c44cdec3f99ba6b08fbcacea6
 SHA512:
-  metadata.gz: af99e603afd3502887161df5cfa999bab897d5133c05a3f018ef38f85e75e53433d958414ca21199f5721968891ab87fd64a2c8e1e42dc73468c68a88511fd07
-  data.tar.gz: 055b51b6c4c5946c36881ed44c54e7f687193ca45dbefff25ff39e1206e3e2a00a53e5265a462086035675c09cc85161d50efc9308e55a2f9c8c9d14949ebc41
+  metadata.gz: 8c53cee000f6a95373d5728c6ef2988029ca2c1f720a18a5780ed2681383def6a0b41bbc4258fc7bd701dd316e032981712f0be90817edd9c2f07ac7d57fed80
+  data.tar.gz: d7e746b35a3afc73965fc414747c64972e5dcc1784b1ef0017b8d547ebb056588702ce5ce46198f11145e921b05c63f732f5add2a750ad3cecab9aff03c21205

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+### 1.0.3 - 2014-08-11
+
+- Cleaned up asset methods, added back Sass rendering through liquid.
+
 ### 1.0.2 - 2014-08-11
 
-- Fix: Updated integration with latest Octopress Ink
+- Fix: Updated integration with latest Octopress Ink.
 
 ### 1.0.1 - 2014-07-19
 

data/lib/octopress-asset-pipeline.rb

@@ -65,10 +65,9 @@ module Octopress
           add_sass
 
           if !combine_css
-            # Add tags for {% js_asset_tag %}
+            # Add tags for {% css_asset_tag %}
             stylesheets.each { |f| Plugins.add_css_tag(f.tag) }
             @css.clear
-            @sass.clear
           end
 
         end
@@ -101,8 +100,8 @@ module Octopress
         def add_sass
           Octopress.site.pages.each do |f| 
             if f.ext =~ /\.s[ca]ss/ 
-              @sass << Assets::LocalSassAsset.new(self, f)
-              Octopress.site.pages.delete(f) if combine_css
+              @sass << LocalAssets::Sass.new(self, f)
+              Octopress.site.pages.delete(f)
             end
           end
         end
@@ -112,7 +111,7 @@ module Octopress
         def add_css
           Octopress.site.static_files.each do |f| 
             if f.path =~ /\.css$/ 
-              @css << Assets::LocalCssAsset.new(self, f)
+              @css << LocalAssets::Css.new(self, f)
               Octopress.site.static_files.delete(f) if combine_css
             end
           end
@@ -123,7 +122,7 @@ module Octopress
         def add_coffee
           Octopress.site.pages.each do |f| 
             if f.ext =~ /\.coffee$/ 
-              @coffee << Assets::LocalCoffeeScriptAsset.new(self, f)
+              @coffee << LocalAssets::Coffeescript.new(self, f)
               Octopress.site.pages.delete(f) if combine_js
             end
           end
@@ -134,7 +133,7 @@ module Octopress
         def add_js
           Octopress.site.static_files.each do |f| 
             if f.path =~ /\.js$/ 
-              @js << Assets::LocalJavaScriptAsset.new(self, f)
+              @js << LocalAssets::Javascript.new(self, f)
               Octopress.site.static_files.delete(f) if combine_js
             end
           end

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

@@ -1,11 +1,7 @@
 module Octopress
   module Ink
-    module Assets
-      class LocalCoffeeScriptAsset < LocalJavaScriptAsset
-        def read
-          @compiled ||= compile
-        end
-
+    module LocalAssets
+      class Coffeescript < LocalAssets::Javascript
         def compile
           ::CoffeeScript.compile(file.content)
         end

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

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
-    module Assets
-      class LocalCssAsset < LocalAsset
+    module LocalAssets
+      class Css < LocalAssets::Asset
         def media
           path.to_s.scan(/@(.+?)\./).flatten[0] || 'all'
         end

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

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
-    module Assets
-      class LocalJavaScriptAsset < LocalAsset
+    module LocalAssets
+      class Javascript < LocalAssets::Asset
         def tag
           "<script src='#{Filters.expand_url(destination)}'></script>"
         end

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

@@ -1,7 +1,7 @@
 module Octopress
   module Ink
-    module Assets
-      class LocalAsset < Asset
+    module LocalAssets
+      class Asset < Ink::Assets::Asset
         def initialize(plugin, file)
           @plugin = plugin
           @file = file
@@ -29,10 +29,6 @@ module Octopress
           Pathname.new file.path
         end
 
-        def read
-          path.read
-        end
-
         # Copy is unncessary with local assets
         #
         def copy(target_dir); end

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

@@ -1,15 +1,7 @@
 module Octopress
   module Ink
-    module Assets
-      class LocalSassAsset < LocalCssAsset
-        def read
-          @compiled ||= compile
-        end
-
-        def content
-          render
-        end
-
+    module LocalAssets
+      class Sass < LocalAssets::Css
         def ext
           file.ext
         end
@@ -19,7 +11,15 @@ module Octopress
         end
 
         def destination
-          File.join(base, filename.sub(/@(.+?)\./,'.').sub(/s.ss/, 'css'))
+          super.sub(/\.s[ca]ss$/, '.css')
+        end
+
+        def add
+          Plugins.static_files << StaticFileContent.new(compile, destination)
+        end
+
+        def data
+          file.data
         end
 
         def compile

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

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

data/octopress-asset-pipeline.gemspec

@@ -18,7 +18,7 @@ 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.13"
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0.0.rc.14"
   
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "clash", "~> 1.0"

data/test/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec path: '../'
-gem 'octopress-ink', path: '../../ink'

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

@@ -1 +1 @@
-body{color:#444}body{background:black}
+body{color:#444}body{background:#00ffaa}

data/test/expected/no_combining/index.html

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

data/test/expected/no_combining/sass-test.css

@@ -1,2 +1,2 @@
 body {
-  background: black; }
+  background: #00ffaa; }

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

@@ -1 +1 @@
-body{color:#444}body{background:black}
+body{color:#444}body{background:#00ffaa}

data/test/site/index.html

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

data/test/site/sass-test.css

@@ -1,2 +1,2 @@
 body {
-  background: black; }
+  background: #00ffaa; }

data/test/source/_sass/_partial.sass

@@ -1 +1 @@
-$bg: black
+$bg: #00ffaa

data/test/source/sass-test.scss

@@ -1,4 +1,5 @@
 ---
+import: partial
 ---
-@import "partial";
+@import "{{ page.import }}";
 body { background: $bg; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-12 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.13
+        version: 1.0.0.rc.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.13
+        version: 1.0.0.rc.14
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement