fuse 0.1.5 → 0.1.6

data/lib/fuse.rb

@@ -3,7 +3,7 @@ require 'thin'
 
 module Fuse
 
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 
   LOG_COLOURS = {
       info:     6, # cyan
@@ -42,6 +42,10 @@ require 'fuse/exceptions'
 require 'fuse/server'
 require 'fuse/document'
 require 'fuse/document/asset'
+require 'fuse/document/asset/has_dependents'
+require 'fuse/document/asset/style_sheet'
+require 'fuse/document/asset/java_script'
+require 'fuse/document/asset/font'
 require 'fuse/document/asset_types'
 require 'fuse/document/asset_collection'
 

data/lib/fuse/document.rb

@@ -13,24 +13,29 @@ class Fuse::Document
   end
 
   def to_s
-    result.to_html encoding: @options[:encoding]
+    ret = result.to_html encoding: @options[:encoding], indent: 0
+    ret.gsub!(/(\s)\s+/, '\\1') unless @options[:preserve_white]
+    ret
   end
 
   def result
 
-    #todo find a way to transform Nokogiri XML to HTML without serializing
-
     document = if xsl_path
-      Nokogiri::HTML(Nokogiri::XSLT(File.read xsl_path).transform(Nokogiri::XML(File.read source_path)).to_html encoding: @options[:encoding])
+      Nokogiri::XSLT(File.read xsl_path).transform(Nokogiri(File.read source_path))
     else
       Nokogiri::HTML(File.read source_path)
     end
 
-    html = document.css('> html').first
+    while (html = document.css('> html').first).nil?
+      document = Nokogiri::HTML(document.to_html encoding: @options[:encoding])
+    end
     body = html.css('> body').first
     head = html.css('> head').first || body.add_previous_sibling(Nokogiri::XML::Node.new 'head', document)
 
-    document.title = @options[:title] unless @options[:title].nil?
+    unless @options[:title].nil?
+      title = head.css('> title').first || head.add_child(Nokogiri::XML::Node.new('title', document))
+      title.children = Nokogiri::XML::Text.new(@options[:title], document)
+    end
 
     #attach stylesheets and scripts
     [Fuse::Document::Asset::StyleSheet, Fuse::Document::Asset::JavaScript].each do |klass|

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

@@ -0,0 +1,32 @@
+class Fuse::Document::Asset
+  class Font < self
+    CSS_FORMATS = [
+        { extension: :woff, format: 'woff' },
+        { extension: :ttf,  format: 'truetype' },
+        { extension: :otf,  format: 'opentype' }
+    ]
+    MIME_TYPES = {
+        otf: 'application/x-font-opentype',
+        ttf: 'application/x-font-truetype',
+        woff: 'application/x-font-woff'
+    }
+    VARIANT_PATTERN = %r`([^/]+?)(?:[-_ ](normal|bold|bolder|lighter|[1-9]00))?(?:[-_ ](normal|italic|oblique))?\.[a-z]+$`
+    def family; @family ||= variant[:family] end
+    def weight; @weight ||= variant[:weight] end
+    def style;  @style  ||= variant[:style]  end
+    def variant
+      @variant ||= begin
+        match = VARIANT_PATTERN.match(path)
+        {
+            family: match[1],
+            weight: match[2] || 'normal',
+            style:  match[3] || 'normal'
+        }
+      end
+    end
+    def face; @face ||= [family, weight, style].join('-') end
+    def type
+      MIME_TYPES[extension.to_sym] || super
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Fuse::Document::Asset::HasDependents
+
+  COMMENT_PATTERN = %r`^\s*(/\*[\s\S]*?\*/|(\s*//.*\s+)+)`
+  REQUIRE_PATTERN = %r`^\s*(?:\*|//)=\s+(require|require_glob)\s+(.+?)\s*$`
+
+  def dependents
+    ret = Fuse::Document::AssetCollection.new
+    local_root = File.dirname(full_path)
+    if (comments = raw[COMMENT_PATTERN])
+      comments.lines.each do |line|
+        if (match = REQUIRE_PATTERN.match(line))
+          case match[1]
+            when 'require'
+              [File.join(local_root, match[2])]
+            when 'require_glob'
+              Dir[File.join(local_root, match[2])]
+            else
+              []
+          end.map do |p|
+            Fuse::Document::Asset.for(p[@root.length..-1], @root)
+          end.reject do |p|
+            p.nil?
+          end.each do |p|
+            ret << p
+          end
+        end
+      end
+    end
+    ret
+  end
+end

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

@@ -0,0 +1,32 @@
+class Fuse::Document::Asset
+  class JavaScript < self
+    EMBED_WITH = 'script'
+    JOIN_WITH = ';'
+    include HasDependents
+    def reference_with
+      {
+          tag_name: 'script',
+          attributes: {
+              type: type,
+              src: relative_path
+          }
+      }
+    end
+    def compress
+      original = filtered
+      compressed = Uglifier.compile original
+      Fuse.log "Uglifier: Compressed #{path} from #{original.bytesize} bytes to #{compressed.bytesize} bytes", :success
+      compressed
+    end
+    def type; 'text/javascript' end
+    class Coffee < self
+      def filter
+        original = raw
+        compiled = CoffeeScript.compile original
+        Fuse.log "CoffeeScript: Compiled #{path} from #{original.bytesize} bytes to #{compiled.bytesize} bytes", :success
+        compiled
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,36 @@
+class Fuse::Document::Asset
+  class StyleSheet < self
+    EMBED_WITH = 'style'
+    JOIN_WITH = ''
+    MEDIA_PATTERN = /\(([a-z]+(?:,\s*[a-z]+)*)\)\.[a-z]+$/i
+    include HasDependents
+    def reference_with
+      {
+          tag_name: 'link',
+          attributes: {
+              rel: 'stylesheet',
+              href: relative_path,
+              media: media
+          }
+      }
+    end
+    def media
+      @media ||= (match = MEDIA_PATTERN.match(path)) && match[1].split(/,\s*/).sort.join(', ')
+    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
+        compiled = ::Sass.compile original, style: :expanded
+        Fuse.log "SASS: Compiled #{path} from #{original.bytesize} bytes to #{compiled.bytesize} bytes", :success
+        compiled
+      end
+    end
+  end
+end

data/lib/fuse/document/asset_types.rb

@@ -4,136 +4,9 @@ require 'uglifier'
 
 class Fuse::Document::Asset
 
-  module HasDependents
-    COMMENT_PATTERN = %r`^\s*(/\*[\s\S]*?\*/|(\s*//.*\s+)+)`
-    REQUIRE_PATTERN = %r`^\s*(?:\*|//)=\s+(require|require_glob)\s+(.+?)\s*$`
-
-    def dependents
-      ret = Fuse::Document::AssetCollection.new
-      local_root = File.dirname(full_path)
-      if (comments = raw[COMMENT_PATTERN])
-        comments.lines.each do |line|
-          if (match = REQUIRE_PATTERN.match(line))
-            case match[1]
-              when 'require'
-                [File.join(local_root, match[2])]
-              when 'require_glob'
-                Dir[File.join(local_root, match[2])]
-              else
-                []
-            end.map do |p|
-              Fuse::Document::Asset.for(p[@root.length..-1], @root)
-            end.reject do |p|
-              p.nil?
-            end.each do |p|
-              ret << p
-            end
-          end
-        end
-      end
-      ret
-    end
-  end
-
-  class StyleSheet < self
-    EMBED_WITH = 'style'
-    JOIN_WITH = ''
-    MEDIA_PATTERN = /\(([a-z]+(?:,\s*[a-z]+)*)\)\.[a-z]+$/i
-    include HasDependents
-    def reference_with
-      {
-          tag_name: 'link',
-          attributes: {
-              rel: 'stylesheet',
-              href: relative_path,
-              media: media
-          }
-      }
-    end
-    def media
-      @media ||= (match = MEDIA_PATTERN.match(path)) && match[1].split(/,\s*/).sort.join(', ')
-    end
-    def compress
-      original = raw
-      compressed = ::Sass.compile original, style: :compressed
-      Fuse.log "SASS: Compressed #{path} from #{original.length} bytes to #{compressed.length} bytes", :success
-      compressed
-    end
-    def type; 'text/css' end
-    class Sass < self
-      def filter
-        original = raw
-        compiled = ::Sass.compile original, style: :expanded
-        Fuse.log "SASS: Compiled #{path} from #{original.length} bytes to #{compiled.length} bytes", :success
-        compiled
-      end
-    end
-  end
-
-  class JavaScript < self
-    EMBED_WITH = 'script'
-    JOIN_WITH = ';'
-    include HasDependents
-    def reference_with
-      {
-          tag_name: 'script',
-          attributes: {
-              type: type,
-              src: relative_path
-          }
-      }
-    end
-    def compress
-      original = filtered
-      compressed = Uglifier.compile original
-      Fuse.log "Uglifier: Compressed #{path} from #{original.length} bytes to #{compressed.length} bytes", :success
-      compressed
-    end
-    def type; 'text/javascript' end
-    class Coffee < self
-      def filter
-        original = raw
-        compiled = CoffeeScript.compile original
-        Fuse.log "CoffeeScript: Compiled #{path} from #{original.length} bytes to #{compiled.length} bytes", :success
-        compiled
-      end
-    end
-  end
-
   class Image < self
   end
 
-  class Font < self
-    CSS_FORMATS = [
-        { extension: :woff, format: 'woff' },
-        { extension: :ttf,  format: 'truetype' },
-        { extension: :otf,  format: 'opentype' }
-    ]
-    MIME_TYPES = {
-        otf: 'application/x-font-opentype',
-        ttf: 'application/x-font-truetype',
-        woff: 'application/x-font-woff'
-    }
-    VARIANT_PATTERN = %r`([^/]+?)(?:[-_ ](normal|bold|bolder|lighter|[1-9]00))?(?:[-_ ](normal|italic|oblique))?\.[a-z]+$`
-    def family; @family ||= variant[:family] end
-    def weight; @weight ||= variant[:weight] end
-    def style;  @style  ||= variant[:style]  end
-    def variant
-      @variant ||= begin
-        match = VARIANT_PATTERN.match(path)
-        {
-            family: match[1],
-            weight: match[2] || 'normal',
-            style:  match[3] || 'normal'
-        }
-      end
-    end
-    def face; @face ||= [family, weight, style].join('-') end
-    def type
-      MIME_TYPES[extension.to_sym] || super
-    end
-  end
-
   class Xml < self
   end
 

data/lib/fuse/main.rb

@@ -6,7 +6,8 @@ module Fuse
   DEFAULTS = {
     common: {
       source: '.',
-      encoding: 'UTF-8'
+      encoding: 'UTF-8',
+      preserve_white: true
     },
     server: {
         addr: '127.0.0.1',
@@ -30,7 +31,7 @@ module Fuse
 
       "
 
-Usage: #{$0} [command] [options]
+Usage: #{$0} command [options]
 
 Commands:
     server  : Run a local testing server
@@ -95,6 +96,11 @@ Options:
               'Show Fuse version.'
       ) { abort Fuse::VERSION }
 
+      opts.on('-w',
+              '--[no-]preserve-white',
+              wrap("Preserve all white space in HTML. Default is #{DEFAULTS[:common][:preserve_white]}.")
+      ) { |w| options[:preserve_white] = w }
+
       opts.on('-x',
               '--xsl FILE',
               wrap('XSL transformation stylesheet. Default is current directory.')
@@ -123,8 +129,9 @@ Options:
         begin
           doc = Document.new(options)
           log "Compiling #{doc.source_path}"
-          print doc.to_s
-          log 'Done.', :success
+          out = doc.to_s
+          print out
+          log "Wrote #{out.bytesize} byte(s) to STDOUT.", :success
         rescue Exception::SourceUnknown::TooManySources
           log "Found more than one potential #{$!.option_name} document. Please specify one with --#{$!.option_name}.", :notice
           log $!.options.join "\n"

data/lib/fuse/server.rb

@@ -4,6 +4,7 @@ class Fuse::Server
 
   def initialize(options)
     @options = options
+    Fuse.log "Starting Fuse Server v#{Fuse::VERSION}", :success
   end
 
   def call(env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuse
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
@@ -134,6 +134,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/fuse
+- lib/fuse/document/asset/font.rb
+- lib/fuse/document/asset/has_dependents.rb
+- lib/fuse/document/asset/java_script.rb
+- lib/fuse/document/asset/style_sheet.rb
 - lib/fuse/document/asset.rb
 - lib/fuse/document/asset_collection.rb
 - lib/fuse/document/asset_types.rb