paste 0.2.2 → 0.3.0

data/spec/paste/cache_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Paste::Glue, 'building cached concatenations' do
+
+  before :each do
+    Paste::Test.write 'foo', 'foo()'
+    Paste::Test.write 'bar', 'bar()'
+    Paste::Test.write 'foo/baz', 'baz()'
+  end
+
+  it "should rebuild within the same instance of the unifier" do
+    subject.rebuild
+
+    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 rebuild pre-existing results despite modification times" do
+    subject.rebuild
+
+    Paste::Test.write 'foo', 'foo2()', Time.now - 42
+    Paste::Test.write 'bar', 'bar2()', Time.now - 42
+    Paste::Test.write 'foo/baz', 'baz2()', Time.now - 42
+
+    subject.rebuild
+
+    subject.should have_in_result('foo', 'foo2()')
+    subject.should have_in_result('bar', 'bar2()')
+    subject.should have_in_result('foo/baz', 'baz2()')
+  end
+
+  it "doesn't explode when one of the files is removed after a rebuild" do
+    subject.rebuild
+
+    Paste::Test.delete_source 'foo'
+
+    subject.rebuild
+  end
+
+end

data/spec/paste/{js/config_spec.rb → config_spec.rb}

@@ -10,24 +10,24 @@ describe Paste::Glue, 'configuration' 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.config.root           = '/foo/bar'
+    subject.config.tmp_path       = 'tmp'
+    subject.config.erb_path       = 'erb'
+    subject.config.js_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.config.root           = '/foo/bar'
+    subject.config.tmp_path       = '/tmp'
+    subject.config.erb_path       = '/erb'
+    subject.config.js_destination = '/dst'
+
     subject.tmp_path.should == '/tmp'
     subject.erb_path.should == '/erb'
     subject.destination.should == '/dst'

data/spec/paste/erb_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe Paste::Glue do
+
+  it "should render an erb file into a temporary location" do
+    Paste::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::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::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::Test.write 'foo', 'foo()'
+    subject.render_all_erb
+
+    subject.erb_path('foo.js').should_not exist
+  end
+
+  describe Paste::Glue, "pasting a variety of regular/erb files" do
+    it "should use the generated ERB file when pasting" do
+      Paste::Test.write 'foo.js.erb', '<%= "foo" %><%= "bar" %>'
+      Paste::Test.write 'bar', "//= require <foo>\nbar()"
+      subject.render_all_erb
+
+      subject.paste('bar')
+    end
+
+    it "should watch for a file to be changed to an ERB file" do
+      Paste::Test.write 'foo', 'foo'
+      subject.render_all_erb
+      Paste::Test.delete_source 'foo'
+
+      Paste::Test.write 'foo.js.erb', '<%= "foo" %><%= "bar" %>'
+      subject.render_all_erb
+
+      subject.paste('foo')
+    end
+  end
+
+  describe "modifying existing files" do
+    before :each do
+      Paste::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::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::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::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/glue_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Paste::Glue do
+  before :each do
+    Paste::Test.write 'foo', 'foo()'
+    Paste::Test.write 'bar', 'bar()'
+    Paste::Test.write 'foo/baz', 'baz()'
+  end
+
+  it "should return the sources given" do
+    results = subject.paste('foo', 'bar', 'foo/baz')[:javascripts]
+
+    results.sort.should == ['bar.js', 'foo.js', 'foo/baz.js']
+  end
+
+  it "returns the sources with dependencies satisfied" do
+    Paste::Test.write 'foo', "//= require <foo/bar>\n//= require <bar>"
+    Paste::Test.write 'bar', '//= require <foo/bar>'
+    Paste::Test.write 'foo/bar', 'foobar()'
+
+    subject.paste('foo', 'bar', 'foo/bar')[:javascripts].should == ['foo/bar.js', 'bar.js', 'foo.js']
+  end
+
+  it "raises an exception on circular dependencies" do
+    Paste::Test.write 'foo', '//= require <bar>'
+    Paste::Test.write 'bar', '//= require <foo>'
+
+    lambda {
+      subject.paste('foo', 'bar')
+    }.should raise_exception(/circular dependency/i)
+  end
+
+  describe "regenerating files" do
+    it "watches for changes in dependencies" do
+      Paste::Test.write 'foo', '//= require <bar>'
+      Paste::Test.write 'bar', ''
+      Paste::Test.write 'baz', ''
+      subject.paste('foo')
+
+      Paste::Test.write 'bar', '//= require <baz>', Time.now + 42
+
+      subject.paste('foo')[:javascripts].should == ['baz.js', 'bar.js', 'foo.js']
+    end
+
+    it "watches for changes in deep dependencies" do
+      Paste::Test.write 'foo', ''
+      Paste::Test.write 'bar', ''
+      subject.paste('foo')
+
+      Paste::Test.write 'foo', '//= require <bar>', Time.now + 42
+
+      subject.paste('foo')[:javascripts].should == ['bar.js', 'foo.js']
+    end
+
+  end
+end

