active_assets 0.3.0 → 0.3.1

data/README.md

@@ -1,16 +1,22 @@
 Active Assets
 =============
 
-A Railtie that provides an asset management system for css, javascript, and sprites in your Rails applications and engines. ActiveAssets includes two libraries, ActiveExpansions and ActiveSprites.  ActiveSprites generates sprites defined by a dsl similar to a route definition.  Similarly, ActiveExpansions' dsl creates `ActionView::Helpers::AssetTagHelper` javascript and stylesheet expansions, and adds additional features:
+A gem that provides an asset management system for css, javascript, and sprites in your Rails applications and engines. ActiveAssets includes two libraries, ActiveExpansions and ActiveSprites.  ActiveSprites generates sprites defined by a dsl similar to a route definition.  Similarly, ActiveExpansions' dsl creates `ActionView::Helpers::AssetTagHelper` javascript and stylesheet expansions, and adds additional features:
 
 * Concatenation of included assets for expansions at boot or deploy time.
 * Support for environment specific assets, so that, say, you can use one file for development and another for production or one file for development and then a cdn resource for production.
 
-Gemfile
--------
+Installation
+============
+
+    gem install active_assets -v 0.3.0
+
+Using Bundler?
+--------------
+### Gemfile
 
     ...
-    gem 'active_assets'
+    gem 'active_assets', '~> 0.3.0'
     ...
     group :development do
       ...
@@ -26,28 +32,14 @@ Gemfile
 
 The above order of image libraries is also the load order precedence.
 
-In your Rails app
+Run the generator
 -----------------
-### application.rb
-
-    ...
-    require 'rails/all'
-    require 'active_assets/railtie'
-    ...
-
-#### You can also include only ActiveSprites or only ActiveExpansions in your application
-### application.rb
-Instead of the above,
 
-    ...
-    require 'rails/all'
-    require 'active_assets/active_expansions/railtie'
-    ... OR ...
-    require 'active_assets/active_sprites/railtie'
-    ...
+    script/generate active_assets
 
-## The DSLs
-### Introduction to Active Sprites
+The DSLs
+========
+## Introduction to Active Sprites
 
 ActiveSprites allows you to generate sprites within your Rails apps with `rake sprites`!  All you need is `rmagick`, `chunky_png`, or `mini_magick` and you are on your way. Store the images that make up your sprites within your Rails project, use the dsl below to inform ActiveSprites of which images to include in your sprites as well as the css selector corresponding to each image, the location to write the sprite, and the location to write the stylesheet.
 
@@ -97,9 +89,9 @@ Rmagick is used by default and is by far the fastest.  You can use one of two me
     ...
 
 
-### Introduction to Active Expansions
+## Introduction to Active Expansions
 
-ActiveExpansions allow you to register Rails javascript and stylesheet expansions via a simple dsl.  Addionally, the assets in the expansion are concatenated when appropriate and the expansion delivers the concatenated (or 'cached') assets' path in the appropriate environments.  Also, files can be specified as deploy only or only for a specific environment.  For example, you may wish to include jQuery or Prototype src files in development and use minified libraries from cdn sources in production.  This is supported.
+ActiveExpansions allow you to register Rails javascript and stylesheet expansions via a simple dsl.  Additionally, the assets in the expansion are concatenated when appropriate and the expansion delivers the concatenated (or 'cached') assets' path in the appropriate environments.  Also, files can be specified as deploy only or only for a specific environment.  For example, you may wish to include jQuery or Prototype src files in development and use minified libraries from cdn sources in production.  This is supported.
 
 * Below demonstration shows several variations on how to declare expansions.  Note that these declaration are redundant to demonstrate how to accomplish the same thing in different ways.
 * Alternatively you can also register your assets in multiple files.  Simply omit `config/asets.rb` and add as many .rb files as you like inside a directory `config/assets`
@@ -189,16 +181,12 @@ You can specify certain assets only be used in a deployment setting or only be u
 
 `_` and `a` are aliases for `asset`
 
