padrino-core 0.6.7 → 0.7.0

data/README.rdoc

@@ -389,6 +389,32 @@ An application can explicitly enable / disable reloading through the use of opti
   
 By default, reloading is enabled in development and disabled in the test and production environments.
 
+If you want to build a standalone app you need to take some precautions see example:
+
+  # simple_demo.rb
+  PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+  require 'padrino-core'
+
+  class SimpleDemo < Padrino::Application
+    set :reload, true
+
+    get "/" do
+      "This is a simple Demo!!!"
+    end
+  end
+
+  Padrino.mount_core("SimpleDemo")
+
+  Padrino.run! unless Padrino.loaded? # If you enable reloader prevent to re-run the app 
+
+  Padrino.load!
+
+Now you can run simple_demo.rb with:
+
+  $ ruby simple_demo.rb
+
+Browse http://localhost:3000 edit your file and refresh your page for see changes!
+
 === Terminal Commands
 
 Padrino also comes equipped with multiple useful terminal commands which can be activated to perform
@@ -415,6 +441,29 @@ The following commands are available:
 
 Using these commands can simplify common tasks making development that much smoother.
 
+=== Special Folders
+
+Padrino load these paths:
+
+  project/lib
+  project/models
+  project/shared/lib
+  project/shared/models
+  project/each_app/models
+
+This mean that you are free to store for example +models+ where you prefer, if you have two or more apps with same
+models you can use +project+/+shared+/+models+ or +root+/+models+.
+
+If you have only one app you still use +project+/+app+/+models+ (this is the default padrino-gen choice)
+
+Remember that if you need to load other paths you can use:
+
+  Padrino.set_load_paths("path/one")
+
+and if you need to load dependencies use:
+
+  Padrino.require_dependencies("path/one/**/*.rb")
+
 == Copyright
 
 Copyright (c) 2010 Padrino. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.7.0

data/lib/padrino-core.rb

@@ -42,7 +42,7 @@ module Padrino
     #
     def set_encoding
       unless RUBY_VERSION >= '1.9'
-        $KCODE = 'UTF8' if $KCODE == 'NONE' || $KCODE.blank?
+        $KCODE = 'U' if $KCODE == 'NONE' || $KCODE.blank?
       end
       nil
     end

data/lib/padrino-core/application.rb

@@ -188,7 +188,7 @@ module Padrino
             unless options.static? && options.public? && (request.get? || request.head?) && static_file?(request.path_info)
               request.path_info =~ /\.([^\.\/]+)$/
               @_content_type = ($1 || :html).to_sym
-              content_type(@_content_type) rescue content_type('application/octet-stream')
+              content_type(@_content_type, :charset => 'utf-8') rescue content_type('application/octet-stream')
             end
           end
         end
@@ -296,7 +296,7 @@ module Padrino
               path += "/" unless path =~ /\/$/
               path += Array(params).collect(&:inspect).join("/")
             end
-            
+
             # Now we need to parse our respond_to
             if format = options.delete(:respond_to)
               path += case format
@@ -309,10 +309,10 @@ module Padrino
                 else ".{:format,#{format}}"
               end
             end
-            
+
             # Build our controller
             controller = Array(@_controller).collect(&:to_s)
-            
+
             unless controller.empty?
               # Now we need to add our controller path only if not mapped directly
               if map.blank?
@@ -325,7 +325,7 @@ module Padrino
                 name = "#{controller_name}_#{name}".to_sym unless controller_name.blank?
               end
             end
-            
+
             # We need to have a path that start with / in some circumstances and that don't end with /
             if path != "(/)" && path != "/"
               path = "/" + path if path !~ /^\//
@@ -391,15 +391,13 @@ module Padrino
     # serving files from the public directory
     # 
     def static_file?(path_info)
-      [options.public, Padrino.root("shared/public")].find do |folder|
-        next if folder.nil?
-        public_dir = File.expand_path(folder)
-
-        path = File.expand_path(public_dir + unescape(path_info))
-        next if path[0, public_dir.length] != public_dir
-        next unless File.file?(path)
-        return path
-      end
+      return if (public_dir = options.public).nil?
+      public_dir = File.expand_path(public_dir)
+
+      path = File.expand_path(public_dir + unescape(path_info))
+      return if path[0, public_dir.length] != public_dir
+      return unless File.file?(path)
+      return path
     end
 
     private
@@ -484,7 +482,7 @@ module Padrino
         if (options[:layout].nil? || options[:layout] == true) && !self.class.templates.has_key?(:layout)
           layout = self.class.instance_variable_defined?(:@_layout) ? self.class.instance_variable_get(:@_layout) : :application
           if layout
-            options[:layout] = File.join('layouts', layout.to_s).to_sym
+            options[:layout] = Dir["#{self.options.views}/#{layout}.*"].size == 0 ? File.join('layouts', layout.to_s).to_sym : layout.to_sym
             logger.debug "Rendering layout #{options[:layout]}"
           end
         end

data/padrino-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-core}
-  s.version = "0.6.7"
+  s.version = "0.7.0"
 
   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-26}
+  s.date = %q{2010-01-31}
   s.default_executable = %q{padrino}
   s.description = %q{The Padrino core gem required for use of this framework}
   s.email = %q{nesquena@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +01:00
+date: 2010-01-31 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency