paste 0.1.1 → 0.2.0

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'sprockets'
+gem 'closure-compiler'
 gem 'paste', :path => '.'
 gem 'activesupport', '>= 3.0.0.beta4'
 

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    paste (0.1.0)
+    paste (0.1.1)
       activesupport (>= 3.0.0.beta4)
+      closure-compiler
       paste
       sprockets
 
@@ -10,6 +11,7 @@ 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)
@@ -37,6 +39,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 3.0.0.beta4)
+  closure-compiler
   jeweler
   paste!
   rake

data/README.rdoc

@@ -1,97 +1,110 @@
-Sprockets for Rails 3
-=================
+= Paste
 
-This gem lets you make use of [Sprockets](http://github.com/sstephenson/sprockets).
+This gem simplifies dependencies between javascript and easily allows requiring of javascript.
 
-## Installing
+== Installing
 
-In your Gemfile: `gem 'sprockets-packager'`
+In your Gemfile: <tt>gem 'paste'</tt>
 
-Then, `bundle install`
+Then, <tt>bundle install</tt>
 
-## Usage
-Read up on how [Sprockets](http://github.com/sstephenson/sprockets) works to start taking advantage of it.
-
-Put all of your javascript files in `app/javascripts`. You can even make erb javascript files to interpolate constants and such.
+== Usage
+Put all of your javascript files in <tt>app/javascripts</tt>. You can even make erb javascript files to interpolate constants and such.
 
 Now in your views, whenever you need javascript, just call
-
-		<% include_sprocket 'foobar' %>
-
-or
-		
-		<% include_sprockets 'foo/bar', 'foo', 'baz' %>
+  <% javascript 'some/javascript/file' %>
+  <% css 'some/css/file' %>
+or	
+  <% javascript 'foo/bar', 'foo', 'baz' %>
 		
 And then in your layout file,
 
-		<%= sprockets_include_tag %>
+  <%= paste_js_tags %>
+  <%= paste_css_tags %>
 
-And that's it! As long as you've got your dependencies in your JS managed all right, the sprockets themselves will be automatically generated for you
+And that's it!
 
-I would recommend you add `public/javascripts/*` to your gitignore. I find it silly to check in generated files anyway.
+I would recommend you add <tt>public/javascripts/*</tt> to the ignore list of your VCS.
 
-### Environments (default behavior)
-#### Production
-In production, whenever `sprockets_include_tag` is called, the unique filename is generated, and if the file does not exist, it is generated via `Sprockets::Secretary`.  
-Subsequent calls to `sprockets_include_tag` will never update the generated sprocket, and there is no other way that the sprocket will be generated.
+== Behaviour
 
-For deployment, you probably don't want the first request to every page spend time rebuild the sprocket for that page. This gem caches all of the built sprockets to the file `tmp/sprockets-cache/sprockets.yml`. You probably want to symlink the entire directory to your deployment, but you can also just symlink this file.
+Paste uses +stylesheet_link_tag+ with a <tt>:cache</tt> option set to a hash of the included CSS files. Normally this means that in production all CSS is concatenated into one file.
 
-You then need to run the `rake sprockets:rebuild` before your deployment goes live to rebuild everything
+=== Production
+For a Rails app, in production, <tt>Paste::JS::Unify</tt> is used to concatenate javascript. This means that +paste_js_tags+ will output only one tag. This tag will have the concatenation of all javascript required, including all of the dependencies (in the correct order).
 
-#### Development
-Here, whenever `sprockets_include_tag` is called, the files are examined and the dependency tree is determined. The files are then included in the order which satisfies the dependency tree.  
-Every request will trigger a refresh of the generated files in addition to them being generated when `sprockets_include_tag` is called.
+This is not compressed originally because it's generated on the fly. A cache file is written, however, so on a re-deploy you can rebuild all of the previously generated concatenations and Google's closure compiler is used for compression.
 
-## Example
+=== Development
+For a Rails app in development, <tt>Paste::JS::Chain</tt> is used to paste javascripts together. This paster simply takes the list of javascripts and determines the dependencies and then generates a separate tag for each javascript file. This proves useful for debugging.
 
-Assume that `app/javascripts/jquery.js` exists and we have these files:
+== Example
 
-### app/javascripts/foo.js
+Assume that <tt>app/javascripts/jquery.js</tt> exists and we have these files:
 
-		//= require <jquery>
-		//= require <foo/bar>
+==== app/javascripts/foo.js
+
+  //= require <jquery>
+  //= require <foo/bar>
 		
-		$(function() {
-			$('#foo').fadeIn().html($['BAR_VALUE']);
-		});
+  $(function() {
+    $('#foo').fadeIn().html($['BAR_VALUE']);
+  });
 
-### app/javascripts/foo/bar.js.erb
+==== app/javascripts/foo/bar.js.erb
 
-		//= require <jquery>
+  //= require <jquery>
 
-		$['BAR_VALUE'] = <%= Bar::BAR_VALUE %>;
+  $['BAR_VALUE'] = <%= Bar::BAR_VALUE %>;
 
-### app/views/foo/index.html.erb
+==== app/views/foo/index.html.erb
 		
-		<% include_sprocket 'foo' %>
+  <% javascript 'foo' %>
+  <% css 'foo' %>
 		
-		<div id='bar'>
-			And the bar value for today is: <div id='foo'></div>
-		</div>
-
-And as long as your template has `<%= sprockets_include_tag %>`, the right javascript concatenation will be generated for you.	
-
-See configuration below for details, but if `:expand_includes` is true, then `sprockets_include_tag` is equivalent to `javascript_include_tag 'jquery', 'foo/bar', 'foo'`.  
-Otherwise, if `:expand_includes` is false, the three files will be concatenated into a file with a unique name, and it will be the only one served on the page
-
-## Configuration
-
-You can configure the packager through `Sprockets::Packager.options`. The following are recognized options:
-
-* `:load_path` - an array of relative/absolute paths of where to load the sprockets from. Sprockets are interpreted as relative from any one of these paths. Default: `['app/javascripts']`
-* `:destination` - This is the destination of generated sprockets to go. Default: `'public/javascripts'`
-* `:root` - This is the root option passed to Sprockets::Secretary. Default: `Rails.root`
-* `:tmp_path` - This is the absolute/relative place to place any generated files like ERB templates. Default `'tmp/sprockets-cache'`
-* `:watch_changes` - Values as to whether to watch the file system for changes. If `true`, this will regenerate all necessary sprockets on each request. Default: `Rails.env.development?`
-* `:expand_includes` - Value as to whether to expand javascript includes or to compact them into one asset. Default: `Rails.env.development?`
-* `:serve_assets` - Value as to whether a Rack component should be installed to serve all static assets. This is useful for deployments on Heroku where the `public/` directory is not writeable. If this is used, the `:destination` is changed to `tmp/javascripts` and assets are served from there. Default: `false`
-
-All configuration should be done in `config/application.rb` or `config/environments/*.rb`.
-
-## License
-
-Copyright &copy; 2009 Alex Crichton.
+  <div id='bar'>
+    And the bar value for today is: <div id='foo'></div>
+  </div>
+
+For this example, whenever +foo/index.html.erb+ is rendered, the stylesheet +public/stylesheets/foo+ will be included and so will both +app/javascripts/foo.js+ and +app/javascripts/bar.js.erb+ with +bar+ before +foo+.
+
+== Configuration
+
+The following are recognized options:
+  
+  # These options are read by both Paste::JS and Paste::CSS
+  Paste::Glue.configure do |config|
+    config.root     # the root directory (defaults to Rails.root or the pwd)
+
+    config.tmp_path # a temporary directory to use. Can be relative to the root
+                    # or it can be an absolute path. Default: 'tmp/paste-cache'
+  end
+
+  Paste::JS.configure do |config|
+    config.destination # relative or absolute path of where to put javascripts.
+                       # Default: 'public/javascripts'
+    
+    config.load_path   # The load path for javascripts. This is where to find
+                       # the source files. Default: ['app/javascripts']
+    
+    config.erb_path    # relative or absolute path of where to generate the
+                       # ERB results to. Default: 'tmp/paste-cache/erb'
+    
+    config.cache_file  # The cache file for when pastes are made. This allows
+                       # the same pastes to be persisted through deployments
+                       # without regenerating on the first request. This is
+                       # a location relative to config.tmp_path
+                       # Default: sprockets.yml
+    
+    config.parser      # The parser class to use when determining dependencies
+                       # of javascripts. Default: Paste::Parser::Sprockets
+  end
+
+All configuration should be done in <tt>config/application.rb</tt> or <tt>config/environments/*.rb</tt>.
+
+== License
+
+Copyright 2009 Alex Crichton.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/paste/css/base.rb

@@ -1,9 +1,6 @@
 module Paste
   module CSS
     class Base < Glue
-      extend Resolver
-      
-      include Resolver
     end
   end
-end
+end

data/lib/paste/js/compress.rb

@@ -1,4 +1,5 @@
-require 'active_support/core_ext/hash/reverse_merge'
+require 'closure-compiler'
+require 'active_support/core_ext/hash/except'
 
 module Paste
   module JS
@@ -20,7 +21,7 @@ module Paste
       def compress result, options = {}
         case options[:compress]
           when 'google'
-            google_compress result, options
+            google_compress result, options.except(:compress)
           when nil, false
             # Compression not asked for
           else
@@ -31,20 +32,13 @@ module Paste
       protected
 
       def google_compress result, options = {}
-        file = destination result
-        uri  = URI.parse('http://closure-compiler.appspot.com/compile')
-        req  = Net::HTTP.post_form(uri,
-          :js_code           => File.read(file),
-          :compilation_level => options[:level] || 'SIMPLE_OPTIMIZATIONS', 
-          :output_format     => 'text', 
-          :output_info       => 'compiled_code'
-        )
-
-        if req.is_a? Net::HTTPSuccess
-          File.open(file, 'w') { |f| f << req.body.chomp }
-        else
-          raise "Google couldn't compile #{result}!"
+        file, output = destination(result), ''
+        handle = File.open(file, 'a+')
+        File.open(file, 'r') do |f|
+          output = Closure::Compiler.new(options).compile f
         end
+        
+        File.open(file, 'w+') { |f| f << output.chomp }
       end
 
     end

data/paste.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paste}
-  s.version = "0.1.1"
+  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-12}
+  s.date = %q{2010-08-17}
   s.description = %q{Asset Management for Rails}
   s.email = ["alex@alexcrichton.com"]
   s.extra_rdoc_files = [
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
 
     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"])
@@ -87,6 +88,7 @@ Gem::Specification.new do |s|
       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"])
@@ -96,6 +98,7 @@ Gem::Specification.new do |s|
     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"])

data/spec/paste/js/compress_spec.rb

@@ -30,7 +30,8 @@ describe Paste::JS::Unify, 'compression' do
     result = subject.paste('foo', 'bar')[:javascript].first
     
     begin
-      subject.rebuild! :compress => 'google', :level => 'ADVANCED_OPTIMIZATIONS'
+      subject.rebuild! :compress => 'google', 
+                       :compilation_level => 'ADVANCED_OPTIMIZATIONS'
     rescue SocketError
       pending 'Error connecting to google'
     end

data/spec/spec_helper.rb

@@ -11,9 +11,6 @@ end
 
 Paste::JS.config.load_path  = ['js_sources']
 Paste::JS.config.destination  = 'destination'
-Paste::CSS.config.load_path = ['css_sources']
-Paste::CSS.config.destination  = 'destination'
-
 
 RSpec.configure do |c|
   c.color_enabled = true

data/spec/support/helpers.rb

@@ -61,12 +61,14 @@ module Paste
       'js'
     end
   end
-
-  module CSS::Test
-    extend TestBase
-
-    def self.extension
-      'css'
+  
+  module CSS
+    module Test
+      extend TestBase
+  
+      def self.extension
+        'css'
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paste
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex Crichton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 -05:00
+date: 2010-08-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: paste
+  name: closure-compiler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,8 +49,22 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: activesupport
+  name: paste
   version_requirements: &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
+  name: activesupport
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +76,12 @@ dependencies:
         - 0
         - beta4
         version: 3.0.0.beta4
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +90,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rake
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,12 +104,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rcov
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,12 +118,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,7 +136,7 @@ dependencies:
         - beta
         - 19
         version: 2.0.0.beta.19
-  requirement: *id007
+  requirement: *id008
 description: Asset Management for Rails
 email: 
 - alex@alexcrichton.com