linner 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 628a0abce862a26e405b98075b06ada3e8df4ab5
-  data.tar.gz: 29e970fc5284ae6cce5bae28cc5674f607d23a6e
+  metadata.gz: 109f2ec4baaa54f466975a57fc9c394b792d57ba
+  data.tar.gz: 8214045c7fe0035d5a85acb246e2e3fc6231a5ed
 SHA512:
-  metadata.gz: 899e3adfc0df7a6b70ab64acfa6481bbe389ae326fc7de23d0f36fdcaa4775bdeb37729f8531d012b869549b43e61350220557dc17df973b99aa18e5b4f2f887
-  data.tar.gz: 1711a3e10d07f0932d68a94c46641f4662512dfe9ee313f0ec5b5ee14c93ca12ea57afd01ac33906b0da0627fb4208d09a0a275e961b80eff5db813bdfc8157a
+  metadata.gz: 8a21df22ee4634f5fd183c4f2a4a7bee930f56a634c01772216b57b4312fbf9cbda3f50d0ebd8fdfd1f6facba19244bfa367a0b3a8bfacb0cb7d00f25cbbc195
+  data.tar.gz: 64d4b5700c56c57caaf86d49e41b98edd11f9a3e3c6a89d9e42e01b579716306665d52d69b26729c333dde04eaf50f1dc1fa1515d8395b60adb1012af4bbbd4c

data/CHANGELOG

@@ -1,3 +1,10 @@
+v 0.4.3
+  - fix the last `/` in `logical_path`
+  - multiple revision file support
+
+v 0.4.2
+  - use `sleep` to instead of `Process.wait`
+
 v 0.4.1
   - `manifest.yml` support
   - lots of badges support

data/lib/linner.rb

@@ -96,11 +96,11 @@ private
 
   def revision
     dump_manifest
-    return unless File.exist?(rev = File.join(env.public_folder, env.revision.to_s))
-    doc = Nokogiri::HTML.parse(File.read rev)
-    replace_tag_with_manifest_value doc, "script", "src"
-    replace_tag_with_manifest_value doc, "link", "href"
-    File.open(rev, "w") {|f| f.write doc.to_html}
+    [env.revision].flatten.each do |rev|
+      file = File.join env.public_folder, rev.to_s
+      next if not File.exist?(file)
+      replace_attributes file
+    end
   end
 
   private
@@ -113,6 +113,13 @@ private
     asset.write
   end
 
+  def replace_attributes file
+    doc = Nokogiri::HTML.parse(File.read file)
+    replace_tag_with_manifest_value doc, "script", "src"
+    replace_tag_with_manifest_value doc, "link", "href"
+    File.open(file, "w") {|f| f.write doc.to_html}
+  end
+
   def replace_tag_with_manifest_value doc, tag, attribute
     doc.search(tag).each do |x|
       next unless node = x.attributes[attribute]

data/lib/linner/asset.rb

@@ -2,6 +2,7 @@ require "digest"
 
 module Linner
   class Asset
+    class RenderError < StandardError; end
 
     attr_accessor :path, :content
 
@@ -37,6 +38,8 @@ module Linner
         File.exist?(path) ? Tilt.new(path, :default_encoding => "UTF-8").render : ""
       rescue RuntimeError
         File.read(path)
+      rescue => e
+        raise RenderError, "#{e.message} in (#{path})"
       end
       if wrappable?
         @content = wrap(source)
@@ -73,7 +76,7 @@ module Linner
     end
 
     def logical_path
-      @logical_path ||= @path.gsub(/#{Linner.env.paths.join("\/|")}/, "")
+      @logical_path ||= @path.gsub(/^(#{Linner.env.paths.join("|")})\/?/, "")
     end
   end
 end

data/lib/linner/templates/app/views/index.html

@@ -17,5 +17,6 @@
 
         <script src="/scripts/vendor.js"></script>
         <script src="/scripts/app.js"></script>
+        <script>require("app")()</script>
     </body>
 </html>

data/lib/linner/templates/config.yml

@@ -20,7 +20,7 @@ groups:
       "/": "app/views/**/*.{html,hbs}"
 modules:
   wrapper: "cmd"
-  ignored: "{vendor/**/*,app/scripts/app.{js,coffee}"
+  ignored: "vendor/**/*"
   definition: "/scripts/app.js"
 revision: "index.html"
 notification: true

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel