paste 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/paste/js/base.rb

@@ -4,7 +4,7 @@ module Paste
 
       include Cache
       include Compress
-      
+
       def initialize
         config.load_path << erb_path
       end

data/lib/paste/js/cache.rb

@@ -18,7 +18,10 @@ module Paste
         render_all_erb
         results.each_pair do |result, sources|
           begin
-            write_result result if blk.call(result, sources[:sources])
+            if blk.call(result, sources[:sources])
+              sources[:parser].reset!
+              write_result result
+            end
           rescue ResolveError
             results.delete result
           end
@@ -41,11 +44,14 @@ module Paste
       end
 
       def needs_update? result
-        path = destination result
-        return true unless File.exists?(path)
+        needs_update_relative_to_sources result do
+          results[result][:sources]
+        end
+      end
 
-        results[result][:sources].inject(false) do |prev, source|
-          prev || File.mtime(path) < File.mtime(find(source))
+      def needs_dependency_update? result
+        needs_update_relative_to_sources result do
+          results[result][:parser].js_dependencies
         end
       end
 
@@ -67,6 +73,15 @@ module Paste
       end
 
       protected
+      
+      def needs_update_relative_to_sources result
+        path = destination result
+        return true unless File.exists?(path) && results.key?(result)
+
+        yield.inject(false) do |prev, source|
+          prev || File.mtime(path) < File.mtime(find(source))
+        end
+      end
 
       def write_cache_to_disk
         file = tmp_path config.cache_file

data/lib/paste/js/chain.rb

@@ -9,16 +9,18 @@ module Paste
         sources.each do |source|
           name = result_name [source]
           if registered? [source]
-            results[name][:parser].reset! if needs_update? name
+            if needs_update?(name) || needs_dependency_update?(name)
+              results[name][:parser].reset! 
+            end
           else
-            register [source] unless registered? [source]
+            register [source]
           end
 
           source_deps  = results[name][:parser].js_dependencies
-          js_dependencies = source_deps | js_dependencies# | source_deps
+          js_dependencies = source_deps | js_dependencies
         end
 
-        js_dependencies = js_dependencies.map do |d| 
+        js_dependencies.map! do |d|
           result = result_name [d]
           register [d] unless registered? [d] # implicit dependencies
           write_result result if needs_update?(result)

data/lib/paste/js/unify.rb

@@ -9,7 +9,8 @@ module Paste
 
         register sources unless registered?(sources)
 
-        if needs_update?(result)
+        if needs_update?(result) || needs_dependency_update?(result)
+          results[result][:parser].reset! 
           write_result result
         end
 

data/lib/paste/parser/sprockets.rb

@@ -11,12 +11,7 @@ module Paste
       def initialize glue, sources
         @glue      = glue
         @sources   = sources
-        @secretary = ::Sprockets::Secretary.new(
-          :root         => glue.root, 
-          :expand_paths => false,
-          :load_path    => glue.load_path,
-          :source_files => sources.map{ |s| glue.find s }
-        )
+        reset!
       end
 
       def js_dependencies
@@ -30,8 +25,14 @@ module Paste
       end
 
       def reset!
-        @js_dependencies  = @css_dependencies = nil
-        secretary.reset!
+        @js_dependencies = @css_dependencies = nil
+
+        @secretary = ::Sprockets::Secretary.new(
+          :root         => glue.root, 
+          :expand_paths => false,
+          :load_path    => glue.load_path,
+          :source_files => @sources.map{ |s| glue.find s }
+        )
       rescue ::Sprockets::LoadError => e
         raise ResolveError.new(e.message)
       end

data/lib/paste/rails/helper.rb

@@ -17,7 +17,7 @@ module Paste
         include_css *other_css
 
         results = Paste::Rails.glue.paste *(@javascripts ||= [])
-        all_css = (results[:css] + other_css + @css).uniq
+        all_css = (results[:css] + @css).uniq
         
         cache = Digest::SHA1.hexdigest(all_css.sort.join)[0..12]
         all_css << {:cache => cache}

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: paste
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Alex Crichton
@@ -15,120 +14,110 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -05:00
+date: 2010-08-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: sprockets
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: closure-compiler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: paste
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230024
         segments: 
         - 3
         - 0
         - 0
         - beta4
         version: 3.0.0.beta4
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
@@ -136,7 +125,9 @@ dependencies:
         - beta
         - 19
         version: 2.0.0.beta.19
