padrino-core 0.9.13 → 0.9.14

data/bin/padrino

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems' unless defined?(Gem)
 
 # We load Padrino libs
 padrino_core_path = File.expand_path('../../lib', __FILE__)

data/lib/padrino-core/application/mounter.rb

@@ -15,12 +15,12 @@ module Padrino
     attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host
 
     def initialize(name, options={})
-      @name      = name.underscore
-      @app_class = options[:app_class] || name.classify
+      @name      = name.to_s.underscore
+      @app_class = options[:app_class] || @name.camelize
       @app_file  = options[:app_file]  || locate_app_file
-      raise MounterException, "Unable to locate app file for #{name}, try with :app_file => /path" unless @app_file
+      @app_obj   = options[:app_obj]   || app_constant || locate_app_object
+      ensure_app_file! || ensure_app_object!
       @app_root  = options[:app_root]  || File.dirname(@app_file)
-      @app_obj   = self.app_object
       @uri_root  = "/"
     end
 
@@ -67,20 +67,47 @@ module Padrino
       app_obj.set :public,   Padrino.root('public', app_data.uri_root)
       app_obj.set :static,   File.exist?(app_obj.public)
       app_obj.setup_application! # We need to initialize here the app.
-      router.map(:path => app_data.uri_root, :to => app_obj, :host => app_data.app_host)
+      router.map(:to => app_obj, :path => app_data.uri_root, :host => app_data.app_host)
     end
 
+    ###
+    # Returns the route objects for the mounted application
+    #
+    def routes
+      app_obj.routes
+    end
+
+    ###
+    # Returns the basic route information for each named route
+    #
+    #
+    def named_routes
+      app_obj.routes.map { |route|
+        name_array     = "(#{route.named.to_s.split("_").map { |piece| %Q[:#{piece}] }.join(", ")})"
+        request_method = route.as_options[:conditions][:request_method][0]
+        full_path = File.join(self.uri_root, route.path)
+        next if route.named.blank? || request_method == 'HEAD'
+        OpenStruct.new(:verb => request_method, :identifier => route.named, :name => name_array, :path => full_path)
+      }.compact
+    end
+
+    ##
+    # Makes two Mounters equal if they have the same name and uri_root
+    #
+    def ==(other)
+      other.is_a?(Mounter) && self.app_class == other.app_class && self.uri_root == other.uri_root
+    end
+    
+    protected
+    
     ##
-    # Return the class for the app
-    #
-    def app_object
-      begin
-        app_class.constantize
-      rescue
-        if app_file
-          Padrino.require_dependencies(app_file)
-          app_class.constantize
-        end
+    # Locates and requires the file to load the app constant
+    #
+    def locate_app_object
+      @_app_object ||= begin
+        ensure_app_file!
+        Padrino.require_dependencies(app_file)
+        app_constant
       end
     end
 
@@ -89,18 +116,34 @@ module Padrino
     #
     def locate_app_file
       candidates  = []
-      candidates << app_object.app_file  if app_object.respond_to?(:app_file) && File.exist?(app_object.app_file)
+      candidates << app_constant.app_file if app_constant.respond_to?(:app_file) && File.exist?(app_constant.app_file.to_s)
       candidates << Padrino.first_caller if File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
       candidates << Padrino.mounted_root(name, "app.rb")
       candidates << Padrino.root("app", "app.rb")
       candidates.find { |candidate| File.exist?(candidate) }
     end
-
+    
     ##
-    # Makes two Mounters equal if they have the same name and uri_root
+    # Returns the class object for the app if defined, nil otherwise
     #
-    def ==(other)
-      other.is_a?(Mounter) && self.name == other.name && self.uri_root == other.uri_root
+    def app_constant
+      app_class.constantize if Object.const_defined?(app_class)
+    end
+    
+    ###
+    # Raises an exception unless app_file is located properly
+    #
+    def ensure_app_file!
+      message = "Unable to locate source file for app '#{name}', try with :app_file => '/path/app.rb'"
+      raise MounterException, message unless @app_file
+    end
+    
+    ###
+    # Raises an exception unless app_obj is defined properly
+    #
+    def ensure_app_object!
+      message = "Unable to locate app for '#{name}', try with :app_class => 'MyAppClass'"
+      raise MounterException, message unless @app_obj
     end
   end
 
@@ -125,8 +168,7 @@ module Padrino
     # Inserts a Mounter object into the mounted applications (avoids duplicates)
     #
     def insert_mounted_app(mounter)
-      return false if Padrino.mounted_apps.include?(mounter)
-      Padrino.mounted_apps << mounter
+      Padrino.mounted_apps.push(mounter) unless Padrino.mounted_apps.include?(mounter)
     end
 
     ##
@@ -138,7 +180,7 @@ module Padrino
     #   Padrino.mount_core(:app_file => "/path/to/file", :app_class => "Blog")
     #
     def mount_core(*args)
