active_assets 1.0.2 → 1.0.3

data/README.md

@@ -1,6 +1,10 @@
 Active Assets
 =============
 
+### Known issue with current versions of ChunkyPng and OliyPng
+
+__In your Rails App's gemfile, if you are using ChunkyPng or ChunkyPng with OilyPng, lock down the version to ChunkyPng(0.12.0), OilyPng(0.3.0)__
+
 If you are looking to use Active Assets with rails 2.3.x, click [here](https://github.com/shwoodard/active_assets/tree/0-3).
 
 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:

data/Rakefile

@@ -5,6 +5,7 @@ Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
+  t.libs << "test/fixtures/rails_root/test"
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/active_assets.gemspec

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

data/lib/active_assets/active_expansions.rb

@@ -13,5 +13,38 @@ module ActiveAssets
     autoload :Javascripts
     autoload :Stylesheets
     autoload :Expansions
+
+    def self.load_active_expansions(root)
+      if File.exists?(File.join(root, 'config/assets.rb'))
+        load File.join(root, 'config/assets.rb')
+      elsif File.directory?(File.join(root, 'config/assets'))
+        Dir[File.join(root, 'config/assets/*.rb')].each do |f|
+          load f
+        end
+      end
+    end
+
+    def self.load_expansions_and_register
+      ActiveExpansions.load_active_expansions(Rails.root)
+      Rails.application.railties.engines.each {|e| ActiveExpansions.load_active_expansions(e.root) }
+      Rails.application.expansions.javascripts.register!
+      Rails.application.expansions.stylesheets.register!
+    end
+
+    def self.remove_active_expansions
+      Rails.application.expansions.javascripts.expansion_names.each do |expansion|
+        Rails.application.expansions.javascripts.remove(expansion)
+        if ActionView::Helpers::AssetTagHelper.javascript_expansions.has_key?(expansion)
+          ActionView::Helpers::AssetTagHelper.javascript_expansions.delete(expansion)
+        end
+      end
+
+      Rails.application.expansions.stylesheets.expansion_names.each do |expansion|
+        Rails.application.expansions.stylesheets.remove(expansion)
+        if ActionView::Helpers::AssetTagHelper.stylesheet_expansions.has_key?(expansion)
+          ActionView::Helpers::AssetTagHelper.stylesheet_expansions.delete(expansion)
+        end
+      end
+    end
   end
 end

data/lib/active_assets/active_expansions/assets.rb

@@ -14,7 +14,7 @@ module ActiveAssets
       end
 
       def expansion_names
-        @expansion.keys
+        @expansions.keys
       end
 
       def [](expansion_name)
@@ -30,6 +30,10 @@ module ActiveAssets
         self[expansion_name].assets.map(&:path)
       end
 
+      def remove(expansion_name)
+        @expansions.delete(expansion_name)
+      end
+
       def asset_type
         raise NoMethodError
       end

data/lib/active_assets/active_expansions/configurable.rb

@@ -6,8 +6,9 @@ module ActiveAssets
       extend ActiveSupport::Concern
 
       included do
-        config_accessor :precache_assets
+        config_accessor :precache_assets, :reload_expansions
         self.precache_assets = false if precache_assets.nil?
+        self.reload_expansions = false if reload_expansions.nil?
       end
     end
   end

data/lib/active_assets/active_expansions/railtie.rb

@@ -1,6 +1,7 @@
 require "rails"
 require "rails/active_expansions"
 require 'active_support/ordered_options'
+require 'active_assets/active_expansions/reload'
 
 module ActiveAssets
   module ActiveExpansions
@@ -15,16 +16,6 @@ module ActiveAssets
         Rails.application.extend(Rails::ActiveExpansions)
       end
 
-      initializer 'active_expansions-load-definitons' do
-        load_active_assets(Rails.root)
-        Rails.application.railties.engines.each {|e| load_active_assets(e.root) }
-      end
-
-      initializer 'active_expansions-register' do
-        Rails.application.expansions.javascripts.register!
-        Rails.application.expansions.stylesheets.register!
-      end
-
       initializer 'active_expansions-set-configs' do
         options = config.active_expansions
         ActiveSupport.on_load(:active_expansions) do
@@ -32,22 +23,20 @@ module ActiveAssets
         end
       end
 
-      initializer 'active_expansions-cache' do
-        if Expansions.precache_assets
-          Rails.application.expansions.javascripts.cache! and Rails.application.expansions.stylesheets.cache!
+      initializer 'active_expansions-load-definitions-and-register' do
+        ActiveExpansions.load_expansions_and_register
+
+        if ActiveAssets::ActiveExpansions::Expansions.reload_expansions
+          ActionController::Base.extend(Reload)
         end
       end
 
-      private
-        def load_active_assets(root)
-          if File.exists?(File.join(root, 'config/assets.rb'))
-            load File.join(root, 'config/assets.rb')
-          elsif File.directory?(File.join(root, 'config/assets'))
-            Dir[File.join(root, 'config/assets/*.rb')].each do |f|
-              load f
-            end
-          end
+      initializer 'active_expansions-cache' do
+        if Expansions.precache_assets
+          Rails.application.expansions.javascripts.cache!
+          Rails.application.expansions.stylesheets.cache!
         end
+      end
     end
   end
 end

data/lib/active_assets/active_expansions/reload.rb

@@ -0,0 +1,14 @@
+module ActiveAssets
+  module ActiveExpansions
+    module Reload
+
+      def self.extended(controller)
+        controller.before_filter do
+          ActiveAssets::ActiveExpansions.remove_active_expansions
+          ActiveAssets::ActiveExpansions.load_expansions_and_register
+        end
+      end
+
+    end
+  end
+end

data/lib/active_assets/active_sprites/sprite_piece.rb

@@ -42,7 +42,7 @@ module ActiveAssets
 {
   width:#{width || "#{details.width}px"};
   height:#{height || "#{details.height}px"};
-  background:url('#{details.sprite_path}') no-repeat #{x || "#{-details.x}px"} #{y || "#{-details.y}px"};
+  background:url('#{details.sprite_path}?#{Time.now.to_i}') no-repeat #{x || "#{-details.x}px"} #{y || "#{-details.y}px"};
   display:block;
 }
         CSS

data/test/active_assets/active_sprites/sprite_test.rb

@@ -88,7 +88,7 @@ class SpriteTest < Test::Unit::TestCase
     uses_url = true
 
     parser.each_selector do |selector, declarations, specificity|
-      uses_url &= declarations[%r{url\('(.+)'\)},1] == "activecodebase.com"
+      uses_url &= declarations[%r{url\('([^\?]+)\??\d*'\)},1] == "activecodebase.com"
     end
 
     assert uses_url

data/test/fixtures/rails_root/app/controllers/application_controller.rb

@@ -0,0 +1,7 @@
+class ApplicationController < ActionController::Base
+  extend ActiveAssets::ActiveExpansions::Reload
+
+  def index
+    head :ok
+  end
+end

data/test/fixtures/rails_root/config/application.rb

@@ -1,9 +1,18 @@
-require 'rails/all'
+# Pick the frameworks you want:
+# require 'rails/all'
+# require "active_record/railtie"
+require "action_controller/railtie"
+# require "action_mailer/railtie"
+# require "active_resource/railtie"
+# require "active_model/railtie"
+require "rails/test_unit/railtie"
 require 'active_assets/railtie'
 
 module ActiveAssetsTest
   class Application < Rails::Application
     config.root = File.expand_path('../..', __FILE__)
+    config.cache_classes = false
+    # config.active_expansions.reload_expansions = true
   end
 end
 

data/test/fixtures/rails_root/config/new.rb

@@ -0,0 +1,5 @@
+        Rails.application.expansions do
+          expansion :new do
+            _'foo.js'
+          end
+        end

data/test/fixtures/rails_root/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  root :to => "application#index"
+end

data/test/fixtures/rails_root/test/functional/application_controller_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+require 'fileutils'
+
+class ApplicationControllerTest < ActionController::TestCase
+  include FileUtils
+
+  def new_assets
+    File.expand_path('../../../config/assets/new.rb', __FILE__)
+  end
+
+  def write_new_assets
+    File.open(new_assets, 'w+') do |io|
+      io.puts <<-EOF
+        Rails.application.expansions do
+          expansion :new do
+            _'foo.js'
+          end
+        end
+      EOF
+    end
+  end
+
+  def teardown
+    rm_rf new_assets
+    ActionView::Helpers::AssetTagHelper.javascript_expansions.delete(:new)
+  end
+
+  def test_index
+    get :index
+    assert response.success?
+  end
+
+  def test_expansions
+    assert ActionView::Helpers::AssetTagHelper.javascript_expansions.any? {|k, v| k == :basfoo}
+  end
+
+  def test_can_add_expansion
+    assert !ActionView::Helpers::AssetTagHelper.javascript_expansions.any? {|k, v| k == :new}
+    get :index
+    write_new_assets
+    get :index
+    assert ActionView::Helpers::AssetTagHelper.javascript_expansions.any? {|k, v| k == :new}
+  end
+
+  def test_can_remove_expansion
+    test_can_add_expansion
+    rm_rf new_assets
+    get :index
+    
+    assert !ActionView::Helpers::AssetTagHelper.javascript_expansions.any? {|k, v| k == :new}
+  end
+end

data/test/fixtures/rails_root/test/test_helper.rb

@@ -0,0 +1,6 @@
+ENV['RAILS_ENV'] ||= 'test'
+
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+

data/test/helper.rb

@@ -1,9 +1,7 @@
 ENV['RAILS_ENV'] ||= 'test'
 
-require 'rubygems'
 require 'test/unit'
 
-require 'rails/all'
 require 'active_assets'
 
 require 'socket'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_assets
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Sam Woodard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -07:00
+date: 2011-04-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: oily_png
   prerelease: false
   type: :development
   requirement: *id001
+  name: oily_png
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -42,10 +42,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: chunky_png
   prerelease: false
   type: :development
   requirement: *id002
+  name: chunky_png
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,10 +56,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rmagick
   prerelease: false
   type: :development
   requirement: *id003
+  name: rmagick
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,10 +70,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mini_magick
   prerelease: false
   type: :development
   requirement: *id004
+  name: mini_magick
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -86,10 +86,10 @@ dependencies:
         - 1
         - 5
         version: 1.1.5
-  name: css_parser
   prerelease: false
   type: :development
   requirement: *id005
+  name: css_parser
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,10 +102,10 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  name: rails
   prerelease: false
   type: :development
   requirement: *id006
+  name: rails
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -117,10 +117,10 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  name: test-unit
   prerelease: false
   type: :development
   requirement: *id007
+  name: test-unit
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -133,10 +133,10 @@ dependencies:
         - 4
         - 2
         version: 4.4.2
-  name: ZenTest
   prerelease: false
   type: :development
   requirement: *id008
+  name: ZenTest
 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
@@ -164,6 +164,7 @@ files:
 - lib/active_assets/active_expansions/expansions.rb
 - lib/active_assets/active_expansions/javascripts.rb
 - lib/active_assets/active_expansions/railtie.rb
+- lib/active_assets/active_expansions/reload.rb
 - lib/active_assets/active_expansions/stylesheets.rb
 - lib/active_assets/active_expansions/type_inferrable.rb
 - lib/active_assets/active_sprites.rb
@@ -193,9 +194,12 @@ files:
 - test/active_assets/active_sprites/sprite_test.rb
 - test/active_assets/active_sprites/sprites_test.rb
 - test/autocolor.rb
+- test/fixtures/rails_root/app/controllers/application_controller.rb
 - test/fixtures/rails_root/config/application.rb
 - test/fixtures/rails_root/config/assets/assets.rb
 - test/fixtures/rails_root/config/environment.rb
+- test/fixtures/rails_root/config/new.rb
+- test/fixtures/rails_root/config/routes.rb
 - test/fixtures/rails_root/config/sprites.rb
 - test/fixtures/rails_root/public/images/sprite_images/sprite3/1.png
 - test/fixtures/rails_root/public/images/sprite_images/sprite3/2.png
@@ -253,6 +257,8 @@ files:
 - test/fixtures/rails_root/public/javascripts/bas/bar.js
 - test/fixtures/rails_root/public/stylesheets/bar/bas.css
 - test/fixtures/rails_root/public/stylesheets/bas/bar.css
+- test/fixtures/rails_root/test/functional/application_controller_test.rb
+- test/fixtures/rails_root/test/test_helper.rb
 - test/helper.rb
 - test/support/abstract_runner.rb
 - test/support/rails_helper.rb
@@ -300,9 +306,12 @@ test_files:
 - test/active_assets/active_sprites/sprite_test.rb
 - test/active_assets/active_sprites/sprites_test.rb
 - test/autocolor.rb
+- test/fixtures/rails_root/app/controllers/application_controller.rb
 - test/fixtures/rails_root/config/application.rb
 - test/fixtures/rails_root/config/assets/assets.rb
 - test/fixtures/rails_root/config/environment.rb
+- test/fixtures/rails_root/config/new.rb
+- test/fixtures/rails_root/config/routes.rb
 - test/fixtures/rails_root/config/sprites.rb
 - test/fixtures/rails_root/public/images/sprite_images/sprite3/1.png
 - test/fixtures/rails_root/public/images/sprite_images/sprite3/2.png
@@ -360,6 +369,8 @@ test_files:
 - test/fixtures/rails_root/public/javascripts/bas/bar.js
 - test/fixtures/rails_root/public/stylesheets/bar/bas.css
 - test/fixtures/rails_root/public/stylesheets/bas/bar.css
+- test/fixtures/rails_root/test/functional/application_controller_test.rb
+- test/fixtures/rails_root/test/test_helper.rb
 - test/helper.rb
 - test/support/abstract_runner.rb
 - test/support/rails_helper.rb