linner 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 234c003d2a8de857346b8001b7d76f4e0e2dc1d3
-  data.tar.gz: 5f67d62fd866da6717fa56f619be7a8613a1c859
+  metadata.gz: ef15c34cce7a178f1dccea701490a4ebd35f098e
+  data.tar.gz: c1005af018772e5356d511df2dcda0ed4b20f28f
 SHA512:
-  metadata.gz: a78076faccfb160445dbe5c3846ba796e787c36a46c0f699f72890e0837dee3ca62f237dd0d83c00772d0eb06fe5b648dd456021c70cdce85ba5c27519726d91
-  data.tar.gz: 2324de42bd8f6ab2fbb82a7a98b54e71fe61f20958edc4c2e798bebfe089dae86fd729c35c6813c873c607f5942703344ecfb7ef670fd19c1a59d4f271de91e8
+  metadata.gz: f0027951a49e9b5b3b634988aa318b6d75cb25d69510e0bf30a9207f3e6b972692694736fc2df85163baafd31e2a2cb6575f2cd0d429ba53bedcf8cf65cb2c93
+  data.tar.gz: 9372867370f3d80267dd95792426ef83bc7c6ff7df11fa15d9d05297c3bf6e308473def78f5dbe30290b64fa99b57c13ada21f90c5d79e1f1c8072d2ea770b0f

data/CHANGELOG

@@ -0,0 +1,4 @@
+v 0.3.0
+  - add `compass` support
+  - cache now supports `styles`
+  - more readable config file

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    linner (0.1.5)
+    linner (0.2.0)
       coffee-script (~> 2.2)
+      compass (~> 0.12.2)
       cssminify (~> 1.0.2)
       listen (~> 1.2)
       multi_json (~> 1.7)
@@ -15,15 +16,21 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    chunky_png (1.2.8)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     cssminify (1.0.2)
     diff-lcs (1.2.4)
     execjs (1.4.0)
       multi_json (~> 1.0)
     ffi (1.9.0)
+    fssm (0.2.10)
     listen (1.2.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)

data/lib/linner/asset.rb

@@ -5,19 +5,43 @@ module Linner
 
     def initialize(path)
       @path = path
-      @content ||= begin
+      if File.exist? @path
+        @mtime ||= File.mtime(path).to_i
+      end
+    end
+
+    def mtime
+      @mtime
+    end
+
+    def content
+      return @content if @content
+      source = begin
         File.exist?(path) ? Tilt.new(path, :default_encoding => "UTF-8").render : ""
       rescue RuntimeError
         File.read(path)
       end
+      if wrappable?
+        @content = wrap(source)
+      else
+        @content = source
+      end
+    end
+
+    def wrap(source)
+      Wrapper.wrap(logical_path.chomp(File.extname logical_path), source)
+    end
+
+    def javascript?
+      Tilt[path] and Tilt[path].default_mime_type == "application/javascript"
     end
 
-    def wrap
-      Wrapper.wrap(logical_path.chomp(File.extname logical_path), @content)
+    def stylesheet?
+      Tilt[path] and Tilt[path].default_mime_type == "text/css"
     end
 
     def wrappable?
-      !!(@path.include? Linner.environment.app_folder and Template.template_for_script?(@path))
+      !!(self.javascript? and !Linner.env.modules_ignored.include?(@path))
     end
 
     def write
@@ -32,7 +56,7 @@ module Linner
     end
 
     def logical_path
-      @logical_path ||= @path.gsub(/#{Linner.environment.app_folder}\/\w*\//, "")
+      @logical_path ||= @path.gsub(/#{Linner.env.paths.join("\/|")}/, "")
     end
   end
 end

data/lib/linner/command.rb

@@ -17,8 +17,9 @@ module Linner
 
     desc "build", "build assets"
     def build
+      Linner.compile = true
       Notifier.info do
-        Linner.perform compile: true
+        Linner.perform
       end
     end
 
@@ -45,7 +46,7 @@ module Linner
 
     desc "clean", "clean assets"
     def clean
-      FileUtils.rm_rf Dir.glob("#{Linner.environment.public_folder}/*")
+      FileUtils.rm_rf Dir.glob("#{env.public_folder}/*")
     end
 
     desc "new", "create the skeleton of project"
@@ -54,9 +55,9 @@ module Linner
       chmod("#{name}/bin/server", 0755)
     end
 
-    private
+  private
     def env
-      Linner.environment
+      Linner.env
     end
   end
 end

data/lib/linner/compressor.rb

@@ -5,9 +5,9 @@ module Linner
   class Compressor
 
     def self.compress(asset)
-      if Template.template_for_script? asset.path
+      if asset.javascript?
         Uglifier.compile asset.content, comments: "none"
-      elsif Template.template_for_style? asset.path
+      elsif asset.stylesheet?
         CSSminify.new.compress asset.content
       end
     end

data/lib/linner/environment.rb

@@ -9,6 +9,10 @@ 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]
@@ -19,12 +23,20 @@ module Linner
       @env["notification"]
     end
 
+    def modules_ignored
+      Dir.glob(@env["modules"]["ignored"])
+    end
+
     def wrapper
       @env["modules"]["wrapper"]
     end
 
-    def files
-      @env["files"].values
+    def definition
+      File.join public_folder, @env["modules"]["definition"]
+    end
+
+    def groups
+      @env["groups"].values
     end
   end
 end

data/lib/linner/helper.rb

@@ -8,13 +8,17 @@ module Linner
   end
 
   module Order
-    def order_by(before:[], after:[])
-      order_by_before(self, before)
-      order_by_after(self, after)
+    def order_by(ary)
+      ary << "..." if not ary.include? "..."
+      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)
       self
     end
 
