padrino-core 0.6.3 → 0.6.7

data/lib/padrino-core/reloader.rb

@@ -1,10 +1,12 @@
 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)
@@ -26,6 +28,6 @@ module Padrino
 
       @app.call(env)
     end
-  end
-end
+  end # Reloader
+end # Padrino
 

data/lib/padrino-core/server.rb

@@ -1,10 +1,22 @@
 module Padrino
 
+  ##
+  # Run the Padrino apps as a self-hosted server using:
+  # thin, mongrel, webrick in that order.
+  # 
+  # Examples:
+  # 
+  #   Padrino.run! # with these defaults => host: "localhost", port: "3000", adapter: the first found
+  #   Padrino.run!("localhost", "4000", "mongrel") # use => host: "localhost", port: "3000", adapter: "mongrel"
+  # 
   def self.run!(*args)
     Padrino.load! unless Padrino.loaded?
     Server.build(*args)
   end
 
+  ##
+  # This module build a Padrino server
+  # 
   module Server
 
     class LoadError < RuntimeError; end
@@ -49,5 +61,5 @@ module Padrino
         end
         raise LoadError, "Server handler (#{servers.join(',')}) not found."
       end
-  end
-end
+  end # Server
+end # Padrino

data/lib/padrino-core/stat.rb

@@ -1,12 +1,14 @@
 require 'pathname'
 
 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  = {}
@@ -28,7 +30,9 @@ module Padrino
         changed
       end
 
+      ##
       # A safe Kernel::load, issuing the hooks depending on the results
+      # 
       def safe_load(file, mtime)
         logger.debug "Reloading #{file}"
         load(file)
@@ -41,7 +45,7 @@ module Padrino
 
       def rotation
         files = [$0, *$LOADED_FEATURES].uniq
-        paths = ['./', *$LOAD_PATH].uniq
+        paths = ['./', *$:].uniq
 
         files.map{ |file|
           next if file =~ /\.(so|bundle)$/                   # cannot reload compiled files
@@ -54,9 +58,11 @@ module Padrino
         }.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?
@@ -79,6 +85,6 @@ module Padrino
       rescue Errno::ENOENT, Errno::ENOTDIR
         CACHE.delete(file) and false
       end
-    end
-  end
-end
+    end # self
+  end # Stat
+end # Padrino

data/lib/padrino-core/support_lite.rb

@@ -1,36 +1,38 @@
-=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#slice, Hash#slice!
-  * Hash#to_params
-  * Hash#symbolize_keys, Hash.symbolize_keys!
-  * Hash#reverse_merge, Hash#reverse_merge!
-  * SupportLite::OrderedHash
-
-=end
+##
+# 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#slice, Hash#slice!
+#   * Hash#to_params
+#   * Hash#symbolize_keys, Hash.symbolize_keys!
+#   * Hash#reverse_merge, Hash#reverse_merge!
+#   * SupportLite::OrderedHash
+# 
 require 'i18n'
 
+##
 # Load our locales
