assette 0.0.1 → 0.0.2

data/Gemfile

@@ -11,7 +11,7 @@ end
 gem "rack", '~> 1'
 gem "thor", '~> 0'
 gem "json", '>= 1.4'
-gem "haml", '~> 3'
+gem "sass", '>= 3.1'
 gem "mime-types", ">= 1.16", :require => 'mime/types'
 gem "git"
 gem "coffee-script", "~> 2"

data/Gemfile.lock

@@ -8,7 +8,6 @@ GEM
     diff-lcs (1.1.2)
     execjs (0.1.0)
     git (1.2.5)
-    haml (3.0.25)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -26,6 +25,7 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    sass (3.1.1)
     thor (0.14.6)
     yard (0.6.4)
 
@@ -36,12 +36,12 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   coffee-script (~> 2)
   git
-  haml (~> 3)
   jeweler (~> 1.5.2)
   json (>= 1.4)
   mime-types (>= 1.16)
   rack (~> 1)
   rcov
   rspec (~> 2.4.0)
+  sass (>= 3.1)
   thor (~> 0)
   yard (~> 0.6.0)

data/Rakefile

@@ -24,7 +24,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency "rack", '~> 1'
   gem.add_runtime_dependency "thor", '~> 0'
   gem.add_runtime_dependency "json", '>= 1.4'
-  gem.add_runtime_dependency "haml", '~> 3'
+  gem.add_runtime_dependency "sass", '>= 3.1'
   gem.add_runtime_dependency "coffee-script", '~> 2'
   # gem.add_runtime_dependency "git"
   gem.add_runtime_dependency "mime-types", ">= 1.16"

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/assette.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assette}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tal Atlas"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-05-07}
   s.default_executable = %q{assette}
   s.description = %q{Renders all asset types (coffeescript/sass/scss) as equals}
   s.email = %q{me@tal.by}
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "lib/assette/compiled_file.rb",
     "lib/assette/config.rb",
     "lib/assette/file.rb",
+    "lib/assette/middleware.rb",
     "lib/assette/post_processor.rb",
     "lib/assette/post_processors.rb",
     "lib/assette/post_processors/cache_buster.rb",
@@ -74,7 +75,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/Talby/assette}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Treat all assets as equal}
   s.test_files = [
     "examples/config/assets.rb",
@@ -95,7 +96,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, ["~> 1"])
       s.add_runtime_dependency(%q<thor>, ["~> 0"])
       s.add_runtime_dependency(%q<json>, [">= 1.4"])
-      s.add_runtime_dependency(%q<haml>, ["~> 3"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.1"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<git>, [">= 0"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2"])
@@ -107,14 +108,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, ["~> 1"])
       s.add_runtime_dependency(%q<thor>, ["~> 0"])
       s.add_runtime_dependency(%q<json>, [">= 1.4"])
