oasis 0.2.0 → 0.2.1

data/VERSION

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

data/lib/oasis.rb

@@ -1,6 +1,22 @@
 path = File.dirname(__FILE__)
 require "#{path}/oasis/debug"
+require "#{path}/oasis/app/loader"
+require "#{path}/oasis/dependencies"
 
 # extend the routing system, if its loaded.
 require "#{path}/oasis/routes" if defined? ActionController::Routing
-require "#{path}/oasis/layout" if defined? ActionController::Layout
+# extend the layout system, if its loaded.
+require "#{path}/oasis/layout" if defined? ActionController::Layout
+
+if defined? Rails
+  # this makes rails reload the models, controllers, etc. inside of a Rails Engine.
+  Rails.configuration.after_initialize do 
+    ActiveSupport::Dependencies.load_once_paths = ActiveSupport::Dependencies.load_once_paths.select { |path| (path =~ /app/).nil? }
+  end
+end
+
+module Oasis
+  # The set of all loaded plugins
+  mattr_accessor :apps
+  self.apps = Oasis::App::List.new
+end

data/lib/oasis/app/list.rb

@@ -0,0 +1,22 @@
+module Oasis
+  module App
+    class List < Array
+      # Finds plugins with the set with the given name (accepts Strings or Symbols), or
+      # index. So, Engines.plugins[0] returns the first-loaded Plugin, and Engines.plugins[:engines]
+      # returns the Plugin instance for the engines plugin itself.
+      def [](name_or_index)
+        if name_or_index.is_a?(Fixnum)
+          super
+        else
+          self.find { |plugin| plugin.name.to_s == name_or_index.to_s }
+        end
+      end
+  
+      # Go through each plugin, highest priority first (last loaded first). Effectively,
+      # this is like <tt>Engines.plugins.reverse</tt>
+      def by_precedence
+        reverse
+      end
+    end
+  end
+end

data/lib/oasis/app/loader.rb

@@ -0,0 +1,21 @@
+module Oasis
+  module App
+    module Loader
+      
+      def register_plugin_as_loaded_with_oasis(plugin)
+        register_plugin_as_loaded_without_oasis(plugin)
+        Oasis.apps << plugin if plugin.engine?
+        Oasis::Debug.log "**** Loading App: #{plugin.name}"
+      end
+      
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :register_plugin_as_loaded, :oasis
+        end
+      end
+      
+    end
+  end
+end
+
+Rails::Plugin::Loader.send :include, Oasis::App::Loader

data/lib/oasis/dependencies.rb

@@ -0,0 +1,48 @@
+# a majority of this code has been adapted
+# from the Rails Engines project which has been largely
+# discontinued and integrated into Rails, itself. ...except for this.
+# Thanks to everyone involved in that work, to make this possible.
+module Oasis
+  module Dependencies
+    
+    def require_or_load(file_name, const_path=nil)
+      file_loaded = false
+      # only look for controller and helper files.
+      %w(controller helper).each do |file_type|
+        if file_name =~ /^(.*app\/#{file_type}s\/)?(.*_#{file_type})(\.rb)?$/
+          base_name = $2
+          
+          # jump through the loaded/registered oasis apps, looking for
+          # similar files that you may want to try to reference.
+          Oasis.apps.each do |app|
+            plugin_file_name = File.expand_path(File.join(app.directory, 'app', "#{file_type}s", base_name))
+            Oasis::Debug.log "checking engine '#{app.name}' for '#{base_name}'"
+            if File.file? "#{plugin_file_name}.rb"
+              Oasis::Debug.log "loading from engine '#{app.name}'"
+              file_loaded = true if super(plugin_file_name, const_path)
+            end
+          end
+          
+          # Ensure we are only loading from the /app directory at this point.
+          app_file_name = File.join(RAILS_ROOT, 'app', "#{file_type}s", "#{base_name}")
+          
+          if File.file? "#{app_file_name}.rb"
+            Oasis::Debug.log "loading from application: #{base_name}" 
+            file_loaded = true if super(app_file_name, const_path)
+          else
+            Oasis::Debug.log "file not found in application"
+          end 
+        end
+      end
+      
+      # if we managed to load a file, return true. If not, default to the original method.
+      # Note that this relies on the RHS of a boolean || not to be evaluated if the LHS is true.
+      file_loaded || super(file_name, const_path)
+    end
+  end
+  
+end
+
+module ::ActiveSupport::Dependencies #:nodoc:
+  extend Oasis::Dependencies
+end

data/lib/oasis/loader.rb

@@ -0,0 +1,44 @@
+module Oasis
+  # only require this if you need it. This is designed for use as pre-initializer.
+  # do not bother setting this within your engine's init.rb file, its too late by then.
+  module Loader
+    # this method defines a series of methods and method chains
+    # that can be used to augment the plugin/engines loader to
+    # consider more potential load paths within the app/ directory.
+    # this should only be necessary if you have code hiding in a top-level
+    # directory, beneath vendor/plugins/<your_engine>/app
+    # eg: vendor/plugins/<your_engine>/app/cells
+    #
+    # this method should be used in the *master* environment.rb
+    # of your rails application.
+    #
+    # example:
+    #
+    # require 'oasis/loader'
+    # Oasis::Loader.add_app_load_path_support_for :cells
+    #
+    # Rails::Initializer.run do |config|
+    #   ...
+    # end
+    def self.add_app_load_path_support_for(*names)
+      names.each do |name|
+        Rails::Plugin.class_eval <<-EOS
+          def has_#{name}_directory?                                     #    def has_cells_directory?
+            File.directory?(File.join(directory, 'app', '#{name}'))      #      File.directory?(File.join(directory, 'app', 'cells'))
+          end                                                            #    end
+                                                                         #    
+          def #{name}_path                                               #    def cells_path
+            File.join(directory, 'app', '#{name}')                       #      File.join(directory, 'app', 'cells')
+          end                                                            #    end
+                                                                         #    
+          def load_paths_with_#{name}                                    #    def load_paths_with_cells
+            paths = load_paths_without_#{name}                           #      paths = load_paths_without_cells
+            paths << #{name}_path if has_#{name}_directory?              #      paths << cells_path if has_cells_directory?
+            paths                                                        #      paths
+          end                                                            #    end
+          alias_method_chain :load_paths, :#{name}                       #    alias_method_chain :load_paths, :cells
+        EOS
+      end      
+    end
+  end  
+end

data/oasis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oasis}
-  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 = ["Derek Perez", "Chris Eppstein"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-12-29}
   s.description = %q{a collection of enhancements for rails engines. Designed to work with Rails 2.3.}
   s.email = %q{derek@derekperez.com}
   s.extra_rdoc_files = [
@@ -24,8 +24,12 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/oasis.rb",
+     "lib/oasis/app/list.rb",
+     "lib/oasis/app/loader.rb",
      "lib/oasis/debug.rb",
+     "lib/oasis/dependencies.rb",
      "lib/oasis/layout.rb",
+     "lib/oasis/loader.rb",
      "lib/oasis/routes.rb",
      "oasis.gemspec",
      "test/fixtures/layout_tests/views/layouts/default_layout.html.erb",
@@ -37,6 +41,7 @@ Gem::Specification.new do |s|
      "test/fixtures/layout_tests/views/products/wish_list.html.erb",
      "test/helper.rb",
      "test/test_oasis_layouts.rb",
+     "test/test_oasis_loader.rb",
      "test/test_oasis_routing.rb"
   ]
   s.homepage = %q{http://github.com/perezd/oasis}
@@ -47,6 +52,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
      "test/test_oasis_layouts.rb",
+     "test/test_oasis_loader.rb",
      "test/test_oasis_routing.rb"
   ]
 