-  requirement: *id008
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: Asset Management for Rails
 email: 
 - alex@alexcrichton.com
@@ -147,11 +138,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
-- Gemfile
-- Gemfile.lock
 - README.rdoc
-- Rakefile
 - VERSION
 - lib/paste.rb
 - lib/paste/capistrano.rb
@@ -171,19 +158,6 @@ files:
 - lib/paste/resolver.rb
 - lib/paste/tasks/paste.rake
 - lib/paste/version.rb
-- paste.gemspec
-- script/test
-- spec/paste/css/provides_spec.rb
-- spec/paste/js/cache_spec.rb
-- spec/paste/js/chain_spec.rb
-- spec/paste/js/compress_spec.rb
-- spec/paste/js/config_spec.rb
-- spec/paste/js/erb_spec.rb
-- spec/paste/js/unify_spec.rb
-- spec/paste/rails/helper_spec.rb
-- spec/spec_helper.rb
-- spec/support/helpers.rb
-- spec/support/matchers.rb
 has_rdoc: true
 homepage: http://github.com/alexcrichton/paste
 licenses: []
@@ -198,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -772280203830109166
       segments: 
       - 0
       version: "0"
@@ -207,7 +181,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -218,15 +191,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: JS and CSS dependency management
-test_files: 
-- spec/paste/css/provides_spec.rb
-- spec/paste/js/cache_spec.rb
-- spec/paste/js/chain_spec.rb
-- spec/paste/js/compress_spec.rb
-- spec/paste/js/config_spec.rb
-- spec/paste/js/erb_spec.rb
-- spec/paste/js/unify_spec.rb
-- spec/paste/rails/helper_spec.rb
-- spec/spec_helper.rb
-- spec/support/helpers.rb
-- spec/support/matchers.rb
+test_files: []
+

data/.gitignore

@@ -1,4 +0,0 @@
-pkg
-coverage*
-.bundle
-tmp

data/Gemfile

