assette 0.1.3 → 0.1.4

data/Rakefile

@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Tal Atlas"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency "rack", '~> 1'
+  gem.add_runtime_dependency "rack", '>= 1.4'
   gem.add_runtime_dependency "thor", '~> 0'
   gem.add_runtime_dependency "json", '>= 1.4'
   gem.add_runtime_dependency "sass", '>= 3.1'

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/assette.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assette}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Tal Atlas}]
-  s.date = %q{2012-01-10}
+  s.date = %q{2012-01-11}
   s.description = %q{Renders all asset types (coffeescript/sass/scss) as equals}
   s.email = %q{me@tal.by}
   s.executables = [%q{assette}]
@@ -122,7 +122,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_runtime_dependency(%q<rack>, ["~> 1"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.4"])
       s.add_runtime_dependency(%q<thor>, ["~> 0"])
       s.add_runtime_dependency(%q<json>, [">= 1.4"])
       s.add_runtime_dependency(%q<sass>, [">= 3.1"])
@@ -146,7 +146,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<rack>, ["~> 1"])
+      s.add_dependency(%q<rack>, [">= 1.4"])
       s.add_dependency(%q<thor>, ["~> 0"])
       s.add_dependency(%q<json>, [">= 1.4"])
       s.add_dependency(%q<sass>, [">= 3.1"])
@@ -171,7 +171,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<rack>, ["~> 1"])
+    s.add_dependency(%q<rack>, [">= 1.4"])
     s.add_dependency(%q<thor>, ["~> 0"])
     s.add_dependency(%q<json>, [">= 1.4"])
     s.add_dependency(%q<sass>, [">= 3.1"])

data/lib/assette/cli.rb

@@ -117,7 +117,7 @@ module Assette
       
       files.delete_if {|f| f =~ /\/_/} # remove any mixins to speed up process
       
-      files = files.collect {|f| Assette::File.open(f)}
+      # files = files.collect {|f| Assette::File.open(f)}
       
       container = if Assette.config.cache_method.to_s == 'path'
         File.join(Assette.config.build_target,sha)
@@ -131,31 +131,40 @@ module Assette
 
       files_to_minify = []
       
-      files.each do |file|
-        files_to_minify.push(file) if file.minify?
-        next if options.minified? || options.static_min?
-        target_path = file.relative_target_path
-        
-        Assette.config.file_paths.each do |p|
-          # target_path.gsub!(p,'')
+      files.each do |file_path|
+        Assette::File.open(file_path) do |file|
+
+          if file.minify?
+            files_to_minify.push(file_path)
+          else
+            unless options.minified? || options.static_min?
+              target_path = file.relative_target_path
+              
+              Assette.config.file_paths.each do |p|
+                # target_path.gsub!(p,'')
+              end
+              
+              new_path = File.join(container,target_path)
+              
+              Assette.logger.debug("Compiling file") {"#{file.path} -> #{new_path}"}
+              create_file(new_path, file.all_code)
+            end
+          end
         end
-        
-        new_path = File.join(container,target_path)
-        
-        Assette.logger.debug("Compiling file") {"#{file.path} -> #{new_path}"}
-        create_file(new_path, file.all_code)
       end
 
       Assette.config.minifying do
         say "\nCreating minified versions of files" unless files_to_minify.empty?
 
-        files_to_minify.each do |file|
-          target_path = file.relative_target_path
+        files_to_minify.each do |file_path|
+          Assette::File.open(file_path) do |file|
+            target_path = file.relative_target_path
 
-          new_path = File.join(container,target_path).sub(/(\.[A-Za-z0-9]{2,10})$/,'.min\1')
+            new_path = File.join(container,target_path).sub(/(\.[A-Za-z0-9]{2,10})$/,'.min\1')
 
-          Assette.logger.debug("Compiling minified file") {"#{file.path} -> #{new_path}"}
-          create_file(new_path, file.all_code)
+            Assette.logger.debug("Compiling minified file") {"#{file.path} -> #{new_path}"}
+            create_file(new_path, file.all_code)
+          end
         end
       end
       

data/lib/assette/readers/less.rb

@@ -26,4 +26,14 @@ private
   def options
     Assette.config.less
   end
+
+  class << self
+    def tag path
+      tag = <<-HTML
+        <link href="#{path}" rel="stylesheet/less" type="text/css"  media="all" />
+      HTML
+
+      tag << %Q{<script src="#{Assette.config.less_js_path}?nodep" type="text/javascript"></script>} if Assette.config.less_js_path
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assette
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 Z
+date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -242,12 +242,13 @@ dependencies:
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 1
-        version: "1"
+        - 4
+        version: "1.4"
   name: rack
   prerelease: false
   type: :runtime