data/spec/paste/provides_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Paste::Glue, 'as a css provider' do
+  before :each do
+    Paste::Test.write 'foo', '//= require_css <foo>'
+  end
+
+  it "should require the css" do
+    result = subject.paste 'foo'
+    result[:stylesheets].should == ['foo']
+  end
+
+  it "should not require multiple css twice" do
+    Paste::Test.write 'bar', '//= require_css <foo>'
+
+    subject.paste('foo', 'bar')[:stylesheets].should == ['foo']
+  end
+end

data/spec/paste/rails/helper_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 
 describe Paste::Rails::Helper do
-  
+
   before :each do
     @helper = Object.new
     @helper.class.send :include, subject
   end
 
+  after :each do
+    Paste.config.no_cache = false
+  end
+
   describe "working with javascript" do
     it "should register the include_javascript method" do
       @helper.include_javascript 'foobar'
@@ -34,84 +38,99 @@ describe Paste::Rails::Helper do
 
       @glue.should_receive(:paste).with('foo', 'bar').and_return(
         :javascripts => [],
-        :css         => []
+        :stylesheets => []
       )
 
       @helper.include_javascript 'foo'
-      @helper.paste_js_tags 'bar'
+      @helper.javascript_tags 'bar'
     end
 
     it "should return the javascript include tags" do
       @helper.should_receive(:javascript_include_tag).with(
-          'foo', 'bar').and_return 'foo.js'
+          'foo', 'bar', instance_of(Hash)).and_return 'foo.js'
       Paste::Rails.stub(:glue).and_return(
         mock(Paste::Glue, :paste => {
-          :javascript => ['foo', 'bar'],
-          :css        => ['bar/baz']
+          :javascripts => ['foo', 'bar'],
+          :stylesheets => ['bar/baz']
         })
       )
 
-      @helper.paste_js_tags('foo').should == 'foo.js'
+      @helper.javascript_tags('foo').should == 'foo.js'
+    end
+
+    it "doesn't cache javascripts when asked to not do so" do
+      Paste::Test.write 'bar', 'test'
+      Paste.config.no_cache = true
+      @helper.should_receive(:javascript_include_tag).with('bar.js')
+
+      @helper.javascript_tags('bar')
     end
   end
 
   describe "working with css" do
     it "should register the include_css method" do
-      @helper.include_css 'foobar'
+      @helper.stylesheet 'foobar'
 
-      @helper.included_css.should == ['foobar']
+      @helper.included_stylesheets.should == ['foobar']
     end
 
     it "should allow multiple sources to be included at once" do
-      @helper.include_css 'foo', 'bar'
+      @helper.include_stylesheets 'foo', 'bar'
 
-      @helper.included_css.should == ['foo', 'bar']
+      @helper.included_stylesheets.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.include_stylesheets 'foo', 'bar'
+      @helper.include_stylesheet 'foo'
 
-      @helper.included_css.should == ['foo', 'bar']
+      @helper.included_stylesheets.should == ['foo', 'bar']
     end
 
     it "should return the stylesheet link tags for what was included" do
-      @helper.include_css 'foo', 'bar'
+      @helper.include_stylesheets '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)
+      Paste::Rails.stub(:glue).and_return(Paste::Glue.new)
 
-      @helper.paste_css_tags.should == 'foo.css'
+      @helper.stylesheet_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)
+      Paste::Rails.stub(:glue).and_return(Paste::Glue.new)
 
