dynamic_assets 0.5.2 → 0.6.0

data/README.rdoc

@@ -7,21 +7,19 @@ Out of the box it can (optionally):
 * Combine all CSS files into one for faster downloading.
 * Combine all JavaScript files into one.
 * Minify assets to make them smaller.
-* Run your CSS or JS assets through ERB, like views.
+* Run your CSS or JS assets through ERB so they can reference helpers, like views.
 * Run your CSS assets through a {Sass}[http://sass-lang.com/] pre-processor (sass or scss).
-* Run them through ERB then Sass, what the heck. (Actually, this can be useful, like to allow
-  your app to set some Sass variables.)
+* Run them through ERB then Sass, which can be useful to allow your app to set some Sass variables.
 * Combine, minify, and pre-process in memory instead of on disk, to accommodate read-only
   filesystems (e.g. Heroku).
 * Set Cache-Control and Expires headers for far-future expiration,
-  allowing browsers and front-end caches like Varnish to hold assets for a long time.
-* Allow assets to be grouped, much like
+  allowing browsers and front-end caches like Varnish or {Rack::Cache}[http://rtomayko.github.com/rack-cache/]
+  to hold assets for a long time.
+* Group assets, much like
   {Scott Becker's venerable asset_packager}[http://synthesis.sbecker.net/pages/asset_packager].
   (Example: You may want a set of stylesheets for your main interface, and another set for your admin
   interface, maybe with some overlap. With DynamicAssets, your normal users won't pay the
   penalty of downloading your admin styles.)
-* Allow CSS assets to refer to static images through relative URLs. That is, it doesn't break URLs
-  embedded in CSS.
 * Invalidate caches and CDNs by inserting a SHA1 signature into the asset URL path instead of using the
   Rails scheme of appending a URL timestamp. Some asset servers (notably Amazon CloudFront) will
   drop parameters from the URL, so cache-busting requires path-changing, and since assets are often
@@ -40,6 +38,11 @@ dynamically is useful enough that multiple people have thought of implementing i
 
     gem "dynamic_assets"
 
+   And if you're planning to use Sass or SCSS, add this, too:
+
+    gem "haml", "~> 3.0"
+
+
 2. Put your CSS files in <tt>app/assets/stylesheets</tt> and your JS files in
    <tt>app/assets/javascripts</tt>. Each filename's extension triggers an
    optional pre-processor:
@@ -124,34 +127,11 @@ dynamically is useful enough that multiple people have thought of implementing i
     <link href="/assets/stylesheets/1302901403/sidebar.css" media="screen" rel="stylesheet" type="text/css" />
 
 
-== Variables for ERB
-
-By default, assets are served by a small controller whose routes are added to
-your app automatically when the gem is loaded, but you can easily create your
-own controller if you prefer. One reason to do this would be to inject variables
-into an asset via ERB, like this:
-
-    class AssetsController < ApplicationController
-        include DynamicAssets::Controller
-
-        def show_stylesheet
-          @background_color = '#FFE'
-          render_asset :stylesheets, params[:name], "text/css"
-        end
-    end
-
-Now in app/assets/stylesheets/application.css.erb you could do this:
-
-    body {
-        background-color: <%= @background_color %>;
-    }
-
-
 == Static Image URLs Embedded in CSS
 
 Suppose you install a JavaScript plugin that comes with a stylesheet and
 some images. The stylesheet, thing.css, may reference one of its images
-like this:
+with a relative URL, like this:
 
     div.thing {
         background: url(fancy_background.png);

data/app/helpers/dynamic_assets_helpers.rb

@@ -31,7 +31,9 @@ protected
   def asset_path(asset_ref)
     path_args = []
     path_args << asset_ref.name
-    path_args << { :signature => asset_ref.signature } if asset_ref.signature.present?
+
+    signature = asset_ref.signature binding
+    path_args << { :signature => signature } if signature.present?
 
     case asset_ref
     when DynamicAssets::StylesheetReference then stylesheet_asset_path *path_args

data/lib/dynamic_assets/reference.rb

@@ -50,23 +50,22 @@ module DynamicAssets
       @member_root = File.find_existing(possible_roots) || possible_roots.first
     end
 
-    # Optionally pass context from which ERB can pull instance variables.
-    def content(context = nil)
+    def content(context, for_signature = false)
       @context = context
-      s = combine_content
-      s = minify s if DynamicAssets::Manager.minify?
+      s = combine_content for_signature
+      s = minify s if DynamicAssets::Manager.minify? && !for_signature
       s
     end
 
-    def signature
-      # Note that the signature is based on the context-free
-      # content. The context must depend on external factors
-      # in the route, like the domain name, since the signature
-      # will not change when the context changes. To force a
-      # change in signature, set or update the ASSET_VERSION
+    def signature(context)
+      # Note that the signature is based on the context at the time the
+      # asset helper is called, which is different from the context at
+      # the time of asset rendering.
+      #
+      # To force a change in signature, set or update the ASSET_VERSION
       # config variable.
 
-      @signature ||= ((ENV['ASSET_VERSION'] || "") + Digest::SHA1.hexdigest(content))
+      (ENV['ASSET_VERSION'] || "") + Digest::SHA1.hexdigest(content(context, true))
     end
 
     def minify(content_string)
@@ -104,16 +103,26 @@ module DynamicAssets
       File.extname(path) == ".erb"
     end
 
-    def combine_content
+    def combine_content(for_signature)
       member_names.map do |member_name|
-        read_member member_name
+        read_member member_name, for_signature
       end.join "\n"
     end
 
-    def read_member(member_name)
+    def read_member(member_name, for_signature)
       path = path_for_member_name member_name
       content_string = get_raw_content path
-      content_string = ERB.new(content_string).result(@context) if @context && path_is_erb?(path)
+
+      if path_is_erb?(path)
+        raise "ERB requires a context" unless @context
+        begin
+          content_string = ERB.new(content_string).result @context
+        rescue StandardError => e
+          raise e.exception(parse_erb_error(e, path, content_string) ||
+            "Error in ERB #{path}, unknown line number: #{e}")
+        end
+      end
+
       content_string
     end
 
@@ -125,5 +134,26 @@ module DynamicAssets
       File.open(path, "r") { |f| f.read }
     end
 
+    def parse_erb_error(error, path, content_string)
+      # Exception parsing inspired by HelpfulERB
+
+      return nil unless error.backtrace.first =~ /^[^:]+:(\d+):in /
+
+      line_number = $1.to_i
+      lines = content_string.split /\n/
+
+      min = [line_number - 5, 0].max
+      max = [line_number + 1, lines.length].min
+
+      width = max.to_s.size
+
+      message = "Error in ERB '#{path}' at line #{line_number}:\n\n" +
+        (min..max).map do |i|
+          n = i + 1
+          marker = n == line_number ? "*" : ""
+          "%2s %#{width}i %s" % [marker, n, lines[i]]
+        end.join("\n") +
+        "\n\n#{error.class}: #{error.message}"
+    end
   end
 end

data/lib/dynamic_assets/reference/stylesheet_reference.rb

@@ -28,8 +28,10 @@ module DynamicAssets
   protected
 
     # Overridden to transform URLs embedded in the CSS
-    def read_member(member_name)
+    def read_member(member_name, for_signature)
       content_string = super
+      return content_string if for_signature
+
       format = format_for_member_name member_name
 
       content_string = case format

metadata

@@ -2,7 +2,7 @@
 name: dynamic_assets
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Robert Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -05:00
+date: 2011-06-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: *id004
@@ -113,30 +113,6 @@ files:
 - lib/dynamic_assets/reference/javascript_reference.rb
 - lib/dynamic_assets/reference/stylesheet_reference.rb
 - README.rdoc
-- spec/dummy_rails_app/app/controllers/application_controller.rb
-- spec/dummy_rails_app/app/helpers/application_helper.rb
-- spec/dummy_rails_app/config/application.rb
-- spec/dummy_rails_app/config/boot.rb
-- spec/dummy_rails_app/config/environment.rb
-- spec/dummy_rails_app/config/environments/development.rb
-- spec/dummy_rails_app/config/environments/production.rb
-- spec/dummy_rails_app/config/environments/test.rb
-- spec/dummy_rails_app/config/initializers/backtrace_silencers.rb
-- spec/dummy_rails_app/config/initializers/inflections.rb
-- spec/dummy_rails_app/config/initializers/mime_types.rb
-- spec/dummy_rails_app/config/initializers/secret_token.rb
-- spec/dummy_rails_app/config/initializers/session_store.rb
-- spec/dummy_rails_app/config/routes.rb
-- spec/dummy_rails_app/db/seeds.rb
-- spec/dummy_rails_app/spec/spec_helper.rb
-- spec/dummy_rails_app/test/performance/browsing_test.rb
-- spec/dummy_rails_app/test/test_helper.rb
-- spec/helpers/dynamic_assets_helpers_spec.rb
-- spec/lib/dynamic_assets/config_spec.rb
-- spec/lib/dynamic_assets/manager_spec.rb
-- spec/lib/dynamic_assets/stylesheet_reference_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/string_matchers.rb
 has_rdoc: true
 homepage: http://github.com/davisre/dynamic_assets
 licenses: 
@@ -151,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3222917560639699619
+      hash: 1850481041292794772
       segments: 
       - 0
       version: "0"
@@ -168,28 +144,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Allow your Rails 3 app to package and process your CSS and JS assets on the fly.
-test_files: 
-- spec/dummy_rails_app/app/controllers/application_controller.rb
-- spec/dummy_rails_app/app/helpers/application_helper.rb
-- spec/dummy_rails_app/config/application.rb
-- spec/dummy_rails_app/config/boot.rb
-- spec/dummy_rails_app/config/environment.rb
-- spec/dummy_rails_app/config/environments/development.rb
-- spec/dummy_rails_app/config/environments/production.rb
-- spec/dummy_rails_app/config/environments/test.rb
-- spec/dummy_rails_app/config/initializers/backtrace_silencers.rb
-- spec/dummy_rails_app/config/initializers/inflections.rb
-- spec/dummy_rails_app/config/initializers/mime_types.rb
-- spec/dummy_rails_app/config/initializers/secret_token.rb
-- spec/dummy_rails_app/config/initializers/session_store.rb
-- spec/dummy_rails_app/config/routes.rb
-- spec/dummy_rails_app/db/seeds.rb
-- spec/dummy_rails_app/spec/spec_helper.rb
-- spec/dummy_rails_app/test/performance/browsing_test.rb
-- spec/dummy_rails_app/test/test_helper.rb
-- spec/helpers/dynamic_assets_helpers_spec.rb
-- spec/lib/dynamic_assets/config_spec.rb
-- spec/lib/dynamic_assets/manager_spec.rb
-- spec/lib/dynamic_assets/stylesheet_reference_spec.rb
-- spec/spec_helper.rb
-- spec/support/matchers/string_matchers.rb
+test_files: []
+

data/spec/dummy_rails_app/app/controllers/application_controller.rb

@@ -1,3 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-end

data/spec/dummy_rails_app/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/spec/dummy_rails_app/config/application.rb

@@ -1,42 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
-
-module DummyRailsApp
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-  end
-end

data/spec/dummy_rails_app/config/boot.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/dummy_rails_app/config/environment.rb

@@ -1,5 +0,0 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-DummyRailsApp::Application.initialize!

data/spec/dummy_rails_app/config/environments/development.rb

@@ -1,26 +0,0 @@
-DummyRailsApp::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
-  config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger
-  config.active_support.deprecation = :log
-
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-end
-

data/spec/dummy_rails_app/config/environments/production.rb

@@ -1,49 +0,0 @@
-DummyRailsApp::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
-  config.cache_classes = true
-
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
-
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
-
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
-end

data/spec/dummy_rails_app/config/environments/test.rb

@@ -1,35 +0,0 @@
-DummyRailsApp::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates
-  config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
-  config.active_support.deprecation = :stderr
-end

data/spec/dummy_rails_app/config/initializers/backtrace_silencers.rb

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!

data/spec/dummy_rails_app/config/initializers/inflections.rb

@@ -1,10 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end

data/spec/dummy_rails_app/config/initializers/mime_types.rb

@@ -1,5 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone

data/spec/dummy_rails_app/config/initializers/secret_token.rb

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-DummyRailsApp::Application.config.secret_token = '9c84a3a25344a4bb6033fb01225d7af245dc5f965cadf01502ca1badd308b46940020af7a9d1986005e4b3d02472356d49e62cc87f4c3320e6fcf3a8dbaa94e0'

data/spec/dummy_rails_app/config/initializers/session_store.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-DummyRailsApp::Application.config.session_store :cookie_store, :key => '_dummy_rails_app_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# DummyRailsApp::Application.config.session_store :active_record_store

data/spec/dummy_rails_app/config/routes.rb

@@ -1,58 +0,0 @@
-DummyRailsApp::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
-end

data/spec/dummy_rails_app/db/seeds.rb

@@ -1,7 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)

data/spec/dummy_rails_app/spec/spec_helper.rb

@@ -1,27 +0,0 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-
-RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
-end

data/spec/dummy_rails_app/test/performance/browsing_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionDispatch::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end

data/spec/dummy_rails_app/test/test_helper.rb

@@ -1,13 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end

data/spec/helpers/dynamic_assets_helpers_spec.rb

@@ -1,164 +0,0 @@
-require 'spec_helper'
-
-describe DynamicAssetsHelpers do
-
-  describe "#stylesheet_asset_tag" do
-    subject { helper.stylesheet_asset_tag *args }
-
-    context "when called with no arguments" do
-      let(:args) { [] }
-
-      it "fails with an ArgumentError" do
-        expect { subject }.to raise_error ArgumentError
-      end
-    end
-
-    context "when called with a group_key" do
-      let(:args)      { [group_key] }
-      let(:group_key) { :base }
-
-      context "when the DynamicAssets::Manager says the given group key is associated with 3 stylesheets" do
-
-        before do
-          DynamicAssets::Manager.stub(:asset_references_for_group_key).with(:stylesheets, group_key).
-            and_return [
-              DynamicAssets::StylesheetReference.new.tap { |r| r.stub(:name => "a", :signature => 123) },
-              DynamicAssets::StylesheetReference.new.tap { |r| r.stub(:name => "b", :signature => 456) },
-              DynamicAssets::StylesheetReference.new.tap { |r| r.stub(:name => "c", :signature => 789) }
-            ]
-        end
-
-        it "is three link tags" do
-          subject.scan('<link ').length.should == 3
-        end
-
-        it 'is three tags with type="text/css"' do
-          subject.scan('type="text/css"').length.should == 3
-        end
-
-        it 'is three tags with rel"stylesheet"' do
-          subject.scan('rel="stylesheet"').length.should == 3
-        end
-
-        it 'is three tags with media="screen"' do
-          subject.scan('media="screen"').length.should == 3
-        end
-
-        context "when the arguments also include HTML attributes" do
-          before { args << { :media => "print", :id => "foo" } }
-
-          it "is three links, each of which has the given attributes" do
-            subject.scan('media="print"').length.should == 3
-            subject.scan('id="foo"').length.should == 3
-          end
-        end
-
-        context "when config.asset_host is nil" do
-          before { helper.config.asset_host.should be_nil }
-
-          it "is three tags with hrefs derived from the asset name and signature" do
-            should contain_string 'href="/assets/stylesheets/v/123/a.css"'
-            should contain_string 'href="/assets/stylesheets/v/456/b.css"'
-            should contain_string 'href="/assets/stylesheets/v/789/c.css"'
-          end
-        end
-
-        context "when config.asset_host is set to a.example.com" do
-          before { helper.config.stub(:asset_host).and_return "http://a.example.com" }
-
-          it "is three tags with hrefs whose host is a.example.com" do
-            should contain_string 'href="http://a.example.com/assets/stylesheets/v/123/a.css"'
-            should contain_string 'href="http://a.example.com/assets/stylesheets/v/456/b.css"'
-            should contain_string 'href="http://a.example.com/assets/stylesheets/v/789/c.css"'
-          end
-        end
-
-        context "when config.asset_host is set to a%d.example.com" do
-          before { helper.config.stub(:asset_host).and_return "http://a%d.example.com" }
-
-          it "is three tags with hrefs whose host is a[0-3].example.com" do
-            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/v\/123\/a.css"/
-            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/v\/456\/b.css"/
-            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/v\/789\/c.css"/
-          end
-        end
-      end
-    end
-  end
-
-  describe "#javascript_asset_tag" do
-    subject { helper.javascript_asset_tag *args }
-
-    context "when called with no arguments" do
-      let(:args) { [] }
-
-      it "fails with an ArgumentError" do
-        expect { subject }.to raise_error ArgumentError
-      end
-    end
-
-    context "when called with a group_key" do
-      let(:args)      { [group_key] }
-      let(:group_key) { :base }
-
-      context "when the DynamicAssets::Manager says the given group key is associated with 3 scripts" do
-
-        before do
-          DynamicAssets::Manager.stub(:asset_references_for_group_key).with(:javascripts, group_key).
-            and_return [
-              DynamicAssets::JavascriptReference.new.tap { |r| r.stub(:name => "a", :signature => 123) },
-              DynamicAssets::JavascriptReference.new.tap { |r| r.stub(:name => "b", :signature => 456) },
-              DynamicAssets::JavascriptReference.new.tap { |r| r.stub(:name => "c", :signature => 789) }
-            ]
-        end
-
-        it "is three script tags" do
-          subject.scan('<script ').length.should == 3
-        end
-
-        it 'is three tags with type="text/javascript"' do
-          subject.scan('type="text/javascript"').length.should == 3
-        end
-
-        context "when the arguments also include HTML attributes" do
-          before { args << { :id => "foo" } }
-
-          it "is three links, each of which has the given attributes" do
-            subject.scan('id="foo"').length.should == 3
-          end
-        end
-
-        context "when config.asset_host is nil" do
-          before { helper.config.asset_host.should be_nil }
-
-          it "is three tags with srcs derived from the asset name and signature" do
-            should contain_string 'src="/assets/javascripts/v/123/a.js"'
-            should contain_string 'src="/assets/javascripts/v/456/b.js"'
-            should contain_string 'src="/assets/javascripts/v/789/c.js"'
-          end
-        end
-
-        context "when config.asset_host is set to a.example.com" do
-          before { helper.config.stub(:asset_host).and_return "http://a.example.com" }
-
-          it "is three tags with srcs whose host is a.example.com" do
-            should contain_string 'src="http://a.example.com/assets/javascripts/v/123/a.js"'
-            should contain_string 'src="http://a.example.com/assets/javascripts/v/456/b.js"'
-            should contain_string 'src="http://a.example.com/assets/javascripts/v/789/c.js"'
-          end
-        end
-
-        context "when config.asset_host is set to a%d.example.com" do
-          before { helper.config.stub(:asset_host).and_return "http://a%d.example.com" }
-
-          it "is three tags with srcs whose host is a[0-3].example.com" do
-            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/v\/123\/a.js"/
-            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/v\/456\/b.js"/
-            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/v\/789\/c.js"/
-          end
-        end
-      end
-    end
-  end
-
-end

data/spec/lib/dynamic_assets/config_spec.rb

@@ -1,148 +0,0 @@
-require 'spec_helper'
-
-describe DynamicAssets::Config do
-  subject         { Object.new.extend(DynamicAssets::Config).tap { |m| m.init yml_path } }
-  let(:yml_path)  { "/yml/path" }
-
-
-  context "when the yml file does not exist" do
-    before { File.stub(:exists?).with(yml_path).and_return false }
-
-    it "#asset_references_for_group_key works but returns nil" do
-      subject.asset_references_for_group_key(:stylesheets, :base).should be_nil
-    end
-
-    it "#asset_reference_for_name works but returns nil" do
-      subject.asset_reference_for_name(:stylesheets, "sheet1").should be_nil
-    end
-  end
-
-
-  context "when the yml file exists" do
-    let(:yml) { {} }
-    before do
-      File.stub(:exists?).with(yml_path).and_return true
-      YAML.stub(:load_file).with(yml_path).and_return yml
-    end
-
-    context "and contains no config vars" do
-      its(:combine_asset_groups?) { should be_true }
-      its(:minify?)               { should be_true }
-      its(:cache?)                { should be_true }
-
-      context "and contains one group of two stylesheets" do
-        before { yml["stylesheets"] = [{ "base" => ["sheet1", "sheet2"] }] }
-
-        it "instantiates one StylesheetReference" do
-          DynamicAssets::StylesheetReference.should_receive(:new).once.and_return "a Style Ref"
-          subject
-        end
-
-        it "#asset_references_for_group_key returns one stylesheet reference for the group" do
-          subject.asset_references_for_group_key(:stylesheets, :base).length.should == 1
-        end
-
-        it "#asset_reference_for_name returns one stylesheet reference for the grouped sheet" do
-          subject.asset_reference_for_name(:stylesheets, "base").should_not be_nil
-        end
-
-        it "#asset_reference_for_name returns no stylesheet reference for an individual sheet" do
-          subject.asset_reference_for_name(:stylesheets, "sheet1").should be_nil
-        end
-
-        context "and contains one group of three javascripts" do
-          before { yml["javascripts"] = [{ "base" => ["script1", "script2", "script3"] }] }
-
-          it "instantiates one JavascriptReference" do
-            DynamicAssets::JavascriptReference.should_receive(:new).once.and_return "a JavaScript Ref"
-            subject
-          end
-
-          it "#asset_references_for_group_key returns one javascript reference for the group" do
-            subject.asset_references_for_group_key(:javascripts, :base).length.should == 1
-          end
-
-          it "#asset_reference_for_name returns one javascript reference for the grouped script" do
-            subject.asset_reference_for_name(:javascripts, "base").should_not be_nil
-          end
-
-          it "#asset_reference_for_name returns no javascript reference for an individual script" do
-            subject.asset_reference_for_name(:javascripts, "script2").should be_nil
-          end
-        end
-
-      end
-
-    end
-
-    context "when the yml file contains config vars that set minify to false" do
-      let(:yml) { { "config" => { Rails.env => { "minify" => false } } } }
-
-      its(:combine_asset_groups?) { should be_true }
-      its(:minify?)               { should be_false }
-      its(:cache?)                { should be_true }
-    end
-
-    context "when the yml file contains config vars that set cache to false" do
-      let(:yml) { { "config" => { Rails.env => { "cache" => false } } } }
-
-      its(:combine_asset_groups?) { should be_true }
-      its(:minify?)               { should be_true }
-      its(:cache?)                { should be_false }
-    end
-
-    context "when the yml file contains config vars that set combine_asset_groups to false" do
-      let(:yml) { { "config" => { Rails.env => { "combine_asset_groups" => false } } } }
-
-      its(:combine_asset_groups?) { should be_false }
-      its(:minify?)               { should be_true }
-      its(:cache?)                { should be_true }
-
-      context "and contains one group of two stylesheets" do
-        before { yml["stylesheets"] = [{ "base" => ["sheet1", "sheet2"] }] }
-
-        it "instantiates two StylesheetReferences" do
-          DynamicAssets::StylesheetReference.should_receive(:new).twice.and_return "a Style Ref"
-          subject
-        end
-
-        it "#asset_references_for_group_key returns two stylesheet references for the group" do
-          subject.asset_references_for_group_key(:stylesheets, :base).length.should == 2
-        end
-
-        it "#asset_reference_for_name returns no stylesheet reference for the grouped sheet" do
-          subject.asset_reference_for_name(:stylesheets, "base").should be_nil
-        end
-
-        it "#asset_reference_for_name returns a stylesheet reference for an individual sheet" do
-          subject.asset_reference_for_name(:stylesheets, "sheet1").should_not be_nil
-        end
-
-        context "and contains one group of three javascripts" do
-          before { yml["javascripts"] = [{ "base" => ["script1", "script2", "script3"] }] }
-
-          it "instantiates three JavascriptReferences" do
-            DynamicAssets::JavascriptReference.should_receive(:new).exactly(3).times.
-              and_return "a JavaScript Ref"
-            subject
-          end
-
-          it "#asset_references_for_group_key returns three javascript references for the group" do
-            subject.asset_references_for_group_key(:javascripts, :base).length.should == 3
-          end
-
-          it "#asset_reference_for_name returns no javascript reference for the grouped script" do
-            subject.asset_reference_for_name(:javascripts, "base").should be_nil
-          end
-
-          it "#asset_reference_for_name returns a javascript reference for an individual script" do
-            subject.asset_reference_for_name(:javascripts, "script2").should_not be_nil
-          end
-        end
-
-      end
-    end
-
-  end
-
-end

data/spec/lib/dynamic_assets/manager_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe DynamicAssets::Manager do
-
-  it "contains config methods, like a singleton" do
-    expect { DynamicAssets::Manager.combine_asset_groups? }.not_to raise_error
-  end
-
-end

data/spec/lib/dynamic_assets/stylesheet_reference_spec.rb

@@ -1,139 +0,0 @@
-require 'spec_helper'
-
-module DynamicAssets
-  describe StylesheetReference do
-
-    describe "#content" do
-      subject         { reference.content }
-      let(:reference) { StylesheetReference.new :name => "thing" }
-
-      context "when a css file with the given reference name exists" do
-        before do
-          reference.stub(:path_for_member_name).with("thing").and_return "/foo/thing.css"
-          reference.stub(:raw_content_exists?).with("/foo/thing.css").and_return true
-          reference.stub(:get_raw_content).with("/foo/thing.css").and_return raw_content
-        end
-
-        context "and the file is blank" do
-          let(:raw_content) { "" }
-          it { should be_blank }
-        end
-
-        context "and the file contains styles" do
-          let(:raw_content) { "div.foo { color: #FFF }" }
-
-          context "and the Manager is not configured to minify" do
-            before { Manager.stub :minify? => false }
-
-            it "is the raw content" do
-              subject.should == raw_content
-            end
-
-            it "does not call its own #minify method" do
-              reference.should_not_receive :minify
-              subject
-            end
-          end
-
-          context "and the Manager is configured to minify" do
-            before { Manager.stub :minify? => true }
-
-            it "is the result of calling its own #minify method" do
-              reference.should_receive(:minify).and_return "tiny output"
-              subject.should == "tiny output"
-            end
-
-          end
-        end
-
-        context "and the file contains URLs relative to the stylesheet" do
-          let(:raw_content) { "body { background: url(background.gif); }" }
-
-          it "makes the URLs relative to RELATIVE_URL_ROOT and the member name" do
-            should contain_string "url(#{StylesheetReference::RELATIVE_URL_ROOT}/thing/background.gif)"
-          end
-        end
-
-        context "and the file contains URLs within directories relative to the stylesheet" do
-          let(:raw_content) { "body { background: url(a/b/background.gif); }" }
-
-          it "makes the URLs relative to RELATIVE_URL_ROOT and the member name" do
-            should contain_string "url(#{StylesheetReference::RELATIVE_URL_ROOT}/thing/a/b/background.gif)"
-          end
-        end
-
-        context "and the file contains URLs with dots, relative to the stylesheet" do
-          let(:raw_content) { "body { background: url(../a/b/background.gif); }" }
-
-          it "makes the URLs relative to RELATIVE_URL_ROOT and the member name, ignoring leading dots" do
-            should contain_string "url(#{StylesheetReference::RELATIVE_URL_ROOT}/thing/a/b/background.gif)"
-          end
-        end
-
-        context "and the file contains full URLs with hosts" do
-          let(:raw_content) { "body { background: url(http://www.example.com/background.gif); }" }
-
-          it "leaves the URLs unchanged" do
-            should contain_string "url(http://www.example.com/background.gif)"
-          end
-        end
-      end
-    end
-
-    describe "#minify" do
-      subject         { reference.minify content }
-      let(:reference) { StylesheetReference.new :name => "thing" }
-
-      context "when given content that has whitespace and comments" do
-        let(:content) do %Q!
-          /*
-           * Some sample styles
-           */
-          div.foo   { color: #FFF; } /* foo style */
-          div.bar,   span.baz   {   font-size:  12px;   }
-          !
-        end
-
-        it "is the result of calling CSSMin.minify" do
-          CSSMin.should_receive(:minify).with(content).and_return "tiny content"
-          subject.should == "tiny content"
-        end
-
-        # We assume CSSMin is fully tested, but as a sanity check we
-        # observe the StylesheetReference's behavior with a few examples:
-
-        it "contains no double spaces" do
-          should_not =~ /  /
-        end
-
-        it "contains no newlines" do
-          should_not =~ /\n/
-        end
-
-        it "removes space between selectors" do
-          should contain_string "div.bar,span.baz"
-        end
-
-        it "removes space around opening brackets" do
-          should contain_string "span.baz{font-size"
-        end
-
-        it "removes space around closing brackets" do
-          should contain_string "}div.bar"
-        end
-
-        it "removes space around values" do
-          should contain_string "font-size:12px;}"
-        end
-
-        it "removes comments that are on their own lines" do
-          should_not contain_string "Some sample styles"
-        end
-
-        it "removes comments that are on the same line as a style" do
-          should_not contain_string "Some sample styles"
-        end
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,24 +0,0 @@
-ENV["RAILS_ENV"] ||= 'test'
-
-require 'dummy_rails_app/config/environment'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'rspec/rails'
-require 'capybara/rspec'
-
-require 'dynamic_assets'
-
-# PENDING: not sure why these aren't auto-required
-require 'app/helpers/dynamic_assets_helpers'
-require 'config/routes'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end

data/spec/support/matchers/string_matchers.rb

@@ -1,61 +0,0 @@
-
-#
-# Makes sure a string contains a given substring. The difference between these two:
-#
-#    my_string.should =~ /something/                  # Using a regex
-#    my_string.should contain_string "something"      # Using this matcher
-#
-# is that this matcher will escape the string for you, so you can search for .*?%^ASQ
-# and not get weird results.
-#
-RSpec::Matchers.define :contain_string do |expected|
-
-  match do |actual|
-    raise "Expected value has an unexpected type. It's #{expected.class} but should be String." unless
-      expected.is_a?(String)
-    raise "Actual value has an unexpected type. It's #{actual.class} but should be String." unless
-      actual.is_a?(String)
-
-    actual =~ /#{Regexp.escape(expected)}/
-  end
-
-  failure_message_for_should do |actual|
-    "expected that \"#{actual}\" would contain \"#{expected}\""
-  end
-
-  failure_message_for_should_not do |actual|
-    "expected that \"#{actual}\" would not contain \"#{expected}\""
-  end
-
-  description do
-    "contain \"#{expected}\""
-  end
-
-end
-
-
-#
-# Example:  my_string.should start_with "ABCDE"
-#
-RSpec::Matchers.define :start_with do |expected|
-
-  match do |actual|
-    raise "Actual value has an unexpected type. It's #{actual.class} but should be String." unless
-      actual.is_a?(String)
-
-    actual =~ /^#{Regexp.escape("#{expected}")}/
-  end
-
-  failure_message_for_should do |actual|
-    "expected that \"#{actual}\" would start with \"#{expected}\""
-  end
-
-  failure_message_for_should_not do |actual|
-    "expected that \"#{actual}\" would not start with \"#{expected}\""
-  end
-
-  description do
-    "start with \"#{expected}\""
-  end
-
-end