fuse 0.1.7 → 0.1.8

data/lib/fuse.rb

@@ -3,7 +3,7 @@ require 'thin'
 
 module Fuse
 
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 
   LOG_COLOURS = {
       info:     6, # cyan

data/lib/fuse/document.rb

@@ -44,27 +44,18 @@ class Fuse::Document
       link['href'] = asset.relative_path
     end
 
-    #attach stylesheets and scripts
-    [Fuse::Document::Asset::StyleSheet, Fuse::Document::Asset::JavaScript].each do |klass|
-      collection = assets.of_type(klass).sort!
-      next unless collection.length > 0
-      if @options[:embed_assets]
-        #todo recreate stylesheet media attributes
-        tag = Nokogiri::XML::Node.new(klass::EMBED_WITH, document)
-        raw = collection.map do |asset|
-          tag['type'] = asset.type
-          (@options[:compress_assets] ? asset.compress : asset.filtered).strip
-        end.reject{ |x| x.length == 0 }.join(klass::JOIN_WITH)
-        next unless raw.length > 0
-        tag.content = raw
-        head << tag
-      else
-        collection.each do |asset|
-          data = asset.reference_with
-          tag = Nokogiri::XML::Node.new(data[:tag_name], document)
-          data[:attributes].each { |k, v| tag[k] = v unless v.nil? }
-          head << tag
-        end
+    #attach scripts
+    scripts = assets.of_type(Fuse::Document::Asset::JavaScript).sort!
+    head << tag_for_collection(scripts, document) unless scripts.empty?
+
+    #attach stylesheets
+    style_sheets = assets.of_type(Fuse::Document::Asset::StyleSheet)
+    style_sheets.group_by(&:conditional_signature).each_value do |conditional_collection|
+      conditional_collection.group_by(&:media).each do |media, media_collection|
+        media_collection.sort!
+        tag = tag_for_collection(media_collection, document)
+        tag['media'] = media unless media.nil? || media.empty? || Nokogiri::XML::NodeSet === tag
+        head << Nokogiri::HTML.fragment(media_collection.first.conditional.wrap(tag.to_html(encoding: @options[:encoding])), @options[:encoding])
       end
     end
 
@@ -94,7 +85,7 @@ class Fuse::Document
       end
     end
     unless font_css.empty?
-      style_node = head.css('style:not([media]), style[media=all]').first || head.add_child(Nokogiri::XML::Node.new 'style', document)
+      style_node = head.add_child(Nokogiri::XML::Node.new 'style', document)
       style_node.content = font_css + style_node.content
     end
 
@@ -151,4 +142,26 @@ class Fuse::Document
     def assets
       @assets ||= Asset[root]
     end
+
+    def tag_for_collection(collection, document)
+      return if collection.empty?
+      klass = collection.first.class
+      if @options[:embed_assets]
+        tag = Nokogiri::XML::Node.new(klass::EMBED_WITH, document)
+        raw = collection.map do |asset|
+          tag['type'] = asset.type
+          (@options[:compress_assets] ? asset.compress : asset.filtered).strip
+        end.reject{ |x| x.length == 0 }.join(klass::JOIN_WITH)
+        return unless raw.length > 0
+        tag.content = raw
+        tag
+      else
+        Nokogiri::XML::NodeSet.new(document, collection.map do |asset|
+          data = asset.reference_with
+          tag = Nokogiri::XML::Node.new(data[:tag_name], document)
+          data[:attributes].each { |k, v| tag[k] = v unless v.nil? }
+          tag
+        end)
+      end
+    end
 end

data/lib/fuse/document/asset/style_sheet.rb

@@ -1,9 +1,12 @@
 class Fuse::Document::Asset
   class StyleSheet < self
+
     EMBED_WITH = 'style'
     JOIN_WITH = ''
-    MEDIA_PATTERN = /\(([a-z]+(?:,\s*[a-z]+)*)\)\.[a-z]+$/i
+    MEDIA_PATTERN = /\(([a-z]+(?:,\s*[a-z]+)*)\)(?:\.[a-z]+$|\s*\()/i
+
     include HasDependents
+
     def reference_with
       {
           tag_name: 'link',
@@ -14,16 +17,28 @@ class Fuse::Document::Asset
           }
       }
     end
+
     def media
       @media ||= (match = MEDIA_PATTERN.match(path)) && match[1].split(/,\s*/).sort.join(', ')
     end
+
+    def conditional
+      @conditional ||= Conditional.new self
+    end
+
+    def conditional_signature
+      conditional.signature
+    end
+
     def compress
       original = raw
       compressed = ::Sass.compile original, style: :compressed
       Fuse.log "SASS: Compressed #{path} from #{original.bytesize} bytes to #{compressed.bytesize} bytes", :success
       compressed
     end
+
     def type; 'text/css' end
+
     class Sass < self
       def filter
         original = raw
@@ -32,5 +47,37 @@ class Fuse::Document::Asset
         compiled
       end
     end
+
+    class Conditional
+
+      CONDITIONAL_PATTERN = /\((!|[lg]te?\s+)?ie(\s*\d+)?\)(?:\.[a-z]+$|\s*\()/i
+
+      attr_reader :comparison, :version
+
+      def initialize(style_sheet)
+        match = CONDITIONAL_PATTERN.match(style_sheet.path)
+        return unless match
+        @comparison = (match[1] || '').strip.downcase
+        @version = match[2].strip.to_i unless match[2].nil?
+      end
+
+      def wrap(content)
+        if comparison == '!'
+          "<!--[if !IE]> -->#{content}<!-- <![endif]-->"
+        elsif comparison
+          "<!--[if #{signature}]>#{content}<![endif]-->"
+        else
+          content
+        end
+      end
+
+      def signature
+        @signature ||= begin
+          ret = (comparison.nil? || comparison.empty?) ? 'IE' : comparison + ' IE'
+          ret << ' ' + version.to_s if version
+        end
+      end
+
+    end
   end
 end

data/lib/fuse/document/asset_collection.rb

@@ -30,4 +30,8 @@ class Fuse::Document::AssetCollection < Array
     self << asset
   end
 
+  def group_by(*args, &block)
+    Hash[super(*args, &block).map{ |k, v| [k, self.class.new(v)] }]
+  end
+
 end

data/lib/fuse/server.rb

@@ -10,6 +10,8 @@ class Fuse::Server
   def call(env)
 
     request = Rack::Request.new(env)
+    result = nil
+    status = 200
 
     call_options = @options.merge Hash[request.GET.map{ |k, v| [k.to_sym, v] }]
 
@@ -34,9 +36,15 @@ class Fuse::Server
       else
         raise
       end
+    end if request.path == '/'
+
+    if result.nil?
+      log env, 'Not found', :error
+      status = 404
+      result = render_error('Not found')
     end
 
-    [200, {'Content-Type' => 'text/html'}, [result]]
+    [status, {'Content-Type' => 'text/html'}, [result]]
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuse
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin