fuse 0.1.8 → 0.1.9

data/lib/fuse.rb

@@ -1,9 +1,6 @@
-require 'optparse'
-require 'thin'
-
 module Fuse
 
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 
   LOG_COLOURS = {
       info:     6, # cyan
@@ -12,25 +9,25 @@ module Fuse
       notice:   3  # yellow
   }
 
-  def self.root
-    @root ||= File.expand_path File.dirname(__FILE__)
-  end
+  class << self
 
-  def self.log_file=(file)
-    @log_file = file
-  end
+    def root
+      @root ||= File.expand_path File.dirname(__FILE__)
+    end
 
-  def self.log_file
-    @log_file ||= $stderr
-  end
+    def log_file=(file)
+      @log_file = file
+    end
+
+    def log_file
+      @log_file ||= $stderr
+    end
+
+    def log(message, type = nil)
+      colour = 30 + (LOG_COLOURS[type] || LOG_COLOURS[:info])
+      log_file.puts "\x1b[#{colour}m#{message}\x1b[0m"
+    end
 
-  def self.log(message, type = nil)
-    m = "\x1b["
-    m << (30 + (LOG_COLOURS[type] || LOG_COLOURS[:info])).to_s
-    m << 'm'
-    m << message
-    m << "\x1b[0m"
-    log_file.puts m
   end
 
 end

data/lib/fuse/document.rb

@@ -69,9 +69,7 @@ class Fuse::Document
       fonts.values.each do |formats|
         first = formats.values.first
         font_css << '@font-face{'
-        font_css << 'font-family: "%s";' % first.family
-        font_css << 'font-weight: %s;'   % first.weight
-        font_css << 'font-style: %s;'    % first.style
+        font_css << first.variant.map{ |k, v| 'font-%s: "%s";' % [k, v] }.join
         font_css << 'src: url("%s");'    % formats[:eot].relative_path if formats[:eot] && !@options[:embed_assets]
         css_formats = []
         Fuse::Document::Asset::Font::CSS_FORMATS.each do |css_format|

data/lib/fuse/document/asset.rb

@@ -2,20 +2,24 @@ require 'base64'
 
 class Fuse::Document::Asset
 
-  def self.[](dir)
-    assets = Fuse::Document::AssetCollection.new
-    Dir[File.join dir, '**/*.*'].each do |full_path|
-      asset = self.for(full_path[dir.length..-1], dir)
-      assets << asset if asset
+  class << self
+
+    def [](dir)
+      assets = Fuse::Document::AssetCollection.new
+      Dir[File.join dir, '**/*.*'].each do |full_path|
+        asset = self.for(full_path[dir.length..-1], dir)
+        assets << asset if asset
+      end
+      assets
+    end
+
+    def for(path, root = Dir.pwd)
+      full_path = File.join root, path
+      return unless File.exists? full_path
+      type = TYPES[(File.extname(path)[1..-1] || '').to_sym]
+      (@cache ||= {})[File.expand_path full_path] ||= type.new(path, root) if type
     end
-    assets
-  end
 
-  def self.for(path, root = Dir.pwd)
-    full_path = File.join root, path
-    return unless File.exists? full_path
-    type = TYPES[(File.extname(path)[1..-1] || '').to_sym]
-    (@cache ||= {})[File.expand_path full_path] ||= type.new(path, root) if type
   end
 
   attr_reader :path
@@ -58,10 +62,10 @@ class Fuse::Document::Asset
     @type ||= Rack::Mime.mime_type('.' + extension)
   end
 
-  def to_datauri(compress = false)
+  def to_datauri(compressed = false)
     'data:%s;base64,%s' % [
         type,
-        Base64.strict_encode64(compress && respond_to?(:compress) ? self.compress : raw)
+        Base64.strict_encode64(compressed && respond_to?(:compress) ? compress : raw)
     ]
   end
 

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

@@ -1,19 +1,24 @@
 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',
+        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
+
+    [:family, :weight, :style].each do |attr|
+      define_method(attr) { variant[attr] }
+    end
+
     def variant
       @variant ||= begin
         match = VARIANT_PATTERN.match(path)
@@ -24,9 +29,14 @@ class Fuse::Document::Asset
         }
       end
     end
-    def face; @face ||= [family, weight, style].join('-') 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

@@ -4,7 +4,7 @@ module Fuse::Document::Asset::HasDependents
   REQUIRE_PATTERN = %r`^\s*(?:\*|//)=\s+(require|require_glob)\s+(.+?)\s*$`
 
   def dependents
-    ret = Fuse::Document::AssetCollection.new
+    collection = Fuse::Document::AssetCollection.new
     local_root = File.dirname(full_path)
     if (comments = raw[COMMENT_PATTERN])
       comments.lines.each do |line|
