active_assets 0.2.5 → 0.2.6

data/active_assets.gemspec

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

data/lib/active_assets/active_sprites/railtie.rb

@@ -18,8 +18,10 @@ module ActiveAssets
 
       initializer 'active_sprites-load-definitons' do
         Rails.application.config.paths.config.paths.each {|config_path| load_sprite_definition(config_path) }
-        Rails.application.railties.engines.map(&:config).map(&:paths).map(&:config).map(&:paths).each do |config_path|
-          load_sprite_definition(config_path)
+        if config.active_sprites.load_engine_sprite_definitions
+          Rails.application.railties.engines.map(&:config).map(&:paths).map(&:config).map(&:paths).each do |config_path|
+            load_sprite_definition(config_path)
+          end
         end
       end
 

data/lib/active_assets/active_sprites/runners/abstract_runner.rb

@@ -12,7 +12,6 @@ module ActiveAssets
 
       def initialize(railtie, sprites)
         @railtie = railtie
-        setup_context
         @sprites = if ENV['SPRITE']
           sprites.select do |name, sprite|
             ENV['SPRITE'].split(',').map(&:strip).any? do |sp|
@@ -45,8 +44,8 @@ module ActiveAssets
             $stdout << "Starting Sprite, #{sprite.path}\n"
           end
 
-          sprite_path = sanitize_asset_path(context.image_path(sprite.path))
-          sprite_stylesheet_path = sanitize_asset_path(context.stylesheet_path(sprite.stylesheet_path))
+          sprite_path = image_computed_path(sprite.path)
+          sprite_stylesheet_path = stylesheet_computed_path(sprite.stylesheet_path)
 
           orientation = sprite.orientation.to_s
           sprite_pieces = sprite.sprite_pieces
@@ -87,36 +86,22 @@ module ActiveAssets
       end
 
       private
-        def image_full_path(path)
-          File.join(@railtie.config.paths.public.to_a.first, sanitize_asset_path(context.image_path(path)))
+        def image_computed_path(path)
+          File.join('images', path)
         end
 
-        def context
-          @context
+        def image_computed_full_path(path)
+          File.join(@railtie.config.paths.public.to_a.first, image_computed_path(path))
         end
 
-        def sanitize_asset_path(path)
-          path.split('?').first
+        def stylesheet_computed_path(path)
+          stylesheet_full_path = @railtie.config.respond_to?(:action_controller) && @railtie.config.paths.public.stylesheets.to_a.first
+          stylesheet_path = stylesheet_full_path ? stylesheet_full_path[%r{public/(.*)}, 1] : 'stylesheets'
+          File.join(stylesheet_path, path)
         end
 
-        def setup_context
-          unless @railtie.config.respond_to?(:action_controller)
-            @railtie.config.action_controller = ActiveSupport::OrderedOptions.new
-
-            paths   = @railtie.config.paths
-            options = @railtie.config.action_controller
-
-            options.assets_dir           ||= paths.public.to_a.first
-            options.javascripts_dir      ||= paths.public.javascripts.to_a.first
-            options.stylesheets_dir      ||= paths.public.stylesheets.to_a.first
-
-            ActiveSupport.on_load(:action_controller) do
-              options.each { |k,v| send("#{k}=", v) }
-            end
-          end
-
-          controller = ActionController::Base.new
-          @context = AssetContext.new(@railtie.config.action_controller, {}, controller)
+        def sanitize_asset_path(path)
+          path.split('?').first
         end
 
     end

data/lib/active_assets/active_sprites/runners/chunky_png_runner.rb

@@ -12,7 +12,7 @@ module ActiveAssets
           width, height = 0, 0
 
           image_list = sprite_pieces.map do |sp|
-            sprite_piece_path = image_full_path(sp.path)
+            sprite_piece_path = image_computed_full_path(sp.path)
             sp_image =  ChunkyPNG::Image.from_file(sprite_piece_path)
             sp.details = SpritePiece::Details.new(
               sprite.url.present? ? sprite.url : sprite_path,

data/lib/active_assets/active_sprites/runners/mini_magick_runner.rb

@@ -14,7 +14,7 @@ module ActiveAssets
           offset = 0
 
           image_list = sprite_pieces.map do |sp|
-            sp_path = image_full_path(sp.path)
+            sp_path = image_computed_full_path(sp.path)
             image = MiniMagick::Image.open(sp_path)
             sp.details = SpritePiece::Details.new(
               sprite.url.present? ? sprite.url : sprite_path,

data/lib/active_assets/active_sprites/runners/rmagick_runner.rb

@@ -10,7 +10,7 @@ module ActiveAssets
       private
         def set_sprite_details_and_return_image_list(sprite, sprite_path, sprite_pieces, orientation)
           sprite_piece_paths = sprite_pieces.map do |sp|
-            image_full_path(sp.path)
+            image_computed_full_path(sp.path)
           end
           image_list = ImageList.new(*sprite_piece_paths)
 

data/lib/active_assets/active_sprites.rb

@@ -22,6 +22,8 @@ module ActiveAssets
         require 'rails'
         require 'rails/active_sprites'
 
+        ENV['VERBOSE'] ||= 'true'
+
         Rails.application ||= Class.new(Rails::Application)
         Rails.application.extend Rails::ActiveSprites
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_assets
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Sam Woodard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -08:00
+date: 2011-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency