padrino-core 0.1.3 → 0.1.4

data/lib/padrino-core/mounter.rb

@@ -1,16 +1,15 @@
 module Padrino
   # Represents a particular mounted padrino application
   # Stores the name of the application (app folder name) and url mount path
-  # @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")
+  # @example Mounter.new("blog_app", :app_file => "/path/to/blog/app.rb").to("/blog")
   class Mounter
-    attr_accessor :name, :uri_root, :app_file, :app_klass, :app_root
+    attr_accessor :name, :uri_root, :app_file, :app_class, :app_root
     def initialize(name, options={})
-      @name      = name
-      @app_klass = options[:app_class] || name.classify
-      @app_file  = options[:app_file]  || Padrino.mounted_root(name, 'app.rb')
-      @app_root  = options[:app_root]  if options[:app_root]
+      @name      = name.downcase
+      @app_class = options[:app_class] || name.classify
+      @app_file  = options[:app_file]  || locate_app_file
+      @app_root  = options[:app_root]
     end
 
     # Registers the mounted application onto Padrino
@@ -18,33 +17,37 @@ module Padrino
     def to(mount_url)
       @uri_root = mount_url
       Padrino.mounted_apps << self
+      self
     end
 
     # Maps Padrino application onto a Rack::Builder
     # For use in constructing a Rack application
     # @example @app.map_onto(@builder)
     def map_onto(builder)
-      require(self.app_file)
-      app_data, app_klass = self, self.app_klass.constantize
+      self.app_class.constantize rescue require(self.app_file)
+      app_data, app_class = self, self.app_class.constantize
       builder.map self.uri_root do
-        app_klass.set :uri_root, app_data.uri_root
-        app_klass.set :app_file, app_data.app_file
-        app_klass.set :root,     app_data.app_root if app_data.app_root
-        run app_klass
+        app_class.set :uri_root, app_data.uri_root
+        app_class.set :app_file, app_data.app_file
+        app_class.set :app_name, app_data.name
+        app_class.set :root,     app_data.app_root if app_data.app_root
+        run app_class
       end
     end
+
+    # Returns the determined location of the mounted application main file
+    def locate_app_file
+      callers_are_identical = File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
+      callers_are_identical ? Padrino.first_caller : Padrino.mounted_root(name, "app.rb")
+    end
   end
 
   class << self
+    attr_writer :mounted_root # Set root directory where padrino searches mounted apps
+
     # Returns the root to the mounted apps base directory
     def mounted_root(*args)
-      @mounted_root ||= "apps" # Other apps
-      File.join(Padrino.root, @mounted_root, *args)
-    end
-
-    # Set the root directory where padrino search mounted apps
-    def mounted_root=(value)
-      @mounted_root = value
+      File.join(Padrino.root, @mounted_root ||= "apps", *args)
     end
 
     # Returns the mounted padrino applications (MountedApp objects)
@@ -52,17 +55,20 @@ module Padrino
       @mounted_apps ||= []
     end
 
+    # Mounts the core application onto Padrino project with given app settings (file, class, root)
+    # @example Padrino.mount_core("Blog")
+    # @example Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
+    def mount_core(*args)
+      options = args.extract_options!
+      app_class = args.size > 0 ? args.first.to_s.camelize : nil
+      options.reverse_merge!(:app_class => app_class, :app_file => Padrino.root('app/app.rb'), :app_root => Padrino.root)
+      mount("core", options).to("/")
+    end
+
     # Mounts a new sub-application onto Padrino project
     # @example Padrino.mount("blog_app").to("/blog")
     def mount(name, options={})
       Mounter.new(name, options)
     end
-    
-    # Mounts the core application onto Padrino project
-    # @example Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
-    def mount_core(options={})
-      options.reverse_merge!(:app_file => Padrino.root('app/app.rb'), :app_root => Padrino.root)
-      Mounter.new("core", options).to("/")
-    end
   end
-end
+end

data/lib/padrino-core/support_lite.rb

@@ -1,9 +1,24 @@
-# This is for adding specific methods that are required by padrino if activesupport isn't required
-unless String.method_defined?(:titleize) && Hash.method_defined?(:slice)
-  require 'active_support/inflector'
-  require 'active_support/core_ext/blank'
-  require 'active_support/core_ext/class/attribute_accessors'
-  require 'active_support/core_ext/hash'
-  require 'active_support/core_ext/array'
-  require 'active_support/core_ext/module'
-end
+=begin
+
+This file determines if extlib or activesupport are already loaded, and then ensures
+the required objects and methods exist for Padrino to use.
+
+Required for Padrino to run:
+
+  * Class#cattr_accessor
+  * Module#alias_method_chain
+  * String#inflectors (classify, underscore, camelize, etc)
+  * Array#extract_options!
+  * Object#blank?
+  * Object#present?
+  * Hash#symbolize_keys
+  * Hash#reverse_merge, Hash#reverse_merge!
+  * SupportLite::OrderedHash
+
+=end
+
+if defined?(Extlib) # load if already using extlib
+  require File.dirname(__FILE__) + '/support_lite/extlib_support'
+else # load active support by default
+  require File.dirname(__FILE__) + '/support_lite/as_support'
+end

