padrino-core 0.5.0 → 0.6.1

data/lib/padrino-core/cli.rb

@@ -0,0 +1,102 @@
+require 'thor'
+require 'thor/rake_compat'
+
+module Padrino
+  module Cli
+    class Base < Thor
+      include Thor::Actions
+      include Thor::RakeCompat
+
+      class_option :chdir, :type => :string, :aliases => "-c"
+
+      desc "start", "Starts the Padrino application"
+      method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
+      method_option :adapter,     :type => :string,  :aliases => "-a", :required => true, :default => :thin
+      method_option :host,        :type => :string,  :aliases => "-h", :required => true, :default => "localhost"
+      method_option :port,        :type => :numeric, :aliases => "-p", :required => true, :default => 3000
+      method_option :boot,        :type => :string,  :aliases => "-b", :required => true, :default => "config/boot.rb"
+      method_option :daemonize,   :type => :boolean, :aliases => "-d"
+      def start
+        require File.dirname(__FILE__) + "/cli/adapter"
+        boot = check_boot
+        return unless boot
+        require boot
+        Padrino::Cli::Adapter.start(options)
+      end
+
+      desc "stop", "Stops the Padrino application"
+      def stop
+        require File.dirname(__FILE__) + "/cli/adapter"
+        Padrino::Cli::Adapter.stop
+      end
+
+      desc "test", "Executes all the Padrino test files"
+      def test
+        require File.dirname(__FILE__) + "/cli/test"
+        Padrino::Cli::Test.start
+      end
+
+      desc "rake", "Execute rake tasks in {Padrino.root}/lib/tasks"
+      method_option :boot,        :type => :string, :aliases => "-b", :required => true, :default => "config/boot.rb"
+      method_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development
+      method_option :task_list,   :type => :string, :aliases => "-T"  # Only for accept rake
+      def rake(task="")
+        require 'padrino-core/support_lite'
+        require 'padrino-core/tasks'
+        boot = check_boot
+        return unless boot
+        require 'rake'
+        require boot
+        puts "=> Executing Rake..."
+        Rake.application.init
+        load(File.dirname(__FILE__) + "/cli/rake.rb")
+        Rake.application.top_level
+      end
+
+      desc "console", "Boots up the Padrino application irb console"
+      method_option :boot,        :type => :string, :aliases => "-b", :required => true, :default => "config/boot.rb"
+      method_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development
+      def console
+        require File.dirname(__FILE__) + "/version"
+        boot = check_boot
+        return unless boot
+        ARGV.clear
+        puts "=> Loading #{options.environment} console (Padrino v.#{Padrino.version})"
+        require 'irb'
+        require "irb/completion"
+        require boot
+        require File.dirname(__FILE__) + '/cli/console'
+        IRB.start
+      end
+
+      private
+        def check_boot
+          ENV["PADRINO_ENV"] ||= options.environment.to_s
+          chdir(options.chdir)
+          unless File.exist?(options.boot)
+            puts "=> Could not find boot file: #{options.boot.inspect} !!!"
+            return
+          end
+          options.boot
+        end
+
+      protected
+        def self.banner(task)
+          "padrino-gen #{task.name}"
+        end
+
+        def chdir(dir)
+          return unless dir
+          begin
+            Dir.chdir(dir.to_s)
+          rescue Errno::ENOENT
+            puts "=> Specified Padrino root '#{dir}' " +
+                 "does not appear to exist!"
+          rescue Errno::EACCES
+            puts "=> Specified Padrino root '#{dir}' " +
+                 "cannot be accessed by the current user!"
+          end
+        end
+    end
+  end
+end

data/lib/padrino-core/{tasks → cli}/adapter.rb

@@ -1,7 +1,6 @@
 module Padrino
-  module Tasks
+  module Cli
     module Adapter
-
       class << self
         # Start for the given options a rackup handler
         def start(options)

data/lib/padrino-core/{tasks → cli}/console.rb

@@ -7,7 +7,7 @@ end
 def applications
   puts "==== List of Mounted Applications ====\n\n"
   Padrino.mounted_apps.each do |app|
-    puts " * '#{app.name}' mapped to '#{app.uri_root}'"
+    puts " * %-10s mapped to      %s" % [app.name, app.uri_root]
   end
   puts
   Padrino.mounted_apps.collect { |app| "#{app.name} => #{app.uri_root}" }

data/lib/padrino-core/cli/rake.rb

@@ -0,0 +1,25 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require File.dirname(__FILE__) + '/../tasks'
+
+Dir["lib/tasks/**/*.rake"].each { |ext| load(ext) }
+Padrino::Tasks.files.flatten.uniq.each { |ext| load(ext) }
+
+def shell
+  @_shell ||= Thor::Shell::Basic.new
+end
+
+task :environment do
+  Padrino.logger_env = :test
+  Padrino.mounted_apps.each do |app|
+    Padrino.require_dependency(app.app_file)
+    app.app_object.setup_application!
+  end
+end
+
+desc 'Load the seed data from db/seeds.rb'
+task :seed => :environment do
+  seed_file = Padrino.root('db', 'seeds.rb')
+  load(seed_file) if File.exist?(seed_file)
+end

