From 8bc2d6f40d52ad2b29102c8708677b9d74d25889 Mon Sep 17 00:00:00 2001
From: Christopher York <yorkc@alexa-pc.home>
Date: Thu, 29 Jul 2010 16:14:38 +0100
Subject: [PATCH] Revisions to provide integrated Rails 3.0 support.

Repertoire Assets now detects when it is running in Rails, and installs
the Rack middleware automatically via a Railtie.  So now the only config
necessary is a single line in production.rb to turn on asset precaching.

The rake tasks have been revised to integrate cleanly with Rails, and
the gemspec configuration follows Rails standards.
---
 .gitignore                         |  1 +
 FAQ                                | 26 +++++----
 INSTALL                            | 32 ++++++++---
 LICENSE                            |  2 +-
 README                             | 78 ++++++---------------------
 Rakefile                           | 58 +++-----------------
 SNIPPETS                           | 31 +++++++++++
 TODO                               |  4 ++
 VERSION                            |  1 -
 lib/repertoire-assets.rb           |  4 +-
 lib/repertoire-assets/processor.rb | 18 +++----
 lib/repertoire-assets/railtie.rb   | 16 ++++++
 lib/repertoire-assets/tasks.rake   | 29 ++++++++++
 lib/repertoire-assets/tasks.rb     | 58 --------------------
 lib/repertoire-assets/version.rb   |  5 ++
 repertoire-assets.gemspec          | 86 ++++++++++--------------------
 templates/Rakefile                 | 25 ---------
 17 files changed, 189 insertions(+), 285 deletions(-)
 delete mode 100644 VERSION
 create mode 100644 lib/repertoire-assets/railtie.rb
 create mode 100644 lib/repertoire-assets/tasks.rake
 delete mode 100644 lib/repertoire-assets/tasks.rb
 create mode 100644 lib/repertoire-assets/version.rb
 delete mode 100644 templates/Rakefile

diff --git a/.gitignore b/.gitignore
index a8f117f..20fd609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *~
 pkg
 doc
+*.gem
\ No newline at end of file
diff --git a/FAQ b/FAQ
index 4423d52..d87edff 100644
--- a/FAQ
+++ b/FAQ
@@ -12,7 +12,9 @@ Q. My application is not loading javascript or css files.  There is nothing
 about them in the log.
 
 A. You have not installed the Rack middleware in your application's rackup
-file. Consult the README.
+file. The middleware is automatically loaded for Rails 3.0 when you add
+repertoire-assets to your Gemfile - but not for other frameworks.  Consult
+the README.
 
 
 
@@ -43,20 +45,13 @@ public/javascripts/application.js:
 
 
 
-Q. I have compress_assets set to true, but in my deployed application
+Q. I have compress set to true, but in my deployed application
 digest.js or digest.css aren't YUI compressed.
 
 A. You are probably using an uncompressable Javascript syntax. Try compressing
 by hand on the command-line and YUI compressor will give you an error
 statement. This should also appear in the application's log.
-
-
-
-Q. Can I use repertoire-assets together with merb-assets?
-
-A. Yes.  It replaces merb-asset's bundling and javascript/stylesheet helpers,
-but the remaining helpers can be used with assets from either the main app or
-assets in gems.  (See below.)
+[ If using Rails 3, use rake 'assets:build' to compress the files by hand. ]
 
 
 
@@ -67,7 +62,7 @@ A. So that gems can specify in which directory in the host application they
 appear.  e.g., 'foo_gem-0.0.1/public/images/foo/bar.png' is served as though it
 were '<host app>/public/images/foo/bar.png'. 
 
-This way, existing img_tag and other helpers in merb/rails can be used 
+This way, existing image_tag and other helpers in Rails can be used 
 with assets pulled from gems.
 
 
@@ -78,9 +73,18 @@ or different browsers.
 A. This was considered, but isn't implemented.  Issue a feature request.
 
 
