padrino-core 0.13.0.beta2 → 0.13.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9157558167a224779bc75315038e491ff4817df7
-  data.tar.gz: 7b3b6f87d38b17584c7b4f513279062e262c69ad
+  metadata.gz: ada2a90b4ae422b001c76fd0c1975cdc8eb83fb0
+  data.tar.gz: f02e786a62c645f53a0c099954a80e21c3123793
 SHA512:
-  metadata.gz: 808a48bbb9e9ce5963a80e9ecfca40ec6122f3152efe6aecc150d1a8a6a8c87958b3efc1f3c391c4792fb5169c8d96e223f1783ac908a4a644c3b1ef0d56d060
-  data.tar.gz: 94db6c26a4c2162e15a550c58fabe704da50f9d3d7adbb0ee479364441ea697828ff7ad25c34ff917143f2ef7de04b2a380f4453d33c8eed4ed953421fba3abb
+  metadata.gz: e6e7e61f93b09177a0347b1eff272a91cdacb9d3a55f1b5e65bb9902bcc4c4f6a0fd335f6be3c3b683e8fa2a0c2164bad2dcdfe7e3705b955dd5bd428d12e7d6
+  data.tar.gz: ea1d049f1f85e47f84c8b197af9c5e75d0bb21fbca7b867af1ed0c874c84a864cff2ab9952b2aa93203c8f3b8fcb4e5033a16093b8dab875c56febeb1e59c718

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

@@ -62,6 +62,7 @@ module Padrino
         set :uri_root,      '/'
         set :public_folder, proc { Padrino.root('public', uri_root) }
         set :images_path,   proc { File.join(public_folder, 'images') }
+        set :base_url,      'http://localhost'
       end
 
       def default_security

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

@@ -344,6 +344,14 @@ module Padrino
       end
       alias :url_for :url
 
+      ##
+      # Returns absolute url. By default adds 'http://localhost' before generated url.
+      # To change that `set :base_url, 'http://example.com'` in your app.
+      #
+      def absolute_url(*args)
+        base_url + url(*args)
+      end
+
       def get(path, *args, &block)
         conditions = @conditions.dup
         route('GET', path, *args, &block)
@@ -725,8 +733,7 @@ module Padrino
           if types.include?(accept_format)
             content_type(accept_format || :html, :charset => 'utf-8')
           else
-            halt 406 unless catch_all
-            false
+            catch_all ? true : halt(406)
           end
         end
       end
@@ -972,8 +979,9 @@ module Padrino
         @route = request.route_obj = route
         captured_params = captures_from_params(params)
 
-        @params.merge!(params) if params.kind_of?(Hash)
-        @params.merge!(:captures => captured_params) if !captured_params.empty? && route.path.is_a?(Regexp)
+        @params.merge!(params) { |key, original, newval| original } unless params.empty?
+        @params[:format] = params[:format] if params[:format]
+        @params[:captures] = captured_params if !captured_params.empty? && route.path.is_a?(Regexp)
 
         filter! :before if first_time
 

data/lib/padrino-core/logger.rb

@@ -390,6 +390,7 @@ module Padrino
     # Flush the entire buffer to the log object.
     #
     def flush
+      puts @buffer.size if $l
       return unless @buffer.size > 0
       @@mutex.synchronize do
         @log.write(@buffer.join(''))

data/lib/padrino-core/path_router/compiler.rb

@@ -73,7 +73,7 @@ module Padrino
       #
       def match?(offset, path)
         current_regexp = @regexps[offset]
-        return unless current_regexp === path || current_regexp === path[0..-2]
+        return unless current_regexp === path || (path.end_with?("/") && current_regexp === path[0..-2])
         @routes[offset..-1].detect{ |route| Regexp.last_match["_#{route.index}"] }
       end
 

data/lib/padrino-core/reloader.rb

@@ -251,18 +251,13 @@ module Padrino
     #
     def external_constant?(const)
       sources = object_sources(const)
-      begin
-        if sample = ObjectSpace.each_object(const).first
-          sources += object_sources(sample)
-        end
-      rescue RuntimeError => error # JRuby 1.7.12 fails to ObjectSpace.each_object
-        raise unless RUBY_PLATFORM =='java' && error.message.start_with?("ObjectSpace is disabled")
-      end
+      # consider methodless constants not external
+      return false if sources.empty?
       !sources.any?{ |source| source.start_with?(Padrino.root) }
     end
 
     ##
-    # Gets all the sources in which target's class or instance methods are defined.
+    # Gets all the sources in which target class is defined.
     #
     # Note: Method#source_location is for Ruby 1.9.3+ only.
     #
@@ -271,7 +266,14 @@ module Padrino
       target.methods.each do |method_name|
         next unless method_name.kind_of?(Symbol)
         method_object = target.method(method_name)
