skyrocket 0.0.1 → 0.0.2

data/lib/skyrocket/asset.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'digest/md5'
 
 module Skyrocket
   class Asset
@@ -15,15 +16,23 @@ module Skyrocket
       @processor.post_process_name(@filename)
     end
 
+    def to_s
+      name
+    end
+
     def output_path
-      @output_dir + "/" + @processor.post_process_name(@filename)
+      @output_dir + "/" + output_name
+    end
+
+    def output_name
+      digest = Digest::MD5.hexdigest(content)
+      ppn = @processor.post_process_name(@filename)
+      ext = File.extname(ppn)
+      "#{ppn.chomp(ext)}_#{digest}#{ext}"
     end
 
     def content
-      return @content if @content
-      @content = raw 
-      @content = @processor.process(@content) if @processor
-      return @content
+      return @content ||= @processor.process(raw, name)
     end
 
     def raw

data/lib/skyrocket/asset_dependency.rb

@@ -0,0 +1,24 @@
+module Skyrocket
+  class AssetDependency
+    attr_reader :asset
+
+    def initialize(asset, asset_factory)
+      @asset = asset
+      @af = asset_factory
+    end
+
+    def name
+      @asset.to_s
+    end
+
+    def children
+      required = DirectiveReader.read_required(@asset)
+      required.map { |r| dep_from_name(r) }
+    end
+
+  private
+    def dep_from_name(name)
+      AssetDependency.new(@af.from_name(name), @af)
+    end
+  end
+end

data/lib/skyrocket/asset_factory.rb

@@ -17,14 +17,27 @@ module Skyrocket
       found = dir_search(name, @asset_dirs + @lib_dirs)
       if found.length > 0
         found.each do |file|
-          if @pf.post_process_name(file) =~ /#{name}$/
+          if @pf.post_process_name(file) =~ /#{name}$/ || file =~ /#{name}$/
             dir, file = parts(file)
             return Asset.new(dir, file, @output_dir, @pf.processor(file))
           end
         end
       end
       
-      raise AssetNotFoundError
+      raise AssetNotFoundError.new("Asset not found '#{name}'")
+    end
+
+    def name_exist?(name)
+      found = dir_search(name, @asset_dirs + @lib_dirs)
+      if found.length > 0
+        found.each do |file|
+          if @pf.post_process_name(file) =~ /#{name}$/ || file =~ /#{name}$/
+            return true
+          end
+        end
+      end
+
+      return false
     end
 
   private
@@ -46,7 +59,7 @@ module Skyrocket
     def dir_search(part, dirs)
       found = Array.new 
       dirs.each do |dir|
-        found += Dir[dir + "/" + part + ".*"]
+        found += (Dir[dir + "/" + part] + Dir[dir + "/" + part + ".*"])
       end
       found
     end

data/lib/skyrocket/asset_locator.rb

@@ -7,7 +7,7 @@ module Skyrocket
     end
 
     def all_assets
-      dirs = @af.asset_dirs + @af.lib_dirs
+      dirs = @af.asset_dirs
       paths = Array.new
       dirs.each do |dir|
         paths += Dir.glob_files(dir + "/**/*")

data/lib/skyrocket/asset_manager.rb

@@ -5,9 +5,9 @@ module Skyrocket
     attr_reader :asset_dirs, :lib_dirs, :output_dir, :base_url, :style
 
     def initialize(options)
-      @asset_dirs = options[:asset_dirs].map{ |ad| Pathname.new(ad).realpath.to_s }
-      @lib_dirs = options[:lib_dirs].map{ |ld| Pathname.new(ld).realpath.to_s }
-      @output_dir = Pathname.new(options[:output_dir]).realpath.to_s
+      @asset_dirs = options[:asset_dirs].map{ |ad| File.expand_path(ad) }
+      @lib_dirs = options[:lib_dirs].map{ |ld| File.expand_path(ld) }
+      @output_dir = File.expand_path(options[:output_dir])
       @base_url = options[:base_url]
       @style = options[:style]
       @af = AssetFactory.new(@asset_dirs, @lib_dirs, @output_dir)
@@ -25,13 +25,23 @@ module Skyrocket
       gem 'listen', '>=0.4.2'
       require 'listen'
 
-      update_public(&block)
+      begin
+        update_public(&block)
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace
+      end
 