+
 Q. Repertoire assets seems like sprockets or juicer.  How is it different?
 
 A. Only Repertoire assets addresses distributing javascript and css via
 rubygems. Its syntax is borrowed from sprockets, but it has better css support
 than sprockets, and better provisions for debugging than either since you can
 develop on unbundled source files.
+
+
+
+Q. Can I use repertoire-assets together with merb-assets?
+
+A. Yes.  It replaces merb-asset's bundling and javascript/stylesheet helpers,
+but the remaining helpers can be used with assets from either the main app or
+assets in gems.
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index 04d1bfe..701101d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,35 @@
 Repertoire Assets
 =================
 
-(1) Make sure your application loads the middleware. e.g. for Merb:
 
-    <app>/config/rack.rb (Mongrel)
-    <app>/config.ru      (Passenger) 
+(1) Make sure your application loads the middleware.  For Rails 3.0,
+    including repertoire-assets in your Gemfile does this automatically.
+    
+	For Merb and others, you will need to alter your rackup file.  The
+	middleware takes two optional arguments: a configuration hash and
+	the system logger.
+
+      <app>/config/rack.rb (Mongrel)
+      <app>/config.ru      (Passenger) 
   
-*    require 'repertoire-assets'
-*    use Repertoire::Assets::Processor, Merb::Config, Merb.logger
+*        require 'repertoire-assets'
+*        use Repertoire::Assets::Processor, Merb::Config, Merb.logger
     
-    run Merb::Rack::Application.new
+         run Merb::Rack::Application.new
+
 
 (2) Turn on precaching and compression in your production environment,
-    so gem assets are served by your web server. e.g. for Merb:
+    so gem assets are served by your web server. e.g. for Rails:
   
     <app>/config/environments/production.rb:
   
-*    c[:compress_assets] = true
+*        config.repertoire_assets.compress = true
+
+    Or in Merb:
+  
+    <app>/config/environments/production.rb:
+
+*        c[:compress] = true
+
+    For other options that can be used in the configuration hash, see the
+    documentation for Repertoire::Assets::Processor.
diff --git a/LICENSE b/LICENSE
index 52167b2..a6df02d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2009 MIT Hyperstudio
+Copyright (c) 2009-2010 MIT Hyperstudio
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
diff --git a/README b/README
index e078670..fa50a96 100644
--- a/README
+++ b/README
@@ -45,8 +45,8 @@ sourced, it is not loaded again.
 This is accomplished by compiling an ordered manifest of all the javascript
 files required by your code, and then inserting the appropriate <script> and
 <link> tags into your pages' html. Because it uses a rack filter, the system
-is largely transparent to your application. Whether it's written in Merb,
-Rails, Sinatra, or another ruby web framework, the javascript and css will
+is largely transparent to your application. Whether it's written in Rails,
+Merb, Sinatra, or another ruby web framework, the javascript and css will
 still work.
 
 
@@ -61,30 +61,15 @@ can, and cache them in your application's public asset directory.
 *Preparing your application*
 
 You can use javascript components packaged with Repertoire Assets in any ruby
-web application based on Rack (this includes Merb, Rails, Sinatra and others).
+web application based on Rack (this includes Rails, Merb, Sinatra and others).
 
 The javascript gem libraries can either be bundled with your application, or
 reside in the system rubygems repository. Likewise, the repertoire-assets gem
 may be in either place.
 
-Three lines of configuration are required.
-
-(1) Make sure your application loads the middleware. e.g. for Merb:
-
-    <app>/config/rack.rb (Mongrel)
-    <app>/config.ru      (Passenger) 
-  
-*    require 'repertoire-assets'
-*    use Repertoire::Assets::Processor, Merb::Config, Merb.logger
-    
-    run Merb::Rack::Application.new
-
-(2) Turn on precaching and compression in your production environment,
-    so gem assets are served by your web server. e.g. for Merb:
-  
-    <app>/config/environments/production.rb:
-  
-*    c[:compress_assets] = true
+For Rails 3.0, no configuration is necessary for development use.  Production
+environments require a single line of configuration.  See the INSTALL file
+for details.
 
 
 