@@ -21,11 +21,11 @@ module Fuse::Document::Asset::HasDependents
           end.reject do |p|
             p.nil?
           end.each do |p|
-            ret << p
+            collection << p
           end
         end
       end
     end
-    ret
+    collection
   end
 end

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

@@ -1,8 +1,14 @@
+require 'coffee-script'
+require 'uglifier'
+
 class Fuse::Document::Asset
   class JavaScript < self
+
     EMBED_WITH = 'script'
     JOIN_WITH = ';'
+
     include HasDependents
+
     def reference_with
       {
           tag_name: 'script',
@@ -12,13 +18,16 @@ class Fuse::Document::Asset
           }
       }
     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
@@ -27,6 +36,7 @@ class Fuse::Document::Asset
         compiled
       end
     end
+
   end
 
 end

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

@@ -1,3 +1,5 @@
+require 'sass'
+
 class Fuse::Document::Asset
   class StyleSheet < self
 

data/lib/fuse/document/asset_collection.rb

@@ -24,9 +24,12 @@ class Fuse::Document::AssetCollection < Array
     self
   end
 
-  def push_with_dependents(asset)
-    #todo check for circular references
-    asset.dependents.each { |d| push_with_dependents d }
+  def push_with_dependents(asset, pushed = [])
+    pushed << asset
+    asset.dependents.each do |dependent|
+      raise Fuse::Exception::CircularDependency.new(asset, dependent) if pushed.include?(dependent)
+      push_with_dependents dependent, pushed
+    end
     self << asset
   end
 

data/lib/fuse/document/asset_types.rb

@@ -1,7 +1,3 @@
-require 'sass'
-require 'coffee-script'
-require 'uglifier'
-
 class Fuse::Document::Asset
 
   class Image < self
@@ -13,13 +9,8 @@ class Fuse::Document::Asset
     end
   end
 
-  class Xml < self
-  end
-
-  class Xsl < self
-  end
-
-  class Html < self
+  def self.const_missing(name)
+    (@anonymous_subclasses ||= {})[name] ||= Class.new(self)
   end
 
   TYPES = {

data/lib/fuse/exceptions.rb

@@ -16,10 +16,18 @@ class Fuse::Exception < ::RuntimeError
     end
     def message; 'Couldn\'t determine source document. Please specify one with --source.' end
   end
-  class XslMissing
+  class XslMissing < self
     def message
       'Couldn\'t locate an XSL stylesheet to transform the source document. Please specify one with --xsl.'
     end
   end
+  class CircularDependency < self
+    def initialize(offender, dependent)
+      @offender, @dependent = offender, dependent
+    end
+    def message
+      "Found circular dependency as #{@offender.path} depends upon #{@dependent.path}"
+    end
+  end
   def message; end
 end

data/lib/fuse/main.rb

@@ -23,7 +23,9 @@ module Fuse
   SUMMARY_WIDTH  = 30
   SUMMARY_INDENT = 4
 
-  def self.main
+  class << self
+
+  def main
 
     options = {}
 
@@ -148,7 +150,7 @@ Options:
 
   private
 
-    def self.merge_defaults(options)
+    def merge_defaults(options)
       if (defaults = DEFAULTS[(ARGV[0] || '').to_sym])
         defaults.merge(DEFAULTS[:common]).merge(options)
       else
@@ -156,12 +158,13 @@ Options:
       end
     end
 
-    def self.wrap(text, width = 80 - SUMMARY_WIDTH)
+    def wrap(text, width = 80 - SUMMARY_WIDTH)
       text.gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n#{' ' * (SUMMARY_WIDTH + SUMMARY_INDENT + 1)}").strip
     end
 
-    def self.summary(opts)
+    def summary(opts)
       abort opts.summarize([], SUMMARY_WIDTH, SUMMARY_WIDTH - 1, ' ' * SUMMARY_INDENT).join
     end
 
+  end
 end

data/lib/fuse/server.rb

@@ -26,9 +26,11 @@ class Fuse::Server
       result = doc.to_s
       log env, "Using    #{doc.xsl_path} for transformation" if doc.xsl_path
       log env, "Rendered #{doc.source_path} (#{result.length} bytes)", :success
+
     rescue Fuse::Exception::SourceUnknown::TooManySources
       result = render_list($!.options, $!.option_name, request)
       log env, 'Multiple source document options', :notice
+
     rescue Fuse::Exception
       if $!.message
         result = render_error($!.message)
@@ -36,6 +38,7 @@ class Fuse::Server
       else
         raise
       end
+
     end if request.path == '/'
 
     if result.nil?

metadata

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