linner 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad0db2767b837ef41fc611523a7208c1ae2eb7dc
-  data.tar.gz: 0b0171fa4c551709cd155859cc9723033a2ef3b6
+  metadata.gz: 163b9428e612081d56821206cf90610b4d5653c1
+  data.tar.gz: ef2a80cc220dc6ebfc834368b5f1a3726295300a
 SHA512:
-  metadata.gz: 6a505783f236a3a1ea6a9390a5b40dc9d62de55798aa2cc2cf83a9d3e4b695ec5af96dcf267c70b2d72d64ed8bdd2b01a42c096d2a5cd4944b9e7aac0727908f
-  data.tar.gz: 7b8751ebbbafd8ec0db858d793d80ab1e16513be93331bd14e363cdd77a294867807a140d9814abb057f05724a4368cc196d44867aad676d3ffde81637872d43
+  metadata.gz: ba2dd94fda915cd2d24b44ac1313193516140e094510676e1276b1cffb1726f3b40b5c324a7c82baa084c34ef77f5f5e3cb766f93c1bbb7b33e6da7db17b297e
+  data.tar.gz: 23321997a50676a923bc9517365f74559f0078d31342efd9f05953cff8f1eca05cd60168285e003dcf096515f6cb3c37ce6387d84a3906de217530080a372796

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.0.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+v 0.4.1
+  - `manifest.yml` support
+  - lots of badges support
+
 v 0.4.0
   - revision support
   - fix memory leak in `cache_miss?`

data/README.md

@@ -1,5 +1,7 @@
 # Linner
 
