padrino-core 0.14.0.rc2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8404b8357ac37d668e460e0d3c696917e6ff9856
-  data.tar.gz: 3db11b004865f9764c20d32c4e46593a6e72245b
+  metadata.gz: 40709f499ebbaa2e4cd92c62e2142eac2f9c2ab9
+  data.tar.gz: ff33963d9f849f0bd9676be85e58083c3b932f41
 SHA512:
-  metadata.gz: 0fcac954da380e620eb81d654682c88c58b3a7693e2bc5b5826576588983a8e5fce2ea5a2315adaee44dc3c05640b6d95a234e5319cec9512aff2a132bbb0074
-  data.tar.gz: b733600e6602e99991f2a73dcac2cba57eb3e0fdfa7d4b03cb905b7f286f9f105e239aed3be9412df6d62b4546b5e62b4511eed9017d27dd772b1b583164b237
+  metadata.gz: 057ae19651da64cc6b475f705bbe28f0990d38011883458f7caeec8ed1d2f34e66654e0f8d3da9e1e979757c493b57eaa1c7a21c78f5e20303040c9f8213e968
+  data.tar.gz: 0d2fdf09929e900e98a25a39dbfbfaa7cadf831c10b8a4ac7bc2d26c80ae840fb645d6b6a16abee3f764e1bafd60738bd354508a35830efd72746476b08536f3

data/lib/padrino-core/loader.rb

@@ -142,7 +142,7 @@ module Padrino
     #   require_dependencies("#{Padrino.root}/lib/**/*.rb")
     #
     def require_dependencies(*paths)
-      options = (paths.last.is_a?(Hash) ? paths.pop : {}).merge( :cyclic => true )
+      options = { :cyclic => true }.update(paths.last.is_a?(Hash) ? paths.pop : {})
 
       files = paths.flatten.flat_map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.uniq
 
@@ -155,6 +155,7 @@ module Padrino
             files.delete(file)
             loaded = true
           rescue NameError, LoadError => error
+            raise if Reloader.exclude.any?{ |path| file.start_with?(path) } || options[:cyclic] == false
             logger.devel "Cyclic dependency reload for #{error.class}: #{error.message}"
           rescue Exception => fatal
             break

data/lib/padrino-core/mounter.rb

@@ -108,6 +108,7 @@ module Padrino
         app_obj.set :static,         public_folder_exists
         app_obj.set :cascade,        app_data.cascade
       else
+        app_obj.cascade       = app_data.cascade
         app_obj.uri_root      = uri_root
         app_obj.public_folder = Padrino.root('public', uri_root) unless public_folder_exists
       end

data/lib/padrino-core/mounter/application_extension.rb

@@ -1,7 +1,7 @@
 module Padrino
   class Mounter
     module ApplicationExtension
-      attr_accessor :uri_root, :mounter_options
+      attr_accessor :uri_root, :mounter_options, :cascade
       attr_writer :public_folder
 
       def dependencies

data/lib/padrino-core/version.rb

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

data/test/fixtures/apps/mountable_apps/rack_apps.rb

@@ -1,7 +1,11 @@
 
 class RackApp
-  def self.call(_)
-    [200, {}, ["hello rack app"]]
+  def self.call(env)
+    if env['PATH_INFO'] == '/404'
+      [404, {}, ["not found ;("]]
+    else
+      [200, {}, ["hello rack app"]]
+    end
   end
 
   def self.prerequisites

data/test/fixtures/dependencies/linear/h.rb

@@ -0,0 +1 @@
+raise LoadError

data/test/fixtures/dependencies/linear/i.rb

@@ -0,0 +1 @@
+fail

data/test/helper.rb

@@ -9,7 +9,6 @@ require 'builder'
 require 'rack/test'
 require 'yaml'
 require 'padrino-core'
-require 'tilt/haml'
 
 require 'ext/minitest-spec'
 require 'ext/rack-test-methods'

data/test/test_application.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
-require 'haml'
 
 class PadrinoPristine < Padrino::Application; end
 class PadrinoTestApp  < Padrino::Application; end

data/test/test_dependencies.rb

@@ -53,5 +53,17 @@ describe "Dependencies" do
       assert_equal ["name"], F.fields
       assert_equal "", @io.string
     end
+
+    it 'should not silence LoadError raised in dependencies excluded from reloading' do
+      capture_io do
+        assert_raises(LoadError) do
+          Padrino::Reloader.exclude << Padrino.root("fixtures/dependencies/linear/h.rb")
+          Padrino.require_dependencies(
+            Padrino.root("fixtures/dependencies/linear/h.rb"),
+            Padrino.root("fixtures/dependencies/linear/i.rb"),
+          )
+        end
+      end
+    end
   end
 end

data/test/test_mounter.rb

@@ -272,6 +272,16 @@ describe "Mounter" do
       assert_equal [], RackApp.prerequisites
     end
 
+    it 'should support the Rack Application with cascading style' do
+      path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/mountable_apps/rack_apps')
+      require path
+      Padrino.mount('rack_app', :app_class => 'RackApp', :app_file => path, cascade: false).to('/rack_app')
+      Padrino.mount('sinatra_app', :app_class => 'SinatraApp', :app_file => path).to('/')
+      app = Padrino.application
+      res = Rack::MockRequest.new(app).get("/rack_app/404")
+      assert_equal "not found ;(", res.body
+    end
+
     it 'should support the Rack Application inside padrino project' do
       path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_project/app')
       api_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_project/api/app')

data/test/test_routing.rb

@@ -550,7 +550,7 @@ describe "Routing" do
 
   it 'should generate routes for format simple' do
     mock_app do
-      get(:foo, :provides => [:html, :rss]) { render :haml, "Test" }
+      get(:foo, :provides => [:html, :rss]) { "Test\n" }
     end
     get "/foo"
     assert_equal "Test\n", body
@@ -664,8 +664,8 @@ describe "Routing" do
   it 'should generate routes for format with controller' do
     mock_app do
       controller :posts do
-        get(:index, :provides => [:html, :rss, :atom, :js]) { render :haml, "Index.#{content_type}" }
-        get(:show,  :with => :id, :provides => [:html, :rss, :atom]) { render :haml, "Show.#{content_type}" }
+        get(:index, :provides => [:html, :rss, :atom, :js]) { "Index.#{content_type}\n" }
+        get(:show,  :with => :id, :provides => [:html, :rss, :atom]) { "Show.#{content_type}\n" }
       end
     end
     get "/posts"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.14.0.rc2
+  version: 0.14.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-03-15 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.14.0.rc2
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0.rc2
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +180,8 @@ files:
 - test/fixtures/dependencies/circular/f.rb
 - test/fixtures/dependencies/circular/g.rb
 - test/fixtures/dependencies/d.rb
+- test/fixtures/dependencies/linear/h.rb
+- test/fixtures/dependencies/linear/i.rb
 - test/fixtures/reloadable_apps/external/app/app.rb
 - test/fixtures/reloadable_apps/external/app/controllers/base.rb
 - test/fixtures/reloadable_apps/main/app.rb
@@ -219,12 +221,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.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The required Padrino core gem