-      @helper.paste_css_tags('foo', 'bar').should == 'foo.css'
+      @helper.stylesheet_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>'
+      Paste::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'
+      @helper.stylesheet_tags.should == 'bar.css'
+    end
+
+    it "doesn't cache stylesheets when asked to not do so" do
+      Paste.config.no_cache = true
+      @helper.should_receive(:stylesheet_link_tag).with('bar')
+
+      @helper.stylesheet_tags('bar')
     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)
+      Paste::Rails.glue.should be_a(Paste::Glue)
     end
 
     it "should be swappable" do
-      @chain            = Paste::JS::Chain
+      @chain            = Paste::Glue
       Paste::Rails.glue = @chain
 
       Paste::Rails.glue.should == @chain
     end
-  end  
+  end
 end

data/spec/spec_helper.rb

@@ -5,18 +5,18 @@ require 'fileutils'
 require 'rspec/core'
 require 'paste'
 
-Paste::Glue.configure do |config|
+Paste.configure do |config|
   config.root = File.expand_path('../tmp', __FILE__)
 end
 
-Paste::JS.config.load_path  = ['js_sources']
-Paste::JS.config.destination  = 'destination'
+Paste.config.js_load_path  = ['js_sources']
+Paste.config.js_destination  = 'destination'
 
 RSpec.configure do |c|
   c.color_enabled = true
 
   c.after(:each) do
-    FileUtils.rm_rf Paste::Glue.config.root
+    FileUtils.rm_rf Paste.config.root
   end
 end
 

data/spec/support/helpers.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alex Crichton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 -04:00
+date: 2010-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,22 +30,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: closure-compiler
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,7 +45,7 @@ dependencies:
         version: 3.0.0.beta4
   type: :runtime
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id002
 description: Asset Management for Rails
 email: alex@alexcrichton.com
 executables: []
@@ -69,15 +56,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/paste.rb
-- lib/paste/capistrano.rb
-- lib/paste/css/base.rb
+- lib/paste/cache.rb
+- lib/paste/compress.rb
+- lib/paste/erb_renderer.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
@@ -87,13 +69,11 @@ files:
 - lib/paste/tasks/paste.rake
 - lib/paste/version.rb
 - README.rdoc
-- 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/cache_spec.rb
+- spec/paste/config_spec.rb
+- spec/paste/erb_spec.rb
+- spec/paste/glue_spec.rb
+- spec/paste/provides_spec.rb
 - spec/paste/rails/helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
@@ -112,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1981454484605526525
+      hash: -2371119180319752676
       segments: 
       - 0
       version: "0"
@@ -121,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1981454484605526525
+      hash: -2371119180319752676
       segments: 
       - 0
       version: "0"
@@ -133,13 +113,11 @@ 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/cache_spec.rb
+- spec/paste/config_spec.rb
+- spec/paste/erb_spec.rb
+- spec/paste/glue_spec.rb
+- spec/paste/provides_spec.rb
 - spec/paste/rails/helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb

data/lib/paste/capistrano.rb

@@ -1,32 +0,0 @@
-Capistrano::Configuration.instance(true).load do
-  after 'deploy:setup', 'paste:create_cache'
-  after 'deploy:update_code', 'paste:link_cache'
-  before 'deploy:symlink', 'paste:rebuild'
-
-  namespace :paste do
-    desc "Rebuild javascripts and such"
-    task :rebuild do
-      # Don't fail if paste isn't installed or something like that. Force this
-      # command to succeed
-      env = exists?(:rails_env) ? rails_env : 'production'
-      run "cd #{latest_release} && " +
-          "rake RAILS_ENV=#{env} paste:rebuild; echo ''"
-    end
-
-    task :compress do
-      env = exists?(:rails_env) ? rails_env : 'production'
-      run "cd #{latest_release} && " +
-          "rake RAILS_ENV=#{env} paste:compress"
-    end
-
-    desc "Create a directory for caching javascript and such"
-    task :create_cache do
-      run "mkdir -p #{shared_path}/paste-cache"
-    end
-
-    desc "Link the cache directory into place"
-    task :link_cache do
-      run "ln -nsf #{shared_path}/paste-cache #{latest_release}/tmp"
-    end
-  end
-end