-      Listen.to(*(@asset_dirs + @lib_dirs)) do |modified, added, removed|
-        (modified + added).each { |am| process_change(@af.build_asset(am), &block) }
-        removed.each do |del|
-          as = @af.build_asset(del)
-          process_deleted(as.output_path, &block)
+      Listen.to(*(@asset_dirs)) do |modified, added, removed|
+        begin
+          (modified + added).each { |am| process_change(@af.build_asset(am), &block) }
+          removed.each do |del|
+            as = @af.build_asset(del)
+            process_deleted(as.output_path, &block)
+          end
+        rescue Exception => e
+          puts e.message
+          puts e.backtrace
         end
       end
     end

data/lib/skyrocket/asset_writer.rb

@@ -26,7 +26,7 @@ module Skyrocket
       dir_parts.length.times do |index|
         neg_index = -1 - index
         path = dir_parts[0..neg_index].join(File::SEPARATOR)
-        if Dir.entries(path).empty?
+        if Dir.entries(path) == ['.','..']
           Dir.rmdir(path)
         else
           break

data/lib/skyrocket/coffeescript_processor.rb

@@ -3,10 +3,11 @@ require 'coffee-script'
 module Skyrocket
   class CoffeescriptProcessor
     include Processor
+    include DirectiveProcessor
 
     def extension; '.coffee'; end
 
-    def process(contents)
+    def process_contents(contents, name)
       CoffeeScript.compile(contents)
     end
   end

data/lib/skyrocket/dependency_searcher.rb

@@ -0,0 +1,17 @@
+module Skyrocket
+  class DependencySearcher
+    def self.deps(node)
+      build_deps(node)
+    end
+
+    def self.build_deps(node, chain = Array.new)
+      results = Array.new
+      raise CircularReferenceError.new if chain.include?(node.name)
+      chain = chain.clone << node.name
+      node.children.each do |child|
+        results += build_deps(child, chain)
+      end
+      (results << node).uniq{ |n| n.name }
+    end
+  end
+end

data/lib/skyrocket/directive_processor.rb

@@ -0,0 +1,13 @@
+module Skyrocket
+  module DirectiveProcessor
+
+    def preprocess_contents(contents, name)
+      asset = asset_factory.from_name(name)
+      start = AssetDependency.new(asset, asset_factory)
+      deps = DependencySearcher.deps(start)
+      deps.map do |r|
+        DirectiveReader.read_body(asset_factory.from_name(r.name))
+      end.join("\n")
+    end
+  end
+end

data/lib/skyrocket/{asset_loader.rb → directive_reader.rb}

@@ -1,8 +1,5 @@
-require 'shellwords'
-
-# components of this file were borrowed from ruby sprokets, https://github.com/sstephenson/sprockets
 module Skyrocket
-  class AssetLoader
+  class DirectiveReader
     HEADER_PATTERN = /
       \A (
         (?m:\s*) (
@@ -13,28 +10,30 @@ module Skyrocket
         )
       )+
     /x
-
+    
     DIRECTIVE_PATTERN = /
       ^ [\W]* = \s* (\w+.*?) (\*\/)? $
     /x
 
-    attr_reader :headers, :body
-
-    def initialize(filepath)
-      raw = File.read(filepath)
-      @headers = raw[HEADER_PATTERN, 0].lines || [""]
-      @body   = $' || data
-      # Ensure body ends in a new line
-      @body  += "\n" if @body != "" && @body !~ /\n\Z/m
+    def self.read_body(asset)
+      split_parts(asset)[1]
+    end
+    
+    def self.read_required(asset)
+      split_parts(asset)[0]
     end
 
-    def requires
-      @requires ||= @headers.each.map do |line|
+    def self.split_parts(asset)
+      raw = asset.raw
+      headers = raw[HEADER_PATTERN, 0].to_s.lines || [""]
+      body = $' || raw
+      headers = headers.each.map do |line|
         if directive = line[DIRECTIVE_PATTERN, 1]
           name, arg = Shellwords.shellwords(directive)
           arg if name == 'require'
         end
       end.compact
+      [headers, body]
     end
   end
 end

data/lib/skyrocket/empty_processor.rb

@@ -3,7 +3,6 @@ module Skyrocket
     include Processor
 
     def extension; ''; end
