octopress-ink 1.0.0.rc.32 → 1.0.0.rc.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85686fc2ea1d6853f85597565f2932c8e0dd39fa
-  data.tar.gz: d4eb14410553f6f06286c4b0662ccba05139fe3f
+  metadata.gz: 49935f281c619ea34057f2b4eea60512a8d8062a
+  data.tar.gz: e780dfe3bcecb73fb38b9fc4ca7aa44f946ea26c
 SHA512:
-  metadata.gz: 9f413e4a9c176b2b36a9dbe2aa0d04f5980cb8b8be9b4087b1b37bdda8643ca63b783bc5288fce0a3c98b4a26a0b47325ef577c4bd978d56573c436560f1a8d3
-  data.tar.gz: 8fc3b07109b9833163eebfd2215f569665b247342b93b4f6aa220d8d8be3cd8f2c8c64e602121f3f1b3963767f82b6628dcbb80d8b02019fe2e779acd74dba17
+  metadata.gz: 4cc25011f558aaeffb54cb55144d527be812fcc5478e6c3c797f13fbc930d45b978e919fd23f077222d874a0fc0deb2c6396c34dd9bd9dc300e25964384243f3
+  data.tar.gz: b76a45423d4d786ec4fb7aeaa959b06f5de383c7d69fc231542b803d8259f8af6a075a083570455e9e7e4d4488539b9be45e03767c35fe47979a3541f534464d

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
+### 1.0.0 RC33 - 2015-01-28
+
+- Fix: Doesn't assume site plugin path is in site source directory. Thanks [@drallgood](https://github.com/octopress/feeds/issues/10)!
+
 ### 1.0.0 RC32 - 2015-01-26
+
 - Minor change: Moved plugin requiring out to Octopress gem.
 
 ### 1.0.0 RC31 - 2015-01-26

data/lib/octopress-ink.rb

@@ -11,6 +11,7 @@ require 'octopress-ink/version'
 require 'octopress-ink/configuration'
 require 'octopress-ink/jekyll/hooks'
 require 'octopress-ink/tags/set_lang'
+require 'octopress-ink/cache'
 
 module Octopress
   module Ink

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

@@ -103,43 +103,28 @@ module Octopress
         end
 
         def content
-          unless @content
+          @content ||= begin
             if read =~ FRONT_MATTER
-              @content = $POSTMATCH
+              $POSTMATCH
             else
-              @content = read
+              read
             end
           end
-          @content
-        end
-
-        # Render file through Liquid if it contains YAML front-matter
-        #
-        def render
-          unless @rendered_content
-            if asset_payload = payload
-              @rendered_content = Liquid::Template.parse(content).render!(payload)
-            else
-              @rendered_content = content
-            end
-          end
-
-          @rendered_content
         end
 
         def payload