data/lib/padrino-core/support_lite/as_support.rb

@@ -0,0 +1,21 @@
+# This requires necessary pieces of ActiveSupport for the dependencies required by Padrino
+
+## Class#cattr_accessor
+require 'active_support/core_ext/class/attribute_accessors' unless Class.method_defined?(:cattr_accessor)
+## Hash#symbolize_keys, Hash#reverse_merge, Hash#reverse_merge!, Hash#extract_options!
+require 'active_support/core_ext/hash' unless Hash.method_defined?(:reverse_merge)
+## String#inflectors
+require 'active_support/inflector' unless String.method_defined?(:constantize)
+## Object#blank?, Object#present?
+require 'active_support/core_ext/blank' unless Object.method_defined?(:blank?)
+## Array#extract_options!
+require 'active_support/core_ext/array' unless Array.method_defined?(:extract_options!)
+## Module#alias_method_chain
+require 'active_support/core_ext/module' unless Module.method_defined?(:alias_method_chain)
+## SupportLite::OrderedHash
+require 'active_support/ordered_hash' unless defined?(ActiveSupport::OrderedHash)
+unless defined?(SupportLite::OrderedHash)
+  module SupportLite
+    OrderedHash = ::ActiveSupport::OrderedHash
+  end
+end

data/lib/padrino-core/support_lite/extlib_support.rb

@@ -0,0 +1,96 @@
+# This helps extlib to act like ActiveSupport for use with Padrino
+
+## Class#cattr_accessor
+unless Class.method_defined?(:cattr_accessor)
+  require 'extlib/class'
+end
+
+## SupportLite::OrderedHash
+unless defined?(SupportLite::OrderedHash)
+  require 'extlib/dictionary'
+  module SupportLite
+    OrderedHash = ::Dictionary
+  end
+end
+
+## Hash#symbolize_keys
+unless Hash.method_defined?(:symbolize_keys)
+  require 'extlib/hash'
+  require 'extlib/mash'
+  class Hash
+    def symbolize_keys
+      Mash.new(self).symbolize_keys
+    end
+  end
+end
+
+
+## Hash#reverse_merge, Hash#reverse_merge!
+unless Hash.method_defined?(:present?)
+  class Hash
+    def reverse_merge(other_hash)
+      other_hash.merge(self)
+    end
+
+    def reverse_merge!(other_hash)
+      replace(reverse_merge(other_hash))
+    end
+  end
+end
+
+## Array#extract_options!
+unless Array.method_defined?(:extract_options!)
+  class Array
+    def extract_options!
+      last.is_a?(::Hash) ? pop : {}
+    end
+  end
+end
+
+## String#inflectors
+unless String.method_defined?(:constantize)
+  require 'extlib/inflection'
+  class String
+    def classify; Extlib::Inflection.classify(self);     end
+    def underscore; Extlib::Inflection.underscore(self);  end
+    def constantize; Extlib::Inflection.constantize(self); end
+  end
+end
+
+## Object#blank?
+unless Array.method_defined?(:blank?)
+  require 'extlib/blank'
+end
+
+## Object#present?
+unless Array.method_defined?(:present?)
+  class Object
+    def present?
+      !blank?
+    end
+  end
+end
+
+## Module#alias_method_chain
+unless Module.method_defined?(:alias_method_chain)
+  def alias_method_chain(target, feature)
+    # Strip out punctuation on predicates or bang methods since
+    # e.g. target?_without_feature is not a valid method name.
+    aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+    yield(aliased_target, punctuation) if block_given?
+
+    with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
+
+    alias_method without_method, target
+    alias_method target, with_method
+
+    case
+      when public_method_defined?(without_method)
+        public target
+      when protected_method_defined?(without_method)
+        protected target
+      when private_method_defined?(without_method)
+        private target
+    end
+  end
+end

data/lib/padrino-core/tasks.rb

@@ -2,23 +2,20 @@ require 'thor'
 require File.dirname(__FILE__) + "/tasks/helpers"
 
 module Padrino
