padrino-core 0.1.3 → 0.1.4

data/test/helper.rb

@@ -1,15 +1,17 @@
+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'
 require 'shoulda'
 require 'mocha'
 require 'rack/test'
 require 'webrat'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'active_support_helpers'
-
 class Test::Unit::TestCase
   include Rack::Test::Methods
   include Webrat::Methods
@@ -19,12 +21,34 @@ class Test::Unit::TestCase
     config.mode = :rack
   end
 
+  # Test App
+  class PadrinoTestApp < Padrino::Application; end
+
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(base=PadrinoTestApp, &block)
+    @app = Sinatra.new(base, &block)
+  end
+  
+  def app
+    Rack::Lint.new(@app)
+  end
+
   def stop_time_for_test
     time = Time.now
     Time.stubs(:now).returns(time)
     return time
   end
 
+  # Asserts that a file matches the pattern
+  def assert_match_in_file(pattern, file)
+    assert File.exist?(file), "File '#{file}' does not exist!"
+    assert_match pattern, File.read(file)
+  end
+end
+
+class Object
   # Silences the output by redirecting to stringIO
   # silence_logger { ...commands... } => "...output..."
   def silence_logger(&block)
@@ -34,12 +58,6 @@ class Test::Unit::TestCase
     $stdout = orig_stdout
     log_buffer.rewind && log_buffer.read
   end
-
-  # Asserts that a file matches the pattern
-  def assert_match_in_file(pattern, file)
-    assert File.exist?(file), "File '#{file}' does not exist!"
-    assert_match pattern, File.read(file)
-  end
 end
 
 module Webrat

data/test/test_padrino_core.rb

@@ -1,30 +1,20 @@
 require File.dirname(__FILE__) + '/helper'
 
-PADRINO_ENV = RACK_ENV = 'test' unless defined?(PADRINO_ENV)
-require File.dirname(__FILE__) + '/fixtures/simple_app/app'
-require 'padrino-core'
-
 class TestPadrinoCore < Test::Unit::TestCase
 
   context 'for core functionality' do
 
-    should 'check global methods' do
+    should 'check some global methods' do
       assert_respond_to Padrino, :env
       assert_respond_to Padrino, :root
       assert_respond_to Padrino, :load!
       assert_respond_to Padrino, :reload!
-      assert_respond_to Padrino, :load_dependencies
-      assert_respond_to Padrino, :load_required_gems
-      assert_respond_to Padrino, :mounted_root
-      assert_respond_to Padrino, :mounted_apps
-      assert_respond_to Padrino, :mount
-      assert_respond_to Padrino, :mount_core
       assert_respond_to Padrino, :version
     end
 
     should 'validate global helpers' do
       assert_equal "test", Padrino.env
-      assert_match %r{/test/fixtures/simple_app}, Padrino.root
+      assert_match /\/test/, Padrino.root
     end
     
     should 'raise application error if I instantiate a new padrino application without mounted apps' do
@@ -34,4 +24,4 @@ class TestPadrinoCore < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/test_padrino_mounter.rb

@@ -1,19 +1,9 @@
 require File.dirname(__FILE__) + '/helper'
 
-PADRINO_ENV = RACK_ENV = 'test' unless defined?(PADRINO_ENV)
-require File.dirname(__FILE__) + '/fixtures/simple_app/app'
-require 'padrino-core'
-
 class TestPadrinoMounter < Test::Unit::TestCase
 
-  def app
-    Padrino.application.tap { }
-  end
-
   def setup
     Padrino.mounted_apps.clear
-    Padrino.mount("core_1_demo", :app_file => "#{Padrino.root("app.rb")}").to("/core_1_demo")
-    Padrino.mount("core_2_demo", :app_file => "#{Padrino.root("app.rb")}").to("/core_2_demo")
   end
 
   context 'for mounter functionality' do
@@ -26,26 +16,67 @@ class TestPadrinoMounter < Test::Unit::TestCase
       assert_respond_to mounter, :to
       assert_respond_to mounter, :map_onto
       assert_equal "test", mounter.name
+      assert_equal "Test", mounter.app_class
       assert_equal "/path/to/test.rb", mounter.app_file
       assert_equal "/test", mounter.uri_root
       assert_nil mounter.app_root
     end
 
-    should 'mount some apps' do
-      assert_equal ["core_1_demo", "core_2_demo"], Padrino.mounted_apps.collect(&:name)
+    should 'check locate_app_file with __FILE__' do
+      mounter = Padrino::Mounter.new("test")
+      mounter.to("/test")
+      assert_equal "test", mounter.name
+      assert_equal "Test", mounter.app_class
+      assert_equal __FILE__, mounter.app_file
+      assert_equal "/test", mounter.uri_root
+      assert_nil mounter.app_root
     end
 
-    should 'mount only a core' do
-      Padrino.mounted_apps.clear
-      Padrino.mount_core(:app_file => "#{Padrino.root("app.rb")}")
+    should 'mount an app' do
+      class AnApp < Padrino::Application; end
+      
+      Padrino.mount_core("an_app")
       assert_equal ["core"], Padrino.mounted_apps.collect(&:name)
     end