-          unless @payload
-            @payload = Ink.payload
-            @payload['jekyll'] = {
+          @payload ||= begin
+            p = Ink.payload
+            p['jekyll'] = {
               'version' => Jekyll::VERSION,
               'environment' => Jekyll.env
             }
-            @payload['site'] = Octopress.site.config
-            @payload['site']['data'] = Octopress.site.site_data
-            @payload['page'] = data
-          end
+            p['site'] = Octopress.site.config
+            p['site']['data'] = Octopress.site.site_data
+            p['page'] = data
 
-          @payload
+            p
+          end
         end
 
         def data
@@ -153,7 +138,7 @@ module Octopress
         private
 
         def source_dir
-          if exists? user_override_path
+          if exists? user_path
             user_dir
           else
             plugin_dir
@@ -169,19 +154,15 @@ module Octopress
         end
 
         def user_dir
-          File.join Octopress.site.source, Plugins.custom_dir, dir
+          File.join Plugins.custom_dir, dir
         end
 
         def local_plugin_path
           File.join Octopress.site.source, dir, file
         end
 
-        def user_override_path
-          File.join user_dir, filename
-        end
-
         def user_path
-          user_override_path
+          File.join user_dir, filename
         end
 
         def file_check

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

@@ -2,13 +2,17 @@ module Octopress
   module Ink
     module Assets
       class Coffeescript < Javascript
+        def tag
+          "<script src='#{Filters.expand_url(File.join(dir, file.sub(/\.coffee$/,'.js')))}'></script>"
+        end
+
         def add
           Plugins.add_js_tag tag
-          Plugins.static_files << StaticFileContent.new(compile, destination)
+          Plugins.static_files << StaticFileContent.new(content, destination)
         end
 
-        def compile
-          ::CoffeeScript.compile(content)
+        def content
+          ::CoffeeScript.compile(super)
         end
 
         def destination

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

@@ -39,11 +39,7 @@ module Octopress
         end
 
         def page
-          unless @page 
-
-            @page = Page.new(Octopress.site, source_dir, page_dir, file, plugin.config)
-          end
-          @page
+          @page ||= Page.new(Octopress.site, source_dir, page_dir, file, plugin.config)
         end
 
         def info

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

@@ -2,6 +2,8 @@ module Octopress
   module Ink
     module Assets
       class Sass < Stylesheet
+        attr_accessor :exists, :render
+
         def initialize(plugin, base, file)
           @plugin = plugin
           @base = base
@@ -13,14 +15,10 @@ module Octopress
           file_check
         end
 
-        def tag
-          "<link href='#{Filters.expand_url(File.join(dir, output_file_name))}' media='#{@media}' rel='stylesheet' type='text/css'>"
-        end
-
         def add
           unless File.basename(file).start_with?('_')
             Plugins.add_css_tag tag
-            Plugins.static_files << StaticFileContent.new(compile, destination)
+            Plugins.static_files << StaticFileContent.new(content, destination)
           end
         end
 
@@ -38,7 +36,16 @@ module Octopress
           is_disabled('sass', filename) || is_disabled('stylesheets', filename)
         end
 
-        def compile
+        def content
+          @render ||= begin
+            contents = super
+            if asset_payload = payload
+              Liquid::Template.parse(contents).render!(payload)
+            else
+              contents
+            end
+          end
+
           PluginAssetPipeline.compile_sass(self)
         end
 
@@ -49,14 +56,14 @@ module Octopress
         private
 
         def user_load_path
-          File.join(Octopress.site.source, Plugins.custom_dir, dir, File.dirname(file)).sub /\/\.$/, ''
+          File.join(Plugins.custom_dir, dir, File.dirname(file)).sub /\/\.$/, ''
         end
 
         def theme_load_path
           File.expand_path(File.join(root, base))
         end
 
-        def user_override_path
+        def user_path
           # Allow Sass overrides to use either syntax
           if file =~ /s[ac]ss$/
             [File.join(user_dir, file), File.join(user_dir, alt_syntax_file)]

data/lib/octopress-ink/cache.rb

@@ -0,0 +1,41 @@
+module Octopress
+  module Ink
+    module Cache
+      extend self
+
+      INK_CACHE_DIR = '.ink-cache'
+      @cache_files = []
+
+      def read_cache(asset, options)
+        path = get_cache_path(INK_CACHE_DIR, cache_label(asset), options.to_s << asset.content)
+        @cache_files << path
+        File.exist?(path) ? File.read(path) : nil unless path.nil?
+      end
+
+      def write_to_cache(asset, content, options)
+        FileUtils.mkdir_p(INK_CACHE_DIR) unless File.directory?(INK_CACHE_DIR)
+        path = get_cache_path(INK_CACHE_DIR, cache_label(asset), options.to_s << asset.content)
+        File.open(path, 'w') do |f|
+          f.print(content)
+        end
+        content
+      end
+
+      def cache_label(asset)
+        "#{asset.plugin.slug}-#{File.basename(asset.file, '.*').downcase}"
+      end
+
+      def get_cache_path(dir, label, str)
+        File.join(dir, "#{label}#{Digest::MD5.hexdigest(str)}.js")
+      end
+
+      def clean
+        remove = Find.find(INK_CACHE_DIR).to_a.reject do |file|
+          @cache_files.include?(file) || File.directory?(file)
+        end
+
+        FileUtils.rm remove
+      end
+    end
+  end
+end

data/lib/octopress-ink/jekyll/hooks.rb

@@ -16,6 +16,8 @@ module Octopress
         Octopress::Ink::Plugins.static_files.each do |f| 
           f.write(site.dest)
         end
+
+        Octopress::Ink::Cache.clean
       end
     end
   end

data/lib/octopress-ink/plugin.rb

@@ -354,11 +354,9 @@ module Octopress
 
       def add_javascripts
         find_assets(@javascripts_dir).each do |asset|
-          if asset =~ /\.min\.js$/
-            @no_compress_js << Assets::Javascript.new(self, @javascripts_dir, asset)
-          elsif asset =~ /\.js$/
+          if asset.end_with?('js')
             @js << Assets::Javascript.new(self, @javascripts_dir, asset)
-          elsif File.extname(asset) =~ /\.coffee$/
+          elsif asset.end_with?('coffee')
             @coffee << Assets::Coffeescript.new(self, @javascripts_dir, asset)
           end
         end

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -54,7 +54,7 @@ module Octopress
       end
 
       def self.combined_javascript_tag
-        unless combine_javascripts == ''
+        unless @combined_js == ''
           "<script src='#{Filters.expand_url(combined_javascript_path)}'></script>"
         end
       end
@@ -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.ext.match(/\.s[ca]ss/) ? file.compile : file.content)
+              combined[media] << file.content
             end
           end
 