-      # TODO Remove this in 0.9.13 or before 1.0
+      # TODO Remove this in 0.9.14 or pre 1.0
       warn "DEPRECATION! #{Padrino.first_caller}: Padrino.mount_core has been deprecated.\nUse Padrino.mount('AppName').to('/') instead"
       options = args.extract_options!
       app_class = args.size > 0 ? args.first.to_s.camelize : nil

data/lib/padrino-core/application.rb

@@ -68,7 +68,11 @@ module Padrino
       end
 
       ##
-      # Returns the routes of our app
+      # Returns the routes of our app.
+      #
+      # ==== Examples
+      #
+      #   MyApp.routes
       #
       def routes
         router.routes

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

@@ -15,6 +15,6 @@ end
 
 # Load apps
 Padrino.mounted_apps.each do |app|
-  puts "=> Loading Application #{app.app_object}"
-  app.app_object.setup_application!
+  puts "=> Loading Application #{app.app_class}"
+  app.app_obj.setup_application!
 end

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

@@ -23,29 +23,37 @@ Dir["lib/tasks/**/*.rake"].
 # setting up the required environment for Padrino
 task :environment do
   Padrino.mounted_apps.each do |app|
-    app.app_object.setup_application!
+    app.app_obj.setup_application!
   end
 end
 