-#### ActiveExpansions configuration and deployment
-By default, ActiveExpansions will not cache your assets even if `ActionController.perform_caching` is enabled.  This is because if you are not serving assets from the same server as where your application resides, then you most likely want to cache your assets at deploy time (on the front-end servers).  To cache assets manually,
+#### ActiveExpansions caching
+By default, ActiveExpansions will not cache your assets automatically.  This is because if you are not serving assets from the same server as where your application resides, then you most likely want to cache your assets at deploy time (on the front-end servers).  To cache assets, add the following to an initializer to concat assets at boot time or to your deploy scripts if you wish to do it when deploying:
 
     Rails.application.expansions.javascripts.cache!
     Rails.application.expansions.stylesheets.cache!
 
-To enable your application to cache assets when the application is initialized, i.e. boot time, follow this example,
-
-##### config/environments/production.rb
-
-    ...
-    config.active_expansions.precache_assets = true
-    ...
+Contributing
+============
+You know the drill!

data/active_assets.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "active_assets"
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sam Woodard"]
   s.email       = ["sam@wildfireapp.com"]

data/lib/active_assets/active_expansions/assets.rb

@@ -85,7 +85,7 @@ module ActiveAssets
 
         def cleanse_paths!(paths)
           paths.map! do |path|
-            if path =~ %r{^https?}
+            if path =~ %r{^[-a-z]*:?//|^cid:}
               path
             else
               dirname = File.dirname(path)

data/test/active_assets/active_expansions/expansions_test.rb

@@ -160,4 +160,16 @@ class ExpansionsTest < Test::Unit::TestCase
     assert_equal %w{vendor/jquery.mousewheel.js bar/bas.js}, Rails.application.expansions.javascripts[:foo].assets.map(&:path)
   end
 
+  def test_expansion_with_uri
+    Rails.application.expansions do
+      expansion :cdn, :type => :js, :namespace => :fubar do
+        a '//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.10/jquery-ui.min.js', :cache => false, :group => :deploy
+      end
+    end
+
+    Rails.application.expansions.javascripts.register!
+
+    assert ActionView::Helpers::AssetTagHelper.javascript_expansions.any? {|k, v| v.include?('//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.10/jquery-ui.min.js')}
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_assets
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sam Woodard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -08:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,10 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :runtime
-  requirement: *id001
   name: activesupport
   prerelease: false
+  type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,10 +46,10 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :development
-  requirement: *id002
   name: rails
   prerelease: false
+  type: :development
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,10 +60,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id003
   name: rake
   prerelease: false
+  type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,10 +74,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id004
   name: oily_png
   prerelease: false
+  type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,10 +88,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id005
   name: chunky_png
   prerelease: false
+  type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,10 +102,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id006
   name: rmagick
   prerelease: false
+  type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -116,10 +116,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id007
   name: mini_magick
   prerelease: false
+  type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -132,10 +132,10 @@ dependencies:
         - 1
         - 5
         version: 1.1.5
-  type: :development
-  requirement: *id008
   name: css_parser
   prerelease: false
+  type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -147,10 +147,10 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  type: :development
-  requirement: *id009
   name: test-unit
   prerelease: false
+  type: :development
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -163,10 +163,10 @@ dependencies:
         - 4
         - 2
         version: 4.4.2
-  type: :development
-  requirement: *id010
   name: ZenTest
   prerelease: false
+  type: :development
+  requirement: *id010
 description: A Railtie that provides an asset management system for css, javascript, and sprites in your Rails applications and engines. ActiveAssets includes two libraries, ActiveExpansions and ActiveSprites. ActiveSprites generates sprites defined by a dsl similar to a route definition. Similarly, ActiveExpansions' dsl creates ActionView::Helpers::AssetTagHelper javascript and stylesheet expansions, and adds additional features
 email: 
 - sam@wildfireapp.com
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: activeassets
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Railtie that provides an asset management system for css, javascript, and sprites in your Rails applications and engines.