-    private
+  private
     def order_by_before(list, before)
       before.reverse.each do |f|
         if i = list.index {|x| x =~ /#{f}/i}

data/lib/linner/notifier.rb

@@ -11,7 +11,7 @@ module Linner
 
       def error(message)
         puts message = "👻 : #{message}!"
-        if Linner.environment.notification && TerminalNotifier.available?
+        if Linner.env.notification && TerminalNotifier.available?
           TerminalNotifier.notify message, :title => 'Linner'
         end
       end

data/lib/linner/template.rb

@@ -1,5 +1,6 @@
 require "tilt"
 require "sass"
+require "compass"
 require "coffee_script"
 
 module Tilt
@@ -11,21 +12,30 @@ module Tilt
     self.default_mime_type = 'text/css'
   end
 
-  Tilt.register Tilt::CSSTemplate, "css"
-  Tilt.register Tilt::JavascriptTemplate, "js"
-end
+  class CompassSassTemplate < SassTemplate
+    self.default_mime_type = 'text/css'
 
-module Linner
-  class Template
+  private
+    def sass_options
+      super.merge(Linner.sass_engine_options)
+    end
+  end
 
-    class << self
-      def template_for_script?(path)
-        Tilt[path].default_mime_type == "application/javascript"
-      end
+  class CompassScssTemplate < CompassSassTemplate
+    self.default_mime_type = 'text/css'
 
-      def template_for_style?(path)
-        Tilt[path].default_mime_type == "text/css"
-      end
+  private
+    def sass_options
+      super.merge(:syntax => :scss)
     end
   end
+
+  register CSSTemplate, "css"
+  register JavascriptTemplate, "js"
+
+  register CompassSassTemplate, "sass"
+  prefer CompassSassTemplate
+
+  register CompassScssTemplate, "scss"
+  prefer CompassScssTemplate
 end

data/lib/linner/templates/config.yml

@@ -1,15 +1,13 @@
 paths:
   public: "public"
-files:
+groups:
   scripts:
     concat:
       "scripts/app.js": "app/**/*.{js,coffee}"
       "scripts/vendor.js": "vendor/**/*.{js,coffee}"
     order:
-      before:
-        - "vendor/jquery-1.10.2.js"
-      after:
-        - "vendor/commonjs.js"
+      - "vendor/jquery-1.10.2.js"
+      - "..."
   styles:
     concat:
       "styles/app.css": "app/styles/**/[a-z]*.{css,scss,sass}"
@@ -20,5 +18,5 @@ files:
     copy:
       "/": "app/views/**/*.{html,hbs}"
 modules:
-  wrapper: "CMD"
+  wrapper: "cmd"
 notification: true

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/linner/wrapper.rb

@@ -9,5 +9,9 @@ module Linner
     def self.wrap(name, content)
       WRAPPER % [name, content]
     end
+
+    def self.definition
+      File.read(File.join File.dirname(__FILE__), "../../vendor", "require_definition.js")
+    end
   end
 end

data/lib/linner.rb

@@ -11,6 +11,8 @@ require "linner/environment"
 module Linner
   extend self
 
+  attr_accessor :compile
+
   def root
     @root ||= Pathname('.').expand_path
   end
@@ -19,52 +21,68 @@ module Linner
     @cache ||= {}
   end
 
-  def environment
+  def env
     @env ||= Environment.new root.join("config.yml")
   end
 
-  def perform(compile: false)
-    environment.files.each do |config|
-      concat(config, compile)
-      copy(config)
+  def compile?
+    @compile
+  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)
     end
