engine-assets 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/controllers/engine_assets/assets_controller.rb

@@ -10,7 +10,11 @@ class EngineAssets::AssetsController < ApplicationController
     if(flat_file)
       render(:file => flat_file)
     else
-      render(:template => File.join('engine_assets', controller_name, params[:path]), :layout => false)
+      begin
+        render(:template => File.join('engine_assets', controller_name, params[:path]), :layout => false)
+      rescue ActionView::MissingTemplate
+        head :not_found
+      end
     end
   end
 

data/config/routes.rb

@@ -3,7 +3,7 @@ ActionController::Routing::Routes.draw do |map|
     map.send(type, "#{type}/:path.:format", {
       :controller => "engine_assets/#{type}",
       :action     => :show,
-      :path       => /[A-Za-z0-9\/_-]+/   # e.g., path/to/file.ext
+      :path       => /[A-Za-z0-9\/._-]+?/   # e.g., path/to/file.ext
     })
   end
 end

data/engine-assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{engine-assets}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Innis"]
-  s.date = %q{2009-11-06}
+  s.date = %q{2009-11-07}
   s.description = %q{A Rails Engine, which enables Rails Engines to provide assets (javascript, css and images)}
   s.email = %q{support@coolerator.net}
   s.extra_rdoc_files = [
@@ -30,17 +30,27 @@ Gem::Specification.new do |s|
      "config/routes.rb",
      "engine-assets.gemspec",
      "lib/engine-assets.rb",
+     "lib/engine_assets/extensions/rails/plugin.rb",
      "lib/engine_assets/extensions/rails/routes.rb",
      "lib/engine_assets/public_locator.rb",
      "rails/init.rb",
+     "spec/controllers/javascripts_controller_spec.rb",
+     "spec/controllers/stylesheets_controller_spec.rb",
      "spec/routing/javascripts_routing_spec.rb",
      "spec/routing/stylesheets_routing_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/spec_suite.rb",
-     "spec/support/fixtures/app/views/javascripts/asset.js.erb",
-     "spec/support/fixtures/public/javascripts/asset.js",
-     "spec/support/helpers/textmate_helper.rb"
+     "spec/support/fixtures/app/views/engine_assets/javascripts/dual.js.erb",
+     "spec/support/fixtures/app/views/engine_assets/javascripts/solo.js.erb",
+     "spec/support/fixtures/app/views/engine_assets/stylesheets/dual.css.erb",
+     "spec/support/fixtures/app/views/engine_assets/stylesheets/solo.css.erb",
+     "spec/support/fixtures/public/javascripts/dual.js",
+     "spec/support/fixtures/public/stylesheets/dual.css",
+     "spec/support/helpers/fixture_helper.rb",
+     "spec/support/helpers/textmate_helper.rb",
+     "spec/support/shared/assets_controller_spec.rb",
+     "spec/support/shared/assets_routing_spec.rb"
   ]
   s.homepage = %q{http://github.com/coreyti/engine-assets}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -48,11 +58,16 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Rails Engines with assets.}
   s.test_files = [
-    "spec/routing/javascripts_routing_spec.rb",
+    "spec/controllers/javascripts_controller_spec.rb",
+     "spec/controllers/stylesheets_controller_spec.rb",
+     "spec/routing/javascripts_routing_spec.rb",
      "spec/routing/stylesheets_routing_spec.rb",
      "spec/spec_helper.rb",
      "spec/spec_suite.rb",
-     "spec/support/helpers/textmate_helper.rb"
+     "spec/support/helpers/fixture_helper.rb",
+     "spec/support/helpers/textmate_helper.rb",
+     "spec/support/shared/assets_controller_spec.rb",
+     "spec/support/shared/assets_routing_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/engine-assets.rb

@@ -1,4 +1,5 @@
 module EngineAssets ; end
 
 require 'engine_assets/public_locator'
+require 'engine_assets/extensions/rails/plugin'
 require 'engine_assets/extensions/rails/routes'

data/lib/engine_assets/extensions/rails/plugin.rb

@@ -0,0 +1,12 @@
+class Rails::Plugin
+  class Loader
+    def register_plugin_as_loaded_with_engine_assets(plugin)
+      register_plugin_as_loaded_without_engine_assets(plugin)
+
+      if(plugin.engine? && File.exist?(public_dir = File.join(plugin.directory, 'public')))
+        EngineAssets::PublicLocator.paths << public_dir
+      end
+    end
+    alias_method_chain :register_plugin_as_loaded, :engine_assets
+  end
+end

data/rails/init.rb

@@ -5,16 +5,3 @@ require 'engine-assets'
 require 'controllers/engine_assets/assets_controller'
 require 'controllers/engine_assets/javascripts_controller'
 require 'controllers/engine_assets/stylesheets_controller'
-
-class Rails::Plugin
-  class Loader
-    def register_plugin_as_loaded_with_engine_assets(plugin)
-      register_plugin_as_loaded_without_engine_assets(plugin)
-
-      if(plugin.engine? && File.exist?(public_dir = File.join(plugin.directory, 'public')))
-        EngineAssets::PublicLocator.paths << public_dir
-      end
-    end
-    alias_method_chain :register_plugin_as_loaded, :engine_assets
-  end
-end

data/spec/controllers/javascripts_controller_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe EngineAssets::JavascriptsController do
+  before do
+    @format = 'js'
+  end
+
+  it_should_behave_like "A controller acting as an AssetsController"
+end

data/spec/controllers/stylesheets_controller_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe EngineAssets::StylesheetsController do
+  before do
+    @format = 'css'
+  end
+
+  it_should_behave_like "A controller acting as an AssetsController"
+end

data/spec/routing/javascripts_routing_spec.rb

@@ -1,38 +1,10 @@
 require 'spec_helper'
 
 describe EngineAssets::JavascriptsController do
-  describe "routing" do
-    attr_reader :path
-
-    context "given a simple path" do
-      before do
-        @path = '/javascripts/asset.js'
-      end
-
-      it "is able to recognize the path" do
-        pending "my ability to overcome the challenges of spec'ing this working behavior"
-        { :get => path }.should be_routable
-      end
-
-      it "is able to generate the path" do
-        javascripts_path(:asset, :format => :js).should == path
-      end
-    end
-
-    context "given a complex path" do
-      before do
-        @path = '/javascripts/path/to/asset.js'
-      end
-
-      it "is able to recognize the path" do
-        pending "my ability to overcome the challenges of spec'ing this working behavior"
-        { :get => path }.should be_routable
-      end
-
-      it "is able to generate the path" do
-        pending "my ability to overcome the challenges of spec'ing this working behavior"
-        javascripts_path('path/to/asset', :format => :js).should == path
-      end
-    end
+  before do
+    @prefix = 'javascripts'
+    @format = 'js'
   end
+
+  it_should_behave_like "A controller routed as an AssetsController"
 end

data/spec/routing/stylesheets_routing_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
 
 describe EngineAssets::StylesheetsController do
-  describe "routing" do
-    it "recognizes valid paths" do
-      { :get => "/stylesheets/asset.css" }.should be_routable
-    end
-    
-    it "generates valid paths" do
-      stylesheets_path(:asset, :format => :css).should == '/stylesheets/asset.css'
-    end
+  before do
+    @prefix = 'stylesheets'
+    @format = 'css'
   end
+
+  it_should_behave_like "A controller routed as an AssetsController"
 end

data/spec/spec_helper.rb

@@ -10,7 +10,10 @@ require 'engine-assets'
 require 'spec'
 require 'spec/autorun'
 require 'spec/rails'
+require 'support/helpers/fixture_helper'
 require 'support/helpers/textmate_helper'
+require 'support/shared/assets_controller_spec'
+require 'support/shared/assets_routing_spec'
 
 Spec::Runner.configure do |config|
   include Support::Helpers

data/spec/support/fixtures/app/views/engine_assets/javascripts/dual.js.erb

@@ -0,0 +1,2 @@
+// This file, app/views/engine_assets/javascripts/dual.js.erb, should not be rendered
+// since public/javascripts/dual.js takes precedence

data/spec/support/fixtures/app/views/engine_assets/javascripts/solo.js.erb

@@ -0,0 +1,2 @@
+// This file, app/views/engine_assets/javascripts/solo.js.erb, should be rendered
+// since public/javascripts/solo.js does not exist

data/spec/support/fixtures/app/views/engine_assets/stylesheets/dual.css.erb

@@ -0,0 +1,2 @@
+// This file, app/views/engine_assets/stylesheets/dual.css.erb, should not be rendered
+// since public/stylesheets/dual.css takes precedence

data/spec/support/fixtures/app/views/engine_assets/stylesheets/solo.css.erb

@@ -0,0 +1,2 @@
+// This file, app/views/engine_assets/stylesheets/solo.css.erb, should be rendered
+// since public/stylesheets/solo.css does not exist

data/spec/support/fixtures/public/javascripts/dual.js

@@ -0,0 +1,2 @@
+// This file, public/javascripts/dual.js, should be rendered
+// taking precedence over app/views/engine_assets/javascripts/dual.js.erb

data/spec/support/fixtures/public/stylesheets/dual.css

@@ -0,0 +1,2 @@
+// This file, public/stylesheets/dual.css, should be rendered
+// taking precedence over app/views/engine_assets/stylesheets/dual.css.erb

data/spec/support/helpers/fixture_helper.rb

@@ -0,0 +1,8 @@
+module Support
+  module Helpers
+    def load_view_fixtures(controller_class)
+      controller_class.prepend_view_path(File.join(File.dirname(__FILE__), '..', 'fixtures', 'app', 'views'))
+      EngineAssets::PublicLocator.paths << File.join(File.dirname(__FILE__), '..', 'fixtures', 'public')
+    end
+  end
+end

data/spec/support/shared/assets_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "A controller acting as an AssetsController", :shared => true do
+  attr_reader :format
+
+  integrate_views
+
+  before do
+    load_view_fixtures(@controller.class)
+  end
+
+  describe "response" do
+    context "with a matching file found in 'public'" do
+      it "renders that file" do
+        get :show, :path => 'dual', :format => format
+        response.body.should match("dual.#{format}, should be rendered")
+      end
+    end
+
+    context "with a matching file found in 'app'" do
+      it "renders that file" do
+        get :show, :path => 'solo', :format => format
+        response.body.should match("solo.#{format}.erb, should be rendered")
+      end
+    end
+
+    context "without a matching file" do
+      it "renders 404" do
+        get :show, :path => 'none', :format => format
+        response.response_code.should == 404 
+      end
+    end
+  end
+end

data/spec/support/shared/assets_routing_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe "A controller routed as an AssetsController", :shared => true do
+  attr_reader :prefix, :format
+
+  describe "routing" do
+    attr_reader :path, :route
+
+    context "given a simple path" do
+      before do
+        @path  = "/#{prefix}/asset.#{format}"
+        @route = { :controller => "engine_assets/#{prefix}", :action => 'show', :path => 'asset', :format => format }
+      end
+
+      it "recognizes the path" do
+        params_from(:get, path).should == route
+      end
+
+      it "generates the path from a URL helper" do
+        send("#{prefix}_path", :asset, :format => format).should == path
+      end
+    end
+
+    context "given a complex path of nested directories" do
+      before do
+        @path = "/#{prefix}/path/to/asset.#{format}"
+        @route = { :controller => "engine_assets/#{prefix}", :action => 'show', :path => 'path/to/asset', :format => format }
+      end
+
+      it "recognizes the path" do
+        params_from(:get, path).should == route
+      end
+
+      it "generates the path from a URL helper" do
+        CGI.unescape(send("#{prefix}_path", 'path/to/asset', :format => format)).should == CGI.unescape(path)
+      end
+    end
+
+    context "given a complex path of dotted components" do
+      before do
+        @path = "/#{prefix}/path.to/asset.one.#{format}"
+        @route = { :controller => "engine_assets/#{prefix}", :action => 'show', :path => 'path.to/asset.one', :format => format }
+      end
+
+      it "recognizes the path" do
+        params_from(:get, path).should == route
+      end
+
+      it "generates the path from a URL helper" do
+        CGI.unescape(send("#{prefix}_path", 'path.to/asset.one', :format => format)).should == CGI.unescape(path)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: engine-assets
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Corey Innis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -05:00
+date: 2009-11-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,17 +45,27 @@ files:
 - config/routes.rb
 - engine-assets.gemspec
 - lib/engine-assets.rb
+- lib/engine_assets/extensions/rails/plugin.rb
 - lib/engine_assets/extensions/rails/routes.rb
 - lib/engine_assets/public_locator.rb
 - rails/init.rb
+- spec/controllers/javascripts_controller_spec.rb
+- spec/controllers/stylesheets_controller_spec.rb
 - spec/routing/javascripts_routing_spec.rb
 - spec/routing/stylesheets_routing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_suite.rb
-- spec/support/fixtures/app/views/javascripts/asset.js.erb
-- spec/support/fixtures/public/javascripts/asset.js
+- spec/support/fixtures/app/views/engine_assets/javascripts/dual.js.erb
+- spec/support/fixtures/app/views/engine_assets/javascripts/solo.js.erb
+- spec/support/fixtures/app/views/engine_assets/stylesheets/dual.css.erb
+- spec/support/fixtures/app/views/engine_assets/stylesheets/solo.css.erb
+- spec/support/fixtures/public/javascripts/dual.js
+- spec/support/fixtures/public/stylesheets/dual.css
+- spec/support/helpers/fixture_helper.rb
 - spec/support/helpers/textmate_helper.rb
+- spec/support/shared/assets_controller_spec.rb
+- spec/support/shared/assets_routing_spec.rb
 has_rdoc: true
 homepage: http://github.com/coreyti/engine-assets
 licenses: []
@@ -85,8 +95,13 @@ signing_key:
 specification_version: 3
 summary: Rails Engines with assets.
 test_files: 
+- spec/controllers/javascripts_controller_spec.rb
+- spec/controllers/stylesheets_controller_spec.rb
 - spec/routing/javascripts_routing_spec.rb
 - spec/routing/stylesheets_routing_spec.rb
 - spec/spec_helper.rb
 - spec/spec_suite.rb
+- spec/support/helpers/fixture_helper.rb
 - spec/support/helpers/textmate_helper.rb
+- spec/support/shared/assets_controller_spec.rb
+- spec/support/shared/assets_routing_spec.rb

data/spec/support/fixtures/app/views/javascripts/asset.js.erb

@@ -1,2 +0,0 @@
-// This file, app/views/javascripts/asset.js.erb, should not be rendered
-// since public/javascripts/asset.js takes precedence

data/spec/support/fixtures/public/javascripts/asset.js

@@ -1,2 +0,0 @@
-// This file, public/javascripts/asset.js, should be rendered
-// taking precedence over app/views/javascripts/asset.js.erb