data/test/test_oasis_loader.rb

@@ -0,0 +1,21 @@
+require 'helper'
+require 'oasis/loader'
+
+  module Rails
+    class Plugin
+      def load_paths
+        []
+      end
+    end
+  end
+
+class TestOasisLoader < Test::Unit::TestCase
+  
+  should "add methods to Rails::Plugin to add loader support for cells" do
+    Oasis::Loader.add_app_load_path_support_for :cells
+    assert Rails::Plugin.new.respond_to?(:has_cells_directory?)
+    assert Rails::Plugin.new.respond_to?(:cells_path)
+    assert Rails::Plugin.new.respond_to?(:load_paths_with_cells)
+  end
+  
+end

data/test/test_oasis_routing.rb

@@ -1,5 +1,33 @@
 require 'helper'
 
+class MockController
+  attr_accessor :routes
+
+  def initialize(routes)
+    self.routes = routes
+  end
+
+  def url_for(options)
+    only_path = options.delete(:only_path)
+
+    port        = options.delete(:port) || 80
+    port_string = port == 80 ? '' : ":#{port}"
+
+    protocol = options.delete(:protocol) || "http"
+    host     = options.delete(:host) || "test.host"
+    anchor   = "##{options.delete(:anchor)}" if options.key?(:anchor)
+
+    path = routes.generate(options)
+
+    only_path ? "#{path}#{anchor}" : "#{protocol}://#{host}#{port_string}#{path}#{anchor}"
+  end
+
+  def request
+    @request ||= ActionController::TestRequest.new
+  end
+end
+
+
 class TestOasisRouting < Test::Unit::TestCase
 
   ROUTING = ActionController::Routing
@@ -8,7 +36,22 @@ class TestOasisRouting < Test::Unit::TestCase
     Oasis::Routes.routing_for(:customers) do |customers|
       customers.connect "/customers", :controller => "customers"
       customers.connect "/cool-stuff", :controller => "customers"
+      customers.search "/search", :controller => "customers"
+    end
+  end
+  
+  def setup_for_named_route
+    klass = Class.new(MockController)
+    set.install_helpers(klass)
+    klass.new(set)
+  end
+  
+  should "provide explicit namespacing to routing set based on collection name" do
+    set.draw do |map|
+      map.routing_for(:customers)
     end
+    controller = setup_for_named_route
+    assert_equal "/search", controller.send(:customers_search_path)
   end
   
   should "define a named routing set" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oasis
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Derek Perez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -08:00
+date: 2009-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,8 +40,12 @@ files:
 - Rakefile
 - VERSION
 - lib/oasis.rb
+- lib/oasis/app/list.rb
+- lib/oasis/app/loader.rb
 - lib/oasis/debug.rb
+- lib/oasis/dependencies.rb
 - lib/oasis/layout.rb
+- lib/oasis/loader.rb
 - lib/oasis/routes.rb
 - oasis.gemspec
 - test/fixtures/layout_tests/views/layouts/default_layout.html.erb
@@ -53,6 +57,7 @@ files:
 - test/fixtures/layout_tests/views/products/wish_list.html.erb
 - test/helper.rb
 - test/test_oasis_layouts.rb
+- test/test_oasis_loader.rb
 - test/test_oasis_routing.rb
 has_rdoc: true
 homepage: http://github.com/perezd/oasis
@@ -85,4 +90,5 @@ summary: a collection of enhancements for rails engines.
 test_files: 
 - test/helper.rb
 - test/test_oasis_layouts.rb
+- test/test_oasis_loader.rb
 - test/test_oasis_routing.rb