+    @options
   end
 
-  private
-  def concat(config, compile)
-    config["concat"].map do |dest, regex|
-      matches = Dir.glob(regex).uniq.order_by(before:config["order"]["before"], after:config["order"]["after"])
-      dest = Asset.new(File.join environment.public_folder, dest)
-      dest.content = ""
-      cached = matches.select do |path|
-        mtime = File.mtime(path).to_i
-        mtime == cache[path] ? false : cache[path] = mtime
-      end
-      next if cached.empty?
-      matches.each do |m|
-        asset = Asset.new(m)
-        content = asset.content
-        if asset.wrappable?
-          content = asset.wrap
-        end
-        dest.content << content
-      end
-      dest.compress if compile
+  def perform(*asset)
+    env.groups.each do |config|
+      concat(config) if config["concat"]
+      copy(config) if config["copy"]
+    end
+  end
+
+private
+  def concat(config)
+    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
     end
   end
 
   def copy(config)
-    config["copy"].each do |dest, regex|
-      Dir.glob(regex).each do |path|
-        mtime = File.mtime(path).to_i
-        next if cache[path] == mtime
-        cache[path] = mtime
+    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(environment.public_folder, dest, 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
       end
     end
   end
+
+  def cache_miss?(path)
+    asset = Asset.new(path)
+    if asset.stylesheet? and Tilt[path] != Tilt::CSSTemplate
+      partials = Sass::Engine.for_file(path, sass_engine_options).dependencies.map{|m| m.options[:filename]}
+      cache_missed = partials.select do |partial|
+        partial_asset = Asset.new(partial)
+        (cache[partial] and cache[partial].mtime == partial_asset.mtime) ? false : cache[partial] = partial_asset
+      end
+      unless cache_missed.empty?
+        cache[path] = asset
+        return true
+      end
+    end
+    (cache[path] and cache[path].mtime == asset.mtime) ? false : cache[path] = asset
+  end
 end

data/linner.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sass", "~> 3.2"
   spec.add_dependency "listen", "~> 1.2"
   spec.add_dependency "uglifier", "~> 2.1"
+  spec.add_dependency "compass", "~> 0.12.2"
   spec.add_dependency "multi_json", "~> 1.7"
   spec.add_dependency "cssminify", "~> 1.0.2"
   spec.add_dependency "coffee-script", "~> 2.2"

data/spec/linner/asset_spec.rb

@@ -3,19 +3,22 @@ require "spec_helper"
 describe Asset do
 
   before(:each) do
-    @asset = Asset.new("app/scripts/app.js")
+    @script_asset = Asset.new("app/scripts/app.js")
+    @style_asset = Asset.new("app/styles/app.css")
   end
 
-  describe :logical_path do
-    it "should be return right logical_path" do
-      @asset.logical_path.should == "app.js"
-    end
+  it "should be return right logical_path" do
+    @script_asset.logical_path.should == "app.js"
+    @style_asset.logical_path.should == "app.css"
   end
 
-  describe :wrappable do
-    it "should wrapperable" do
-      @asset.wrappable?.should be_true
-      Asset.new("app/styles/app.css").wrappable?.should be_false
-    end
+  it "should be javascript" do
+    @script_asset.javascript?.should be_true
+    @style_asset.stylesheet?.should be_true
+  end
+
+  it "should wrapperable" do
+    @script_asset.wrappable?.should be_true
+    @style_asset.wrappable?.should be_false
   end
 end

data/spec/linner/environment_spec.rb

@@ -3,29 +3,20 @@ require "spec_helper"
 describe Environment do
   before(:each) do
     @env = Environment.new(root.join "config.yml")
+    @ary = ["app/scripts", "app/styles", "app/images", "app/views"]
   end
 
-  describe "convension" do
-    it "should equals default path folder" do
-      @env.app_folder.should == "app"
-      @env.test_folder.should == "test"
-      @env.vendor_folder.should == "vendor"
-      @env.public_folder.should == "public"
-    end
-
-    it "should equals default config" do
-      @env.notification.should be_true
-      @env.wrapper.should == "CMD"
-      @env.files.should respond_to(:each)
-    end
+  it "should equals default path folder" do
+    @env.paths.should =~ @ary
+    @env.app_folder.should == "app"
+    @env.test_folder.should == "test"
+    @env.vendor_folder.should == "vendor"
+    @env.public_folder.should == "public"
+  end
 
-    it "should equals default before and after" do
-      @env.files.each do |file|
-        file["copy"].should respond_to(:each)
-        file["concat"].should respond_to(:each)
-        file["order"]["before"].should respond_to(:each)
-        file["order"]["after"].should respond_to(:each)
-      end
-    end
+  it "should equals default config" do
+    @env.notification.should be_true
+    @env.wrapper.should == "cmd"
+    @env.groups.should respond_to(:each)
   end
 end

data/spec/linner/helper_spec.rb

@@ -5,24 +5,22 @@ describe Array do
     @array = %w[app.js jquery.js bootstrap.css reset.css vendor.js]
   end
 
-  describe :sort do
-    it "won't change when before and after are empty array" do
-      @array.order_by(before:[], after:[]).should be_equal @array
-    end
+  it "won't change when before and after are empty array" do
+    @array.order_by([]).should =~ @array
+  end
 
-    it "will change by before items" do
-      @array.order_by(before:["jquery.js", "vendor.js"], after:[])
-      @array.should =~ %w[jquery.js vendor.js app.js bootstrap.css reset.css]
-    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]
+  end
 