@@ -1,13 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'sprockets'
-gem 'closure-compiler'
-gem 'paste', :path => '.'
-gem 'activesupport', '>= 3.0.0.beta4'
-
-group 'development' do
-  gem 'jeweler'
-  gem 'rake'
-  gem 'rcov'
-  gem 'rspec', '>= 2.0.0.beta.19'
-end

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    paste (0.1.1)
-      activesupport (>= 3.0.0.beta4)
-      closure-compiler
-      paste
-      sprockets
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.0.rc)
-    closure-compiler (0.3.2)
-    diff-lcs (1.1.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rake (0.8.7)
-    rcov (0.9.8)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sprockets (1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 3.0.0.beta4)
-  closure-compiler
-  jeweler
-  paste!
-  rake
-  rcov
-  rspec (>= 2.0.0.beta.19)
-  sprockets

data/Rakefile

@@ -1,36 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require 'jeweler'
-require 'rspec/core/rake_task'
-
-Jeweler::Tasks.new do |gem|
-  gem.name        = 'paste'
-  gem.authors     = ['Alex Crichton']
-  gem.description = 'Asset Management for Rails'
-  gem.summary     = 'JS and CSS dependency management'
-  gem.email       = ['alex@alexcrichton.com']
-  gem.homepage    = 'http://github.com/alexcrichton/paste'
-
-  gem.add_bundler_dependencies
-end
-Jeweler::GemcutterTasks.new
-
-RSpec::Core::RakeTask.new(:spec)
-
-desc "Run all examples using rcov"
-RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
-  t.rcov = true
-  t.rcov_opts =  %[-Ilib -Ispec --exclude "gems/*,spec/support,spec/paste,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
-  t.rcov_opts << %[--no-html --aggregate coverage.data]
-end
-
-task :cleanup_rcov_files do
-  rm_rf 'coverage.data'
-end
-
-task :clobber do
-  rm_rf 'pkg'
-  rm_rf 'tmp'
-  rm_rf 'coverage'
-end

data/paste.gemspec

@@ -1,110 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{paste}
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alex Crichton"]
-  s.date = %q{2010-08-17}
-  s.description = %q{Asset Management for Rails}
-  s.email = ["alex@alexcrichton.com"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/paste.rb",
-     "lib/paste/capistrano.rb",
-     "lib/paste/css/base.rb",
-     "lib/paste/glue.rb",
-     "lib/paste/js/base.rb",
-     "lib/paste/js/cache.rb",
-     "lib/paste/js/chain.rb",
-     "lib/paste/js/compress.rb",
-     "lib/paste/js/erb_renderer.rb",
-     "lib/paste/js/unify.rb",
-     "lib/paste/parser/sprockets.rb",
-     "lib/paste/rails.rb",
-     "lib/paste/rails/helper.rb",
-     "lib/paste/rails/railtie.rb",
-     "lib/paste/rails/updater.rb",
-     "lib/paste/resolver.rb",
-     "lib/paste/tasks/paste.rake",
-     "lib/paste/version.rb",
-     "paste.gemspec",
-     "script/test",
-     "spec/paste/css/provides_spec.rb",
-     "spec/paste/js/cache_spec.rb",
-     "spec/paste/js/chain_spec.rb",
-     "spec/paste/js/compress_spec.rb",
-     "spec/paste/js/config_spec.rb",
-     "spec/paste/js/erb_spec.rb",
-     "spec/paste/js/unify_spec.rb",
-     "spec/paste/rails/helper_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/support/helpers.rb",
-     "spec/support/matchers.rb"
-  ]
-  s.homepage = %q{http://github.com/alexcrichton/paste}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{JS and CSS dependency management}
-  s.test_files = [
-    "spec/paste/css/provides_spec.rb",
-     "spec/paste/js/cache_spec.rb",
-     "spec/paste/js/chain_spec.rb",
-     "spec/paste/js/compress_spec.rb",
-     "spec/paste/js/config_spec.rb",
-     "spec/paste/js/erb_spec.rb",
-     "spec/paste/js/unify_spec.rb",
-     "spec/paste/rails/helper_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/support/helpers.rb",
-     "spec/support/matchers.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sprockets>, [">= 0"])
-      s.add_runtime_dependency(%q<closure-compiler>, [">= 0"])
-      s.add_runtime_dependency(%q<paste>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-    else
-      s.add_dependency(%q<sprockets>, [">= 0"])
-      s.add_dependency(%q<closure-compiler>, [">= 0"])
-      s.add_dependency(%q<paste>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-    end
-  else
-    s.add_dependency(%q<sprockets>, [">= 0"])
-    s.add_dependency(%q<closure-compiler>, [">= 0"])
-    s.add_dependency(%q<paste>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-  end
-end
-

data/script/test

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'bundler'
-require 'bundler/cli'
-
-root        = File.expand_path('../..', __FILE__)
-destination = root + '/tmp'
-
-ENV.delete 'BUNDLE_GEMFILE'
-ENV['GEM_HOME']    = destination
-ENV['GEM_PATH']    = destination
-ENV['BUNDLE_PATH'] = destination
-
-Bundler::CLI.start ['install', "--gemfile=#{root}/Gemfile", '--path', destination]
-
-Bundler.setup :default, :test
-
-require 'rspec/core'
-success = RSpec::Core::Runner.run(['--color', root + '/spec'], $stderr, $stdout)
-
-exit! success ? 0 : 1 

data/spec/paste/css/provides_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-shared_examples_for 'a css provider' do
-  before :each do
-    Paste::JS::Test.write 'foo', '//= require_css <foo>'
-    Paste::CSS::Test.write 'foo', ''
-  end
-  
-  it "should require the css" do
-    result = subject.paste 'foo'
-    result[:css].should == ['foo']
-  end
-  
-  it "should not require multiple css twice" do
-    Paste::JS::Test.write 'bar', '//= require_css <foo>'
-
-    subject.paste('foo', 'bar')[:css].should == ['foo']
-  end
-end
-
-describe 'Providing CSS from javascript' do
-  describe Paste::JS::Unify do
-    it_should_behave_like 'a css provider'
-  end
-
-  describe Paste::JS::Chain do
-    it_should_behave_like 'a css provider'
-  end
-end

data/spec/paste/js/cache_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe Paste::JS::Unify, 'building cached concatenations' do
-
-  before :each do
-    Paste::JS::Test.write 'foo', 'foo()'
-    Paste::JS::Test.write 'bar', 'bar()'
-    Paste::JS::Test.write 'foo/baz', 'baz()'
-    
-    @result = subject.paste('foo', 'bar', 'foo/baz')[:javascript].first
-    Paste::JS::Test.delete @result
-  end
-
-  it "should rebuild within the same instance of the unifier" do
-    subject.rebuild!
-
-    subject.should have_in_result(@result, "foo()\nbar()\nbaz()")
-  end
-
-  it "should allow another watcher to rebuild it" do
-    subject = Paste::JS::Unify.new
-    subject.rebuild!
-
-    subject.should have_in_result(@result, "foo()\nbar()\nbaz()")
-  end
-
-  it "should rebuild pre-existing results despite modification times" do
-    # Make the file exist and have the last modified time of the sources
-    # to be previous to now
-    subject.paste('foo', 'bar', 'foo/baz')
-    Paste::JS::Test.write 'foo', 'foo2()', Time.now - 42
-    Paste::JS::Test.write 'bar', 'bar2()', Time.now - 42
-    Paste::JS::Test.write 'foo/baz', 'baz2()', Time.now - 42
-
-    subject.rebuild!
-
-    subject.should have_in_result(@result, "foo2()\nbar2()\nbaz2()")
-  end
-
-  it "should ignore cached results which no longer exist" do
-    Paste::JS::Test.delete_source 'foo'
-    Paste::JS::Test.delete_source 'bar'
-
-    subject.rebuild!
-    subject.destination(@result).should_not exist
-  end
-end

data/spec/paste/js/chain_spec.rb

@@ -1,100 +0,0 @@
-require 'spec_helper'
-
-describe Paste::JS::Chain do
-  before :each do
-    Paste::JS::Test.write 'foo', 'foo()'
-    Paste::JS::Test.write 'bar', 'bar()'
-    Paste::JS::Test.write 'foo/baz', 'baz()'
-  end
-
-  it "should return the sources given" do
-    results = subject.paste('foo', 'bar', 'foo/baz')[:javascript]
-
-    results.sort.should == ['bar.js', 'foo.js', 'foo/baz.js']
-  end
-  
-  it "should generate the concatenation when the destination doesn't exist" do
-    subject.paste('foo', 'bar', 'foo/baz')
-
-    subject.should have_in_result('foo', 'foo()')
-    subject.should have_in_result('bar', 'bar()')
-    subject.should have_in_result('foo/baz', 'baz()')
-  end
-  
-  it "should return the sources with dependencies satisfied" do
-    Paste::JS::Test.write 'foo', "//= require <foo/bar>\n//= require <bar>"
-    Paste::JS::Test.write 'bar', '//= require <foo/bar>'
-    Paste::JS::Test.write 'foo/bar', 'foobar()'
-
-    subject.paste('foo', 'bar', 'foo/bar')[:javascript].should == ['foo/bar.js', 'bar.js', 'foo.js']
-  end
-  
-  it "should raise an exception on circular dependencies" do
-    Paste::JS::Test.write 'foo', '//= require <bar>'
-    Paste::JS::Test.write 'bar', '//= require <foo>'
-
-    lambda {
-      subject.paste('foo', 'bar')
-    }.should raise_exception(/circular dependency/i)
-  end
-
-  describe "regenerating files" do
-    it "should only regenerate modified files" do
-      subject.paste('foo', 'bar', 'foo/baz')
-
-      Paste::JS::Test.write 'foo', 'foo(foo)', Time.now - 42
-      Paste::JS::Test.write 'bar', 'bar(bar)', Time.now + 42
-
-      subject.paste('foo', 'bar', 'foo/baz')
-
-      subject.should have_in_result('foo', 'foo()')
-      subject.should have_in_result('bar', 'bar(bar)')
-      subject.should have_in_result('foo/baz', 'baz()')
-    end
-
-    it "should update the results only if the sources have changed" do
-      subject = described_class.new
-
-      subject.paste('foo')
-      subject.paste('bar')
-      Paste::JS::Test.write 'foo', 'foobar()', Time.now - 42
-      Paste::JS::Test.write 'bar', 'barbar()', Time.now + 42
-
-      subject.rebuild
-
-      subject.should have_in_result('foo', 'foo()')
-      subject.should have_in_result('bar', 'barbar()')
-    end
-    
-    it "should watch for changes in dependencies as well" do
-      Paste::JS::Test.write 'foo', '//= require <bar>'
-      Paste::JS::Test.write 'bar', ''
-      Paste::JS::Test.write 'baz', ''
-      subject.paste 'foo', 'bar', 'baz'
-
-      Paste::JS::Test.write 'bar', '//= require <baz>', Time.now + 42
-
-      subject.paste('foo', 'bar', 'baz')[:javascript].should == ['baz.js', 'bar.js', 'foo.js']
-    end
-  end
-  
-  describe "implicit dependencies" do
-    before :each do
-      Paste::JS::Test.write 'foo', ''
-      Paste::JS::Test.write 'bar', '//= require <foo>'
-    end
-
-    it "should be included when pasting" do
-      subject.paste('bar')[:javascript].should == ['foo.js', 'bar.js']
-    end
-
-    it "should be regenerated" do
-      result = subject.paste('bar')[:javascript].first
-      
-      Paste::JS::Test.write 'foo', 'foobar()', Time.now + 42
-
-      subject.paste('bar')
-      subject.should have_in_result(result, 'foobar()')
-    end
-  end
-end

data/spec/paste/js/compress_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe Paste::JS::Unify, 'compression' do
-  before :each do
-    Paste::JS::Test.write 'foo', "function foo() {};\n foo()"
-    Paste::JS::Test.write 'bar', "function bar() {};\n bar()"
-  end
-
-  it "should not compress the files when pasting" do
-    result = subject.paste('foo')[:javascript].first
-    
-    subject.should have_in_result(result, "function foo() {};\n foo()")
-  end
-
-  it "should compress the previously generated result" do
-    result = subject.paste('foo', 'bar')[:javascript].first
-    
-    begin
-      subject.rebuild! :compress => 'google'
-    rescue SocketError
-      pending 'Error connecting to google'
-    end
-
-    contents = File.read subject.destination(result)
-    contents.should_not contain("\n")
-    contents.should =~ /function/
-  end
-
-  it "should allow the compilation level to be specified" do
-    result = subject.paste('foo', 'bar')[:javascript].first
-    
-    begin
-      subject.rebuild! :compress => 'google', 
-                       :compilation_level => 'ADVANCED_OPTIMIZATIONS'
-    rescue SocketError
-      pending 'Error connecting to google'
-    end
-
-    # Everything should be optimized out
-    subject.should have_in_result(result, '')
-  end
-
-end

data/spec/paste/js/config_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe Paste::Glue, 'configuration' do
-  it "should resolve absolute paths correctly" do
-    absolute = File.expand_path(__FILE__)
-    subject.resolve(absolute).should == absolute
-  end
-
-  it "should resolve a non-absolute path relative to the specified root" do
-    subject.config.root = '/foo/bar'
-    subject.resolve('nonexistent').should == '/foo/bar/nonexistent'
-  end
-  
-  it "should allow relative paths to the root to be set for configuration" do
-    subject.config.root        = '/foo/bar'
-    subject.config.tmp_path    = 'tmp'
-    subject.config.erb_path    = 'erb'
-    subject.config.destination = 'dst'
-    
-    subject.tmp_path.should == '/foo/bar/tmp'
-    subject.erb_path.should == '/foo/bar/erb'
-    subject.destination.should == '/foo/bar/dst'
-  end
-  
-  it "should allow absolute paths to the root to be set for configuration" do
-    subject.config.root        = '/foo/bar'
-    subject.config.tmp_path    = '/tmp'
-    subject.config.erb_path    = '/erb'
-    subject.config.destination = '/dst'
-    
-    subject.tmp_path.should == '/tmp'
-    subject.erb_path.should == '/erb'
-    subject.destination.should == '/dst'
-  end
-end

data/spec/paste/js/erb_spec.rb

@@ -1,94 +0,0 @@
-require 'spec_helper'
-
-describe Paste::JS::Base do
-
-  it "should render an erb file into a temporary location" do
-    Paste::JS::Test.write 'foo.js.erb', ''
-    subject.render_all_erb
-  
-    subject.erb_path('foo.js').should exist
-  end
-  
-  it "should execute the ERB in the file" do
-    Paste::JS::Test.write 'foo.js.erb', '<%= "foo" %><%= "bar" %>'
-    subject.render_all_erb
-  
-    subject.erb_path('foo.js').should have_contents('foobar')
-  end
-
-  it "should handle deeply nested erb files alright" do
-    Paste::JS::Test.write 'foo/bar/baz.js.erb', '<%= "foo" %><%= "bar" %>'
-    subject.render_all_erb
-  
-    subject.erb_path('foo/bar/baz.js').should have_contents('foobar')
-  end
-
-  it "shouldn't try to render regular js files" do
-    Paste::JS::Test.write 'foo', 'foo()'
-    subject.render_all_erb
-
-    subject.erb_path('foo.js').should_not exist
-  end
-
-  it "should render when being rebuilt" do
-    Paste::JS::Test.write 'foo.js.erb', 'foobar'
-    subject.rebuild!
-  
-    subject.erb_path('foo.js').should have_contents('foobar')
-  end
-
-  context "pasting a variety of regular/erb files" do
-    shared_examples_for 'an erb paster' do
-      it "should use the generated ERB file when pasting" do
-        Paste::JS::Test.write 'foo.js.erb', '<%= "foo" %><%= "bar" %>'
-        Paste::JS::Test.write 'bar', 'bar()'
-        subject.render_all_erb
-
-        subject.paste('foo', 'bar')
-      end
-    end
-
-    describe Paste::JS::Chain do
-      it_should_behave_like 'an erb paster'
-    end
-
-    describe Paste::JS::Unify do
-      it_should_behave_like 'an erb paster'
-    end
-  end
-
-  describe "modifying existing files" do
-    before :each do
-      Paste::JS::Test.write subject.erb_path('foo.js'), 'foo'
-    end
-    
-    it "should regenerate the file if the source was modified" do
-      # File is modified after the original one
-      Paste::JS::Test.write 'foo.js.erb', 'foobar', Time.now + 42
-  
-      subject.render_all_erb
-      
-      subject.erb_path('foo.js').should have_contents('foobar')
-    end
-    
-    it "should not regenerate the file if the source was not modified" do
-      Paste::JS::Test.write 'foo.js.erb', 'foobar', Time.now - 42
-      subject.render_all_erb
-      
-      subject.erb_path('foo.js').should have_contents('foo')
-    end
-  end
-  
-  context "rails" do
-    before :each do
-      Rails = {:foo => 'bar'}
-    end
-
-    it "should allow templates to use Rails instead of ::Rails" do
-      Paste::JS::Test.write 'foo.js.erb', '<%= Rails[:foo] %>'
-      subject.render_all_erb
-      
-      subject.erb_path('foo.js').should have_contents('bar')
-    end
-  end
-end

data/spec/paste/js/unify_spec.rb

@@ -1,90 +0,0 @@
-require 'spec_helper'
-
-describe Paste::JS::Unify do    
-  before :each do
-    Paste::JS::Test.write 'foo', 'foo()'
-    Paste::JS::Test.write 'bar', 'bar()'
-    Paste::JS::Test.write 'foo/baz', 'baz()'
-  end
-
-  it "should generate only one result" do
-    results = subject.paste('foo', 'bar', 'foo/baz')[:javascript]
-
-    results.size.should == 1
-  end
-  
-  it "should generate the same results for different forms of the input" do
-    results = subject.paste('foo', 'bar', 'foo/baz')
-
-    results.should == subject.paste('foo', 'foo/baz.js', 'bar.js')
-    results.should == subject.paste('bar', 'foo.js', 'foo/baz')
-  end
-  
-  it "should generate the concatenation when the destination doesn't exist" do
-    result = subject.paste('foo', 'bar', 'foo/baz')[:javascript].first
-
-    subject.should have_in_result(result, "foo()\nbar()\nbaz()")
-  end
-  
-  it "should rebuild the results after the file has been removed" do
-    result = subject.paste('foo', 'bar', 'foo/baz')[:javascript].first
-
-    Paste::JS::Test.delete result
-    subject.paste('foo', 'bar', 'foo/baz')
-
-    subject.should have_in_result(result, "foo()\nbar()\nbaz()")
-  end
-  
-  it "should raise a descriptive exception when the source doesn't exist" do
-    lambda { 
-      subject.paste 'random' 
-    }.should raise_error(/source random/i)
-  end
-
-  describe "regenerating files" do
-    it "should occur if any file is changed" do
-      result = subject.paste('foo', 'bar')[:javascript].first
-
-      Paste::JS::Test.write 'foo', 'foobar()', Time.now + 42
-      subject.paste('foo', 'bar')
-
-      subject.should have_in_result(result, "foobar()\nbar()")
-    end
-
-    it "should not occur if no files have changed" do
-      result = subject.paste('foo', 'bar')[:javascript].first
-
-      Paste::JS::Test.write 'foo', 'foobar', Time.now - 42
-      subject.paste('foo', 'bar')
-
-      subject.should have_in_result(result, "foo()\nbar()")
-    end
-    
-    it "should update the results only if the sources have changed" do
-      subject = described_class.new
-
-      result1 = subject.paste('foo')[:javascript].first
-      result2 = subject.paste('bar', 'foo/baz')[:javascript].first
-      Paste::JS::Test.write 'foo', 'foobar()', Time.now - 42
-      Paste::JS::Test.write 'bar', 'barbar()', Time.now + 42
-
-      subject.rebuild
-
-      subject.should have_in_result(result1, 'foo()')
-      subject.should have_in_result(result2, "barbar()\nbaz()")
-    end
-    
-    it "should watch for changes in dependencies as well" do
-      Paste::JS::Test.write 'foo', "//= require <bar>\nfoo"
-      Paste::JS::Test.write 'bar', 'bar'
-      Paste::JS::Test.write 'baz', 'baz'
-      result = subject.paste('foo', 'bar', 'baz')[:javascript].first
-
-      Paste::JS::Test.write 'bar', "//= require <baz>\nbar", Time.now + 42
-
-      subject.paste('foo', 'bar', 'baz')
-      
-      subject.should have_in_result(result, "baz\nbar\nfoo")
-    end
-  end
-end

data/spec/paste/rails/helper_spec.rb

@@ -1,117 +0,0 @@
-require 'spec_helper'
-
-describe Paste::Rails::Helper do
-  
-  before :each do
-    @helper = Object.new
-    @helper.class.send :include, subject
-  end
-
-  describe "working with javascript" do
-    it "should register the include_javascript method" do
-      @helper.include_javascript 'foobar'
-
-      @helper.included_javascripts.should == ['foobar']
-    end
-
-    it "should allow multiple sources to be included at once" do
-      @helper.include_javascripts 'foo', 'bar'
-
-      @helper.included_javascripts.should == ['foo', 'bar']
-    end
-
-    it "shouldn't allow multiple sources to be in the list" do
-      @helper.include_javascripts 'foo', 'bar'
-      @helper.include_javascript 'foo'
-
-      @helper.included_javascripts.should == ['foo', 'bar']
-    end
-
-    it "should paste the sources when asked for" do
-      @helper.stub(:javascript_include_tag).and_return ''
-      @glue = mock(Paste::Glue)
-      Paste::Rails.stub(:glue).and_return(@glue)
-
-      @glue.should_receive(:paste).with('foo', 'bar').and_return(
-        :javascripts => [],
-        :css         => []
-      )
-
-      @helper.include_javascript 'foo'
-      @helper.paste_js_tags 'bar'
-    end
-
-    it "should return the javascript include tags" do
-      @helper.should_receive(:javascript_include_tag).with(
-          'foo', 'bar').and_return 'foo.js'
-      Paste::Rails.stub(:glue).and_return(
-        mock(Paste::Glue, :paste => {
-          :javascript => ['foo', 'bar'],
-          :css        => ['bar/baz']
-        })
-      )
-
-      @helper.paste_js_tags('foo').should == 'foo.js'
-    end
-  end
-
-  describe "working with css" do
-    it "should register the include_css method" do
-      @helper.include_css 'foobar'
-
-      @helper.included_css.should == ['foobar']
-    end
-
-    it "should allow multiple sources to be included at once" do
-      @helper.include_css 'foo', 'bar'
-
-      @helper.included_css.should == ['foo', 'bar']
-    end
-
-    it "shouldn't allow multiple sources to be in the list" do
-      @helper.include_css 'foo', 'bar'
-      @helper.include_css 'foo'
-
-      @helper.included_css.should == ['foo', 'bar']
-    end
-
-    it "should return the stylesheet link tags for what was included" do
-      @helper.include_css 'foo', 'bar'
-      @helper.should_receive(:stylesheet_link_tag).with(
-          'foo', 'bar', instance_of(Hash)).and_return 'foo.css'
-      Paste::Rails.stub(:glue).and_return(Paste::JS::Chain.new)
-
-      @helper.paste_css_tags.should == 'foo.css'
-    end
-    
-    it "should return the stylesheet link tags for what is specified" do
-      @helper.should_receive(:stylesheet_link_tag).with(
-          'foo', 'bar', instance_of(Hash)).and_return 'foo.css'
-      Paste::Rails.stub(:glue).and_return(Paste::JS::Chain.new)
-
-      @helper.paste_css_tags('foo', 'bar').should == 'foo.css'
-    end
-    
-    it "should include css required by the javascript" do
-      Paste::JS::Test.write 'foo.js', '//= require_css <bar>'
-      @helper.include_javascript 'foo'
-      @helper.should_receive(:stylesheet_link_tag).with(
-          'bar', instance_of(Hash)).and_return 'bar.css'
-
-      @helper.paste_css_tags.should == 'bar.css'
-    end
-  end
-
-  describe "the default glue value" do
-    it "should be a unifier by default" do
-      Paste::Rails.glue.should be_a(Paste::JS::Unify)
-    end
-
-    it "should be swappable" do
-      @chain            = Paste::JS::Chain
-      Paste::Rails.glue = @chain
-
-      Paste::Rails.glue.should == @chain
-    end
-  end  
-end

data/spec/spec_helper.rb

@@ -1,23 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-
-require 'fileutils'
-require 'rspec/core'
-require 'paste'
-
-Paste::Glue.configure do |config|
-  config.root = File.expand_path('../tmp', __FILE__)
-end
-
-Paste::JS.config.load_path  = ['js_sources']
-Paste::JS.config.destination  = 'destination'
-
-RSpec.configure do |c|
-  c.color_enabled = true
-
-  c.after(:each) do
-    FileUtils.rm_rf Paste::Glue.config.root
-  end
-end
-
-Dir[File.dirname(__FILE__) + '/support/*.rb'].each { |f| load f }

data/spec/support/helpers.rb

@@ -1,74 +0,0 @@
-def dump_tree
-  raise Dir[Paste::JS::Base.root + '/**/*'].map { |f|
-    unless File.directory?(f)
-      out = f
-      out += "\n\t- " + File.read(f).gsub("\n", "\n\t- ")
-      out += "\n\t\t(#{File.mtime(f)})"
-      f = out
-    end
-    f
-  }.join("\n")
-end
-
-module Paste
-  module TestBase
-    def write source, contents, last_modified = Time.now
-      file = path source
-      FileUtils.mkdir_p File.dirname(file)
-      File.open(file, 'w') { |f| f << contents }
-
-      touch source, last_modified
-    end
-
-    def touch source, modified_time = Time.now
-      File.utime Time.now, modified_time, path(source)
-    end
-
-    def path source
-      return source if source.to_s[0...1] == '/'
-
-      file = File.join(base.load_path.first, source)
-      file += '.' + extension unless file.end_with?('.' + extension) ||
-          file.end_with?('.erb')
-      file
-    end
-
-    def delete result
-      delete_file File.join(base.destination, result)
-    end
-
-    def delete_source source
-      delete_file File.join(base.load_path.first, source)
-    end
-
-    protected
-
-    def delete_file file
-      file += '.' + extension unless file.end_with?('.' + extension)
-
-      File.delete(file)
-    end
-    
-    def base
-      Paste.const_get(extension.upcase).const_get('Base')
-    end
-  end
-
-  module JS::Test
-    extend TestBase
-    
-    def self.extension
-      'js'
-    end
-  end
-  
-  module CSS
-    module Test
-      extend TestBase
-  
-      def self.extension
-        'css'
-      end
-    end
-  end
-end

data/spec/support/matchers.rb

@@ -1,45 +0,0 @@
-def failed_not_contains_message file, contents
-  msg = "Expected #{file} to contain:\n\t#{contents.gsub("\n", "\n\t")}\nWhen"
-  
-  if File.file?(file)
-    msg += " it contained:\n#{File.read(file)}".gsub("\n", "\n\t")
-  else
-    msg += ' it did not exist.'
-  end
-  
-  msg
-end
-
-RSpec::Matchers.define :have_in_result do |result, contents|
-  result += '.js' unless result.end_with?('.js')
-
-  match do |glue|
-    File.join(glue.destination, result).should have_contents(contents)
-  end
-  
-  failure_message do |glue|
-    failed_not_contains_message File.join(glue.destination, result), contents
-  end
-end
-
-RSpec::Matchers.define :have_contents do |contents|
-  match do |file|
-    File.file?(file) && File.read(file).chomp.should == contents.chomp
-  end
-
-  failure_message do |file|
-    failed_not_contains_message file, contents
-  end
-end
-
-RSpec::Matchers.define :exist do
-  match do |file|
-    File.exists?(file)
-  end
-end
-
-RSpec::Matchers.define :contain do |substr|
-  match do |str|
-    !str.index(substr).nil?
-  end
-end