+[![Gem Version](https://badge.fury.io/rb/linner.png)](http://badge.fury.io/rb/linner)   [![Build Status](https://travis-ci.org/SaitoWu/linner.png)](https://travis-ci.org/SaitoWu/linner)   [![Code Climate](https://codeclimate.com/repos/520fd56e56b10241f50f15a3/badges/e8beb45f55b5c1fa6142/gpa.png)](https://codeclimate.com/repos/520fd56e56b10241f50f15a3/feed)   [![Dependency Status](https://gemnasium.com/SaitoWu/linner.png)](https://gemnasium.com/SaitoWu/linner)
+
 Linner is a full-featured HTML5 application assembler.
 
 ![Linner](http://d.pr/i/bWPA+)

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+
+desc "test"
+task :test do
+  sh 'rspec'
+end
+
+task :default => [:test]

data/lib/linner.rb

@@ -3,6 +3,7 @@ require "nokogiri"
 require "linner/version"
 require "linner/command"
 require "linner/asset"
+require "linner/cache"
 require "linner/helper"
 require "linner/reactor"
 require "linner/wrapper"
@@ -23,12 +24,30 @@ module Linner
     @root ||= Pathname('.').expand_path
   end
 
+  def env
+    @env ||= Environment.new begin
+      linner_file = root.join("Linnerfile")
+      config_file = root.join("config.yml")
+      File.exist?(linner_file) ? linner_file : config_file
+    end
+  end
+
   def cache
-    @cache ||= {}
+    @cache ||= Cache.new
   end
 
-  def env
-    @env ||= Environment.new root.join("config.yml")
+  def manifest
+    @manifest ||= begin
+      hash = {}
+      env.groups.each do |config|
+        config["concat"].to_h.each do |dest, pattern|
+          asset = Asset.new(File.join env.public_folder, dest)
+          hash[dest] = asset.relative_digest_path
+          asset.revision!
+        end
+      end
+      hash
+    end
   end
 
   def compile?
@@ -36,11 +55,13 @@ module Linner
   end
 
   def sass_engine_options
-    @options ||= Compass.configuration.to_sass_engine_options
-    env.paths.each do |load_path|
-      @options[:load_paths] << Sass::Importers::Filesystem.new(load_path)
+    @options ||= begin
+      options = Compass.configuration.to_sass_engine_options
+      env.paths.each do |load_path|
+        options[:load_paths] << Sass::Importers::Filesystem.new(load_path)
+      end
+      options
     end
-    @options
   end
 
   def perform(*asset)
@@ -56,19 +77,15 @@ private
     config["concat"].each_with_index do |pair, index|
       dest, pattern, order = pair.first, pair.last, config["order"]||[]
       matches = Dir.glob(pattern).order_by(order)
-      next if matches.select {|p| cache_miss? p}.empty?
-      dest = Asset.new(File.join env.public_folder, dest)
-      definition = Wrapper.definition if dest.path == env.definition
-      dest.content = matches.inject(definition || "") {|s, m| s << cache[m].content}
-      dest.compress if compile?
-      dest.write
+      next if matches.select {|p| cache.miss? p}.empty?
+      write_asset(dest, matches)
     end
   end
 
   def copy(config)
     config["copy"].each do |dest, pattern|
       Dir.glob(pattern).each do |path|
-        next if not cache_miss?(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)
@@ -78,29 +95,34 @@ private
   end
 
   def revision
-    revision = File.join env.public_folder, env.revision
-    doc = Nokogiri::HTML.parse(File.read revision)
-    doc.search("script").each do |x|
-      next unless src = x.attributes["src"]
-      asset = Asset.new(File.join env.public_folder, src)
-      x.set_attribute "src", asset.revision!
-    end
-    doc.search("link").each do |x|
-      next unless href = x.attributes["href"]
-      asset = Asset.new(File.join env.public_folder, href)
-      x.set_attribute "href", asset.revision!
-    end
-    File.open(revision, "w") do |f|
-      f.write doc.to_html
+    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}
+  end
+
+  private
+
+  def write_asset(dest, child_assets)
+    asset = Asset.new(File.join env.public_folder, dest)
+    definition = (asset.path == env.definition ? Wrapper.definition : "")
+    asset.content = child_assets.inject(definition) {|s, m| s << cache[m].content}
+    asset.compress if compile?
+    asset.write
+  end
+
+  def replace_tag_with_manifest_value doc, tag, attribute
+    doc.search(tag).each do |x|
+      next unless node = x.attributes[attribute]
+      x.set_attribute attribute, manifest[node.value]
     end
   end
 
-  def cache_miss?(path)
-    asset = Asset.new(path)
-    if cache[path] and cache[path].mtime == asset.mtime
-      false
-    else
-      cache[path] = asset
+  def dump_manifest
+    File.open(File.join(env.public_folder, env.manifest), "w") do |f|
+      YAML.dump(manifest, f)
     end
   end
 end

data/lib/linner/asset.rb

@@ -7,9 +7,7 @@ module Linner
 
     def initialize(path)
       @path = path
-      if File.exist? @path
-        @mtime ||= File.mtime(path).to_i
-      end
+      @mtime = File.mtime(path).to_i if File.exist?(path)
     end
 
     def mtime
@@ -17,17 +15,20 @@ module Linner
     end
 
     def extname
-      File.extname @path
+      @extname = File.extname path
+    end
+
+    def digest_path
+      digest = Digest::MD5.hexdigest content
+      path.chomp(extname) << "-#{digest}" << extname
     end
 
-    def digest
-      Digest::MD5.hexdigest content
+    def relative_digest_path
+      digest_path.gsub /#{Linner.env.public_folder}/, ""
     end
 
     def revision!
-      revision = @path.chomp(extname) << "-#{digest}" << extname
-      File.rename @path, revision
-      revision.gsub /#{Linner.env.public_folder}/, ""
+      File.rename path, digest_path
     end
 
     def content

data/lib/linner/cache.rb

@@ -0,0 +1,19 @@
+module Linner
+  class Cache < Hash
+    def miss? path
+      asset = Asset.new path
+      if self[path] and self[path].mtime == asset.mtime
+        false
+      else
+        self[path] = asset
+      end
+    end
+
+    def expire_by paths
+      is_include_partial_styles = paths.any? do |path|
+        Asset.new(path).stylesheet? and File.basename(path).start_with? "_"
+      end
+      self.reject! {|k, v| v.stylesheet?} if is_include_partial_styles
+    end
+  end
+end

data/lib/linner/command.rb

@@ -18,46 +18,18 @@ module Linner
     desc "build", "build assets"
     def build
       Linner.compile = true
-
       clean
-
-      Notifier.profile do
-        Linner.perform
-      end
+      Notifier.profile { Linner.perform }
     end
 
     desc "watch", "watch assets"
     def watch
-      trap :INT do
-        Notifier.exit
-        Process.kill("QUIT", 0)
-      end
-
+      trap(:INT) { exit! }
       clean
-
-      @proc = Proc.new do |modified, added, removed|
-        begin
-          Notifier.profile{ Linner.perform }
-        rescue
-          Notifier.error $!
-        end
-      end
-      @proc.call
-
-      Listen.to env.app_folder, env.vendor_folder, env.test_folder do |modified, added, removed|
-        is_include_partial_styles = (modified + added + removed).any? do |path|
-          Asset.new(path).stylesheet? and File.basename(path).start_with? "_"
-        end
-        Linner.cache.reject! {|k, v| v.stylesheet?} if is_include_partial_styles
-        @proc.call
-      end
-
-      @reactor = Reactor.supervise_as(:reactor).actors.first
-      Listen.to env.public_folder, relative_path: true do |modified, added, removed|
-        @reactor.reload_browser(modified + added + removed)
-      end
-
-      sleep
+      perform_proc.call
+      watch_for_perform
+      watch_for_reload
+      Process.wait
     end
 
     desc "clean", "clean assets"
@@ -75,6 +47,35 @@ module Linner
     def env
       Linner.env
     end
+
+    def perform_proc
+      @proc ||= Proc.new do |modified, added, removed|
+        begin
+          Notifier.profile{ Linner.perform }
+        rescue
+          Notifier.error $!
+        end
+      end
+    end
+
+    def watch_for_perform
+      Listen.to env.watched_paths do |modified, added, removed|
+        Linner.cache.expire_by(modified + added + removed)
+        perform_proc.call
+      end
+    end
+
+    def watch_for_reload
+      reactor = Reactor.supervise_as(:reactor).actors.first
+      Listen.to env.public_folder, relative_path: true do |modified, added, removed|
+        reactor.reload_browser(modified + added + removed)
+      end
+    end
+
+    def exit!
+      Notifier.exit
+      Kernel::exit
+    end
   end
 end
 

data/lib/linner/environment.rb

@@ -9,22 +9,26 @@ module Linner
       @env = @convension.rmerge!(@env)
     end
 
-    def paths
-      groups.map { |group| group["paths"] }.flatten.uniq
-    end
-
     %w(app test vendor public).each do |method|
       define_method("#{method}_folder") do
         @env["paths"][method]
       end
     end
 
-    def revision
-      @env["revision"]
+    def paths
+      groups.map { |group| group["paths"] }.flatten.uniq
+    end
+
+    def watched_paths
+      [app_folder, vendor_folder, test_folder].select do |path|
+        File.exists? path
+      end
     end
 
-    def notification
-      @env["notification"]
+    %w(revision notification manifest).each do |method|
+      define_method("#{method}") do
+        @env[method]
+      end
     end
 
     def modules_ignored

data/lib/linner/helper.rb

@@ -13,25 +13,18 @@ module Linner
       order_ary = ary.inject([[]]) do |a, x|
         x != "..." ? a.last << x : a<< []; a
       end
-      order_by_before(self, order_ary.first)
-      order_by_after(self, order_ary.last)
+      order_by_direction(order_ary.first, :before)
+      order_by_direction(order_ary.last, :after)
       self
     end
 
   private
-    def order_by_before(list, before)
-      before.reverse.each do |f|
-        if i = list.index {|x| x =~ /#{f}/i}
-          list.unshift list.delete_at i
-        end
-      end
-    end
-
-    def order_by_after(list, after)
-      after.reverse.each do |f|
-        if i = list.index {|x| x =~ /#{f}/i}
-          list.push list.delete_at i
-        end
+    def order_by_direction(ary, direction)
+      ary = ary.reverse if direction == :before
+      ary.each do |f|
+        next unless i = self.index {|x| x =~ /#{f}/i}
+        item = self.delete_at i
+        direction == :before ? self.unshift(item) : self.push(item)
       end
     end
   end

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

@@ -6,7 +6,7 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="styles/app.css">
+        <link rel="stylesheet" href="/styles/app.css">
     </head>
     <body>
         <!--[if lt IE 7]>
@@ -15,8 +15,7 @@
 
         <p>Hello world! This is Linner Boilerplate.</p>
 
-        <script src="scripts/vendor.js"></script>
-        <script src="scripts/app.js"></script>
-        <script>require("app")()</script>
+        <script src="/scripts/vendor.js"></script>
+        <script src="/scripts/app.js"></script>
     </body>
 </html>

data/lib/linner/templates/config.yml

@@ -3,21 +3,24 @@ paths:
 groups:
   scripts:
     concat:
-      "scripts/app.js": "app/**/*.{js,coffee}"
-      "scripts/vendor.js": "vendor/**/*.{js,coffee}"
+      "/scripts/app.js": "app/**/*.{js,coffee}"
+      "/scripts/vendor.js": "vendor/**/*.{js,coffee}"
     order:
       - "vendor/jquery-1.10.2.js"
       - "..."
+      - "app/scripts/app.coffee"
   styles:
     concat:
-      "styles/app.css": "app/styles/**/[a-z]*.{css,scss,sass}"
+      "/styles/app.css": "app/styles/**/[a-z]*.{css,scss,sass}"
   images:
     copy:
-      "images/": "app/images/**/*.{png,gif}"
+      "/images/": "app/images/**/*.{png,gif}"
   views:
     copy:
       "/": "app/views/**/*.{html,hbs}"
 modules:
   wrapper: "cmd"
+  ignored: "{vendor/**/*,app/scripts/app.{js,coffee}"
+  definition: "/scripts/app.js"
 revision: "index.html"
 notification: true

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/linner.gemspec

@@ -22,15 +22,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 0.18"
   spec.add_dependency "tilt", "~> 1.4"
   spec.add_dependency "sass", "~> 3.2"
-  spec.add_dependency "listen", "~> 1.2"
+  spec.add_dependency "listen", "~> 1.3"
   spec.add_dependency "nio4r", "~> 0.5.0"
-  spec.add_dependency "uglifier", "~> 2.1"
+  spec.add_dependency "uglifier", "~> 2.2"
   spec.add_dependency "nokogiri", "~> 1.6.0"
   spec.add_dependency "compass", "~> 0.12.2"
   spec.add_dependency "cssminify", "~> 1.0.2"
   spec.add_dependency "coffee-script", "~> 2.2"
-  spec.add_dependency "terminal-notifier", "~> 1.4"
+  spec.add_dependency "terminal-notifier", "~> 1.5"
 
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/linner/asset_spec.rb

@@ -5,13 +5,19 @@ describe Asset do
   before(:each) do
     @script_asset = Asset.new("app/scripts/app.js")
     @style_asset = Asset.new("app/styles/app.css")
+    @dest_asset = Asset.new("public/app.js")
   end
 
-  it "should be return right logical_path" do
+  it "should return right logical_path" do
     @script_asset.logical_path.should == "app.js"
     @style_asset.logical_path.should == "app.css"
   end
 
+  it "should return right digest_path" do
+    @dest_asset.digest_path.should == "public/app-cdd1c27fabeede75d12b8adf46e987fd.js"
+    @dest_asset.relative_digest_path.should == "/app-cdd1c27fabeede75d12b8adf46e987fd.js"
+  end
+
   it "should be javascript" do
     @script_asset.javascript?.should be_true
     @style_asset.stylesheet?.should be_true

data/spec/linner/environment_spec.rb

@@ -17,6 +17,7 @@ describe Environment do
   it "should equals default config" do
     @env.notification.should be_true
     @env.wrapper.should == "cmd"
+    @env.manifest.should == "manifest.yml"
     @env.revision.should == false
     @env.groups.should respond_to(:each)
   end

data/spec/linner/helper_spec.rb

@@ -6,21 +6,21 @@ describe Array do
   end
 
   it "won't change when before and after are empty array" do
-    @array.order_by([]).should =~ @array
+    @array.order_by([]).should == @array
   end
 
   it "will change by before items" do
     @array.order_by(["jquery.js", "vendor.js"])
-    @array.should =~ %w[jquery.js vendor.js app.js bootstrap.css reset.css]
+    @array.should == %w[jquery.js vendor.js app.js bootstrap.css reset.css]
   end
 
   it "will change by after items" do
     @array.order_by(["...", "reset.css", "bootstrap.css"])
-    @array.should =~ %w[app.js jquery.js vendor.js reset.css bootstrap.css]
+    @array.should == %w[app.js jquery.js vendor.js reset.css bootstrap.css]
   end
 
   it "will change by before and after items" do
     @array.order_by(["jquery.js", "vendor.js", "...", "reset.css", "bootstrap.css"])
-    @array.should =~ %w[jquery.js vendor.js app.js reset.css bootstrap.css]
+    @array.should == %w[jquery.js vendor.js app.js reset.css bootstrap.css]
   end
 end

data/vendor/config.default.yml

@@ -24,8 +24,8 @@ groups:
 modules:
   wrapper: "cmd"
   ignored: "vendor/**/*"
-  definition: "scripts/app.js"
+  definition: "/scripts/app.js"
 
+manifest: "manifest.yml"
 revision: false
-
 notification: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +244,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -241,6 +256,7 @@ files:
 - docs/config.md
 - lib/linner.rb
 - lib/linner/asset.rb
+- lib/linner/cache.rb
 - lib/linner/command.rb
 - lib/linner/compressor.rb
 - lib/linner/environment.rb