+# 
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/locale/*.yml"]
 
 module Padrino
+  ##
   # Return the current support used.
   # Can be one of: :extlib, :active_support
+  # 
   def self.support
     @_padrino_support
   end
 
-end
+end # Padrino
 
 if defined?(Extlib) # load if already using extlib
   Padrino.instance_variable_set(:@_padrino_support, :extlib)

data/lib/padrino-core/tasks.rb

@@ -1,6 +1,7 @@
 module Padrino
 
-  # Ti module it's used for bootstrap with padrino rake
+  ##
+  # This module it's used for bootstrap with padrino rake
   # thirdy party tasks, in your gem/plugin/extension you
   # need only do this:
   # 
@@ -8,10 +9,12 @@ module Padrino
   # 
   module Tasks
 
+    ##
     # Returns a list of files to handle with padrino rake
+    # 
     def self.files
       @files ||= []
     end
 
-  end
-end
+  end # Tasks
+end # Padrino

data/lib/padrino-core/version.rb

@@ -1,7 +1,13 @@
+##
 # Manages Padrino version from the VERSION file managed by Jeweler
-
+# We put this in a separate file so you can get padrino version 
+# without include full padrino core.
+#
 module Padrino
+  ##
+  # Return the current Padrino version
+  # 
   def self.version
     @version ||= File.read(File.dirname(__FILE__) + '/../../VERSION').chomp
   end
-end
+end # Padrino

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.6.3"
+  s.version = "0.6.7"
 
   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-15}
+  s.date = %q{2010-01-26}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{nesquena@gmail.com}
@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
      "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",
@@ -53,9 +52,13 @@ Gem::Specification.new do |s|
      "test/fixtures/apps/.gitignore",
      "test/fixtures/apps/complex.rb",
      "test/fixtures/apps/simple.rb",
+     "test/fixtures/dependencies/a.rb",
+     "test/fixtures/dependencies/b.rb",
+     "test/fixtures/dependencies/c.rb",
      "test/helper.rb",
      "test/test_application.rb",
      "test/test_core.rb",
+     "test/test_dependencies.rb",
      "test/test_logger.rb",
      "test/test_mounter.rb",
      "test/test_reloader_complex.rb",

data/test/fixtures/apps/simple.rb

@@ -15,4 +15,10 @@ SimpleDemo.controllers do
   end
 end
 
-Padrino.load! # Replace this with Parino.run! unless Padrino.loaded? if you want to run the app standalone
+## If you want use this as a standalone app uncomment:
+# 
+# Padrino.mount_core("SimpleDemo")
+# Padrino.run! unless Padrino.loaded? # If you enable reloader prevent to re-run the app
+# 
+
+Padrino.load!

data/test/fixtures/dependencies/a.rb

@@ -0,0 +1,4 @@
+A = "A"
+
+# But here we need some of b.rb
+A_result = [B, A]

data/test/fixtures/dependencies/b.rb

@@ -0,0 +1,4 @@
+B = "B"
+
+# Here we need some of c.rb
+B_result = [C, B]

data/test/fixtures/dependencies/c.rb

@@ -0,0 +1 @@
+C = "C"

data/test/helper.rb

@@ -18,6 +18,14 @@ module Kernel
     log_buffer.string
   end
   alias :silence_stdout :silence_logger
+
+  def silence_warnings
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    yield
+  ensure
+    $VERBOSE = old_verbose
+  end unless respond_to?(:silence_warnings)
+
 end
 
 class Class

data/test/test_core.rb

@@ -5,8 +5,11 @@ class TestCore < Test::Unit::TestCase
   context 'for core functionality' do
 
     should 'check some global methods' do
-      assert_respond_to Padrino, :env
       assert_respond_to Padrino, :root
+      assert_respond_to Padrino, :env
+      assert_respond_to Padrino, :application
+      assert_respond_to Padrino, :set_encoding
+      assert_respond_to Padrino, :require_dependencies!
       assert_respond_to Padrino, :load!
       assert_respond_to Padrino, :reload!
       assert_respond_to Padrino, :version
@@ -16,7 +19,20 @@ class TestCore < Test::Unit::TestCase
       assert_equal :test, Padrino.env
       assert_match /\/test/, Padrino.root
     end
-    
+
+    should 'set correct utf-8 encoding' do
+      Padrino.set_encoding
+      if RUBY_VERSION >= '1.9'
+        assert_equal nil, $KCODE
+      else
+        assert_equal 'UTF8', $KCODE
+      end
+    end
+
+    should 'have load paths' do
+      assert_equal [Padrino.root('lib'), Padrino.root('models'), Padrino.root('shared')], Padrino.load_paths
+    end
+
     should 'raise application error if I instantiate a new padrino application without mounted apps' do
       Padrino.mounted_apps.clear
       assert_raise(Padrino::ApplicationLoadError) { Padrino.application.new }

data/test/test_dependencies.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestDependencies < Test::Unit::TestCase
+  context 'when we require a dependency that have another dependecy' do
+
+    should 'raise an error without padrino' do
+      assert_raise NameError do
+        require "fixtures/dependencies/a.rb"
+        require "fixtures/dependencies/b.rb"
+        require "fixtures/dependencies/c.rb"
+      end
+    end
+
+    should 'resolve dependency problems' do
+      silence_warnings do
+        Padrino.require_dependencies(
+          Padrino.root("fixtures/dependencies/a.rb"),
+          Padrino.root("fixtures/dependencies/b.rb"),
+          Padrino.root("fixtures/dependencies/c.rb")
+        )
+      end
+      assert_equal ["B", "A"], A_result
+      assert_equal ["C", "B"], B_result
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.7
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +01:00
+date: 2010-01-26 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,7 +146,6 @@ files:
 - 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
@@ -159,9 +158,13 @@ files:
 - test/fixtures/apps/.gitignore
 - test/fixtures/apps/complex.rb
 - test/fixtures/apps/simple.rb
+- test/fixtures/dependencies/a.rb
+- test/fixtures/dependencies/b.rb
+- test/fixtures/dependencies/c.rb
 - test/helper.rb
 - test/test_application.rb
 - test/test_core.rb
+- test/test_dependencies.rb
 - test/test_logger.rb
 - test/test_mounter.rb
 - test/test_reloader_complex.rb