data/lib/padrino-core/{tasks → cli}/test.rb

@@ -1,7 +1,6 @@
 module Padrino
-  module Tasks
+  module Cli
     module Test
-
       class << self
 
         # This method executes tests found for the given app.
@@ -14,8 +13,8 @@ module Padrino
           cmd = "ruby -rubygems -I.:lib -e'%w( #{tests.join(' ')} ).each { |file| require file }'"
           system cmd
         end
-
       end
+
     end
   end
 end

data/lib/padrino-core/loader.rb

@@ -5,9 +5,8 @@ module Padrino
       return false if loaded?
       @_called_from = first_caller
       load_required_gems # load bundler gems
-      require_dependencies("#{root}/config/apps.rb", "#{root}/config/database.rb") # load configuration
-      load_apps_models # load all models of our apps
       require_dependencies("#{root}/lib/**/*.rb", "#{root}/models/**/*.rb") # load root app models
+      require_dependencies("#{root}/config/database.rb", "#{root}/config/apps.rb") # load configuration
       Stat.reload! # We need to fill our Stat::CACHE but we do that only for development
       Thread.current[:padrino_loaded] = true
     end
@@ -73,11 +72,6 @@ module Padrino
         end
       end
 
-      # 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
-
       # Prints out a message to the stdout if not in test environment
       def say(text)
         print text if Padrino.env != :test

data/lib/padrino-core/logger.rb

@@ -3,7 +3,11 @@ module Padrino
   def self.logger
     Thread.current[:padrino_logger] ||= Padrino::Logger.setup!
   end
-  
+
+  def self.logger_env=(env)
+    Thread.current[:padrino_logger] ||= Padrino::Logger.setup!(env)
+  end
+
   class Logger
 
     attr_accessor :level
@@ -65,8 +69,8 @@ module Padrino
 
 
     # Setup a new logger
-    def self.setup!
-      config = Config[Padrino.env] || Config[:test]
+    def self.setup!(env=nil)
+      config = Config[env || Padrino.env] || Config[:test]
       stream = case config[:stream]
         when :to_file
           FileUtils.mkdir_p(Padrino.root("log")) unless File.exists?(Padrino.root("log"))

data/lib/padrino-core/mounter.rb

@@ -32,6 +32,8 @@ module Padrino
         app_obj.set :app_name, app_data.name
         app_obj.set :app_file, app_data.app_file unless File.exist?(app_obj.app_file)
         app_obj.set :root,     app_data.app_root unless app_data.app_root.blank?
+        # We need to initialize here the app.
+        app_obj.setup_application!
         run app_obj
       end
     end

data/lib/padrino-core/support_lite.rb

@@ -20,7 +20,7 @@ Required for Padrino to run:
 =end
 require 'i18n'
 # Load our locales
