octopress-ink 1.0.0.rc.13 → 1.0.0.rc.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48037693d08748489adee87f801cb143f5a320fd
-  data.tar.gz: 7ffb7e286fd7664305502dbbb98dd6e32c55c6fc
+  metadata.gz: b2897bcee91248ea1e129e5cf04a4f0c1ede2844
+  data.tar.gz: ffbebcfa8a92445270a5241ca67e7b2a2feac89c
 SHA512:
-  metadata.gz: c1021fc8290f4d780810aa696046f60d9fe63c49d370817d4eb0514445f05cee27ce32bffcbaf39464166599b0418d5a609c5d5f062b829b7ae21d0b0bb5931e
-  data.tar.gz: 4b20db2aec8fc8bdcdaba7b17708e9c6d0543dee05a5c54e645e27f07a3631e669ab14add044f72a6ee779c60bf9dd9e819b76da591c5047af7db3844df28ed1
+  metadata.gz: 29f661c90f771c2aae273523978bb1ec1f6dad7fc75efe1080e206c33afa9e93b7fea49cbc8879d895f815454f7274caeef6cf74ffd7ed6c3ecc9bd13078a6d7
+  data.tar.gz: 9316a8d4c8e18b6536d80b5f0c7e82c16ff7c302e111a0f15cd30e76cd93b2f5aca1d7a66bb14573dd468b5ff62a94e75593e99e2353b1354951a72b345093e2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC14 - 2014-08-11
+
+- Reworked asset methods
+
 ### 1.0.0 RC13 - 2014-08-11
 
 - Fixed an issue with asset tags

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

@@ -5,6 +5,8 @@ module Octopress
         attr_reader :plugin, :dir, :base, :root, :file
         attr_accessor :exists
 
+        FRONT_MATTER = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+
         def initialize(plugin, base, file)
           @file = file
           @base = base
@@ -57,6 +59,10 @@ module Octopress
           end
         end
 
+        def ext
+          File.extname(filename)
+        end
+
         def read
           path.read
         end
@@ -96,28 +102,55 @@ module Octopress
           File.join(dir, file)
         end
 
-        private
-
-        def source_dir
-          if exists? user_override_path
-            user_dir
-          else
-            plugin_dir
+        def content
+          unless @content
+            if read =~ FRONT_MATTER
+              @content = $POSTMATCH
+            else
+              @content = read
+            end
           end
+          @content
         end
 
         # Render file through Liquid if it contains YAML front-matter
         #
         def render
-          content = path.read
+          unless @rendered_content
+            if asset_payload = payload
+              @rendered_content = Liquid::Template.parse(content).render!(payload)
+            else
+              @rendered_content = content
+            end
+          end
+
+          @rendered_content
+        end
 
-          if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
-            payload = Octopress.site.site_payload
-            content = $POSTMATCH
-            payload['page'] = SafeYAML.load($1)
-            Liquid::Template.parse(content).render!(payload)
+        def payload
+          unless @payload
+            @payload = Octopress.site.site_payload
+            @payload['page'] = data
+          end
+
+          @payload
+        end
+
+        def data
+          if read =~ FRONT_MATTER
+            SafeYAML.load($1)
+          else
+            {}
+          end
+        end
+
+        private
+
+        def source_dir
+          if exists? user_override_path
+            user_dir
           else
-            content
+            plugin_dir
           end
         end
 

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

@@ -2,19 +2,13 @@ module Octopress
   module Ink
     module Assets
       class Coffeescript < Javascript
-        def read
-          @compiled ||= compile
-        end
-
         def add
           Plugins.add_js_tag tag
-          Plugins.static_files << StaticFileContent.new(read, destination)
+          Plugins.static_files << StaticFileContent.new(compile, destination)
         end
 
-        private
-
         def compile
-          ::CoffeeScript.compile(render)
+          ::CoffeeScript.compile(content)
         end
 
         def destination

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

@@ -11,8 +11,6 @@ module Octopress
           super
         end
 
-        private
-
         def destination
           File.join(base, plugin.slug, file)
         end

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

@@ -17,21 +17,13 @@ module Octopress
           "<link href='#{Filters.expand_url(File.join(dir, file))}' media='#{@media}' rel='stylesheet' type='text/css'>"
         end
 
-        def read
-          @compiled ||= compile
-        end
-
         def add
           unless file =~ /^_/
             Plugins.add_css_tag tag
-            Plugins.static_files << StaticFileContent.new(read, destination)
+            Plugins.static_files << StaticFileContent.new(compile, destination)
           end
         end
 
-        def content
-          render
-        end
-
         def ext
           path.extname
         end
@@ -44,12 +36,16 @@ module Octopress
           is_disabled('sass', filename) || is_disabled('stylesheets', filename)
         end
 
-        private
-
         def compile
           PluginAssetPipeline.compile_sass(self)
         end
 
+        def destination
+          File.join(base, plugin.slug, file.sub(/@(.+?)\./,'.').sub(/s.ss/, 'css'))
+        end
+
+        private
+
         def user_load_path
           File.join(Octopress.site.source, Plugins.custom_dir, dir, File.dirname(file)).sub /\/\.$/, ''
         end
@@ -73,9 +69,6 @@ module Octopress
           file.sub(ext, alt_ext)
         end
 
-        def destination
-          File.join(base, plugin.slug, file.sub(/@(.+?)\./,'.').sub(/s.ss/, 'css'))
-        end
       end
     end
   end

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -13,7 +13,7 @@ module Octopress
       end
 
       def self.compile_sass(sass)
-        Sass.compile(sass.content, sass_configs(sass))
+        Sass.compile(sass.render, sass_configs(sass))
       end
 
       # Gets default Sass configuration hash from Jekyll
@@ -77,7 +77,7 @@ module Octopress
               header = "/* #{file.plugin.type.capitalize}: #{file.plugin.name} */"
               combined[media] ||= ''
               combined[media] << "#{header}\n" unless combined[media] =~ /#{file.plugin.name}/
-              combined[media] << file.read
+              combined[media] << (file.ext.match(/\.s[ca]ss/) ? file.compile : file.content)
             end
           end
 
@@ -139,11 +139,11 @@ module Octopress
           @combined_javascript
         else
           js = ""
-          javascripts.clone.each do |f| 
-            unless js =~ /#{f.plugin.name}/
-              js += "/* #{f.plugin.type.capitalize}: #{f.plugin.name} */\n" 
+          javascripts.clone.each do |file| 
+            unless js =~ /#{file.plugin.name}/
+              js += "/* #{file.plugin.type.capitalize}: #{file.plugin.name} */\n" 
             end
-            js += f.read
+            js += (file.ext.match(/.coffee/) ? file.compile : file.content)
           end
           @combined_javascript = js
         end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.13"
+    VERSION = "1.0.0.rc.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.13
+  version: 1.0.0.rc.14
 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: jekyll