sstephenson-sprockets 0.3.0 → 0.4.0

data/bin/sprocketize

@@ -44,15 +44,5 @@ OptionParser.new do |opts|
   end
 end
 
-environment  = Sprockets::Environment.new(".", load_path)
-preprocessor = Sprockets::Preprocessor.new(environment)
-
-filenames.each do |filename|
-  if pathname = environment.find(filename)
-    preprocessor.require(pathname.source_file)
-  else
-    raise Sprockets::LoadError, "no such file `#{filename}'"
-  end
-end
-
-print preprocessor.output_file
+secretary = Sprockets::Secretary.new(:load_path => load_path, :source_files => filenames, :expand_paths => false)
+print secretary.output_file

data/lib/sprockets/environment.rb

@@ -22,7 +22,11 @@ module Sprockets
     end
     
     def find(location)
-      find_all(location).first
+      if absolute?(location) && File.exists?(location)
+        pathname_from(location)
+      else
+        find_all(location).first
+      end
     end
     
     def constants(reload = false)
@@ -35,9 +39,13 @@ module Sprockets
     end
     
     protected
+      def absolute?(location)
+        location[0, 1] == File::SEPARATOR
+      end
+      
       def absolute_location_from(location)
         location = location.to_s
-        location = File.join(root.absolute_location, location) unless location[/^\//]
+        location = File.join(root.absolute_location, location) unless absolute?(location)
         File.expand_path(location)
       end
       

data/lib/sprockets/secretary.rb

@@ -0,0 +1,66 @@
+module Sprockets
+  class Secretary
+    DEFAULT_OPTIONS = {
+      :root         => ".",
+      :load_path    => [],
+      :source_files => [],
+      :expand_paths => true
+    }
+
+    attr_reader :environment, :preprocessor
+    
+    def initialize(options = {})
+      @options = DEFAULT_OPTIONS.merge(options)
+      @environment  = Sprockets::Environment.new(@options[:root])
+      @preprocessor = Sprockets::Preprocessor.new(@environment)
+
+      add_load_locations(@options[:load_path])
+      add_source_files(@options[:source_files])
+    end
+
+    def add_load_location(load_location, options = {})
+      add_load_locations([load_location], options)
+    end
+
+    def add_load_locations(load_locations, options = {})
+      expand_paths(load_locations, options).each do |load_location|
+        environment.register_load_location(load_location)
+      end
+    end
+    
+    def add_source_file(source_file, options = {})
+      add_source_files([source_file], options)
+    end
+    
+    def add_source_files(source_files, options = {})
+      expand_paths(source_files, options).each do |source_file|
+        if pathname = environment.find(source_file)
+          preprocessor.require(pathname.source_file)
+        else
+          raise Sprockets::LoadError, "no such file `#{source_file}'"
+        end
+      end
+    end
+    
+    def output_file
+      preprocessor.output_file
+    end
+    
+    protected
+      def expand_paths(paths, options = {})
+        if options.has_key?(:expand_paths) ? options[:expand_paths] : @options[:expand_paths]
+          paths.map { |path| Dir[from_root(path)].sort }.flatten.compact
+        else
+          paths.map { |path| from_root(path) }
+        end
+      end
+      
+      def from_root(path)
+        if path[0, 1] == File::SEPARATOR
+          path
+        else
+          File.join(@options[:root], path)
+        end
+      end
+  end
+end

data/lib/sprockets/version.rb

@@ -1,8 +1,8 @@
 module Sprockets
   module Version
     MAJOR  = 0
-    MINOR  = 1
-    TINY   = 1
+    MINOR  = 4
+    TINY   = 0
 
     STRING = [MAJOR, MINOR, TINY].join(".")
   end

data/lib/sprockets.rb

@@ -10,3 +10,4 @@ require "sprockets/source_line"
 require "sprockets/source_file"
 require "sprockets/output_file"
 require "sprockets/preprocessor"
+require "sprockets/secretary"

data/test/test_secretary.rb

@@ -0,0 +1,34 @@
+require "test_helper"
+
+class SecretaryTest < Test::Unit::TestCase
+  def test_load_locations_are_not_expanded_when_expand_paths_is_false
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    secretary.add_load_locations("src/**/", :expand_paths => false)
+    
+    assert_equal [File.join(FIXTURES_PATH, "src/**"), FIXTURES_PATH], 
+                 secretary.environment.load_path.map { |pathname| pathname.absolute_location }
+  end
+  
+  def test_load_locations_are_expanded_when_expand_paths_is_true
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    secretary.add_load_locations("src/**/", :expand_paths => true)
+    
+    assert_equal [File.join(FIXTURES_PATH, "src", "foo"), File.join(FIXTURES_PATH, "src"), FIXTURES_PATH],
+                 secretary.environment.load_path.map { |pathname| pathname.absolute_location }
+  end
+  
+  def test_source_files_are_not_expanded_when_expand_paths_is_false
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    assert_raises(Sprockets::LoadError) do
+      secretary.add_source_files("src/f*.js", :expand_paths => false)
+    end
+  end
+  
+  def test_source_files_are_expanded_when_expand_paths_is_true
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    secretary.add_source_files("src/f*.js", :expand_paths => true)
+    
+    assert_equal [File.join(FIXTURES_PATH, "src", "foo.js")],
+                 secretary.preprocessor.source_files.map { |source_file| source_file.pathname.absolute_location }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sstephenson-sprockets
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-28 00:00:00 -08:00
+date: 2009-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -30,11 +30,13 @@ files:
 - lib/sprockets/source_file.rb
 - lib/sprockets/error.rb
 - lib/sprockets/output_file.rb
+- lib/sprockets/secretary.rb
 - lib/sprockets/environment.rb
 - lib/sprockets/version.rb
 - lib/sprockets/source_line.rb
 - lib/sprockets/pathname.rb
 - test/test_preprocessor.rb
+- test/test_secretary.rb
 - test/test_source_line.rb
 - test/test_source_file.rb
 - test/test_output_file.rb