-      s.add_runtime_dependency(%q<haml>, ["~> 3"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.1"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
     else
       s.add_dependency(%q<rack>, ["~> 1"])
       s.add_dependency(%q<thor>, ["~> 0"])
       s.add_dependency(%q<json>, [">= 1.4"])
-      s.add_dependency(%q<haml>, ["~> 3"])
+      s.add_dependency(%q<sass>, [">= 3.1"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<coffee-script>, ["~> 2"])
@@ -126,7 +127,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack>, ["~> 1"])
       s.add_dependency(%q<thor>, ["~> 0"])
       s.add_dependency(%q<json>, [">= 1.4"])
-      s.add_dependency(%q<haml>, ["~> 3"])
+      s.add_dependency(%q<sass>, [">= 3.1"])
       s.add_dependency(%q<coffee-script>, ["~> 2"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
     end
@@ -134,7 +135,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack>, ["~> 1"])
     s.add_dependency(%q<thor>, ["~> 0"])
     s.add_dependency(%q<json>, [">= 1.4"])
-    s.add_dependency(%q<haml>, ["~> 3"])
+    s.add_dependency(%q<sass>, [">= 3.1"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<coffee-script>, ["~> 2"])
@@ -146,7 +147,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack>, ["~> 1"])
     s.add_dependency(%q<thor>, ["~> 0"])
     s.add_dependency(%q<json>, [">= 1.4"])
-    s.add_dependency(%q<haml>, ["~> 3"])
+    s.add_dependency(%q<sass>, [">= 3.1"])
     s.add_dependency(%q<coffee-script>, ["~> 2"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
   end

data/lib/assette/cli.rb

@@ -65,6 +65,12 @@ module Assette
           
           opts[:daemonize] = true
           opts[:pid] = pid_file
+        else
+          Assette.logger.level = Logger::DEBUG
+          Assette.logger.datetime_format = "%H:%M:%S"
+          Assette.logger.formatter = Proc.new do |severity, datetime, progname, msg|
+            "#{severity}: #{progname} - #{msg}\n"
+          end
         end
       
         say "Starting Assette server on port #{opts[:Port]}"

data/lib/assette/config.rb

@@ -6,7 +6,7 @@ module Assette
     f.unshift(optional_path.to_s) if optional_path
 
     p = f.find { |path| File.exist?(path) }
-    
+    raise "Can't find config file" unless p
     @config = Assette::Config.load(p)
   end
   

data/lib/assette/file.rb

@@ -41,6 +41,8 @@ class Assette::File < ::File
   
   def code
     reader_class.new(self).compile
+  rescue => e
+    target_class.error(e.to_s,path)
   end
   
   def all_code_array
@@ -68,7 +70,16 @@ class Assette::File < ::File
   end
   
   def target_path
-    File.join(dirname,filename.gsub(reader_class.extension,target_class.extension))
+    File.expand_path(File.join(dirname,filename.gsub(reader_class.extension,target_class.extension)))
+  end
+  
+  def relative_target_path
+    tp = target_path
+    Assette.config.file_paths.each do |fp|
+      f = File.expand_path(fp)
+      tp.gsub! f, ''
+    end
+    tp
   end
   
   def filename
@@ -102,9 +113,12 @@ class Assette::File < ::File
       
       p = ::File.expand_path(::File.join(dirname,m[1]))
       
+      Assette.logger.info("Dependecy Checking") {p}
+      
       # Check for _filename if filename doesn't exist
       unless ::File.exist?(p)
         p2 = p.gsub /(.*\/)?(.+)/, '\1_\2'
+        Assette.logger.info("Dependecy Checking") {p2}
         if ::File.exist?(p2)
           p = p2
         else
@@ -121,6 +135,8 @@ class Assette::File < ::File
       
     end
     
+    Assette.logger.debug('Dependencies') {"For: #{path}\n#{@dependencies.pretty_inspect}"}
+    
     @dependencies
   end
   
@@ -166,13 +182,35 @@ class Assette::File < ::File
       code << f.comment_str % "Time taken to generate: #{Time.now-start}s"
     end
     
-    def rack_resp_if_exists path
+    def rack_resp_if_exists path, opts = {}
       return unless File.exist?(path)
       start = Time.now
       f = open(path)
-      code = f.all_code_array
+      
+      if opts[:deparr]
+        code = f.dependencies.collect do |d|
+          d.relative_target_path
+        end
+        
+        code << f.relative_target_path
+        
+        resp = {:dependencies => code, :target_type => f.target_class.mime_type, :target_extension => f.extension}
+        
+        return [200,{"Content-Type" => 'text/javascript'}, [resp.to_json]]
+      end
+      
+      if opts[:nodep]
+        code = [f.code]
+        type = f.target_class.mime_type
+      else
+        code = f.all_code_array
+        type = f.target_class.mime_type
+      end
+      
       code << "\n"
       code << f.comment_str % "Time taken to generate: #{Time.now-start}s"
+      
+      [200,{"Content-Type" => type.content_type},code]
     end
     
   end

data/lib/assette/middleware.rb

@@ -0,0 +1,22 @@
+require 'assette/server'
+
+module Assette
+  class Middleware
+    def initialize(app, *args)
+      @app = app
+    end
+    
+    def call(env)
+      if env['PATH_INFO'] == '/'
+        return @app.call(env)
+      end
+      
+      assette_resp = Assette::Server.call(env)
+      if assette_resp[0] == 200
+        assette_resp
+      else
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/assette/readers/css.rb

@@ -6,6 +6,25 @@ class Assette::Reader::Css < Assette::Reader(:css)
   
   class << self
     
+    def error str, stack = nil
+      <<-CSS
+      body:before {
+        position: absolute;
+        top: 0px;
+        padding: 10px;
+        font-size: 18px;
+        text-align: center;
+        width: 100%;
+        display: block;
+        content: #{str.inspect};
+        background-color: #992E40;
+        color: white;
+        font-weight:bold;
+        z-index: 9999;
+      }
+      CSS
+    end
+    
     def comment_str
       '/* %s */'
     end

data/lib/assette/readers/js.rb

@@ -6,6 +6,18 @@ class Assette::Reader::Js < Assette::Reader(:js)
   
   class << self
     
+    def error str, path=nil
+      if path
+        <<-JS
+        console.group("Compiling Error in file #{path}");
+        console.error(#{str.to_json});
+        console.groupEnd();
+        JS
+      else
+        "console.error(#{str.to_json});"
+      end
+    end
+    
     def comment_str
       '// %s'
     end

data/lib/assette/readers/sass.rb

@@ -1,5 +1,5 @@
-require 'haml'
 require 'sass'
+
 class Assette::Reader::Sass < Assette::Reader(:css)
   
   def compile
@@ -14,4 +14,4 @@ private
       :load_paths => [File.expand_path(@file.dirname)]|Assette.config.file_paths
     }
   end
-end
+end

data/lib/assette/server.rb

@@ -6,6 +6,19 @@ module Assette
       @env = env
       @path = env["PATH_INFO"]
       
+      @params = env["QUERY_STRING"].split('&').inject({}) do |resp,v|
+        k,v = v.split('=')
+        
+        if v == '1' || v.nil?
+          v = true
+        elsif v == '0'
+          v = false
+        end
+        
+        resp[k.to_sym] = v
+        resp
+      end
+      
       # Assette.config.asset_path
     end
     
@@ -14,18 +27,21 @@ module Assette
       Assette.config.file_paths.each do |p|
         
         Assette::Reader.possible_targets(File.join(p,path)).each do |pp|
-          f = Assette::File.rack_resp_if_exists( pp )
+          Assette.logger.debug('Checking for compiled file') {pp}
+          f = Assette::File.rack_resp_if_exists( pp, @params )
+          Assette.logger.info("Found File") {"Compiled file at #{pp}"} if f
           break if f
         end
         
         break if f
       end
+      
       f
     end
     
     def path_extension
       m = path.match(/\.(\w+)$/)
-      m[1] if m
+      m ? m[1] : :none
     end
     
     def has_registered_reader?
@@ -47,6 +63,7 @@ module Assette
         new_path = File.join(p,path)
         if File.exist?(new_path)
           new_path = File.join(Dir.pwd,new_path)
+          Assette.logger.info("Found File") {"Raw file at #{new_path}"}
           f = Rack::File.new(p).call(@env)
         end
         
@@ -58,7 +75,7 @@ module Assette
     
     def rack_resp
       if has_registered_reader? && (f = find_compiled_file)
-        [200,{"Content-Type" => f.content_type},f]
+        f
       elsif f = find_file
         f
       else

data/lib/assette.rb

@@ -1,6 +1,8 @@
 require 'json'
 require 'forwardable'
 require 'mime/types'
+require 'logger'
+require 'pp'
 
 coffee_type = MIME::Type.new('text/coffeescript') do |t|
   t.encoding = '8bit'
@@ -18,6 +20,14 @@ module Assette
   extend self
   CONFIG_WRAPPER = 'ASSETTE CONFIG'
   VERSION = File.open(File.expand_path(File.dirname(__FILE__)+'/../VERSION')).read
+  
+  def logger
+    @logger ||= Logger.new(STDOUT)
+  end
+  
+  def logger=(l)
+    @logger = l
+  end
 end
 
 %w{config reader readers post_processor post_processors

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assette
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-05-07 00:00:00 -04:00
 default_executable: assette
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,16 +62,17 @@ dependencies:
   type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: sass
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
         - 3
-        version: "3"
+        - 1
+        version: "3.1"
   prerelease: false
   type: :runtime
   requirement: *id004
@@ -240,16 +241,17 @@ dependencies:
   type: :runtime
   requirement: *id015
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: sass
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 5
         segments: 
         - 3
-        version: "3"
+        - 1
+        version: "3.1"
   prerelease: false
   type: :runtime
   requirement: *id016
@@ -321,6 +323,7 @@ files:
 - lib/assette/compiled_file.rb
 - lib/assette/config.rb
 - lib/assette/file.rb
+- lib/assette/middleware.rb
 - lib/assette/post_processor.rb
 - lib/assette/post_processors.rb
 - lib/assette/post_processors/cache_buster.rb
@@ -373,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Treat all assets as equal