padrino-core 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/padrino-core/loader.rb

@@ -6,7 +6,8 @@ module Padrino
       @_called_from = first_caller
       load_required_gems # load bundler gems
       require_dependencies("#{root}/config/apps.rb", "#{root}/config/database.rb") # load configuration
-      require_dependencies("#{root}/lib/**/*.rb", "#{root}/models/*.rb") # load root app dependencies
+      load_apps_models # load all models of our apps
+      require_dependencies("#{root}/lib/**/*.rb", "#{root}/models/**/*.rb") # load root app models
       Stat.reload! # We need to fill our Stat::CACHE but we do that only for development
       Thread.current[:padrino_loaded] = true
     end
@@ -57,30 +58,34 @@ module Padrino
     alias :load_dependency :load_dependencies
 
     protected
+      # Loads the vendored gems or system wide gems through Gemfile
+      def load_required_gems
+        require root('vendor', 'gems', 'environment')
+        Bundler.require_env(Padrino.env)
+        say! "=> Loaded bundled gems for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
+      rescue LoadError
+        require 'bundler'
+        if File.exist?(root("Gemfile"))
+          Bundler::Bundle.load(root("Gemfile")).environment.require_env(Padrino.env)
+          say! "=> Located Gemfile for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
+        else
+          say! "=> Gemfile for #{Padrino.env} not found!"
+        end
+      end
 
-    # Loads the vendored gems or system wide gems through Gemfile
-    def load_required_gems
-      require root('vendor', 'gems', 'environment')
-      Bundler.require_env(Padrino.env)
-      say! "=> Loaded bundled gems for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
-    rescue LoadError
-      require 'bundler'
-      if File.exist?(root("Gemfile"))
-        Bundler::Dsl.load_gemfile(root("Gemfile")).require_env(Padrino.env)
-        say! "=> Located Gemfile for #{Padrino.env} with #{Padrino.support.to_s.humanize}"
-      else
-        say! "=> Gemfile for #{Padrino.env} not found!"
+      # Loads for each mounted applications their models
+      def load_apps_models
+        Padrino.mounted_apps.each { |mounted_app| load_dependencies("#{mounted_app.app_root}/models/**/*.rb")  }
       end
-    end
 
-    # Prints out a message to the stdout if not in test environment
-    def say(text)
-      print text if Padrino.env != :test
-    end
+      # Prints out a message to the stdout if not in test environment
+      def say(text)
+        print text if Padrino.env != :test
+      end
     
-    # Puts out a message to the stdout if not in test environment
-    def say!(text)
-      puts text if Padrino.env != :test
-    end
+      # Puts out a message to the stdout if not in test environment
+      def say!(text)
+        puts text if Padrino.env != :test
+      end
   end
 end

data/lib/padrino-core/mounter.rb

@@ -10,7 +10,7 @@ module Padrino
       @name      = name.downcase
       @app_class = options[:app_class] || name.classify
       @app_file  = options[:app_file]  || locate_app_file
-      @app_root  = options[:app_root]
+      @app_root  = options[:app_root]  || File.dirname(@app_file)
       @app_obj   = self.app_object
     end
 

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-01-06}
+  s.date = %q{2010-01-07}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{nesquena@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +01:00
+date: 2010-01-07 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency