oasis 0.4.2 → 0.5.0

data/lib/oasis/debug.rb

@@ -1,10 +1,8 @@
 module Oasis
   class Debug
     def self.log(msg)
-      if defined? RAILS_DEFAULT_LOGGER
+      if defined? RAILS_DEFAULT_LOGGER && RAILS_ENV == "development"
         RAILS_DEFAULT_LOGGER.debug "** [OASIS] : #{msg}"
-      else
-        puts "** [OASIS] : #{msg}"
       end
     end
   end

data/lib/oasis/dependencies.rb

@@ -5,64 +5,69 @@
 module Oasis
   module Dependencies
     
-    def require_or_load(file_name, const_path=nil)
-      super(file_name, const_path) unless defined? RAILS_ROOT
+    def require_or_load(file, const_path=nil)
+      super(file, const_path) unless defined? RAILS_ROOT
       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 
+
+      plugin_file_name, app_file_name = "", ""      
+      # get out the peices we want for them requirement.
+      file_name, base_name = extract_file_name(file), extract_base_name(file)
+      
+      # start, by looking for the files as helpers or controllers
+      # if they are suffixed with helper or controller.
+      if file_name =~ /_(helper|controller)?$/
+        type = file_name.split("_").last
+        Oasis::Debug.log "searching for #{type} named '#{file_name}'"
+        Oasis.apps.each do |app|
+          plugin_file_name = File.expand_path(File.join(app.directory, "app", "#{type}s", base_name))
+          Oasis::Debug.log "checking engine '#{app.name}' for '#{file_name}' (#{plugin_file_name})"
+          break if File.file? "#{plugin_file_name}.rb"
         end
+        
+      else
+        
+        # if we didn't find it in helpers or controllers, lets try looking in models.
+        Oasis::Debug.log "searching for models named '#{file_name}'"
+        Oasis.apps.each do |app|
+          plugin_file_name = File.expand_path(File.join(app.directory, "app", "models", base_name))
+          Oasis::Debug.log "checking engine '#{app.name}' for '#{file_name}' (#{plugin_file_name})"
+          break if File.file? "#{plugin_file_name}.rb"
+        end
+        
+      end
+      
+      # success! we've found code in the engine, lets load it.
+      if File.file?("#{plugin_file_name}.rb")
+        Oasis::Debug.log "loading '#{file_name}' from an engine."
+        file_loaded = true if super(plugin_file_name, const_path)
+      end
+      
+      app_file_name = File.join(RAILS_ROOT, "app", "#{type||"model"}s", base_name)
+      if File.file? "#{app_file_name}.rb"
+        Oasis::Debug.log "loading from application: #{file_name}" 
+        file_loaded = true if super(app_file_name, const_path)
+      else
+        Oasis::Debug.log "file '#{file_name}' not found in application"
       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)
+      file_loaded || super(file, const_path)
+    end
+    
+    private
+    
+    def extract_base_name(file_name)
+      (file_name.split("/app/").last.split("/") - ["models", "controllers", "helpers"]).join("/").gsub(".rb","")
+    end
+    
+    def extract_file_name(file_name)
+      file_name.split("/").last.gsub(".rb","")
     end
   end
-  
 end
 
 
 module ::ActiveSupport::Dependencies #:nodoc:
   extend Oasis::Dependencies
-end
-
-class Object
-  # shortcut for requiring models from rails engines.
-  def require_model_from(app_name, constant_name)
-    require_from(app_name,"app/models/#{constant_name}")
-  end
-  
-  # this can be used to require something deep within a rails engine so that it
-  # can be reopened properly. for instance, model files could now define
-  # require_from :plugin_name, "app/models/foobar"
-  # class Foobar
-  #
-  # def some_added_method ...
-  def require_from(app_name, path)
-    raise "#{app_name} has not been registered with Oasis." unless Oasis.apps[app_name]
-    eval(%Q{require "#{Oasis.apps[app_name].directory}/#{path}"})
-  end
 end

data/lib/oasis/version.rb

@@ -1,3 +1,3 @@
 module Oasis
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/oasis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oasis}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Derek Perez", "Chris Eppstein"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-01-11}
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oasis
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Derek Perez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -08:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency