linner 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56eddb6bdd3b9a4d268b59282e61043e30d25fca
-  data.tar.gz: 873ebb2984003054d1e79a2a0c60b5e30e949270
+  metadata.gz: e785dfaa4d3d75d851dc95472e4b4c67498136cb
+  data.tar.gz: 5b7fca59e81147ce0d9038c702620399e6391d91
 SHA512:
-  metadata.gz: 1c27b05cd161ec9099c94a716ad2f330774f48d7429202820a7bfb77316b0b22110f2e24c24f4c027d906fa4235dccaee8c718c534abd0294c450c661f1e3e35
-  data.tar.gz: 7a1a5eec0c249738b742487f73c944870902fee854fe34901fa4d394602e51cc3b05057d7918e9d5116ec01521d19d22690c1d98dc3082486d8b7bc7bf7937c5
+  metadata.gz: c8b479fc61a9697c2122ab51001ba0f0df96d0b9aeed1b0644fc66620ab9e46f0eeae4138aebc66f7acb588d568f4cb28589daf6550e115f34dfaa0d03e6ca92
+  data.tar.gz: 1df1468c43a72ab91ed8f5c2e3d1b47eb7f98dc6400ab878fe85621d58c13d5f820e6a6a420136caa55b331c17c304433eebf53969593fcd1527b7c0a589222e

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.6.4
+  - copy task now support render and compress
+  - fix cache problem when same asset in different linner task
+
 v0.6.3
   - support sprite revision
 

data/lib/linner.rb

@@ -118,7 +118,7 @@ module Linner
     config["concat"].each_with_index do |pair, index|
       dest, pattern, order = pair.first, pair.last, config["order"]||[]
       matches = Dir.glob(pattern).sort_by(&:downcase).order_by(order)
-      next if matches.select {|p| cache.miss? p}.empty?
+      next if matches.select {|path| cache.miss?(dest, path)}.empty?
       write_asset(dest, matches)
     end
   end
@@ -126,11 +126,20 @@ module Linner
   def copy(config)
     config["copy"].each do |dest, pattern|
       Dir.glob(pattern).each do |path|
-        next if not cache.miss?(path)
-        logical_path = Asset.new(path).logical_path
-        dest_path = File.join(env.public_folder, dest, logical_path)
-        FileUtils.mkdir_p File.dirname(dest_path)
-        FileUtils.cp_r path, dest_path
+        next if not cache.miss?(dest, path)
+        asset = Asset.new(path)
+        dest_path = File.join(env.public_folder, dest, asset.logical_path)
+        if asset.javascript? or asset.stylesheet?
+          asset.content
+          asset.compress if compile?
+          dest_path = dest_path.sub(/[^.]+\z/,"js") if asset.javascript?
+          dest_path = dest_path.sub(/[^.]+\z/,"css") if asset.stylesheet?
+          asset.path = dest_path
+          asset.write
+        else
+          FileUtils.mkdir_p File.dirname(dest_path)
+          FileUtils.cp_r path, dest_path
+        end
       end
     end
   end
@@ -138,7 +147,7 @@ module Linner
   def precompile(config)
     config["precompile"].each do |dest, pattern|
       matches = Dir.glob(pattern).sort_by(&:downcase)
-      next if matches.select { |p| cache.miss? p }.empty?
+      next if matches.select { |path| cache.miss?(dest, path) }.empty?
       write_template(dest, matches)
     end
   end
@@ -146,7 +155,7 @@ module Linner
   def sprite(config)
     config["sprite"].each do |dest, pattern|
       matches = Dir.glob(pattern).sort_by(&:downcase)
-      next if matches.select { |p| cache.miss? p }.empty?
+      next if matches.select { |path| cache.miss?(dest, path) }.empty?
       paint_sprite(dest, matches)
     end
   end
@@ -183,7 +192,7 @@ module Linner
 
   def write_template(dest, child_assets)
     asset = Asset.new(File.join env.public_folder, dest)
-    content = child_assets.inject("") {|s, m| s << cache[m].content}
+    content = child_assets.inject("") {|s, m| s << cache["#{dest}:#{m}"].content}
     asset.content = Wrapper::Template.definition(content)
     asset.compress if compile?
     asset.write
@@ -192,7 +201,7 @@ module Linner
   def write_asset(dest, child_assets)
     asset = Asset.new(File.join env.public_folder, dest)
     definition = (asset.path == env.definition ? Wrapper::Module.definition : "")
-    asset.content = child_assets.inject(definition) {|s, m| s << cache[m].content}
+    asset.content = child_assets.inject(definition) {|s, m| s << cache["#{dest}:#{m}"].content}
     asset.compress if compile?
     asset.write
   end

data/lib/linner/cache.rb

@@ -1,11 +1,11 @@
 module Linner
   class Cache < Hash
-    def miss? path
+    def miss? ns, path
       asset = Asset.new path
-      if self[path] and self[path].mtime == asset.mtime
+      if self["#{ns}:#{path}"] and self["#{ns}:#{path}"].mtime == asset.mtime
         false
       else
-        self[path] = asset
+        self["#{ns}:#{path}"] = asset
       end
     end
 

data/lib/linner/compressor.rb

@@ -9,6 +9,8 @@ module Linner
         Uglifier.compile asset.content, comments: "none"
       elsif asset.stylesheet?
         CSSminify.new.compress asset.content
+      else
+        asset.content
       end
     end
   end

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: HTML5 Application Assembler