@@ -192,8 +177,8 @@ named after your library (e.g. /images/superdraw/circle.png rather than
 For security reasons, the system will never serve a file that was not
 explicitly required or provided.
 
-A template for your own gems' Rakefile, based on jeweler, is distributed in
-repertoire-assets/templates/Rakefile.  Copy it out and modify as necessary.
+If you are using Rails and would like to preview the manifest or generate
+digests by hand, use 'rake assets:list' and 'rake assets:build'.
 
 
 
@@ -224,55 +209,26 @@ the conflict and told which one is being used.
 
 The following options are available for production configurations.
 
-   :precache_assets [false]                   # copy and bundle assets into host application?
-   :compress_assets [false]                   # compress bundled javascript & stylesheets? (implies :precache)
-   :disable_rack_assets [false]               # don't interpolate <script> and <link> tags
-   :path_prefix     ['']                      # prefix for all generated urls
+   - precache [false]                   # copy and bundle assets into host application?
+   - compress [false]                   # compress bundled javascript & stylesheets? (implies :precache)
+   - disable_rack_assets [false]               # don't interpolate <script> and <link> tags
+   - path_prefix     ['']                      # prefix for all generated urls
 
-In general, :compress_assets is preferred. This copies all binary assets into
+In general, 'compress' is preferred. This copies all binary assets into
 your host application, bundles together all required javascript and css into
 files named '/digest.js' and '/digest.css', and compresses these files using
-YUI compressor.  Use :precache_assets if you do not want to compress the files.
+YUI compressor.  Use 'precache' if you do not want to compress the files.
 
 In both cases, the asset mirroring middleware is disabled, and your app's
 webserver serves all assets directly from the filesystem.
 
 If desired, you may also disable the <script> and <link> middleware in your
 production install while still precaching and compressing all assets. Set the
-:disable_rack_assets configuration option to true, and add the following to
+'disable_rack_assets' configuration option to true, and add the following to
 your html header:
 
 <link rel='stylesheet' type='text/css' href='/digest.css'/> 
 <script language='javascript' type='text/javascript' src='/digest.js'></script>
 
-Note, however, that the server performance gain from :disable_rack_assets is
-minimal.
-
-
-* Using Repertoire Assets as a Build Tool *
-
-If you want to build your assets for use outside of ruby applications, you can
-use the repertoire assets' rake tasks to generate a set of bundled standalone 
-files.  First, import the rake tasks into your gem's Rakefile:
-
-... [ ./Rakefile ]
-begin
-  require 'repertoire-assets'
-  Repertoire::Assets::Tasks.new(:gem_excludes => ["jquery", ...])            # list any libraries to distribute separately here
-rescue LoadError
-  puts "Repertoire assets not available.  Install it with: sudo gem install repertoire-assets"
-end
-...
-
-Then you can build a bundled and compressed directory of assets for your 
-component with:
-
-# rake assets:build
-
-This gives you the flexibility of developing and deploying components that use
-javascript dependencies and version management for use within ruby frameworks,
-but also distributing your code for a wider audience.
-
-The gem_excludes option allow you to list of required javascript libraries NOT to 
-bundle into your distribution directory for legal reasons.  You may also supply
-any of the other the other standard repertoire-assets options.
\ No newline at end of file
+Note, however, that the server performance gain from 'disable_rack_assets' is
+minimal.
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index 97125fe..a514a91 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,56 +1,10 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "repertoire-assets"
-    s.summary = "Repertoire Assets javascript and css distribution framework"
-    s.description = "Repertoire Assets javascript and css distribution framework"
-    s.email = "yorkc@mit.edu"
-    s.homepage = "http://github.com/repertoire/repertoire-assets"
-    s.authors = ["Christopher York"]
-    s.add_dependency('rack', '>=1.0.1')
-    s.post_install_message = <<-POST_INSTALL_MESSAGE
-  #{'*'*80}
-    One of your gems uses Repertoire asset support, which provides access to
-    javascript, stylesheets and or others assets distributed via Rubygems.
+require __FILE__ + '/../lib/repertoire-assets'
 
-    Rack middleware serves assets in front of your Merb or Rails application,
-    and includes <script> and <link> tags in the header automatically.
+gemspec = eval(File.read("repertoire-assets.gemspec"))
 
-    (1) Make sure your application loads the middleware. e.g. for Merb:
+task :build => "#{gemspec.full_name}.gem"
 
-        <app>/config/rack.rb (Mongrel)
-        <app>/config.ru      (Passenger) 
-
-        require 'repertoire-assets'
-        use Repertoire::Assets::Processor, Merb::Config, Merb.logger
-        run Merb::Rack::Application.new
-
-    (2) Turn on precaching and compression in your production environment,
-        so gem assets are served by your web server. e.g. for Merb:
-
-        <app>/config/environments/production.rb:
-
-        c[:compress_assets] = true
-
-    See the repertoire-assets README for details.
-  #{'*'*80}
-  POST_INSTALL_MESSAGE
-  end
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "yardoc"
-  end
- 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+file "#{gemspec.full_name}.gem" => gemspec.files + ["repertoire-assets.gemspec"] do
+  system "gem build repertoire-assets.gemspec"
+  system "gem install repertoire-assets-#{Repertoire::Assets::VERSION}.gem"
 end
-
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new(:yardoc)
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yard, you must: sudo gem install yard"
-  end
-end
\ No newline at end of file
diff --git a/SNIPPETS b/SNIPPETS
index e2439b1..70ad958 100644
--- a/SNIPPETS
+++ b/SNIPPETS
@@ -1,3 +1,34 @@
+* Using Repertoire Assets as a Build Tool *
+
+If you want to build your assets for use outside of ruby applications, you can
+use the repertoire assets' rake tasks to generate a set of bundled standalone 
+files.  First, import the rake tasks into your gem's Rakefile:
+
+... [ ./Rakefile ]
+begin
+  require 'repertoire-assets'
+  Repertoire::Assets::Tasks.new(:gem_excludes => ["jquery", ...])            # list any libraries to distribute separately here
+rescue LoadError
+  puts "Repertoire assets not available.  Install it with: sudo gem install repertoire-assets"
+end
+...
+
+Then you can build a bundled and compressed directory of assets for your 
+component with:
+
+# rake assets:build
+
+This gives you the flexibility of developing and deploying components that use
+javascript dependencies and version management for use within ruby frameworks,
+but also distributing your code for a wider audience.
+
+The gem_excludes option allow you to list of required javascript libraries NOT to 
+bundle into your distribution directory for legal reasons.  You may also supply
+any of the other the other standard repertoire-assets options.
+
+[ since the Rake tasks now require Rails, this use case is less useful ]
+
+
 /* Repertoire gem assets manifest file */
 (function() {
   
diff --git a/TODO b/TODO
index ccb974e..a056a4a 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,9 @@
 - tainted files need to check css
 
+- rails3. rework rake tasks to use Rails configuration	DONE
+- rails3. use middleware automatically via a railtie	DONE
+- rails3. use rails-style gemspec configuration			DONE 
+
 - create digests based on the gem name for asset builds DONE
 - test exclude functionality                        DONE
 - test asset build config                           DONE
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 1180819..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.1.7
diff --git a/lib/repertoire-assets.rb b/lib/repertoire-assets.rb
index adcec9a..6ba1e64 100644
--- a/lib/repertoire-assets.rb
+++ b/lib/repertoire-assets.rb
@@ -6,4 +6,6 @@
 require dir + 'manifest'
 require dir + 'provides'
 require dir + 'processor'
-require dir + 'tasks'
\ No newline at end of file
+require dir + 'version'
+
+require dir + 'railtie' if defined?(Rails)
\ No newline at end of file
diff --git a/lib/repertoire-assets/processor.rb b/lib/repertoire-assets/processor.rb
index 14058c1..e1a5711 100644
--- a/lib/repertoire-assets/processor.rb
+++ b/lib/repertoire-assets/processor.rb
@@ -7,8 +7,8 @@ class Processor
       attr_accessor :manifest, :provided
 
       DEFAULT_OPTIONS = {
-        :precache_assets     => nil,
-        :compress_assets     => nil,
+        :precache     => nil,
+        :compress     => nil,
         :disable_rack_assets => nil,
 
         :path_prefix     => '',                      # prefix to add before all urls
@@ -41,8 +41,8 @@ class Processor
       #
       # Common settings and defaults
       #
-      #   :precache_assets [false]                   # copy and bundle assets into host application?
-      #   :compress_assets [false]                   # compress bundled javascript & stylesheets? (implies :precache)
+      #   :precache [false]                   # copy and bundle assets into host application?
+      #   :compress [false]                   # compress bundled javascript & stylesheets? (implies :precache)
       #   :disable_rack_assets [false]               # don't interpolate <script> and <link> tags (implies :precache)
       #   :path_prefix     ['']                      # prefix for all generated urls
       #  
@@ -63,7 +63,7 @@ def initialize(delegate, settings={}, logger=nil)
         reset!
 
         # if requested, cache assets in app's public directory at startup
-        @provider.precache! && @manifester.precache! if @options[:precache_assets]
+        @provider.precache! && @manifester.precache! if @options[:precache]
       end
 
 
@@ -77,7 +77,7 @@ def initialize(delegate, settings={}, logger=nil)
       def call(env)
         delegate = case
           when @options[:disable_rack_assets]  then @app              # ignore all asset middleware
-          when @options[:precache_assets] then @manifester       # use manifest middleware only
+          when @options[:precache] then @manifester       # use manifest middleware only
           else                                 
             reset! if stale?                                     
             @provider                                            # use provider + manifest middleware
@@ -499,9 +499,9 @@ def verify_options(options)
           raise Error, "No load paths are available" unless $LOAD_PATH
         
           # precaching must be turned on in order to compress
-          if options[:compress_assets]
-            raise Error, "Must select asset precaching for compression" if options[:precache_assets] == false
-            options[:precache_assets] = true
+          if options[:compress]
+            raise Error, "Must select asset precaching for compression" if options[:precache] == false
+            options[:precache] = true
           end
 
           # the javascript source files must be located in the public app root to have valid uris        
diff --git a/lib/repertoire-assets/railtie.rb b/lib/repertoire-assets/railtie.rb
new file mode 100644
index 0000000..18de431
--- /dev/null
+++ b/lib/repertoire-assets/railtie.rb
@@ -0,0 +1,16 @@
+require 'rails'
+
+module Repertoire
+  module Assets
+    class Railtie < Rails::Railtie
+      config.repertoire_assets = ActiveSupport::OrderedOptions.new
+      
+      config.app_middleware.use Repertoire::Assets::Processor, config.repertoire_assets, Rails.logger
+      
+      rake_tasks do
+        dir = Pathname(__FILE__).dirname.expand_path
+        load dir + "tasks.rake"
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/repertoire-assets/tasks.rake b/lib/repertoire-assets/tasks.rake
new file mode 100644
index 0000000..2a46ce9
--- /dev/null
+++ b/lib/repertoire-assets/tasks.rake
@@ -0,0 +1,29 @@
+require 'pathname'
+
+namespace :assets do
+  
+  # Load module and application configuration
+  config = Repertoire::Assets::Processor::DEFAULT_OPTIONS.dup
+  config.merge!(Rails.application.config.repertoire_assets)  if defined?(Rails)
+  
+  # directory for build products
+  directory config[:cache_root]
+  
+  desc "Clean products from assets:build"
+  task :clean do
+    dir = Pathname(config[:cache_root]).expand_path
+    files = Pathname.glob(dir + "#{config[:digest_basename]}.*")
+    rm files unless files.empty?
+  end
+  
+  desc "List summary of javascript, css, and other assets"
+  task :list do
+    Repertoire::Assets::Processor.new(nil, config, Rails.logger)
+  end
+
+  desc "Package all assets for release [ 'config.repertoire_assets.compress = true' ]"
+  task :build => [:clean, config[:cache_root]] do
+    config[:compress] = true
+    Repertoire::Assets::Processor.new(nil, config, Rails.logger)
+  end
+end
\ No newline at end of file
diff --git a/lib/repertoire-assets/tasks.rb b/lib/repertoire-assets/tasks.rb
deleted file mode 100644
index e0c3807..0000000
--- a/lib/repertoire-assets/tasks.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-require 'rake/tasklib'
-
-module Repertoire
-  module Assets
-    class Tasks < ::Rake::TaskLib
-
-      DEFAULT_OPTIONS = {
-        :cache_root      => './build',
-        :precache_assets => true,
-        :compress_assets => true
-      }
-      
-      def initialize(config)
-        config    = DEFAULT_OPTIONS.merge(config)
-        logger    = Logger.new(STDERR)
-        build_dir = config[:cache_root]
-        
-        namespace :assets do
-          # directory for build products
-          directory build_dir
-          
-          desc "Clean products from assets:build"
-          task :clean do
-            rm_rf build_dir
-          end
-        
-          desc "Package javascript, css, and assets for release outside rubygems"
-          task :build => [:clean, :gemspec, build_dir] do
-            # Find and load all gemspecs in package root
-            gemspecs = Dir['*.gemspec'].map do |file|
-              eval( File.read(file) )
-            end
-          
-            # Require all rubygem dependencies
-            gemspecs.each do |spec|
-              # treat gem we're building as an asset source
-              spec.require_paths.each do |path|
-                path = Pathname.new(path).realpath
-                $LOAD_PATH.unshift(path)
-              end
-
-              # load all of gem's dependencies            
-              spec.dependencies.each do |library|
-                logger.info "Loading #{library}"
-                # TODO.  are there ever more than one version requirement string?
-                gem library.name, library.requirements_list.first
-              end
-            end
-          
-            # Generate digest files and assets
-            config[:digest_basename] ||= gemspecs.first.name
-            Processor.new(nil, config, logger)
-          end
-        end
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/repertoire-assets/version.rb b/lib/repertoire-assets/version.rb
new file mode 100644
index 0000000..b78abf2
--- /dev/null
+++ b/lib/repertoire-assets/version.rb
@@ -0,0 +1,5 @@
+module Repertoire
+  module Assets
+    VERSION = '0.2.0'
+  end
+end
\ No newline at end of file
diff --git a/repertoire-assets.gemspec b/repertoire-assets.gemspec
index 4b0480f..5ba42b4 100644
--- a/repertoire-assets.gemspec
+++ b/repertoire-assets.gemspec
@@ -1,22 +1,15 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/repertoire-assets/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{repertoire-assets}
-  s.version = "0.1.7"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christopher York"]
-  s.date = %q{2010-07-28}
-  s.description = %q{Repertoire Assets javascript and css distribution framework}
-  s.email = %q{yorkc@mit.edu}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README",
-     "TODO"
-  ]
+  s.name        = "repertoire-assets"
+  s.version     = Repertoire::Assets::VERSION
+  s.authors     = ["Christopher York"]
+  s.email       = "yorkc@mit.edu"
+  s.date        = "2010-07-28"
+  s.summary     = "Hyperstudio Asset framework"
+  s.description = "Repertoire Assets javascript and css distribution framework"
+  s.homepage    = "http://github.com/repertoire/repertoire-assets"
+  
   s.files = [
     ".gitignore",
      "FAQ",
@@ -24,63 +17,40 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README",
      "Rakefile",
-     "SNIPPETS",
-     "TODO",
-     "VERSION",
-     "archive/repertoire-assets-design.txt",
      "lib/repertoire-assets.rb",
      "lib/repertoire-assets/exceptions.rb",
      "lib/repertoire-assets/manifest.rb",
      "lib/repertoire-assets/processor.rb",
      "lib/repertoire-assets/provides.rb",
-     "lib/repertoire-assets/tasks.rb",
+     "lib/repertoire-assets/railtie.rb",
+     "lib/repertoire-assets/version.rb",
+     "lib/repertoire-assets/tasks.rake",
      "repertoire-assets.gemspec",
-     "templates/Rakefile",
      "vendor/yuicompressor-2.4.2.jar"
   ]
-  s.homepage = %q{http://github.com/repertoire/repertoire-assets}
+  s.extra_rdoc_files = [
+       "LICENSE",
+       "README",
+       "TODO"
+  ]
+     
   s.post_install_message = %q{  ********************************************************************************
     One of your gems uses Repertoire asset support, which provides access to
-    javascript, stylesheets and or others assets distributed via Rubygems.
+    javascript, stylesheets and other assets distributed via Rubygems.
 
-    Rack middleware serves assets in front of your Merb or Rails application,
-    and includes <script> and <link> tags in the header automatically.
-
-    (1) Make sure your application loads the middleware. e.g. for Merb:
-
-        <app>/config/rack.rb (Mongrel)
-        <app>/config.ru      (Passenger) 
-
-        require 'repertoire-assets'
-        use Repertoire::Assets::Processor, Merb::Config, Merb.logger
-        run Merb::Rack::Application.new
-
-    (2) Turn on precaching and compression in your production environment,
-        so gem assets are served by your web server. e.g. for Merb:
+    You should turn on precaching and compression in your production environment,
+    so gem assets are served by your web server. e.g. for Rails 3.0:
 
         <app>/config/environments/production.rb:
 
-        c[:compress_assets] = true
+    *        config.repertoire_assets.compress = true
 
-    See the repertoire-assets README for details.
+    See the repertoire-assets README for other frameworks or details.
   ********************************************************************************
 }
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Repertoire Assets javascript and css distribution framework}
-
-  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<rack>, [">= 1.0.1"])
-    else
-      s.add_dependency(%q<rack>, [">= 1.0.1"])
-    end
-  else
-    s.add_dependency(%q<rack>, [">= 1.0.1"])
-  end
-end
+  s.require_paths    = ["lib"]
+  s.rubygems_version = '1.3.7'
 
+  s.add_dependency('rack', '>= 1.0.1')
+end
\ No newline at end of file
diff --git a/templates/Rakefile b/templates/Rakefile
deleted file mode 100644
index c25170a..0000000
--- a/templates/Rakefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Example template for a Repertoire Assets javascript gem library
-# Modify as necessary and use jeweler to install or publish your gem
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "superdraw"
-    s.summary = "Hyperstudio superdraw javascript library"
-    s.description = "Hyperstudio superdraw javascript library"
-    s.email = "yorkc@mit.edu"
-    s.homepage = "http://hyperstudio.mit.edu"
-    s.authors = ["Christopher York"]
-    s.add_dependency('repertoire-assets', '~>0.1.4')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
-begin
-  require 'repertoire-assets'
-  Repertoire::Assets::Tasks.new(:gem_excludes => [])            # list any libraries to distribute separately here
-rescue LoadError
-  puts "Repertoire assets not available.  Install it with: sudo gem install repertoire-assets"
-end
\ No newline at end of file