-I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-core/locale/*.yml"]
+I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"]
 
 module Padrino
   # Return the current support used.

data/lib/padrino-core/tasks.rb

@@ -1,88 +1,17 @@
-require 'thor'
-require 'thor/rake_compat'
-require File.dirname(__FILE__) + "/tasks/helpers"
-
 module Padrino
-  module Tasks
-    class Base < Thor
-      include Thor::Actions
-      include Thor::RakeCompat
-      include Padrino::Tasks::Helpers
-
-      class_option :chdir, :type => :string, :aliases => "-c"
-
-      desc "start", "Starts the Padrino application"
-      method_option :environment, :type => :string,  :aliases => "-e", :required => true, :default => :development
-      method_option :adapter,     :type => :string,  :aliases => "-a", :required => true, :default => :thin
-      method_option :host,        :type => :string,  :aliases => "-h", :required => true, :default => "localhost"
-      method_option :port,        :type => :numeric, :aliases => "-p", :required => true, :default => 3000
-      method_option :boot,        :type => :string,  :aliases => "-b", :required => true, :default => "config/boot.rb"
-      method_option :daemonize,   :type => :boolean, :aliases => "-d"
-      def start
-        require File.dirname(__FILE__) + "/tasks/adapter"
-        boot = check_boot
-        return unless boot
-        require boot
-        Padrino::Tasks::Adapter.start(options)
-      end
-
-      desc "stop", "Stops the Padrino application"
-      def stop
-        require File.dirname(__FILE__) + "/tasks/adapter"
-        Padrino::Tasks::Adapter.stop
-      end
 
-      desc "test", "Executes all the Padrino test files"
-      def test
-        require File.dirname(__FILE__) + "/tasks/test"
-        Padrino::Tasks::Test.start
-      end
-
-      desc "rake", "Execute rake tasks in {Padrino.root}/lib/tasks"
-      method_option :boot,        :type => :string, :aliases => "-b", :required => true, :default => "config/boot.rb"
-      method_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development
-      def rake
-        boot = check_boot
-        return unless boot
-        require 'rake'
-        puts "=> Executing Rake..."
-        Rake.application.init
-        load(File.dirname(__FILE__) + "/tasks/rake_tasks.rb")
-        Padrino::Tasks::RakeFile.boot_file = boot
-        Rake.application.top_level
-      end
-
-      desc "console", "Boots up the Padrino application irb console"
-      method_option :boot,        :type => :string, :aliases => "-b", :required => true, :default => "config/boot.rb"
-      method_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development
-      def console
-        require File.dirname(__FILE__) + "/version"
-        boot = check_boot
-        return unless boot
-        ARGV.clear
-        puts "=> Loading #{options.environment} console (Padrino v.#{Padrino.version})"
-        require 'irb'
-        require "irb/completion"
-        require boot
-        require File.dirname(__FILE__) + '/tasks/console'
-        IRB.start
-      end
-
-      private
-        def check_boot
-          ENV["PADRINO_ENV"] ||= options.environment.to_s
-          chdir(options.chdir)
-          unless File.exist?(options.boot)
-            puts "=> Could not find boot file: #{options.boot.inspect} !!!"
-            return
-          end
-          options.boot
-        end
+  # Ti module it's used for bootstrap with padrino rake
+  # thirdy party tasks, in your gem/plugin/extension you
+  # need only do this:
+  # 
+  #   Padrino::Tasks.files << yourtask.rb
+  # 
+  module Tasks
 
-      protected
-        def self.banner(task)
-          "padrino-gen #{task.name}"
-        end
+    # Returns a list of files to handle with padrino rake
+    def self.files
+      @files ||= []
     end
+
   end
 end

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.5.0"
+  s.version = "0.6.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{2010-01-06}
+  s.date = %q{2010-01-14}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{nesquena@gmail.com}
@@ -28,22 +28,25 @@ Gem::Specification.new do |s|
      "lib/padrino-core.rb",
      "lib/padrino-core/application.rb",
      "lib/padrino-core/caller.rb",
+     "lib/padrino-core/cli.rb",
+     "lib/padrino-core/cli/adapter.rb",
+     "lib/padrino-core/cli/console.rb",
+     "lib/padrino-core/cli/rake.rb",
+     "lib/padrino-core/cli/test.rb",
+     "lib/padrino-core/images/404.png",
+     "lib/padrino-core/images/500.png",
      "lib/padrino-core/loader.rb",
      "lib/padrino-core/locale/en.yml",
      "lib/padrino-core/logger.rb",
      "lib/padrino-core/mounter.rb",
      "lib/padrino-core/reloader.rb",
+     "lib/padrino-core/routing.rb",
      "lib/padrino-core/server.rb",
      "lib/padrino-core/stat.rb",
      "lib/padrino-core/support_lite.rb",
      "lib/padrino-core/support_lite/as_support.rb",
      "lib/padrino-core/support_lite/extlib_support.rb",
      "lib/padrino-core/tasks.rb",
-     "lib/padrino-core/tasks/adapter.rb",
-     "lib/padrino-core/tasks/console.rb",
-     "lib/padrino-core/tasks/helpers.rb",
-     "lib/padrino-core/tasks/rake_tasks.rb",
-     "lib/padrino-core/tasks/test.rb",
      "lib/padrino-core/version.rb",
      "padrino-core.gemspec",
      "test/fixtures/apps/.components",
@@ -57,6 +60,7 @@ Gem::Specification.new do |s|
      "test/test_mounter.rb",
      "test/test_reloader_complex.rb",
      "test/test_reloader_simple.rb",
+     "test/test_routing.rb",
      "test/test_server.rb"
   ]
   s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-core}
@@ -72,6 +76,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<usher>, [">= 0.6.2"])
       s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_runtime_dependency(%q<bundler>, [">= 0.5.0"])
@@ -82,6 +87,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_dependency(%q<i18n>, [">= 0.3.2"])
+      s.add_dependency(%q<usher>, [">= 0.6.2"])
       s.add_dependency(%q<thor>, [">= 0.11.8"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<bundler>, [">= 0.5.0"])
@@ -93,6 +99,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
     s.add_dependency(%q<i18n>, [">= 0.3.2"])
+    s.add_dependency(%q<usher>, [">= 0.6.2"])
     s.add_dependency(%q<thor>, [">= 0.11.8"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<bundler>, [">= 0.5.0"])

data/test/fixtures/apps/complex.rb

@@ -17,11 +17,11 @@ class Complex2Demo < Padrino::Application
 end
 
 Complex1Demo.controllers do
-  get(""){ "Given random #{LibDemo.give_me_a_random}" }
+  get("(/)"){ "Given random #{LibDemo.give_me_a_random}" }
 end
 
 Complex2Demo.controllers do
-  get(""){ "The magick number is: 65!" } # Change only the number!!!
+  get("(/)"){ "The magick number is: 53!" } # Change only the number!!!
 end
 
 Padrino.load!

data/test/fixtures/apps/simple.rb

@@ -11,7 +11,7 @@ end
 
 SimpleDemo.controllers do
   get "/" do
-    'The magick number is: 60!' # Change only the number!!!
+    'The magick number is: 43!' # Change only the number!!!
   end
 end
 

data/test/helper.rb

@@ -1,9 +1,6 @@
 ENV['PADRINO_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 require 'rubygems'
 require 'padrino-core'
 require 'test/unit'