-  module Tasks 
+  module Tasks
     class Base < Thor
       include Thor::Actions
       include Padrino::Tasks::Helpers
 
       class_option :chdir, :type => :string, :aliases => "-c"
 
-      desc "start ", "Starts the Padrino application"
-
+      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"
-
-      desc "start", "Start the Padrino application"
       def start
         require File.dirname(__FILE__) + "/tasks/adapter"
         chdir(options.chdir)
@@ -45,7 +42,7 @@ module Padrino
         require File.dirname(__FILE__) + "/version"
         boot = options.chdir ? File.join(options.chdir, options.boot) : options.boot
         unless File.exist?(boot)
-          puts "=> We didn't find boot file: #{boot} !!!"
+          puts "=> Could not find boot file: #{boot.inspect} !!!"
           exit
         end
         ENV["PADRINO_ENV"] ||= environment

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

@@ -4,11 +4,12 @@ module Padrino
 
       class << self
 
-        # This metod start testing for the given app.
-        # It look for any test/test_*.rb file in your app root.
+        # This method executes tests found for the given app.
+        # It look for any spec/*_spec.rb and test/test_*.rb files in your app root.
         def start
-          puts "=> Starting Test"
-          tests = Dir['test/**/test_*.rb'] - ['test/test_helper.rb']
+          puts "=> Executing Tests..."
+          tests =  Dir['test/**/test_*.rb'] - ['test/test_helper.rb']
+          tests << Dir['spec/**/*_spec.rb'] - Dir['spec/**/spec_helper.rb']
           cmd = "ruby -rubygems -I.:lib -e'%w( #{tests.join(' ')} ).each { |file| require file }'"
           system cmd
         end

data/lib/padrino-core/version.rb

@@ -4,4 +4,4 @@ module Padrino
   def self.version
     @version ||= File.read(File.dirname(__FILE__) + '/../../VERSION').chomp
   end
-end
+end

data/padrino-core.gemspec

@@ -5,36 +5,36 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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-20}
+  s.date = %q{2009-11-23}
   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"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
      "README.rdoc",
-     "README.rdoc",
-     "Rakefile",
      "Rakefile",
      "VERSION",
      "bin/padrino",
      "lib/padrino-core.rb",
      "lib/padrino-core/application.rb",
+     "lib/padrino-core/caller.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/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",
@@ -42,17 +42,15 @@ Gem::Specification.new do |s|
      "lib/padrino-core/tasks/test.rb",
      "lib/padrino-core/version.rb",
      "padrino-core.gemspec",
-     "test/active_support_helpers.rb",
-     "test/fixtures/simple_app/.components",
-     "test/fixtures/simple_app/.gitignore",
-     "test/fixtures/simple_app/Gemfile",
-     "test/fixtures/simple_app/app.rb",
+     "test/fixtures/apps/.components",
+     "test/fixtures/apps/.gitignore",
+     "test/fixtures/apps/app.rb",
+     "test/fixtures/apps/multi.rb",
      "test/helper.rb",
-     "test/test_padrino_application.rb",
      "test/test_padrino_core.rb",
      "test/test_padrino_mounter.rb"
   ]
-  s.homepage = %q{http://github.com/padrino/padrino-core}
+  s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-core}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
@@ -66,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.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"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
@@ -74,6 +73,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sinatra>, [">= 0.9.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"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
@@ -83,6 +83,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sinatra>, [">= 0.9.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"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])

data/test/fixtures/apps/app.rb

@@ -0,0 +1,15 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+require 'rubygems'
+require 'sinatra/base'
+require 'lib/padrino-core'
+
+class SingleDemo < Padrino::Application; end
+
+SingleDemo.controllers do
+  get "/test" do
+    'This should work'
+  end
+end
+
+Padrino.mount_core("single_demo")
+Padrino.load!

data/test/fixtures/apps/multi.rb

@@ -0,0 +1,27 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+require 'sinatra/base'
+require 'padrino-core'
+
+class Multi1Demo < Padrino::Application
+  disable :padrino_routing
+  disable :padrino_mailer
+  disable :padrino_helpers
+  
+  get "" do
+    "Im Core1Demo"
+  end
+end
+
+class Mutli2Demo < Padrino::Application
+  disable :padrino_routing
+  disable :padrino_mailer
+  disable :padrino_helpers
+  
+  get "" do
+    "Im Core2Demo"
+  end
+end
+
+Padrino.mount("multi_1_demo").to("/multi_1_demo")
+Padrino.mount("multi_2_demo").to("/multi_2_demo")
+Padrino.load!