-    it "will change by after items" do
-      @array.order_by(before:[], after:["reset.css", "bootstrap.css"])
-      @array.should =~ %w[app.js jquery.js vendor.js reset.css bootstrap.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]
+  end
 
-    it "will change by before and after items" do
-      @array.order_by(before:["jquery.js", "vendor.js"], after:["reset.css", "bootstrap.css"])
-      @array.should =~ %w[jquery.js vendor.js app.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]
   end
 end

data/spec/linner/template_spec.rb

@@ -1,26 +1,12 @@
 require "spec_helper"
 
-describe Template do
+describe "Template" do
 
-  describe :templates do
-
-    it "should be javascript tempalate" do
-      Tilt["app.js"].should == Tilt::JavascriptTemplate
-    end
-
-    it "should be css template" do
-      Tilt["app.css"].should == Tilt::CSSTemplate
-    end
-
-    it "should tempalte for script" do
-      Template.template_for_script?("app.js").should be_true
-      Template.template_for_script?("app.coffee").should be_true
-    end
+  it "should be javascript tempalate" do
+    Tilt["app.js"].should == Tilt::JavascriptTemplate
+  end
 
-    it "should tempalte for style" do
-      Template.template_for_style?("app.css").should be_true
-      Template.template_for_style?("app.sass").should be_true
-      Template.template_for_style?("app.scss").should be_true
-    end
+  it "should be css template" do
+    Tilt["app.css"].should == Tilt::CSSTemplate
   end
 end

data/spec/linner/wrapper_spec.rb

@@ -13,10 +13,12 @@ describe Wrapper do
       ";}});\n"
   end
 
-  describe :wrap do
-    it "should wrapped by wrapper" do
-      script = Wrapper.wrap(@name, @script)
-      script.should eq @expected_script
-    end
+  it "should wrapped by wrapper" do
+    script = Wrapper.wrap(@name, @script)
+    script.should eq @expected_script
+  end
+
+  it "should has definition" do
+    Wrapper.definition.should_not be_nil
   end
 end

data/vendor/config.default.yml

@@ -3,32 +3,27 @@ paths:
   test: "test"
   vendor: "vendor"
   public: "public"
-files:
+
+groups:
   scripts:
-    concat: {}
-    copy: {}
+    paths:
+      - "app/scripts"
     order:
-      before:
-        - "vendor/jquery-1.10.2.js"
-      after: []
+      - "vendor/jquery-1.10.2.js"
+      - "..."
   styles:
-    concat: {}
-    copy: {}
-    order:
-      before: []
-      after: []
+    paths:
+      - "app/styles"
   images:
-    concat: {}
-    copy: {}
-    order:
-      before: []
-      after: []
+    paths:
+      - "app/images"
   views:
-    concat: {}
-    copy: {}
-    order:
-      before: []
-      after: []
+    paths:
+      - "app/views"
+
 modules:
-  wrapper: "CMD"
+  wrapper: "cmd"
+  ignored: "vendor/**/*"
+  definition: "scripts/app.js"
+
 notification: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +202,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -209,7 +224,6 @@ files:
 - lib/linner/templates/bin/server
 - lib/linner/templates/config.yml
 - lib/linner/templates/test/.gitkeep
-- lib/linner/templates/vendor/commonjs.js
 - lib/linner/templates/vendor/jquery-1.10.2.js
 - lib/linner/version.rb
 - lib/linner/wrapper.rb
@@ -224,6 +238,7 @@ files:
 - spec/spec_helper.rb
 - vendor/config.default.yml
 - vendor/livereload.js
+- vendor/require_definition.js
 homepage: https://github.com/saitowu/linner
 licenses:
 - MIT