lib/engine_assets/public_locator.rb in engine-assets-0.4.2 vs lib/engine_assets/public_locator.rb in engine-assets-0.5.0

@@ -1,29 +1,44 @@
 class EngineAssets::PublicLocator
   class << self
     attr_reader :paths
 
+    # TODO: expose this as EngineAssets.register(...)
     def register(full_path)
-      @paths ||= []
+      raise ArgumentError unless File.exist?(full_path)
 
+      @paths ||= []
       public_path = File.join(full_path, 'public')
-      File.open(public_path) {}
 
-      paths << public_path
+      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
+      end
     end
 
     def locate(file_path)
-      full_paths = paths.map { |base_path| File.join(base_path, file_path) }
+      full_paths = (paths || []).map { |base_path| File.join(base_path, file_path) }
+
       full_paths.each do |full_path|
         return full_path if File.exist?(full_path)
       end
+
       nil
     end
 
 
     private
 
     def clear
-      @paths = []
+      @paths = nil
     end
   end
 end