-desc "Displays a listing of the named routes within a project"
+# lists all routes of a given app
+def list_app_routes(app, args)
+  app_routes = app.named_routes
+  app_routes.reject! { |r| r.identifier.to_s !~ /#{args.query}/ } if args.query.present?
+  app_routes.map! { |r| [r.verb, r.name, r.path] }
+  return if app_routes.empty?
+  shell.say "\nApplication: #{app.app_class}", :yellow
+  app_routes.unshift(["REQUEST", "URL", "PATH"])
+  max_col_1 = app_routes.max { |a, b| a[0].size <=> b[0].size }[0].size
+  max_col_2 = app_routes.max { |a, b| a[1].size <=> b[1].size }[1].size
+  app_routes.each_with_index do |row, i|
+    message = [row[1].ljust(max_col_2+2), row[0].center(max_col_1+2), row[2]]
+    shell.say("    " + message.join(" "), i==0 ? :bold : nil)
+  end
+end
+
+desc "Displays a listing of the named routes within a project, optionally only those matched by [query]"
 task :routes, :query, :needs => :environment do |t, args|
   Padrino.mounted_apps.each do |app|
-    app_routes = app.app_object.router.routes
-    app_routes.reject! { |r| r.named.blank? || r.as_options[:conditions][:request_method].try(:first) == 'HEAD' }
-    app_routes.reject! { |r| r.named.to_s !~ /#{args.query}/ } if args.query.present?
-    next if app_routes.empty?
-    shell.say "\nApplication: #{app.name}", :yellow
-    app_routes.map! do |route|
-      name_string     = "(#{route.named.to_s.split("_").map { |piece| %Q[:#{piece}] }.join(", ")})"
-      request_method = route.as_options[:conditions][:request_method].try(:first)
-      [request_method, name_string, route.path]
-    end
-    app_routes.unshift(["REQUEST", "URL", "PATH"])
-    max_col_1 = app_routes.max { |a, b| a[0].size <=> b[0].size }[0].size
-    max_col_2 = app_routes.max { |a, b| a[1].size <=> b[1].size }[1].size
-    app_routes.each_with_index do |row, i|
-      message = [row[1].ljust(max_col_2+2), row[0].center(max_col_1+2), row[2]]
-      shell.say("    " + message.join(" "), i==0 ? :bold : nil)
-    end
+    list_app_routes(app, args)
+  end
+end
+
+desc "Displays a listing of the named routes a given app [app]"
+namespace :routes do
+  task :app, :app, :needs => :environment do |t, args|
+    app = Padrino.mounted_apps.find { |app| app.app_class == args.app }
+    list_app_routes(app, args) if app
   end
 end

data/lib/padrino-core/reloader.rb

@@ -84,7 +84,7 @@ module Padrino
             # If the file is related to their app (i.e. a controller/mailer/helper)
             if app = Padrino.mounted_apps.find { |a| file =~ /^#{File.dirname(a.app_file)}/ }
               # We need to reload their own app
-              app.app_object.reload!
+              app.app_obj.reload!
               # App reloading will also perform safe_load of itself so we can go next
               if File.identical?(app.app_file, file)
                 MTIMES[file] = mtime # This prevent a loop

data/lib/padrino-core/version.rb

@@ -5,7 +5,7 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.13' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.14' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #

data/test/fixtures/apps/complex.rb

@@ -21,7 +21,7 @@ Complex1Demo.controllers do
 end
 
 Complex2Demo.controllers do
-  get("/"){ "The magick number is: 62!" } # Change only the number!!!
+  get("/"){ "The magick number is: 16!" } # Change only the number!!!
 end
 
 Padrino.load!

data/test/test_application.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/helper')
 class PadrinoTestApp < Padrino::Application; end
 
 class TestApplication < Test::Unit::TestCase
+  def setup
+    Padrino.mounted_apps.clear
+  end
+
   def teardown
     remove_views
   end
@@ -29,7 +33,7 @@ class TestApplication < Test::Unit::TestCase
       assert !PadrinoTestApp.flash
     end
 
-    #compare to: test_routing: allow global provides
+    # compare to: test_routing: allow global provides
     should "set content_type to :html if none can be determined" do
       mock_app do
         provides :xml
@@ -46,6 +50,5 @@ class TestApplication < Test::Unit::TestCase
       get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
       assert_equal "Foo in html", body
     end
-
   end
 end

data/test/test_mounter.rb

@@ -39,7 +39,7 @@ class TestMounter < Test::Unit::TestCase
       assert_equal ["an_app"], Padrino.mounted_apps.collect(&:name)
     end
 
-    should 'mount a core' do
+    should 'mount a primary app to root uri' do
       mounter = Padrino.mount("test", :app_file => __FILE__).to("/")
       assert_equal "test", mounter.name
       assert_equal "Test", mounter.app_class
@@ -49,7 +49,7 @@ class TestMounter < Test::Unit::TestCase
       assert_equal File.dirname(mounter.app_file), mounter.app_root
     end
 
-    should 'mount a core to url' do
+    should 'mount a primary app to sub_uri' do
       mounter = Padrino.mount("test", :app_file => __FILE__).to('/me')
       assert_equal "test", mounter.name
       assert_equal "Test", mounter.app_class
@@ -59,6 +59,16 @@ class TestMounter < Test::Unit::TestCase
       assert_equal File.dirname(mounter.app_file), mounter.app_root
     end
 
+    should "raise error when app has no located file" do
+      assert_raise(Padrino::Mounter::MounterException) { Padrino.mount("tester_app").to('/test') }
+      assert_equal 0, Padrino.mounted_apps.size
+    end
+
+    should "raise error when app has no located object" do
+      assert_raise(Padrino::Mounter::MounterException) { Padrino.mount("tester_app", :app_file => "/path/to/file.rb").to('/test') }
+      assert_equal 0, Padrino.mounted_apps.size
+    end
+
     should 'mount multiple apps' do
       class ::OneApp < Padrino::Application; end
       class ::TwoApp < Padrino::Application; end
@@ -84,6 +94,47 @@ class TestMounter < Test::Unit::TestCase
       assert_equal Padrino.root("test", "app.rb"), Padrino.mounted_root("test", "app.rb")
     end
 
+    should "be able to access routes data for mounted apps" do
+      class ::OneApp < Padrino::Application
+        get("/test") { "test" }
+        get(:index, :provides => [:js, :json]) { "index" }
+        controllers :posts do
+          get(:index) { "index" }
+          get(:new, :provides => :js) { "new" }
+          get(:show, :provides => [:js, :html], :with => :id) { "show" }
+          post(:create, :provides => :js, :with => :id) { "create" }
+        end
+      end
+      class ::TwoApp < Padrino::Application
+        controllers :users do
+          get(:index) { "users" }
+          get(:new) { "users new" }
+          post(:create) { "users create" }
+          put(:update) { "users update" }
+          delete(:destroy) { "users delete" }
+        end
+      end
+
+      Padrino.mount("one_app").to("/")
+      Padrino.mount("two_app").to("/two_app")
+
+      assert_equal 11, Padrino.mounted_apps[0].routes.size
+      assert_equal 7, Padrino.mounted_apps[1].routes.size
+      assert_equal 5, Padrino.mounted_apps[0].named_routes.size
+      assert_equal 5, Padrino.mounted_apps[1].named_routes.size
+
+      first_route = Padrino.mounted_apps[0].named_routes[3]
+      assert_equal "posts_show", first_route.identifier.to_s
+      assert_equal "(:posts, :show)", first_route.name
+      assert_equal "GET", first_route.verb
+      assert_equal "/posts/show/:id(.:format)", first_route.path
+      another_route = Padrino.mounted_apps[1].named_routes[2]
+      assert_equal "users_create", another_route.identifier.to_s
+      assert_equal "(:users, :create)", another_route.name
+      assert_equal "POST", another_route.verb
+      assert_equal "/two_app/users/create", another_route.path
+    end
+
     should 'correctly instantiate a new padrino application' do
       mock_app do
         get("/demo_1"){ "Im Demo 1" }
@@ -96,4 +147,4 @@ class TestMounter < Test::Unit::TestCase
       assert_equal "Im Demo 2", body
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 9
-  - 13
-  version: 0.9.13
+  - 14
+  version: 0.9.14
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 +02:00
+date: 2010-06-30 00:00:00 -07:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
-        - 2
-        - 5
-        version: 0.2.5
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   name: http_router
   prerelease: false