-    def process(contents); contents; end;
-
+    def process_contents(contents, name); contents; end;
   end
 end

data/lib/skyrocket/erb_processor.rb

@@ -6,7 +6,7 @@ module Skyrocket
 
     def extension; '.erb'; end
 
-    def process(contents)
+    def process_contents(contents, name)
       template = ERB.new(contents, nil, '-', '@out')
       results = template.result(get_binding { |name=nil| '' })
       if(@layout)
@@ -16,7 +16,7 @@ module Skyrocket
           if name == nil
             results
           else
-            @content_for[name.to_sym]
+            cf[name.to_sym] || ''
           end
         end)
       end
@@ -40,7 +40,7 @@ module Skyrocket
       "<script src=\"#{resolve(path)}\"></script>"
     end
 
-    def link_to(content, path, options)
+    def link_to(content, path, options = Hash.new)
       opt_s = to_opt_s(options)
       "<a href=\"#{resolve(path)}\"#{opt_s}>#{content}</a>"
     end
@@ -62,8 +62,7 @@ module Skyrocket
       @out = ''
       results = yield.chomp
       @out = old
-      @content_for ||= Hash.new
-      @content_for[key.to_sym] = results
+      cf[key.to_sym] = results
       nil
     end
 
@@ -76,7 +75,7 @@ module Skyrocket
         if name == nil
           results
         else
-          @content_for[name.to_sym]
+          cf[name.to_sym]
         end
       end)
       @out = old
