atd-asset_bundler 0.0.2 → 0.0.3

data/app/controllers/asset_bundler/assets_controller.rb

@@ -5,8 +5,9 @@ require 'action_controller/metal'
 class AssetBundler::AssetsController < ActionController::Metal
   include ActionController::Rendering
   include ActionController::MimeResponds
+  include ActionController::Streaming
   
-  self.view_paths = %w{app}
+  self.view_paths = AssetBundler.paths
   
   def go
     # Always cache resources. It's the responsibility of the asset tag to
@@ -15,7 +16,10 @@ class AssetBundler::AssetsController < ActionController::Metal
     headers['Expires']       = 1.year.from_now.httpdate
 
     begin
-      go_render(File.join(self.controller_path, self.expansion_for(params[:path])))
+      template = find_template(File.join(self.controller_name, self.expansion_for(params[:path])))
+      send_file template.identifier,
+                :type => formats.first,
+                :disposition => 'inline'
     rescue
       raise(ActionController::RoutingError,
             "No route matches #{ request.path.inspect }")
@@ -44,12 +48,4 @@ class AssetBundler::AssetsController < ActionController::Metal
   def expansion_for(path)
     expansion?(path.to_s) ? expansions[path.to_sym] : path
   end
-
-  #
-  # Renders text file
-  # Must be overwrited for binary data
-  #
-  def go_render(path)
-    render path
-  end
 end

data/app/controllers/assets/images_controller.rb

@@ -1,17 +1,7 @@
 module Assets
   class ImagesController < AssetBundler::AssetsController
-    include ActionController::Streaming
-
     respond_to :png, :jpeg, :gif
 
-    protected
-
-    def go_render(path)
-      send_file find_template(path).identifier,
-                :type => formats.first,
-                :disposition => 'inline'
-    end
-   
     private
     
     def expansion?(path)

data/lib/asset_bundler.rb

@@ -1,5 +1,9 @@
+require 'asset_bundler/version'
+require 'asset_bundler/routing'
+require 'asset_bundler/engine'
+require 'asset_bundler/rails/ext'
+
 module AssetBundler
-  require 'asset_bundler/version'
-  require 'asset_bundler/routing'
-  require 'asset_bundler/engine'
+  mattr_accessor :paths
+  @@paths = []
 end

data/lib/asset_bundler/rails/ext.rb

@@ -0,0 +1,9 @@
+require 'rails/engine'
+
+class Rails::Engine
+  initializer :add_asset_paths do |app|
+    paths.app.assets = "app/assets"
+
+    AssetBundler.paths += paths.app.assets.to_a
+  end
+end

data/lib/asset_bundler/version.rb

@@ -1,3 +1,3 @@
 module AssetBundler
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: atd-asset_bundler
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Stephen Touset
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2010-10-31 01:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +44,7 @@ files:
 - config/routes.rb
 - lib/asset_bundler.rb
 - lib/asset_bundler/engine.rb
+- lib/asset_bundler/rails/ext.rb
 - lib/asset_bundler/routing.rb
 - lib/asset_bundler/version.rb
 has_rdoc: true