-        if method_object.owner == (target.class == Class ? target.singleton_class : target.class)
+        if method_object.owner == target.singleton_class
+          sources << method_object.source_location.first
+        end
+      end
+      target.instance_methods.each do |method_name|
+        next unless method_name.kind_of?(Symbol)
+        method_object = target.instance_method(method_name)
+        if method_object.owner == target
           sources << method_object.source_location.first
         end
       end

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.beta2' unless defined?(Padrino::VERSION)
+  VERSION = '0.13.0.beta3' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/fixtures/apps/stealthy/app.rb

@@ -0,0 +1,7 @@
+PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+
+class SystemStealthyClassDemo < Padrino::Application
+  set :reload, true
+end
+
+Padrino.load!

data/test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb

@@ -0,0 +1,13 @@
+class Boo
+  def self.class_method
+    "BooClass"
+  end
+end
+
+class Woo < Boo
+  def poo
+  end
+end
+
+class Soo < Boo
+end

data/test/test_logger.rb

@@ -1,3 +1,4 @@
+#coding:utf-8
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require 'logger'
 
@@ -58,6 +59,14 @@ describe "PadrinoLogger" do
       assert_match /log via alias/, @log.string
     end
 
+    it 'should not blow up on mixed or broken encoodings' do
+      skip
+      setup_logger(:log_level => :error, :auto_flush => false)
+      @logger.error "\xD0".force_encoding('BINARY')
+      @logger << 'фыв'
+      @logger.flush
+    end
+
     it 'should log an application' do
       mock_app do
         enable :logging
@@ -262,7 +271,7 @@ describe "options :source_location" do
 
   it 'should output source_location if :source_location is set to true' do
     stub_root { Padrino.logger.debug("hello world") }
-    assert_match /\[test\/test_logger\.rb:264\] hello world/, Padrino.logger.log.string
+    assert_match /\[test\/test_logger\.rb:#{__LINE__-1}\] hello world/, Padrino.logger.log.string
   end
 
   it 'should output source_location if file path is relative' do

data/test/test_reloader_system.rb

@@ -109,5 +109,15 @@ describe "SystemReloader" do
         FileUtils.rm tmp_file
       end
     end
+
+    it 'should not fail with superclass mismatch when reloading descendant classes with no instances' do
+      Padrino.clear!
+      require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/stealthy/app.rb')
+      @app = SystemStealthyClassDemo
+      Padrino.mount(SystemStealthyClassDemo).to("/")
+      get '/'
+      FileUtils.touch File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb')
+      Padrino.reload!
+    end
   end
 end

data/test/test_routing.rb

@@ -436,6 +436,16 @@ describe "Routing" do
     assert_equal 406, status
   end
 
+  it 'should provide proper content when :provides is specified and Accept: `*/*` requested' do
+    mock_app do
+      get(:text, :provides => :text) { "text" }
+    end
+    header 'Accept', '*/*'
+    get "/text"
+    assert_equal 200, status
+    assert_equal "text", body
+  end
+
   it 'should return 404 on file extensions it does not provide and flag is not set' do
     mock_app do
       get(:a, :provides => [:html, :js]){ content_type }
@@ -2325,4 +2335,43 @@ describe "Routing" do
     assert ok?
     assert_equal 'bar', body
   end
+
+  it 'should generate urls and absolute urls' do
+    mock_app do
+      get(:index) { settings.url(:index) }
+      get(:absolute) { settings.absolute_url(:absolute) }
+    end
+    get '/'
+    assert_equal '/', body
+    get '/absolute'
+    assert_equal 'http://localhost/absolute', body
+    @app.set :base_url, 'http://example.com'
+    get '/absolute'
+    assert_equal 'http://example.com/absolute', body
+  end
+
+  it 'should not match if route regexps matches with incorrect_path[0..2]' do
+    mock_app do
+      get(:index) { "bork" }
+      get("/foo") { "foo" }
+    end
+    get "/"
+    assert_equal 200, status
+    get "/a"
+    assert_equal 404, status
+    get "/foo"
+    assert_equal 200, status
+    get "/fo"
+    assert_equal 404, status
+  end
+
+  it "should maintain Sinatra's params indifference" do
+    mock_app do
+      get '/update', :with => :id do
+        "#{params[:product]['title']}==#{params[:product][:title]}"
+      end
+    end
+    get '/update/1?product[title]=test'
+    assert_equal 'test==test', body
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta2
+  version: 0.13.0.beta3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-08-02 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.beta2
+        version: 0.13.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,8 @@ files:
 - test/fixtures/apps/precompiled_app.rb
 - test/fixtures/apps/simple.rb
 - test/fixtures/apps/static.rb
+- test/fixtures/apps/stealthy/app.rb
+- test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/system_class_methods_demo.rb
 - test/fixtures/apps/system_instance_methods_demo.rb
@@ -261,6 +263,8 @@ test_files:
 - test/fixtures/apps/precompiled_app.rb
 - test/fixtures/apps/simple.rb
 - test/fixtures/apps/static.rb
+- test/fixtures/apps/stealthy/app.rb
+- test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb
 - test/fixtures/apps/system.rb
 - test/fixtures/apps/system_class_methods_demo.rb
 - test/fixtures/apps/system_instance_methods_demo.rb