engine-assets 0.3.0 → 0.3.1

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email       = "support@coolerator.net"
     gem.homepage    = "http://github.com/coreyti/engine-assets"
     gem.authors     = ["Corey Innis"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", ">= 1.2.8"
     gem.files      += Dir['app/**/*.rb']
     gem.files      += Dir['lib/**/*.rb']
     gem.files.uniq!  # TODO (CTI): figure out why I'm having to do this manipulation.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/engine-assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{engine-assets}
-  s.version = "0.3.0"
+  s.version = "0.3.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-08}
+  s.date = %q{2009-11-12}
   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 = [
@@ -82,12 +82,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.8"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 1.2.8"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 1.2.8"])
   end
 end
 

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

@@ -1,15 +1,10 @@
 module ActionView::Helpers::AssetTagHelper
-  def expand_javascript_sources(sources, recursive = false)
+  def expand_javascript_sources_with_engine_assets(sources, recursive = false)
     if sources.include?(:all)
-      all_javascript_files = collect_asset_files(JAVASCRIPTS_DIR, ('**' if recursive), '*.js')
-      result = ((determine_source(:defaults, @@javascript_expansions).dup) + all_javascript_files).uniq
-      result
+      return (determine_source(:defaults, @@javascript_expansions).dup | expand_javascript_sources_without_engine_assets(sources, recursive))
     else
-      expanded_sources = sources.collect do |source|
-        determine_source(source, @@javascript_expansions)
-      end.flatten
-      expanded_sources << "application" if sources.include?(:defaults) && File.exist?(File.join(JAVASCRIPTS_DIR, "application.js"))
-      expanded_sources
+      raise NotImplementedError
     end
   end
+  alias_method_chain :expand_javascript_sources, :engine_assets
 end

data/spec/lib/engine_assets/extensions/rails/plugins_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe Rails::Plugin::Loader do
   attr_reader :loader, :plugin, :directory

data/spec/lib/engine_assets/extensions/rails/routes_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe ActionController::Routing::RouteSet do
   describe "#load_routes!" do
@@ -22,7 +22,7 @@ describe ActionController::Routing::RouteSet do
 
     it "adds the engine-assets routes configuration" do
       routeset.load_routes!
-      routeset.configuration_files[0].should =~ /engine-assets.*\/config\/routes\.rb/
+      routeset.configuration_files[0].should =~ /engine[-_ ]assets.*\/config\/routes\.rb/
     end
   end
 end

data/spec/lib/engine_assets/public_locator_spec.rb

@@ -1,10 +1,11 @@
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe EngineAssets::PublicLocator do
-  attr_reader :base_path, :find_path, :miss_path
+  attr_reader :base_path, :full_path, :find_path, :miss_path
 
   before do
-    @base_path = File.join(basedir, 'spec', 'support', 'fixtures', 'public')
+    @base_path = File.join('fixtures', 'public')
+    @full_path = File.join(basedir, 'spec', 'support', base_path)
     @find_path = '/javascripts/dual.js'
     @miss_path = '/javascripts/miss.js'
 
@@ -14,7 +15,7 @@ describe EngineAssets::PublicLocator do
   describe "#locate" do
     context "when the requested sub-path is located" do
       it "returns the full path to the file" do
-        EngineAssets::PublicLocator.locate(find_path).should == File.join(base_path, find_path)
+        EngineAssets::PublicLocator.locate(find_path).should =~ /#{File.join(base_path, find_path)}/
       end
     end
 

data/spec/routing/javascripts_routing_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe EngineAssets::JavascriptsController do
   before do

data/spec/routing/stylesheets_routing_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe EngineAssets::StylesheetsController do
   before do

data/spec/spec_suite.rb

@@ -1,19 +1,13 @@
 class SpecSuite
   def files
-    dir = File.dirname(__FILE__)
     Dir["#{dir}/../spec/**/*_spec.rb"]
   end
 
   def run
-    basedir = File.join(File.dirname(__FILE__), '..')
-    libdir  = File.join(basedir, 'lib')
-    specdir = File.join(basedir, 'spec')
+    $LOAD_PATH.unshift(File.join(dir, '..'))
+    $LOAD_PATH.unshift(File.join(dir, '..', 'lib'))
 
-    $LOAD_PATH.unshift(basedir)
-    $LOAD_PATH.unshift(libdir)
-    $LOAD_PATH.unshift(specdir)
-
-    ARGV.concat ["--options", "#{specdir}/spec.opts"]
+    ARGV.concat ["--options", "#{dir}/spec.opts"]
 
     files.each do |file|
       require file
@@ -21,6 +15,10 @@ class SpecSuite
     result = ::Spec::Runner::CommandLine.run
     exit result
   end
+
+  def dir
+    @dir ||= File.dirname(__FILE__)
+  end
 end
 
 if $0 == __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: engine-assets
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Corey Innis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 -05:00
+date: 2009-11-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
+        version: 1.2.8
     version: 
 description: A Rails Engine, which enables Rails Engines to provide assets (javascript, css and images)
 email: support@coolerator.net