padrino-core 0.13.0.beta3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada2a90b4ae422b001c76fd0c1975cdc8eb83fb0
-  data.tar.gz: f02e786a62c645f53a0c099954a80e21c3123793
+  metadata.gz: df73d4a14b1d5ad90c0cee78699bfb08addd30f4
+  data.tar.gz: 7307777a18f4d046f27bbc3296afcb26bab98757
 SHA512:
-  metadata.gz: e6e7e61f93b09177a0347b1eff272a91cdacb9d3a55f1b5e65bb9902bcc4c4f6a0fd335f6be3c3b683e8fa2a0c2164bad2dcdfe7e3705b955dd5bd428d12e7d6
-  data.tar.gz: ea1d049f1f85e47f84c8b197af9c5e75d0bb21fbca7b867af1ed0c874c84a864cff2ab9952b2aa93203c8f3b8fcb4e5033a16093b8dab875c56febeb1e59c718
+  metadata.gz: c951c3160d9354c1d0cef4c195f90cfc9e725661d235033ce930cc0fc2a3c47f34db0dda0dc02d9ee23fd6af7485f3c87e2389554f7330ac1df41572dbd21582
+  data.tar.gz: bd1cd61aec6fd3de5c26c1f1e52695fb7dd4649f5d18a89a943f695b6b11f566483ec227362876800a987a7889f818fee8a74cd55bb0f3356735ae1b30b8fa9a

data/lib/padrino-core.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'padrino-core/version'
 require 'padrino-support'
+require 'padrino-core/configuration'
 require 'padrino-core/application'
 
 require 'padrino-core/caller'
@@ -25,6 +26,7 @@ module Padrino
   class ApplicationLoadError < RuntimeError # @private
   end
 
+  extend Configuration
   extend Loader
 
   class << self

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

@@ -407,7 +407,7 @@ module Padrino
         replace_instance_variable(:@_controller, args)
         replace_instance_variable(:@_defaults, options)
         replace_instance_variable(:@filters, :before => @filters[:before].dup, :after => @filters[:after].dup)
-        replace_instance_variable(:@layout, nil)
+        replace_instance_variable(:@layout, @layout)
 
         yield
 
@@ -731,7 +731,7 @@ module Padrino
 
           accept_format = CONTENT_TYPE_ALIASES[type] || type
           if types.include?(accept_format)
-            content_type(accept_format || :html, :charset => 'utf-8')
+            content_type(accept_format || :html)
           else
             catch_all ? true : halt(406)
           end
@@ -751,7 +751,7 @@ module Padrino
         mime_types = types.map{ |type| mime_type(CONTENT_TYPE_ALIASES[type] || type) }
         condition do
           halt 406 unless mime_types.include?(request.media_type)
-          content_type(mime_symbol(request.media_type), :charset => 'utf-8')
+          content_type(mime_symbol(request.media_type))
         end
       end
 
@@ -894,7 +894,6 @@ module Padrino
       #
       def content_type(type=nil, params={})
         return @_content_type unless type
-        params.delete(:charset) if type == :json
         super(type, params)
         @_content_type = type
       end
@@ -904,7 +903,7 @@ module Padrino
       def provides_any?(formats)
         accepted_format = formats.first
         type = accepted_format ? mime_symbol(accepted_format) : :html
-        content_type(CONTENT_TYPE_ALIASES[type] || type, :charset => 'utf-8')
+        content_type(CONTENT_TYPE_ALIASES[type] || type)
       end
 
       def provides_format?(types, format)
@@ -914,7 +913,7 @@ module Padrino
           halt 406 if settings.respond_to?(:treat_format_as_accept) && settings.treat_format_as_accept
           false
         else
-          content_type(format || :html, :charset => 'utf-8')
+          content_type(format || :html)
         end
       end
 

data/lib/padrino-core/caller.rb

@@ -18,7 +18,8 @@ module Padrino
     %r{rake_test_loader\.rb},
     %r{custom_require\.rb$},
     %r{active_support},
-    %r{/thor}
+    %r{/thor},
+    %r{/lib/bundler},
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##

data/lib/padrino-core/configuration.rb