@@ -88,10 +87,19 @@ module Skyrocket
       if(path.start_with?("/") || path =~ /^\w+:\/\//)
         path
       else
-        base_url == '/' ? "#{base_url}#{path}" : "#{base_url}/#{path}"
+        if asset_factory.name_exist?(path)
+          on = asset_factory.from_name(path).output_name
+          base_url == '/' ? "#{base_url}#{on}" : "#{base_url}/#{on}"
+        else
+          base_url == '/' ? "#{base_url}#{path}" : "#{base_url}/#{path}"
+        end
       end
     end
 
+    def cf
+      @content_for ||= Hash.new
+    end
+
     def to_opt_s(options)
       opt_s = options.keys.map{ |k| "#{k}=\"#{options[k]}\"" }.join(' ')
       opt_s = " " + opt_s unless opt_s == ''

data/lib/skyrocket/errors.rb

@@ -1,5 +1,6 @@
 module Skyrocket
   class AssetNotFoundError < Exception; end;
+  class CircularReferenceError < Exception; end;
   class PathNotInAssetsError < Exception; end;
   class NoValidProcessorError < Exception; end;
 end

data/lib/skyrocket/javascript_processor.rb

@@ -0,0 +1,13 @@
+module Skyrocket
+  class JavascriptProcessor
+    include Processor
+    include DirectiveProcessor
+
+    def extension; '.js'; end
+    def post_process_name(file); file.chomp; end
+
+    def process_contents(contents, name)
+      contents
+    end
+  end
+end

data/lib/skyrocket/less_processor.rb

@@ -6,7 +6,7 @@ module Skyrocket
 
     def extension; '.less'; end
 
-    def process(contents)
+    def process_contents(contents, name)
       tree = parser.parse(contents)
       tree.to_css
     end

data/lib/skyrocket/processor.rb

@@ -4,8 +4,9 @@ module Skyrocket
       raise NotImplimentedError.new("must impliment #{caller[0][/`.*'/][1..-2]} for #{self.class.name}")
     end
 
-    def process(contents)
-      raise NotImplimentedError.new("must impliment #{caller[0][/`.*'/][1..-2]} for #{self.class.name}")
+    def process(contents, name)
+      contents = preprocess_contents(contents, name) if self.respond_to?(:preprocess_contents)
+      process_contents(contents, name)
     end
 
     def process?(file)

data/lib/skyrocket/processor_factory.rb

@@ -1,7 +1,7 @@
 module Skyrocket
   class ProcessorFactory
    
-    PROCESSORS = [ CoffeescriptProcessor, ErbProcessor, LessProcessor, EmptyProcessor ]
+    PROCESSORS = [ CoffeescriptProcessor, ErbProcessor, JavascriptProcessor, LessProcessor, EmptyProcessor ]
 
     def process?(filename)
       PROCESSORS.each do |processor|

data/lib/skyrocket/version.rb

@@ -1,3 +1,3 @@
 module Skyrocket
-  VERSION = "0.0.1"
-end
+  VERSION = "0.0.2"
+end

data/lib/skyrocket.rb

@@ -2,18 +2,24 @@ require 'skyrocket/version'
 
 module Skyrocket
   autoload :Asset,                 "skyrocket/asset"
+  autoload :AssetDependency,       "skyrocket/asset_dependency"
   autoload :AssetLocator,          "skyrocket/asset_locator"
   autoload :AssetFactory,          "skyrocket/asset_factory"
   autoload :AssetManager,          "skyrocket/asset_manager"
   autoload :AssetWriter,           "skyrocket/asset_writer"
   autoload :CoffeescriptProcessor, "skyrocket/coffeescript_processor"
+  autoload :DependencySearcher,    "skyrocket/dependency_searcher"
+  autoload :DirectiveProcessor,    "skyrocket/directive_processor"
+  autoload :DirectiveReader,       "skyrocket/directive_reader"
   autoload :EmptyProcessor,        "skyrocket/empty_processor"
   autoload :ErbProcessor,          "skyrocket/erb_processor"
+  autoload :JavascriptProcessor,   "skyrocket/javascript_processor"
   autoload :LessProcessor,         "skyrocket/less_processor"
   autoload :Processor,             "skyrocket/processor"
   autoload :ProcessorFactory,      "skyrocket/processor_factory"
 
   autoload :AssetNotFoundError,    "skyrocket/errors"
+  autoload :CircularReferenceError, "skyrocket/errors"
   autoload :NoValidProcessorError, "skyrocket/errors"
   autoload :PathNotInAssetsError,  "skyrocket/errors"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skyrocket
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-09 00:00:00.000000000Z
+date: 2012-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70197185909260 !ruby/object:Gem::Requirement
+  requirement: &70096236593860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197185909260
+  version_requirements: *70096236593860
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &70197185908840 !ruby/object:Gem::Requirement
+  requirement: &70096236593440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197185908840
+  version_requirements: *70096236593440
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70197185908420 !ruby/object:Gem::Requirement
+  requirement: &70096236593020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70197185908420
+  version_requirements: *70096236593020
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70197185908000 !ruby/object:Gem::Requirement
+  requirement: &70096236592600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197185908000
+  version_requirements: *70096236592600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70197185907500 !ruby/object:Gem::Requirement
+  requirement: &70096236592100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70197185907500
+  version_requirements: *70096236592100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70197185907080 !ruby/object:Gem::Requirement
+  requirement: &70096236591680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,11 +76,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197185907080
+  version_requirements: *70096236591680
 description: An alternative and opinionated static content/ asset management tool
   that will concatenate/ render javascript, coffeescript, css, less, erb and html
 email:
-- michael@raveld.com
+- michael.m.wasser@gmail.com
 executables:
 - skyrocket
 extensions: []
@@ -89,25 +89,29 @@ files:
 - README.md
 - LICENSE
 - lib/skyrocket/asset.rb
+- lib/skyrocket/asset_dependency.rb
 - lib/skyrocket/asset_factory.rb
-- lib/skyrocket/asset_loader.rb
 - lib/skyrocket/asset_locator.rb
 - lib/skyrocket/asset_manager.rb
 - lib/skyrocket/asset_writer.rb
 - lib/skyrocket/cmd.rb
 - lib/skyrocket/coffeescript_processor.rb
+- lib/skyrocket/dependency_searcher.rb
 - lib/skyrocket/dir_ext.rb
+- lib/skyrocket/directive_processor.rb
+- lib/skyrocket/directive_reader.rb
 - lib/skyrocket/empty_processor.rb
 - lib/skyrocket/erb_processor.rb
 - lib/skyrocket/errors.rb
 - lib/skyrocket/file_ext.rb
+- lib/skyrocket/javascript_processor.rb
 - lib/skyrocket/less_processor.rb
 - lib/skyrocket/processor.rb
 - lib/skyrocket/processor_factory.rb
 - lib/skyrocket/version.rb
 - lib/skyrocket.rb
 - bin/skyrocket
-homepage: http://www.raveld.com/
+homepage: http://www.mikewasser.com/
 licenses: []
 post_install_message: 
 rdoc_options: []