assette 0.0.0 → 0.0.1

data/lib/assette/config.rb

@@ -1,24 +1,158 @@
-require 'yaml'
-
 module Assette
-  attr_accessor :config
+  def config(optional_path=nil)
+    return @config if @config && !optional_path
+    
+    f = %w{assets.rb config/assets.rb}
+    f.unshift(optional_path.to_s) if optional_path
+
+    p = f.find { |path| File.exist?(path) }
+    
+    @config = Assette::Config.load(p)
+  end
   
   class Config
-    OPTIONS = [
-      :file_paths, :asset_path, :templates_path, :template_format
-    ]
+    MULTIPLES = %w{file_path asset_host}.freeze
+    SINGLES = %w{asset_dir templates_path template_format cache_method
+      template_preloader template_partial}.freeze
+    BLOCKS = %w{after_compile}.freeze
+    
+    OPTIONS = begin
+      arr = MULTIPLES.collect do |m|
+        "#{m}s"
+      end
+      arr += SINGLES
+      arr += BLOCKS
+    end.freeze
+    
     attr_reader *OPTIONS
+    attr_accessor :compiling, :sha
+    
+    DEFAULTS = {
+      :asset_dir => 'assets',
+      :asset_hosts => [],
+      :file_paths => %w{public},
+      :templates_path => 'app/templates',
+      :template_format => 'AT.t[{*path*}] = {*template*};'
+    }.freeze
     
     def initialize args = {}
+      args = DEFAULTS.merge(args||{})
+      
       args.each do |k,v|
         instance_variable_set "@#{k}", v.dup.freeze
       end
     end
     
