padrino-core 0.1.0 → 0.1.1

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "thor",          ">= 0.11.8"
     gem.add_development_dependency "haml",          ">= 2.2.1"
-    gem.add_development_dependency "shoulda", ">= 0"
+    gem.add_development_dependency "shoulda",       ">= 0"
     gem.add_development_dependency "mocha",         ">= 0.9.7"
     gem.add_development_dependency "rack-test",     ">= 0.5.0"
     gem.add_development_dependency "webrat",        ">= 0.5.1"

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/padrino

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+%w[rubygems activesupport thor].each { |gem| require gem }
+require File.dirname(__FILE__) + "/../lib/padrino-core/tasks"
+
+arguments = ARGV.any? ? ARGV : ['-h']
+Padrino::Tasks::Base.start(arguments)

data/lib/padrino-core.rb

@@ -5,6 +5,7 @@ Dir[File.dirname(__FILE__) + '/padrino-core/**/*.rb'].each {|file| require file
 PADRINO_ENV = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development" unless defined?(PADRINO_ENV)
 
 module Padrino
+
   # Helper method for file references.
   #
   # @param args [Array] Path components relative to ROOT_DIR.
@@ -13,18 +14,20 @@ module Padrino
   def self.root(*args)
     File.join(PADRINO_ROOT, *args)
   end
-
+  
   # Returns the prepared rack application mapping each 'mounted' application
   def self.application
     Rack::Builder.new do
       Padrino.mounted_apps.each do |app|
+        require(app.app_file)
+        app_klass = app.klass.constantize
         map app.uri_root do
-          require app.app_file
-          app.klass.constantize.set :uri_root, app.uri_root
-          run app.klass.constantize
+          app_klass.set :uri_root, app.uri_root
+          app_klass.set :app_file, app.app_file
+          run app_klass
         end
       end
     end
   end
-  
+
 end

data/lib/padrino-core/application.rb

@@ -2,7 +2,7 @@ module Padrino
   # Subclasses of this become independent Padrino applications (stemming from Sinatra::Application)
   # These subclassed applications can be easily mounted into other Padrino applications as well.
   class Application < Sinatra::Application
-    
+
     def logger
       @log_stream ||= self.class.log_to_file? ? Padrino.root("log/#{PADRINO_ENV.downcase}.log") : $stdout
       @logger   ||= Logger.new(@log_stream)
@@ -26,19 +26,20 @@ module Padrino
       # Makes the routes defined in the block and in the Modules given
       # in `extensions` available to the application
       def controllers(*extensions, &block)
+        @routes = {} if reload? # This perform a basic reload controller
         instance_eval(&block) if block_given?
-        include(*extensions) if extensions.any?
+        include(*extensions)  if extensions.any?
       end
 
       # Makes the urls defined in the block and in the Modules given
       # in `extensions` available to the application
       def urls(*extensions, &block)
         instance_eval(&block) if block_given?
-        include(*extensions) if extensions.any?
+        include(*extensions)  if extensions.any?
       end
 
       protected
-      
+
       # Setup the application by registering initializers, load paths and logger
       # Invoked automatically when an application instance is created
       def setup_application!
@@ -57,6 +58,7 @@ module Padrino
         set :logging, true
         set :sessions, true
         set :log_to_file, !development?
+        set :reload, development?
         # Padrino specific
         set :app_name, self.to_s.underscore.to_sym
         set :app_file, Padrino.mounted_root(self.app_name.to_s, "/app.rb")
@@ -72,6 +74,7 @@ module Padrino
       def register_initializers
         use Rack::Session::Cookie
         use Rack::Flash if flash?
+        use Padrino::Reloader if reload?
         Dir[Padrino.root + '/config/initializers/*.rb'].each do |file|
           Padrino.load_dependencies(file)
           file_class = File.basename(file, '.rb').classify
@@ -81,8 +84,9 @@ module Padrino
 
       # Registers all desired padrino extension helpers/routing
       def register_framework_extensions
-        register Padrino::Helpers  if padrino_helpers?
         register Padrino::Routing
+        register Padrino::Mailer
+        register Padrino::Helpers  if padrino_helpers?
       end
 
       # Require all files within the application's load paths

data/lib/padrino-core/loader.rb

@@ -3,10 +3,17 @@ module Padrino
     # Requires necessary dependencies as well as application files from root lib and models
     def load!
       load_required_gems # load bundler gems
-      load_dependencies("#{root}/lib/**/*.rb", "#{root}/models/*.rb") # load root app dependencies
+      load_dependencies("#{root}/config/apps.rb", "#{root}/lib/**/*.rb", "#{root}/models/*.rb") # load root app dependencies
+      reload! # We need to fill our Stat::CACHE but we do that only for development
+    end
+
+    # Method for reload required classes
+    def reload!
+      Stat::reload!
     end
 
     # Attempts to load/require all dependency libs that we need.
+    # If you use this method we can perform correctly a Padrino.reload!
     #
     # @param paths [Array] Path where is necessary require or load a dependency
     # @example For load all our app libs we need to do:
@@ -16,23 +23,24 @@ module Padrino
         Dir[path].each { |file| require(file) }
       end
     end
-    
+    alias_method :load_dependency, :load_dependencies
+
     # Attempts to require all dependencies with bundler; if fails, we try to use system wide gems
     def load_required_gems
       begin
         require 'bundler'
         gemfile_path = root("Gemfile")
-        puts ">> Loading GemFile #{gemfile_path}"
+        puts "=> Loading GemFile #{gemfile_path} for #{PADRINO_ENV}"
         Bundler::Environment.load(gemfile_path).require_env(PADRINO_ENV)
       rescue Bundler::DefaultManifestNotFound => e
-        puts ">> You didn't create Bundler Gemfile manifest or you are not in a Sinatra application."
+        puts "=> You didn't create Bundler Gemfile manifest or you are not in a Sinatra application."
       end
 
       begin
-        require root('/../vendor', 'gems', PADRINO_ENV)
-        puts ">> Using bundled gems"
+        load_dependencies(root('/../vendor', 'gems', PADRINO_ENV))
+        puts "=> Using bundled gems"
       rescue LoadError => e
-        puts ">> Using system wide gems (No bundled gems)"
+        puts "=> Using system wide gems (No bundled gems)"
       end
     end
   end

data/lib/padrino-core/mounter.rb

@@ -1,17 +1,19 @@
 module Padrino
   # Represents a particular mounted padrino application
   # Stores the name of the application (app folder name) and url mount path
-  # @example MountedApplication.new("blog_app").to("/blog")
-  class MountedApplication
+  # @example Mounter.new("blog_app").to("/blog")
+  # @example Mounter.new("blog_app", :app_file => "/path/to/root/app.rb").to("/blog")
+  # @example Mounter.new("blog_app", :app_class => "Blog").to("/blog")
+  class Mounter
     attr_accessor :name, :uri_root, :app_file, :klass
-    def initialize(name)
-      @name = name
-      @klass = name.classify
+    def initialize(name, options={})
+      @name     = name
+      @klass    = options[:app_class] || name.classify
+      @app_file = options[:app_file]  || Padrino.mounted_root(name, 'app.rb')
     end
 
     # registers the mounted application to Padrino
     def to(mount_url)
-      @app_file = Padrino.mounted_root(name, "app.rb")
       @uri_root = mount_url
       Padrino.mounted_apps << self
     end
@@ -30,8 +32,9 @@ module Padrino
 
     # Mounts a new sub-application onto Padrino
     # @example Padrino.mount("blog_app").to("/blog")
-    def mount(name)
-      MountedApplication.new(name)
+    # @example Padrino.mount("blog_app", :app_file => "/path/to/root/app.rb").to("/blog")
+    def mount(name, options={})
+      Mounter.new(name, options)
     end
   end
 end

data/lib/padrino-core/reloader.rb

@@ -0,0 +1,31 @@
+module Padrino
+  # High performant source reloader
+  #
+  # This class acts as Rack middleware.
+  #
+  # It is performing a check/reload cycle at the start of every request, but
+  # also respects a cool down time, during which nothing will be done.
+  class Reloader
+
+    def initialize(app, cooldown = 1, backend = Stat)
+      @app = app
+      @cooldown = cooldown
+      @last = (Time.now - cooldown)
+    end
+
+    def call(env)
+      if @cooldown and Time.now > @last + @cooldown
+        if Thread.list.size > 1
+          Thread.exclusive { Padrino.reload! }
+        else
+          Padrino.reload!
+        end
+
+        @last = Time.now
+      end
+
+      @app.call(env)
+    end
+  end
+end
+

data/lib/padrino-core/stat.rb

@@ -0,0 +1,74 @@
+module Padrino
+  # What makes it especially suited for use in a any environment is that
+  # any file will only be checked once and there will only be made one system
+  # call stat(2).
+  #
+  # Please note that this will not reload files in the background, it does so
+  # only when actively called.
+  module Stat
+    class << self
+      CACHE  = {}
+      MTIMES = {}
+
+      def reload!
+        rotation do |file, mtime|
+          previous_mtime = MTIMES[file] ||= mtime
+          safe_load(file, mtime) if mtime > previous_mtime
+        end
+      end
+
+      # A safe Kernel::load, issuing the hooks depending on the results
+      def safe_load(file, mtime)
+        puts "=> Reloading #{file}"
+        load(file)
+        file
+      rescue LoadError, SyntaxError => ex
+        $stderr.puts ex
+      ensure
+        MTIMES[file] = mtime
+      end
+
+      def rotation
+        files = [$0, *$LOADED_FEATURES].uniq
+        paths = ['./', *$LOAD_PATH].uniq
+
+        files.map{|file|
+          next if file =~ /\.(so|bundle)$/ # cannot reload compiled files
+
+          found, stat = figure_path(file, paths)
+          next unless found && stat && mtime = stat.mtime
+
+          CACHE[file] = found
+
+          yield(found, mtime)
+        }.compact
+      end
+
+      # Takes a relative or absolute +file+ name, a couple possible +paths+ that
+      # the +file+ might reside in. Returns the full path and File::Stat for the
+      # path.
+      def figure_path(file, paths)
+        found = CACHE[file]
+        found = file if !found and Pathname.new(file).absolute?
+        found, stat = safe_stat(found)
+        return found, stat if found
+
+        paths.find do |possible_path|
+          path = ::File.join(possible_path, file)
+          found, stat = safe_stat(path)
+          return ::File.expand_path(found), stat if found
+        end
+
+        return false, false
+      end
+
+      def safe_stat(file)
+        return unless file
+        stat = ::File.stat(file)
+        return file, stat if stat.file?
+      rescue Errno::ENOENT, Errno::ENOTDIR
+        CACHE.delete(file) and false
+      end
+    end
+  end
+end

data/lib/padrino-core/tasks.rb

@@ -0,0 +1,37 @@
+require 'thor'
+
+module Padrino
+  module Tasks 
+    class Base < Thor
+      include Thor::Actions
+      
+      desc "start", "Starts the Padrino application"
+      def start
+        say "Starting the Padrino application from root #{destination_root}"
+      end
+      
+      desc "stop", "Stops the Padrino application"
+      def stop
+        say "Stopping the Padrino application"
+      end
+      
+      desc "test", "Executes all the Padrino test files"
+      def test
+        say "Executing Padrino test files"
+      end
+      
+      desc "console ENVIRONMENT", "Boots up the Padrino application irb console"
+      def console(environment="development")
+        require File.dirname(__FILE__) + "/version.rb"
+        raise "Are you in a Padrino Project? We didn't find config/boot.rb !!!" unless File.exist?("config/boot.rb")
+        ENV["PADRINO_ENV"] ||= environment
+        puts "=> Loading #{environment} console (Padrino v.#{Padrino.version})"
+        irb   = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+        libs  =  " -r irb/completion"
+        libs <<  " -r config/boot"
+        libs <<  " -r #{File.dirname(__FILE__)}/tasks/console"
+        exec "#{irb} #{libs} --simple-prompt"
+      end
+    end
+  end
+end

data/lib/padrino-core/tasks/console.rb

@@ -0,0 +1,21 @@
+# Reloads classes
+def reload!
+  Padrino.reload!
+  true
+end
+
+# Show applications
+def applications
+  puts "==== List of Mounted Applications ====\n\n"
+  Padrino.mounted_apps.each do |app|
+    puts " * '#{app.name}' mapped to '#{app.uri_root}'"
+  end
+  puts
+  Padrino.mounted_apps.collect { |app| "#{app.name} => #{app.uri_root}" }
+end
+
+# Load apps
+Padrino.mounted_apps.each do |app|
+  puts "=> Loading Application #{app.name}"
+  Padrino.load_dependency(app.app_file)
+end

data/lib/padrino-core/version.rb

@@ -0,0 +1,7 @@
+# Manages Padrino version from the VERSION file managed by Jeweler
+
+module Padrino
+  def self.version
+    @version ||= File.read(File.dirname(__FILE__) + '/../../VERSION').chomp
+  end
+end

data/padrino-core.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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{2009-11-16}
+  s.date = %q{2009-11-17}
+  s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{nesquena@gmail.com}
+  s.executables = ["padrino"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -21,34 +23,35 @@ Gem::Specification.new do |s|
      ".gitignore",
      "LICENSE",
      "README.rdoc",
+     "README.rdoc",
+     "Rakefile",
      "Rakefile",
      "VERSION",
+     "bin/padrino",
      "lib/padrino-core.rb",
      "lib/padrino-core/application.rb",
      "lib/padrino-core/loader.rb",
      "lib/padrino-core/mounter.rb",
+     "lib/padrino-core/reloader.rb",
+     "lib/padrino-core/stat.rb",
      "lib/padrino-core/support_lite.rb",
+     "lib/padrino-core/tasks.rb",
+     "lib/padrino-core/tasks/console.rb",
+     "lib/padrino-core/version.rb",
      "padrino-core.gemspec",
      "test/active_support_helpers.rb",
      "test/fixtures/extended_app/app.rb",
      "test/fixtures/simple_app/app.rb",
      "test/helper.rb",
      "test/test_padrino_core.rb",
-     "test/test_padrino_mounting.rb"
+     "test/test_padrino_mounting.rb",
+     "test/test_padrino_tasks.rb"
   ]
   s.homepage = %q{http://github.com/padrino/padrino-core}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{The required Padrino core gem}
-  s.test_files = [
-    "test/active_support_helpers.rb",
-     "test/fixtures/extended_app/app.rb",
-     "test/fixtures/simple_app/app.rb",
-     "test/helper.rb",
-     "test/test_padrino_core.rb",
-     "test/test_padrino_mounting.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/fixtures/extended_app/app.rb

@@ -1,7 +1,7 @@
 require 'sinatra/base'
 require 'haml'
 
-PADRINO_ROOT = File.dirname(__FILE__)
+# PADRINO_ROOT = File.dirname(__FILE__)
 
 class ExtendedCoreDemo < Padrino::Application
   configure do

data/test/fixtures/simple_app/app.rb

@@ -1,7 +1,7 @@
 require 'sinatra/base'
 require 'haml'
 
-PADRINO_ROOT = File.dirname(__FILE__)
+# PADRINO_ROOT = File.dirname(__FILE__)
 
 class SimpleCoreDemo < Padrino::Application
   configure do

data/test/helper.rb

@@ -8,8 +8,8 @@ require 'webrat'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'active_support_helpers'
-require File.dirname(__FILE__) + '/../../padrino-helpers/lib/padrino-helpers.rb'
-require File.dirname(__FILE__) + '/../lib/padrino-core.rb'
+require 'padrino-helpers'
+require 'padrino-core'
 
 class Test::Unit::TestCase
   include Padrino::Helpers::OutputHelpers

data/test/test_padrino_core.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/simple_app/app'
+# require File.dirname(__FILE__) + '/fixtures/simple_app/app'
 
 class TestPadrinoCore < Test::Unit::TestCase
   context 'for core functionality' do

data/test/test_padrino_mounting.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/helper'
-require File.dirname(__FILE__) + '/fixtures/simple_app/app'
+# require File.dirname(__FILE__) + '/fixtures/simple_app/app'
 
 class TestPadrinoMounting < Test::Unit::TestCase
   context 'for mounting applications functionality' do

data/test/test_padrino_tasks.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/helper'
+# require File.dirname(__FILE__) + '/fixtures/simple_app/app'
+
+class TestPadrinoTasks < Test::Unit::TestCase
+  context 'for padrino command line tasks' do
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,8 +12,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -08:00
-default_executable: 
+date: 2009-11-17 00:00:00 -08:00
+default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -87,8 +87,8 @@ dependencies:
     version: 
 description: The Padrino core gem required for use of this framework
 email: nesquena@gmail.com
-executables: []
-
+executables: 
+- padrino
 extensions: []
 
 extra_rdoc_files: 
@@ -101,11 +101,17 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/padrino
 - lib/padrino-core.rb
 - lib/padrino-core/application.rb
 - lib/padrino-core/loader.rb
 - lib/padrino-core/mounter.rb
+- lib/padrino-core/reloader.rb
+- lib/padrino-core/stat.rb
 - lib/padrino-core/support_lite.rb
+- lib/padrino-core/tasks.rb
+- lib/padrino-core/tasks/console.rb
+- lib/padrino-core/version.rb
 - padrino-core.gemspec
 - test/active_support_helpers.rb
 - test/fixtures/extended_app/app.rb
@@ -113,6 +119,7 @@ files:
 - test/helper.rb
 - test/test_padrino_core.rb
 - test/test_padrino_mounting.rb
+- test/test_padrino_tasks.rb
 has_rdoc: true
 homepage: http://github.com/padrino/padrino-core
 licenses: []
@@ -141,10 +148,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: The required Padrino core gem
-test_files: 
-- test/active_support_helpers.rb
-- test/fixtures/extended_app/app.rb
-- test/fixtures/simple_app/app.rb
-- test/helper.rb
-- test/test_padrino_core.rb
-- test/test_padrino_mounting.rb
+test_files: []
+