engine-assets 0.5.1 → 0.6.0.pre1

data/README.md

@@ -44,6 +44,14 @@ TODO
   * Add spec/feature coverage for gem-installed engine, rather than plugins.
   * Add spec/feature coverage for rails/init.rb making a difference.
 
+        actionpack (3.0.0) lib/action_view/helpers/asset_tag_helper.rb:905:in `exist?'
+        actionpack (3.0.0) lib/action_view/helpers/asset_tag_helper.rb:905:in `asset_file_path!'
+        actionpack (3.0.0) lib/action_view/helpers/asset_tag_helper.rb:878:in `ensure_javascript_sources!'
+        actionpack (3.0.0) lib/action_view/helpers/asset_tag_helper.rb:877:in `each'
+        actionpack (3.0.0) lib/action_view/helpers/asset_tag_helper.rb:877:in `ensure_javascript_sources!'
+        actionpack (3.0.0) lib/action_view/helpers/asset_tag_helper.rb:361:in `javascript_include_tag'
+        app/views/layouts/application.html.erb:12:in `_app_views_layouts_application_html_erb___615183510_2191829220_0'
+
 
 Contributors
 ------------------------------------------------------------------------------

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0.pre1

data/engine-assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{engine-assets}
-  s.version = "0.5.1"
+  s.version = "0.6.0.pre1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Innis"]
-  s.date = %q{2010-09-18}
+  s.date = %q{2010-11-03}
   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 = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/engine-assets.rb",
      "lib/engine_assets/engine.rb",
+     "lib/engine_assets/extensions/action_view/helpers/asset_tag_helper.rb",
      "lib/engine_assets/extensions/rails/assets.rb",
      "lib/engine_assets/public_locator.rb",
      "rails/init.rb",

data/lib/engine-assets.rb

@@ -8,4 +8,4 @@ end
 
 require 'engine_assets/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 require 'engine_assets/public_locator'
-require 'engine_assets/extensions/rails/assets'
+require 'engine_assets/extensions/action_view/helpers/asset_tag_helper'

data/lib/engine_assets/engine.rb

@@ -1,3 +1,11 @@
 require 'rails' unless defined?(Rails)
 
-class EngineAssets::Engine < Rails::Engine ; end
+class EngineAssets::Engine < Rails::Engine
+  def initialize(*args)
+    super(*args)
+
+    EngineAssets::PublicLocator.paths.each do |path|
+      Rails.configuration.middleware.use ::ActionDispatch::Static, path
+    end
+  end
+end

data/lib/engine_assets/extensions/action_view/helpers/asset_tag_helper.rb

@@ -0,0 +1,28 @@
+# require 'action_view/helpers/asset_tag_helper'
+
+# TODO:
+#   * find a mechanism to do this without monkey-patching Rails
+#   * add an autoload option to load all from plugins, or similar
+#   * allow engines to indicate (automatically when #register is called?)
+#     which assets to include.
+
+module ActionView::Helpers::AssetTagHelper
+  # def expand_javascript_sources_with_engine_assets(sources, recursive = false)
+  #   if sources.include?(:all)
+  #     result = (determine_source(:defaults, @@javascript_expansions).dup | expand_javascript_sources_without_engine_assets(sources, recursive))
+  #     result.map! { |entry| entry =~ /\.js$/ ? entry : "#{entry}.js" }
+  #     return result.uniq
+  #   else
+  #     raise NotImplementedError
+  #   end
+  # end
+  # alias_method_chain :expand_javascript_sources, :engine_assets
+  #
+  def asset_file_path_with_engine_assets(path)
+    primary = asset_file_path_without_engine_assets(path)
+    return primary if File.exist?(primary)
+
+    EngineAssets::PublicLocator.locate(path)
+  end
+  alias_method_chain :asset_file_path, :engine_assets
+end

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

@@ -4,23 +4,23 @@
 #   * allow engines to indicate (automatically when #register is called?)
 #     which assets to include.
 
-module ActionView::Helpers::AssetTagHelper
-  def expand_javascript_sources_with_engine_assets(sources, recursive = false)
-    if sources.include?(:all)
-      result = (determine_source(:defaults, @@javascript_expansions).dup | expand_javascript_sources_without_engine_assets(sources, recursive))
-      result.map! { |entry| entry =~ /\.js$/ ? entry : "#{entry}.js" }
-      return result.uniq
-    else
-      raise NotImplementedError
-    end
-  end
-  alias_method_chain :expand_javascript_sources, :engine_assets
-
-  def asset_file_path_with_engine_assets(path)
-    primary = asset_file_path_without_engine_assets(path)
-    return primary if File.exist?(primary)
-
-    EngineAssets::PublicLocator.locate(path)
-  end
-  alias_method_chain :asset_file_path, :engine_assets
-end
+# module ActionView::Helpers::AssetTagHelper
+#   # def expand_javascript_sources_with_engine_assets(sources, recursive = false)
+#   #   if sources.include?(:all)
+#   #     result = (determine_source(:defaults, @@javascript_expansions).dup | expand_javascript_sources_without_engine_assets(sources, recursive))
+#   #     result.map! { |entry| entry =~ /\.js$/ ? entry : "#{entry}.js" }
+#   #     return result.uniq
+#   #   else
+#   #     raise NotImplementedError
+#   #   end
+#   # end
+#   # alias_method_chain :expand_javascript_sources, :engine_assets
+#   #
+#   def asset_file_path_with_engine_assets(path)
+#     primary = asset_file_path_without_engine_assets(path)
+#     return primary if File.exist?(primary)
+# 
+#     EngineAssets::PublicLocator.locate(path)
+#   end
+#   alias_method_chain :asset_file_path, :engine_assets
+# end

data/lib/engine_assets/public_locator.rb

@@ -10,17 +10,7 @@ class EngineAssets::PublicLocator
       public_path = File.join(full_path, 'public')
 
       if File.exist?(public_path)
-        # TODO:
-        #   * spec me
-        #   * split me into separate implementations
-
-        if defined?(Rails) && Rails::VERSION::MAJOR == 3
-          # Rails 3
-          Rails.configuration.middleware.use ::ActionDispatch::Static, public_path
-        else
-          # Rails 2
-          paths << public_path
-        end
+        paths << public_path
       end
     end
 
@@ -34,11 +24,10 @@ class EngineAssets::PublicLocator
       nil
     end
 
-
     private
 
-    def clear
-      @paths = nil
-    end
+      def clear
+        @paths = nil
+      end
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: engine-assets
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: -1876988208
+  prerelease: true
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  - pre1
+  version: 0.6.0.pre1
 platform: ruby
 authors: 
 - Corey Innis
@@ -15,14 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 -07:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  name: cucumber
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +31,12 @@ dependencies:
         - 8
         - 5
         version: 0.8.5
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: cucumber
   prerelease: false
-  name: rake
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,12 +47,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: rake
   prerelease: false
-  name: rr
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: rr
   prerelease: false
-  name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,12 +79,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: rspec
   prerelease: false
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,12 +95,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: jeweler
   prerelease: false
-  name: term-ansicolor
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,7 +111,10 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  requirement: *id006
+  type: :development
+  name: term-ansicolor
+  prerelease: false
+  version_requirements: *id006
 description: A Rails Engine, which enables Rails Engines to provide assets (javascript, css and images)
 email: support@coolerator.net
 executables: []
@@ -146,6 +147,7 @@ files:
 - init.rb
 - lib/engine-assets.rb
 - lib/engine_assets/engine.rb
+- lib/engine_assets/extensions/action_view/helpers/asset_tag_helper.rb
 - lib/engine_assets/extensions/rails/assets.rb
 - lib/engine_assets/public_locator.rb
 - rails/init.rb
@@ -196,12 +198,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: