paste 0.3.0 → 0.3.1

data/lib/paste.rb

@@ -5,14 +5,14 @@ require 'active_support/core_ext/module/attr_accessor_with_default'
 require 'active_support/core_ext/module/delegation'
 
 module Paste
-  autoload :Cache,       'paste/cache'
-  autoload :Compress,    'paste/compress'
-  autoload :ERBRenderer, 'paste/erb_renderer'
-  autoload :Glue,        'paste/glue'
-  autoload :NeedsUpdate, 'paste/needs_update'
-  autoload :Rails,       'paste/rails'
-  autoload :Resolver,    'paste/resolver'
-  autoload :VERSION,     'paste/version'
+  autoload :Cache,        'paste/cache'
+  autoload :Compress,     'paste/compress'
+  autoload :ERBRenderer,  'paste/erb_renderer'
+  autoload :Glue,         'paste/glue'
+  autoload :Rails,        'paste/rails'
+  autoload :Resolver,     'paste/resolver'
+  autoload :ResolveError, 'paste/resolver'
+  autoload :VERSION,      'paste/version'
 
   class << self
     delegate :configure, :config, :to => Glue
@@ -29,11 +29,8 @@ Paste.configure do |config|
 
   config.js_destination = 'public/javascripts'
   config.js_load_path   = ['app/javascripts']
-  config.erb_path    = 'tmp/paste-cache/erb'
-  config.parser      = Paste::Parser::Sprockets
-
-  config.css_destination = 'public/stylesheets'
-  config.css_load_path   = ['app/stylesheets']
+  config.erb_path       = 'tmp/paste-cache/erb'
+  config.parser         = Paste::Parser::Sprockets
 end
 
 require 'paste/rails/railtie' if defined?(Rails)

data/lib/paste/erb_renderer.rb

@@ -5,6 +5,16 @@ module Paste
 
     def render_all_erb
       erb_sources.each { |s| render_erb s }
+
+      Dir[erb_path + '/**/*.js'].each do |erb|
+        erb_rel = erb.gsub erb_path + '/', ''
+
+        begin
+          find(erb_rel + '.erb')
+        rescue ResolveError
+          File.delete erb
+        end
+      end
     end
 
     def render_erb source

data/lib/paste/parser/sprockets.rb

@@ -37,20 +37,16 @@ module Paste
         if @js_dependencies.nil? || @css_dependencies.nil? ||
             @last_updated.nil? || @last_updated < File.mtime(@file)
 
-          begin
-            @last_updated    = Time.now
-
-            @secretary = ::Sprockets::Secretary.new(
-              :root         => glue.root,
-              :expand_paths => false,
-              :load_path    => glue.load_path,
-              :source_files => [@file]
-            )
-
-            generate_dependencies
-          rescue ::Sprockets::LoadError => e
-            raise ResolveError.new(e.message)
-          end
+          @last_updated    = Time.now
+
+          @secretary = ::Sprockets::Secretary.new(
+            :root         => glue.root,
+            :expand_paths => false,
+            :load_path    => glue.load_path,
+            :source_files => [@file]
+          )
+
+          generate_dependencies
         end
       end
 

data/lib/paste/version.rb

@@ -1,3 +1,3 @@
 module Paste
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/paste/erb_spec.rb

@@ -71,6 +71,15 @@ describe Paste::Glue do
 
       subject.erb_path('foo.js').should have_contents('foo')
     end
+
+    it "should delete the file if the source was removed" do
+      Paste::Test.write 'foo.js.erb', 'foobar', Time.now - 42
+      subject.render_all_erb
+      Paste::Test.delete_source 'foo.js.erb'
+
+      subject.render_all_erb
+      subject.erb_path('foo.js').should_not have_contents('foo')
+    end
   end
 
   context "rails" do

data/spec/paste/glue_spec.rb

@@ -30,6 +30,22 @@ describe Paste::Glue do
     }.should raise_exception(/circular dependency/i)
   end
 
+  it "raises an exception on nonexistent dependencies" do
+    lambda {
+      subject.paste('nonexistent')
+    }.should raise_exception(/nonexistent.*couldn't be found/i)
+  end
+
+  it "raises a descriptive exception when a dependency is removed" do
+    Paste::Test.write 'nonexistent', ''
+    subject.paste('nonexistent')
+    Paste::Test.delete_source 'nonexistent'
+
+    lambda {
+      subject.paste('nonexistent')
+    }.should raise_exception(/nonexistent.*couldn't be found/i)
+  end
+
   describe "regenerating files" do
     it "watches for changes in dependencies" do
       Paste::Test.write 'foo', '//= require <bar>'

data/spec/support/helpers.rb

@@ -50,7 +50,8 @@ module Paste
       end
 
       def delete_file file
-        file += '.' + extension unless file.end_with?('.' + extension)
+        file += '.' + extension unless file.end_with?('.' + extension) ||
+            file.end_with?('.erb')
 
         File.delete(file)
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Alex Crichton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -04:00
+date: 2010-10-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,14 +35,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
-        - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: "3.0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -92,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2371119180319752676
+      hash: 3666398460497558282
       segments: 
       - 0
       version: "0"
@@ -101,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2371119180319752676
+      hash: 3666398460497558282
       segments: 
       - 0
       version: "0"