@@ -0,0 +1,40 @@
+require 'ostruct'
+
+module Padrino
+  ##
+  # Padrino simple configuration module
+  #
+  module Configuration
+    ##
+    # Returns the configuration structure allowing to get and set it's values.
+    # Padrino.config is a simple Ruby OpenStruct object with no additional magic.
+    #
+    # Example:
+    #
+    #   Padrino.config.value1 = 42
+    #   exit if Padrino.config.exiting
+    #
+    def config
+      @config ||= OpenStruct.new
+    end
+
+    ##
+    # Allows to configure different environments differently. Requires a block.
+    #
+    # Example:
+    #
+    #   Padrino.configure :development do |config|
+    #     config.value2 = 'only development'
+    #   end
+    #   Padrino.configure :development, :production do |config|
+    #     config.value2 = 'both development and production'
+    #   end
+    #   Padrino.configure do |config|
+    #     config.value2 = 'any environment'
+    #   end
+    #
+    def configure(*environments)
+      yield(config) if environments.empty? || environments.include?(Padrino.env)
+    end
+  end
+end

data/lib/padrino-core/logger.rb

@@ -264,6 +264,9 @@ module Padrino
     #
     # :log_level:: Once of [:fatal, :error, :warn, :info, :debug]
     # :stream:: Once of [:to_file, :null, :stdout, :stderr] our your custom stream
+    # :log_path:: Defines log file path or directory if :stream is :to_file
+    #   If it's a file, its location is created by mkdir_p.
+    #   If it's a directory, it must exist. In this case log name is '<env>.log'
     # :log_level::
     #   The log level from, e.g. :fatal or :info. Defaults to :warn in the
     #   production environment and :debug otherwise.
@@ -279,6 +282,10 @@ module Padrino
     #   Padrino::Logger::Config[:development] = { :log_level => :debug, :stream => :to_file }
     #   # or you can edit our defaults
     #   Padrino::Logger::Config[:development][:log_level] = :error
+    #   # or change log file path
+    #   Padrino::Logger::Config[:development][:log_path] = 'logs/app-development.txt'
+    #   # or change log file directory
+    #   Padrino::Logger::Config[:development][:log_path] = '/var/logs/padrino'
     #   # or you can use your stream
     #   Padrino::Logger::Config[:development][:stream] = StringIO.new
     #
@@ -329,8 +336,18 @@ module Padrino
 
         stream = case config[:stream]
           when :to_file
-            FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
-            File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
+            if filename = config[:log_path]
+              filename = Padrino.root(filename) unless Pathname.new(filename).absolute?
+              if File.directory?(filename)
+                filename = File.join(filename, "#{Padrino.env}.log")
+              else
+                FileUtils.mkdir_p(File.dirname(filename))
+              end
+              File.new(filename, 'a+')
+            else
+              FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
+              File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
+            end
           when :null   then StringIO.new
           when :stdout then $stdout
           when :stderr then $stderr

data/lib/padrino-core/mounter.rb

@@ -96,20 +96,23 @@ module Padrino
     def map_onto(router)
       app_data = self
       app_obj = @app_obj
+
+      uri_root             = app_data.uri_root
+      public_folder_exists = File.exist?(app_obj.public_folder)
+
       if padrino_application?
-        app_obj.set :uri_root,       app_data.uri_root
-        app_obj.set :app_name,       app_data.app_obj.app_name.to_s
-        app_obj.set :app_file,       app_data.app_file unless File.exist?(app_obj.app_file)
-        app_obj.set :root,           app_data.app_root unless app_data.app_root.blank?
-        app_obj.set :public_folder,  Padrino.root('public', app_data.uri_root) unless File.exist?(app_obj.public_folder)
-        app_obj.set :static,         File.exist?(app_obj.public_folder) if app_obj.nil?
+        app_obj.set :uri_root,       uri_root
+        app_obj.set :app_name,       app_obj.app_name.to_s
+        app_obj.set :root,           app_data.app_root
+        app_obj.set :public_folder,  Padrino.root('public', uri_root) unless public_folder_exists
+        app_obj.set :static,         public_folder_exists
         app_obj.set :cascade,        app_data.cascade
       else
-        app_obj.uri_root      = app_data.uri_root
-        app_obj.public_folder = Padrino.root('public', app_data.uri_root) unless File.exist?(app_obj.public_folder)
+        app_obj.uri_root      = uri_root
+        app_obj.public_folder = Padrino.root('public', uri_root) unless public_folder_exists
       end
       app_obj.setup_application! # Initializes the app here with above settings.
-      router.map(:to => app_obj, :path => app_data.uri_root, :host => app_data.app_host)
+      router.map(:to => app_obj, :path => uri_root, :host => app_data.app_host)
     end
 
     ###
@@ -185,8 +188,10 @@ module Padrino
     # Returns the determined location of the mounted application main file.
     #
     def locate_app_file
+      app_const = app_constant
+
       candidates  = []