@@ -130,32 +130,9 @@ module Octopress
           Plugins.plugins.clone.map(&:javascripts).flatten
       end
 
-      def self.no_compress_js
-        @no_compress_js ||= Plugins.plugins.clone.map(&:no_compress_js).flatten
-      end
-
       def self.javascript_fingerprint
         @javascript_fingerprint ||=
-          fingerprint(javascripts.clone.concat(no_compress_js).map(&:path))
-      end
-
-      def self.combine_javascripts
-        @combined_javascripts ||= combine_js(javascripts)
-      end
-
-      def self.combine_no_compress_javascripts
-        @combined_no_compress_javascripts ||= combine_js(no_compress_js) || ''
-      end
-
-      def self.combine_js(files)
-        js = ''
-        files.each do |file|
-          unless js =~ /#{file.plugin.name}/
-            js << "/* #{file.plugin.type.capitalize}: #{file.plugin.name} */\n" 
-          end
-          js << (file.ext.match(/.coffee/) ? file.compile : file.content)
-        end
-        (js == '' ? false : js)
+          fingerprint(javascripts.clone.map(&:path))
       end
 
       def self.combined_javascript_path
@@ -163,17 +140,40 @@ module Octopress
       end
 
       def self.write_combined_javascript
-        @combined_javascripts = nil
-        if js = combine_javascripts
-          if Ink.configuration['asset_pipeline']['compress_js']
-            settings = Jekyll::Utils.symbolize_hash_keys(Ink.configuration['asset_pipeline']['uglifier'])
-            js = Uglifier.new(settings).compile(js)
+        @combined_js = ''
+
+        if Ink.configuration['asset_pipeline']['combine_js']
+          javascripts.each do |file|
+
+            js = if compress_js?(file)
+              @uglify_settings ||= Jekyll::Utils.symbolize_hash_keys(Ink.configuration['asset_pipeline']['uglifier'])
+
+              if cached = Cache.read_cache(file, @uglify_settings)
+                cached
+              else
+                js = Uglifier.new(@uglify_settings).compile(file.content)
+                Cache.write_to_cache(file, js, @uglify_settings)
+              end
+            else
+              file.content
+            end
+
+            unless @combined_js =~ /#{file.plugin.name}/
+              @combined_js << "/* #{file.plugin.type.capitalize}: #{file.plugin.name} */\n" 
+            end
+            @combined_js << js
+          end
+
+          unless @combined_js == ''
+            write_files(@combined_js, combined_javascript_path)
           end
-          js = combine_no_compress_javascripts << js
-          write_files(js, combined_javascript_path)
         end
       end
 
+      def self.compress_js?(file)
+        Ink.configuration['asset_pipeline']['compress_js'] && !file.file.end_with?('.min.js')
+      end
+
       def self.write_files(source, dest)
         Plugins.static_files << StaticFileContent.new(source, dest)
       end

data/lib/octopress-ink/plugins.rb

@@ -111,7 +111,7 @@ module Octopress
       # Read plugin dir from site configs
       #
       def self.custom_dir
-        Octopress.site.config['plugins']
+        Octopress.site.plugin_manager.plugins_path.first
       end
 
       # Copy/Generate Stylesheets

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.32
+  version: 1.0.0.rc.33
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -177,6 +177,7 @@ files:
 - lib/octopress-ink/assets/page.rb
 - lib/octopress-ink/assets/sass.rb
 - lib/octopress-ink/assets/stylesheet.rb
+- lib/octopress-ink/cache.rb
 - lib/octopress-ink/commands.rb
 - lib/octopress-ink/commands/copy.rb
 - lib/octopress-ink/commands/helpers.rb