oasis 0.3.1 → 0.4.1

data/Rakefile

@@ -1,9 +1,14 @@
+$: << File.join(File.dirname(__FILE__), 'lib')
+require 'oasis/version'
+
 require 'rubygems'
 require 'rake'
 
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
+    gem.version = Oasis::VERSION
     gem.name = "oasis"
     gem.summary = %Q{a collection of enhancements for rails engines.}
     gem.description = %Q{a collection of enhancements for rails engines. Designed to work with Rails 2.3.}

data/lib/oasis.rb

@@ -1,25 +1,16 @@
-path = File.dirname(__FILE__)
-require "#{path}/oasis/debug"
-require "#{path}/oasis/app/loader"
-require "#{path}/oasis/dependencies"
+require 'active_support/core_ext/module'
+require "oasis/version"
+require "oasis/debug"
+require "oasis/app/list"
+require "oasis/app/loader"
+require "oasis/dependencies"
+require "oasis/development"
 
-require "#{path}/oasis/routes" if defined? ActionController::Routing
-require "#{path}/oasis/layout" if defined? ActionController::Layout
-
-# this block of code is responsible for making sure that
-# while in development mode, Rails will treat anything it
-# considers a "rails engine", will completely reload everything in app/ and lib/
-# within itself.
-if defined? Rails && RAILS_ENV == "development"
-  Rails.configuration.after_initialize do
-    app_names = Oasis.apps.collect { |app| Regexp.escape(app.name) }.join("|")
-    load_once_paths = ActiveSupport::Dependencies.load_once_paths.dup.reject { |path| path =~ /\/#{app_names}\// }
-    ActiveSupport::Dependencies.load_once_paths = load_once_paths
-  end
-end
+require "oasis/routes" if defined? ActionController::Routing
+require "oasis/layout" if defined? ActionController::Layout
 
 module Oasis
   # an array of all loaded rails engines, that Oasis can know about.
   mattr_accessor :apps
   self.apps = Oasis::App::List.new
-end
+end

data/lib/oasis/app/loader.rb

@@ -19,5 +19,4 @@ module Oasis
     end
   end
 end
-
-Rails::Plugin::Loader.send :include, Oasis::App::Loader
+Rails::Plugin::Loader.send :include, Oasis::App::Loader if defined? Rails

data/lib/oasis/dependencies.rb

@@ -6,6 +6,7 @@ module Oasis
   module Dependencies
     
     def require_or_load(file_name, const_path=nil)
+      super(file_name, const_path) unless defined? RAILS_ROOT
       file_loaded = false
       # only look for controller and helper files.
       %w(controller helper).each do |file_type|

data/lib/oasis/development.rb

@@ -0,0 +1,17 @@
+module Oasis
+  module Development
+    extend self
+    # this block of code is responsible for making sure that
+    # while in development mode, Rails will treat anything it
+    # considers a "rails engine", will completely reload everything in app/ and lib/
+    # within itself.
+    def configure!(config = nil)
+      config ||= Rails.configuration if defined? Rails
+      config.after_initialize do
+        app_names = Oasis.apps.collect { |app| Regexp.escape(app.name) }.join("|")
+        load_once_paths = ActiveSupport::Dependencies.load_once_paths.dup.reject { |path| path =~ /\/#{app_names}\// }
+        ActiveSupport::Dependencies.load_once_paths = load_once_paths
+      end
+    end
+  end
+end

data/lib/oasis/loader.rb

@@ -36,9 +36,10 @@ module Oasis
             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
+          alias_method :load_paths_without_#{name}, :load_paths
+          alias_method :load_paths, :load_paths_with_#{name}
         EOS
-      end      
+      end
     end
-  end  
+  end
 end

data/lib/oasis/version.rb

@@ -0,0 +1,3 @@
+module Oasis
+  VERSION = "0.4.1"
+end

data/test/helper.rb

@@ -7,6 +7,19 @@ require 'redgreen' rescue nil
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+RAILS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+unless defined?(Rails)
+  module Rails
+    class Plugin
+      class Loader
+        def register_plugin_as_loaded
+        end
+      end
+    end
+  end
+end
+
 require 'oasis'
 
 # silence the logger, or define a new path for logging.
@@ -18,5 +31,6 @@ module Oasis
   end
 end
 
+
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oasis
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Derek Perez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -08:00
+date: 2009-12-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,15 +38,16 @@ files:
 - LICENSE
 - README.rdoc
 - 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/development.rb
 - lib/oasis/layout.rb
 - lib/oasis/loader.rb
 - lib/oasis/routes.rb
+- lib/oasis/version.rb
 - oasis.gemspec
 - test/fixtures/layout_tests/views/layouts/default_layout.html.erb
 - test/fixtures/layout_tests/views/layouts/fancy_products.html.erb

data/VERSION

@@ -1 +0,0 @@
-0.3.1