+    def find_file_from_relative_path path
+      a = Assette.config.file_paths.find do |pp|
+        File.exist?(File.join(pp,path))
+      end
+      File.join(a,path)
+    end
+    
+    def find_target_from_relative_path path
+      Assette.config.file_paths.find do |p|
+        Assette::Reader.possible_targets(File.join(p,path)).find do |pp|
+          File.exist?(pp)
+        end
+      end
+    end
+    
+    def build_target
+      @asset_dir
+    end
+    
+    def asset_hosts?
+      !@asset_hosts.empty?
+    end
+    
+    def compiling?
+      !!compiling
+    end
+    
+    def asset_host i
+      return '' unless asset_hosts?
+      @asset_hosts[i % @asset_hosts.size]
+    end
+    
+    def compiled_path str
+      str = str.dup
+      if sha
+        case cache_method.to_s
+        when 'path'
+          str = File.join(sha,str)
+        when 'param'
+          str << (str.include?('?') ? '&' : '?')
+          
+          str << 'v=' << sha
+        else
+          warn('No cache compile method set (param or path)')
+        end
+      end
+      
+      str
+    end
+    
+    class Builder
+      
+      attr_reader :__hsh__
+      def initialize(file)
+        @__str = File.open(file).read
+        
+        @__hsh__ = {}
+      end
+      
+      def __run__
+        instance_eval @__str
+      end
+      
+      MULTIPLES.each do |m|
+        eval <<-RB
+        def #{m} *args
+          @__hsh__[:#{m}s] ||= []
+          @__hsh__[:#{m}s] |= args.flatten
+        end
+        
+        def #{m}s *args
+          @__hsh__[:#{m}s] = args.flatten
+        end
+        RB
+      end
+      
+      SINGLES.each do |s|
+        eval <<-RB
+        def #{s} v
+          @__hsh__[:#{s}] = v
+        end
+        RB
+      end
+      
+      BLOCKS.each do |b|
+        eval <<-RB
+        def #{b} val=nil, &blk
+          if val
+            @__hsh__[:#{b}] ||= {}
+            @__hsh__[:#{b}][val] = blk
+          else
+            @__hsh__[:#{b}] = blk
+          end
+        end
+        RB
+      end
+      
+      def to_hash
+        @__hsh__
+      end
+      
+    end
+    
     class << self
       
       def load p
-        new YAML.load_file(p)
+        b = Builder.new(p)
+        b.__run__
+        
+        new b.to_hash
       end
       
     end
@@ -26,10 +160,3 @@ module Assette
   end
   
 end
-
-f = %w{assets.yml config/assets.yml}
-f << File.join( File.dirname(__FILE__), '..', '..', 'examples', 'defaults.yml' )
-
-p = f.find { |path| File.exist?(path) }
-
-Assette.config = Assette::Config.load(p)

data/lib/assette/file.rb

@@ -6,7 +6,7 @@ class Assette::File < ::File
   end
   
   def extension
-    m = path.match(/\.(\w+)$/)
+    m = filename.match(/\.(\w+)$/)
     m[1] if m
   end
   
@@ -67,8 +67,12 @@ class Assette::File < ::File
     File.dirname(path)
   end
   
+  def target_path
+    File.join(dirname,filename.gsub(reader_class.extension,target_class.extension))
+  end
+  
   def filename
-    path.gsub(dirname,'').gsub(/^\//,'')
+    File.basename(path)
   end
   
   def puts *args

data/lib/assette/post_processor.rb

@@ -0,0 +1,65 @@
+module Assette
+  module PostProcessor
+    extend self
+    POST_PROCESSORS = Hash.new {|h,k| h[k] = []}
+    
+    def s
+      POST_PROCESSORS
+    end
+    
+    class Base
+      
+      def initialize(str, args={})
+        @str = str; @args = args
+      end
+      
+      def should_process?
+        true
+      end
+      
+      def processor
+        raise Exception, "You must implement the processor method for #{self.class.inspect} (you can use the @str)"
+      end
+      
+      def process
+        return @str unless should_process?
+        
+        processor
+      end
+      
+      class << self
+        def inherited subclass
+          return if subclass == Assette::PostProcessor::Base || subclass.inspect =~ /#<Class/
+          
+          if outputs
+            Assette::PostProcessor::POST_PROCESSORS[outputs] |= [subclass]
+          end
+        end
+        
+        def outputs
+          
+        end
+        
+        def set_outputs val
+          raise ArgumentError, 'must set outputs to a symbol' unless val.is_a?(Symbol)
+          
+          instance_eval <<-RUBY
+          def outputs
+            #{val.inspect}
+          end
+          RUBY
+          val
+        end
+      end
+    end
+    
+  end
+  
+  
+  
+  def self.PostProcessor(type)
+    c = Class.new(PostProcessor::Base)
+    c.set_outputs(type)
+    c
+  end
+end

data/lib/assette/post_processors/cache_buster.rb

@@ -0,0 +1,18 @@
+class Assette::PostProcessor::CacheBuster < Assette::PostProcessor(:css)
+  URL_MATCHER = /url\((?:["'])?(?!http)(?!\/\/)([\w\/\.\-\s\?=]+)(?:["'])?\)/i
+  
+  def should_process?
+    Assette.config.compiling?
+  end
+  
+  def processor
+    @@i ||= -1
+    
+    @str.gsub(URL_MATCHER) do |s|
+      url = File.join(Assette.config.asset_host(@@i+=1),Assette.config.compiled_path($1))
+      
+      %Q{url("#{url}")}
+    end
+  end
+  
+end

data/lib/assette/post_processors.rb

@@ -0,0 +1,4 @@
+fname = File.join(File.dirname(__FILE__),'post_processors','*.rb')
+Dir[fname].each do |f|
+  require f
+end

data/lib/assette/readers/coffee.rb

@@ -1,4 +1,4 @@
-require 'open3'
+require 'coffee-script'
 
 class Assette::Reader::Coffee < Assette::Reader(:js)
   
@@ -6,26 +6,26 @@ class Assette::Reader::Coffee < Assette::Reader(:js)
     self.class.compile_str text
   end
   
-  class << self
-    
-    def compile_str text
-      out = nil
-
-      Open3.popen3('coffee -sc') do |stdin, stdout, stderr|
-        stdin.puts(text)
-        stdin.close_write
-        out = stdout.read
-      end
-
-      out
-    end
-    
-    def comment_str
-      '#'
-    end
-
-    def comment_str_end
-      ''
-    end
+  def self.comment_str
+    '# %s'
   end
-end
+  
+  def self.compile_str text
+    CoffeeScript.compile text
+  end
+  
+end
+
+# require 'open3'
+# Compile coffeescript using coffee binary.
+# def compile_str_external text
+#   out = nil
+# 
+#   Open3.popen3('coffee -sc') do |stdin, stdout, stderr|
+#     stdin.puts(text)
+#     stdin.close_write
+#     out = stdout.read
+#   end
+# 
+#   out
+# end

data/lib/assette/readers/css.rb

@@ -7,7 +7,7 @@ class Assette::Reader::Css < Assette::Reader(:css)
   class << self
     
     def comment_str
-      @comment_str ||= '/* %s */'
+      '/* %s */'
     end
     
   end

data/lib/assette/readers/js.rb

@@ -7,7 +7,7 @@ class Assette::Reader::Js < Assette::Reader(:js)
   class << self
     
     def comment_str
-      @comment_str ||= "// %s"
+      '// %s'
     end
   end
 end

data/lib/assette/readers/sass.rb

@@ -3,8 +3,7 @@ require 'sass'
 class Assette::Reader::Sass < Assette::Reader(:css)
   
   def compile
-    engine = ::Sass::Engine.new(text,options)
-    engine.to_css
+    ::Sass::Engine.new(text,options).to_css
   end
   
 private

data/lib/assette/run.ru

@@ -0,0 +1,2 @@
+
+run Assette::Server

data/lib/assette/server.rb

@@ -2,9 +2,11 @@ module Assette
   # Methods for finding files are ugly, should fix someday
   class Server
     attr_reader :path
-    def initialize(path)
-      @path = path
-      Assette.config.asset_path
+    def initialize(env)
+      @env = env
+      @path = env["PATH_INFO"]
+      
+      # Assette.config.asset_path
     end
     
     def find_compiled_file
@@ -44,8 +46,8 @@ module Assette
       Assette.config.file_paths.each do |p|
         new_path = File.join(p,path)
         if File.exist?(new_path)
-          f = File.open(new_path)
-          # add in grabbing index.html files if no extension provided
+          new_path = File.join(Dir.pwd,new_path)
+          f = Rack::File.new(p).call(@env)
         end
         
         break if f
@@ -55,25 +57,25 @@ module Assette
     end
     
     def rack_resp
-      
       if has_registered_reader? && (f = find_compiled_file)
         [200,{"Content-Type" => f.content_type},f]
-      elsif (f = find_file) && path_mime_type
-        puts content_type
-        [200,{"Content-Type" => content_type},f]
+      elsif f = find_file
+        f
       else
-        [404,{"Content-Type" => "text/plain"},["File Not Found"]]
+        possible_paths = Assette.config.file_paths.collect do |p|
+          File.join(Dir.pwd,p,path)
+        end
+        
+        [404,{"Content-Type" => "text/plain"},["File Not Found\n#{possible_paths.join("\n")}"]]
       end
     end
     
     class << self
       
       def call(env)
-        s = new(env["PATH_INFO"])
+        s = new(env)
         
         s.rack_resp
-      # rescue => e
-      #   [500,{"Content-Type" => "text/plain"},[e.inspect]]
       end
       
     end

data/lib/assette/template.rb

@@ -2,7 +2,11 @@ module Assette
   
   class Template < Assette::File
     def compile
-      format = Assette.config.template_format.dup
+      if Assette.config.template_partial && filename =~ /^_/
+        format = Assette.config.template_partial.dup
+      else
+        format = Assette.config.template_format.dup
+      end
       
       format.gsub!('{*path*}',local_path.to_json)
       format.gsub!('{*template*}',stringify_body)
@@ -14,7 +18,9 @@ module Assette
     
     def local_path
       lp = path.gsub(Assette.config.templates_path,'')
-      lp.gsub!(/((\.html)?\.\w+)$/,'')
+      lp.gsub!(/((\.html)?\.\w+)$/,'').gsub!(/^\//,'')
+      lp.gsub!(/\/_/,'/')
+      lp
     end
   end
   

data/lib/assette/template_set.rb

@@ -36,6 +36,13 @@ module Assette
       end
     end
     
+    def insert_preloader
+      p = Assette.config.template_preloader
+      if p && pp = Assette.config.find_file_from_relative_path(p)
+        Assette::File.open(pp).all_code
+      end
+    end
+    
     def compile
       coffee = Array.new
       
@@ -49,7 +56,7 @@ module Assette
           str = "window[#{var.to_json}] ||= {}"
         else
           str = used.join('.')
-          str << " = (#{str} || {})"
+          str << " ||= {}"
         end
         
         coffee << str
@@ -59,7 +66,9 @@ module Assette
         coffee << template.compile
       end
       
-      Assette::Reader::Coffee.compile_str(coffee.join("\n"))
+      t = Assette::Reader::Coffee.compile_str(coffee.join("\n"))
+      pre = insert_preloader
+      pre ? [pre,t].join("\n") : t
     end
     
     def storage_variable

data/lib/assette.rb

@@ -17,8 +17,10 @@ MIME::Types.add coffee_type, sass_type
 module Assette
   extend self
   CONFIG_WRAPPER = 'ASSETTE CONFIG'
+  VERSION = File.open(File.expand_path(File.dirname(__FILE__)+'/../VERSION')).read
 end
 
-%w{config reader readers compiled_file file template_set template}.each do |f|
+%w{config reader readers post_processor post_processors
+  compiled_file file template_set template}.each do |f|
   require File.dirname(__FILE__)+'/assette/'+f
 end

data/spec/config_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Assette::Config do
+  
+  before do
+    Assette.instance_variable_set :@config, nil
+  end
+  
+  it "should recieve correct file" do
+    Assette::Config.should_receive(:load).once.with('config/assets.rb')
+    
+    Dir.chdir(File.dirname(__FILE__) + '/../examples') { Assette.config }
+  end
+  
+  describe "default file" do
+    before(:all) do
+      @dir_before = Dir.pwd
+      Dir.chdir(File.dirname(__FILE__) + '/../examples')
+    end
+
+    after(:all) do
+      Dir.chdir(@dir_before)
+    end
+    
+    subject {Assette.config}
+
+    it "should set file paths" do
+      subject.file_paths.should == %w{public foo}
+    end
+
+    it "should set asset hosts" do
+      subject.asset_hosts.should == %w{http://cdn1.gilt.com http://cdn2.gilt.com}
+    end
+    
+    it "should set assets dir" do
+      subject.asset_dir.should == 'myassets'
+    end
+    
+    it "should set templates path" do
+      subject.templates_path.should == 'myapp/templates'
+    end
+    
+    it "should set templates format" do
+      subject.template_format.should == 'GC.foo.t[{*path*}] = Handlebars.compile({*template*});'
+    end
+    
+    it "should set after compile" do
+      subject.after_compile.call.should == 3
+    end
+  end
+  
+end

data/spec/post_processor_spec.rb

@@ -0,0 +1,63 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Assette::PostProcessor do
+  
+  before(:all) do
+    @dir_before = Dir.pwd
+    Dir.chdir(File.dirname(__FILE__) + '/../examples')
+  end
+  
+  after(:all) do
+    Dir.chdir(@dir_before)
+  end
+  
+  describe Assette::PostProcessor::CacheBuster do
+    
+    before(:all) do
+      Assette.config.compiling = true
+      Assette.config.sha = "1234567"
+    end
+    
+    after(:all) do
+      Assette.config.compiling = nil
+    end
+    
+    subject do
+      Assette::File.open('public/stylesheets/two2.scss')
+    end
+    
+    describe "with asset cdn paths" do
+      before(:all) do
+        Assette.config.instance_variable_set :@asset_hosts, %w{http://cdn1.gilt.com http://cdn2.gilt.com}
+      end
+      
+      describe "path changing" do
+        before(:all) do
+          Assette.config.instance_variable_set :@cache_method, 'path'
+        end
+        
+        it "does something" do
+          subject.all_code.should include('gilt.com/1234567/images/mystuff/goat.se?test=1"')
+          subject.all_code.should include('gilt.com/1234567/images/mystuff/goa-t.se"')
+          subject.all_code.should include('gilt.com/1234567/images/mystuff/go_at.se"')
+        end
+      end
+      
+      
+      describe "param changing" do
+        before(:all) do
+          Assette.config.instance_variable_set :@cache_method, 'param'
+        end
+        
+        it "does something" do
+          subject.all_code.should include('gilt.com/images/mystuff/goat.se?test=1&v=1234567"')
+          subject.all_code.should include('gilt.com/images/mystuff/goa-t.se?v=1234567"')
+          subject.all_code.should include('gilt.com/images/mystuff/go_at.se?v=1234567"')
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/spec/server_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'assette/server'
+
+describe Assette::Server do
+  before(:all) do
+    @dir_before = Dir.pwd
+    Dir.chdir(File.dirname(__FILE__) + '/../examples')
+  end
+  
+  after(:all) do
+    Dir.chdir(@dir_before)
+  end
+  
+  it "should be implemented"
+end

data/spec/template_spec.rb

@@ -14,18 +14,22 @@ describe "Templates" do
   describe Assette::TemplateSet do
   
     it "should get correct list of files" do
-      f = Assette::Template.open("app/templates/foo/index.html.mustache")
+      f = Assette::Template.open("myapp/templates/foo/index.html.mustache")
       
       a = Assette::TemplateSet.new(:all)
       a.templates.should include f
-    
+      
+      p = Assette::Template.open("myapp/templates/foo/_partial.html.mustache")
       a = Assette::TemplateSet.new(:foo)
-      a.templates.should == [f]
+      a.templates.should == [p,f]
     end
     
     it "should compile" do
       a = Assette::TemplateSet.new(:all)
-      a.compile.should include('{{foo}}')
+      c = a.compile
+      c.should include('{{foo}}')
+      c.should include('Handlebars.registerPartial("foo/partial",')
+      c.should include('Handlebars.compile("<div>')
       
       a = Assette::TemplateSet.new(:foo)
       a.compile.should include('{{foo}}')
@@ -36,7 +40,7 @@ describe "Templates" do
   describe Assette::Template do
   
     subject do
-      Assette::Template.open("app/templates/foo/index.html.mustache")
+      Assette::Template.open("myapp/templates/foo/index.html.mustache")
     end
   
   end