+    
+    should 'mount a core' do
+      mounter = Padrino.mount_core("test")
+      assert_equal "core", mounter.name
+      assert_equal "Test", mounter.app_class
+      assert_equal Padrino.root('app/app.rb'), mounter.app_file
+      assert_equal "/", mounter.uri_root
+      assert_equal Padrino.root, mounter.app_root
+    end
+
+    should 'mount multiple apps' do
+      class OneApp < Padrino::Application; end
+      class TwoApp < Padrino::Application; end
+      
+      Padrino.mount("one_app").to("/one_app")
+      Padrino.mount("two_app").to("/two_app")
+
+      assert_equal ["one_app", "two_app"], Padrino.mounted_apps.collect(&:name)
+    end
+    
+    should 'change mounted_root' do
+      Padrino.mounted_root = "fixtures"
+      assert_equal Padrino.root("fixtures", "test", "app.rb"), Padrino.mounted_root("test", "app.rb")
+      Padrino.mounted_root = "apps"
+      assert_equal Padrino.root("apps", "test", "app.rb"), Padrino.mounted_root("test", "app.rb")
+      Padrino.mounted_root = nil
+      assert_equal Padrino.root("apps", "test", "app.rb"), Padrino.mounted_root("test", "app.rb")
+    end
 
     should 'correctly instantiate a new padrino application' do
-      visit '/core_1_demo'
-      assert_contain "Im Core1Demo"
-      visit '/core_2_demo'
-      assert_contain "Im Core2Demo"
+      mock_app do
+        get("/demo_1"){ "Im Demo 1" }
+        get("/demo_2"){ "Im Demo 2" }
+      end
+      
+      get '/demo_1'
+      assert_contain "Im Demo 1"
+      visit '/demo_2'
+      assert_contain "Im Demo 2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-11-23 00:00:00 -08:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   type: :development
@@ -92,7 +102,6 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
 - .document
@@ -104,11 +113,14 @@ files:
 - 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
@@ -116,17 +128,15 @@ files:
 - 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
 has_rdoc: true
-homepage: http://github.com/padrino/padrino-core
+homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-core
 licenses: []
 
 post_install_message: 

data/test/active_support_helpers.rb

@@ -1,7 +0,0 @@
-unless Fixnum.method_defined?(:days)
-  require 'active_support/core_ext/object/misc'
-  require 'active_support/core_ext/date'
-  require 'active_support/core_ext/time'
-  require 'active_support/core_ext/numeric'
-  require 'active_support/duration'
-end

data/test/fixtures/simple_app/Gemfile

@@ -1,9 +0,0 @@
-clear_sources
-source 'http://gemcutter.org'
- 
-# Base requirements
-gem 'sinatra', :require_as => 'sinatra/base'
-gem 'rack-flash'
- 
-# Component requirements
-gem 'haml'

data/test/fixtures/simple_app/app.rb

@@ -1,41 +0,0 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
-require 'sinatra/base'
-require 'haml'
-require 'padrino-core'
-
-class Core1Demo < Padrino::Application
-  set :app_file, File.dirname(__FILE__) + "/app.rb"
-  disable :padrino_routing
-  disable :padrino_mailer
-  disable :padrino_helpers
-  
-  get "" do
-    "Im Core1Demo"
-  end
-end
-
-class Core2Demo < Padrino::Application
-  set :app_file, File.dirname(__FILE__) + "/app.rb"
-  disable :padrino_routing
-  disable :padrino_mailer
-  disable :padrino_helpers
-  
-  get "" do
-    "Im Core2Demo"
-  end
-end
-
-class Core3Demo < Padrino::Application
-  enable :padrino_routing
-  
-  # TODO enabling this causes an error (because routing not loaded yet)
-  # get :test, :map => '/test' do
-  #   "This raises a large error"
-  # end
-end
-
-orig_stdout = $stdout
-$stdout = log_buffer = StringIO.new
-Padrino.load!
-$stdout = orig_stdout
-log_buffer.rewind && log_buffer.read

data/test/test_padrino_application.rb

@@ -1,45 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-PADRINO_ENV = RACK_ENV = 'test' unless defined?(PADRINO_ENV)
-require File.dirname(__FILE__) + '/fixtures/simple_app/app'
-require 'padrino-core'
-
-class TestPadrinoApplication < Test::Unit::TestCase
-
-  def app
-    Padrino.application.tap { }
-  end
-
-  def setup
-    Padrino.mounted_apps.clear
-    Padrino.mount("core_1_demo", :app_file => "#{Padrino.root("app.rb")}").to("/core_1_demo")
-    Padrino.mount("core_2_demo", :app_file => "#{Padrino.root("app.rb")}").to("/core_2_demo")
-  end
-
-  context 'for application functionality' do
-    
-    should 'check methods' do
-      assert_respond_to Padrino::Application, :new
-      assert_respond_to Padrino::Application, :controllers
-      assert_respond_to Padrino::Application, :setup_application!
-      assert_respond_to Padrino::Application, :default_configuration!
-      assert_respond_to Padrino::Application, :calculate_paths
-      assert_respond_to Padrino::Application, :register_initializers
-      assert_respond_to Padrino::Application, :register_framework_extensions
-      assert_respond_to Padrino::Application, :require_load_paths
-      assert_respond_to Padrino::Application, :setup_logger
-      assert_respond_to Padrino::Application, :load_paths
-      assert_respond_to Padrino::Application, :find_view_path
-    end
-
-    should 'have controllers' do
-      Core1Demo.controllers do
-        get("/controller") { "Im a controller" }
-      end
-      visit "/core_1_demo/controller"
-      assert_contain "Im a controller"
-    end
-    
-    
-  end
-end