-      candidates << app_constant.app_file if app_constant.respond_to?(:app_file) && File.exist?(app_constant.app_file.to_s)
+      candidates << app_const.app_file if app_const.respond_to?(:app_file)
       candidates << Padrino.first_caller if File.identical?(Padrino.first_caller.to_s, Padrino.called_from.to_s)
       candidates << Padrino.mounted_root(name.downcase, "app.rb")
       simple_name = name.split("::").last.downcase

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.13.0.beta3' unless defined?(Padrino::VERSION)
+  VERSION = '0.13.0' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/test_configuration.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "PadrinoConfiguration" do
+  it 'should be able to store values' do
+    Padrino.config.val1 = 12345
+    assert_equal 12345, Padrino.config.val1
+  end
+
+  it 'should be able to configure with block' do
+    Padrino.configure do |config|
+      config.val2 = 54321
+    end
+    assert_equal 54321, Padrino.config.val2
+  end
+
+  it 'should be able to configure with block' do
+    Padrino.configure :test do |config|
+      config.test1 = 54321
+    end
+    Padrino.configure :development do |config|
+      config.test1 = 12345
+    end
+    Padrino.configure :test, :development do |config|
+      config.both1 = 54321
+    end
+    assert_equal 54321, Padrino.config.test1
+    assert_equal 54321, Padrino.config.both1
+  end
+end

data/test/test_logger.rb

@@ -1,6 +1,7 @@
 #coding:utf-8
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'logger'
+require 'tempfile'
 
 describe "PadrinoLogger" do
   before do
@@ -37,6 +38,28 @@ describe "PadrinoLogger" do
         Padrino::Logger.setup!
         assert_equal my_stream, Padrino.logger.log
       end
+
+      it 'should use a custom file path' do
+        tempfile = Tempfile.new('app.txt')
+        path = tempfile.path
+        tempfile.unlink
+        Padrino::Logger::Config[:test][:stream] = :to_file
+        Padrino::Logger::Config[:test][:log_path] = path
+        Padrino::Logger.setup!
+        assert_file_exists path
+        File.unlink(path)
+      end
+
+      it 'should use a custom log directory' do
+        tmpdir = Dir.mktmpdir
+        Padrino::Logger::Config[:test][:stream] = :to_file
+        Padrino::Logger::Config[:test][:log_path] = tmpdir
+        Padrino::Logger.setup!
+        log_path = File.join(tmpdir, 'test.log')
+        assert_file_exists log_path
+        File.unlink(log_path)
+        Dir.rmdir(tmpdir)
+      end
     end
 
     it 'should log something' do

data/test/test_routing.rb

@@ -766,12 +766,27 @@ describe "Routing" do
     assert_equal 'application/json', response["Content-Type"]
     get "/a.foo"
     assert_equal "foo", body
-    assert_equal 'application/foo;charset=utf-8', response["Content-Type"]
+    assert_equal 'application/foo', response["Content-Type"]
     get "/a"
     assert_equal "html", body
     assert_equal 'text/html;charset=utf-8', response["Content-Type"]
   end
 
+  it 'should not drop json charset' do
+    mock_app do
+      get '/' do
+        content_type :json, :charset => 'utf-16'
+      end
+      get '/a' do
+        content_type :json, 'charset' => 'utf-16'
+      end
+    end
+    get '/'
+    assert_equal 'application/json;charset=utf-16', response["Content-Type"]
+    get '/a'
+    assert_equal 'application/json;charset=utf-16', response["Content-Type"]
+  end
+
   it 'should use controllers' do
     mock_app do
       controller "/admin" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta3
+  version: 0.13.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta3
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,7 @@ files:
 - lib/padrino-core/cli/rake.rb
 - lib/padrino-core/cli/rake_tasks.rb
 - lib/padrino-core/command.rb
+- lib/padrino-core/configuration.rb
 - lib/padrino-core/ext/sinatra.rb
 - lib/padrino-core/filter.rb
 - lib/padrino-core/images/404.png
@@ -194,6 +195,7 @@ files:
 - test/fixtures/reloadable_apps/main/app.rb
 - test/helper.rb
 - test/test_application.rb
+- test/test_configuration.rb
 - test/test_core.rb
 - test/test_csrf_protection.rb
 - test/test_dependencies.rb
@@ -226,12 +228,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-core
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem
@@ -280,6 +282,7 @@ test_files:
 - test/fixtures/reloadable_apps/main/app.rb
 - test/helper.rb
 - test/test_application.rb
+- test/test_configuration.rb
 - test/test_core.rb
 - test/test_csrf_protection.rb
 - test/test_dependencies.rb