octopress-ink 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a3b15b45d91c027ba553ed2389bd8f2eda786f5
-  data.tar.gz: e5ad4861c19163e4887bedee72e26936a3601623
+  metadata.gz: 393f90ab27ed225dd0e5c7c4ffbaf5be7b2e9a3d
+  data.tar.gz: 0ef937e4ecbb7f857a9de3ceb1f8aec3dc46d82c
 SHA512:
-  metadata.gz: 5ec39b805dbe73ebd301ae499e1e63e7a4f16b8a221779237263c363f0799d441569e8621f09af3297155702eb3d68d762cf42129d797c43e18b67c2716d9037
-  data.tar.gz: 43285a10de3685141b7fd2c5401d7f877716a538c47a126c31dd11bf9f40d4fe902ed4b43f5b9991fbe6ffb7e288daa98e5e0771f445de16506db117c25ba866
+  metadata.gz: bd52d72b1b39bfa070e4e9709880dce5e893931be76301ff85ad60cd5b77542c0e5d672c754da0ff7baa6f43ff5265caf9344d738f1ba5fd390ae4b05d8dcec0
+  data.tar.gz: 21c32ec66c2bf8946ce6fd60be983f44e1338fef2a2ee01e6fd75fa12402a3d4295023c434da66ca8069470955a24efd63103d8493f4025595bf56796a818952

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 1.1.4 (2015-05-18)
+- Fix: Cache writes no longer trigger Jekyll watch.
+- Fix: Cache writes happen after site builds.
+
+### 1.1.3 (2015-05-17)
+- Fix: Ink assets filters files which shouldn't be included like .hidden_file, emacs.backup~, etc
+
 ### 1.1.2 (2015-05-12)
 - Use Jekyll Hooks if you got 'em.
 - Now supporting Jekyll 2 & 3

data/lib/octopress-ink/cache.rb

@@ -7,6 +7,7 @@ module Octopress
 
       def reset
         @cache_files = []
+        @write_cache = {}
       end
 
       def read_cache(asset, options)
@@ -18,9 +19,7 @@ module Octopress
       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
+        @write_cache[path] = content
         content
       end
 
@@ -29,7 +28,16 @@ module Octopress
       end
 
       def get_cache_path(dir, label, str)
-        File.join(dir, "#{label}#{Digest::MD5.hexdigest(str)}.js")
+        File.join(dir, ".#{label}#{Digest::MD5.hexdigest(str)}.js")
+      end
+
+      def write
+        @write_cache.each do |path, contents|
+          File.open(path, 'w') do |f|
+            f.print(contents)
+          end
+        end
+        @write_cache = {}
       end
 
       def clean

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

@@ -26,6 +26,7 @@ module Octopress
           f.write(site.dest)
         end
 
+        Octopress::Ink::Cache.write
         Octopress::Ink::Cache.clean
       end
     else
@@ -52,6 +53,7 @@ module Octopress
             f.write(site.dest)
           end
 
+          Octopress::Ink::Cache.write
           Octopress::Ink::Cache.clean
         end
       end

data/lib/octopress-ink/plugin.rb

@@ -513,7 +513,10 @@ module Octopress
       def glob_assets(dir)
         return [] unless Dir.exist? dir
         Find.find(dir).to_a.reject do |file|
-          File.directory?(file) || File.basename(file).start_with?('.')
+          # Don't match directories or
+          # Files which begin or end with non-alpha characters
+          # like: .hidden_file or emacs.backup~
+          File.directory?(file) || !File.basename(file).match(/^\w.+?\w$/)
         end
       end
 

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.1.2"
+    VERSION = "1.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll