padrino-core 0.13.0.beta1 → 0.13.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd190eb5ae35578b80e7e1f3917864308bf6be3a
-  data.tar.gz: 8927013bd7f6c5c190a894780efd38d842e9bc87
+  metadata.gz: 9157558167a224779bc75315038e491ff4817df7
+  data.tar.gz: 7b3b6f87d38b17584c7b4f513279062e262c69ad
 SHA512:
-  metadata.gz: 6b1db6d4f4ebfd97f9a0b1383f94a8f19e8d10f4b9b71d33ee7a8b8be6ba2e5d9a5227dda9b5a57ed28595127646a508fd8cc7bce4dfa1e52400757f1bc5b468
-  data.tar.gz: a5ccf5a769094f21b189f30fbdf06914ad977c3c7a7caf794cbf4bf56ec361bcc5514c144b91f9c0e96c5a3de875bac84a863d27b142b23f8745b856cdd47e73
+  metadata.gz: 808a48bbb9e9ce5963a80e9ecfca40ec6122f3152efe6aecc150d1a8a6a8c87958b3efc1f3c391c4792fb5169c8d96e223f1783ac908a4a644c3b1ef0d56d060
+  data.tar.gz: 94db6c26a4c2162e15a550c58fabe704da50f9d3d7adbb0ee479364441ea697828ff7ad25c34ff917143f2ef7de04b2a380f4453d33c8eed4ed953421fba3abb

data/README.rdoc

@@ -291,4 +291,4 @@ For a complete overview of Padrino terminal commands, check out the
 
 == Copyright
 
-Copyright (c) 2011-2013 Padrino. See LICENSE for details.
+Copyright (c) 2011-2015 Padrino. See LICENSE for details.

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

@@ -916,6 +916,7 @@ module Padrino
       end
 
       def filter!(type, base=settings)
+        filter! type, base.superclass if base.superclass.respond_to?(:filters)
         base.filters[type].each { |block| instance_eval(&block) }
       end
 

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

@@ -4,35 +4,6 @@ module Padrino
   #
   # @private
   class ShowExceptions < Sinatra::ShowExceptions
-    if Sinatra::VERSION <= '1.4.5'
-      def call(env)
-        @app.call(env)
-      rescue Exception => e
-        errors, env["rack.errors"] = env["rack.errors"], @@eats_errors
-
-        if prefers_plain_text?(env)
-          content_type = "text/plain"
-          exception_string = dump_exception(e)
-        else
-          content_type = "text/html"
-          exception_string = pretty(env, e)
-        end
-
-        env["rack.errors"] = errors
-
-        # Post 893a2c50 in rack/rack, the #pretty method above, implemented in
-        # Rack::ShowExceptions, returns a String instead of an array.
-        body = Array(exception_string)
-
-        [
-          500,
-         {"Content-Type" => content_type,
-          "Content-Length" => Rack::Utils.bytesize(body.join).to_s},
-         body
-        ]
-      end
-    end
-
     private
 
     def frame_class(frame)

data/lib/padrino-core/cli/rake_tasks.rb

@@ -1,11 +1,3 @@
-Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
-  begin
-    load(file)
-  rescue LoadError => e
-    warn "#{file}: #{e.message}"
-  end
-end
-
 # Loads the Padrino applications mounted within the project.
 # Setting up the required environment for Padrino.
 task :environment do
@@ -43,6 +35,19 @@ def list_app_routes(app, args)
   end
 end
 
+def env_migration_version
+  version = ENV["MIGRATION_VERSION"]
+  if version.nil? && ENV["VERSION"]
+    deprecated = true
+    warn "Environment variable VERSION is deprecated, use MIGRATION_VERSION"
+    version = ENV["VERSION"]
+  end
+  version ? Integer(version) : nil
+rescue ArgumentError
+  warn "Environment variable #{deprecated ? '' : 'MIGRATION_'}VERSION=#{version} should be non-existant or Integer"
+  nil
+end
+
 desc "Displays a listing of the named routes within a project, optionally only those matched by [query]"
 task :routes, [:query] => :environment do |t, args|
   Padrino.mounted_apps.each do |app|
@@ -57,3 +62,11 @@ namespace :routes do
     list_app_routes(app, args) if app
   end
 end
+
+Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
+  begin
+    load(file)
+  rescue LoadError => e
+    warn "#{file}: #{e.message}"
+  end
+end

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

@@ -0,0 +1,55 @@
+module Padrino
+  class Mounter
+    module ApplicationExtension
+      attr_accessor :uri_root, :mounter_options
+      attr_writer :public_folder
+
+      def dependencies
+        @__dependencies ||= Dir.glob("#{root}/**/*.rb").delete_if { |path| path == app_file }
+      end
+
+      def prerequisites
+        @__prerequisites ||= []
+      end
+
+      def app_file
+        @__app_file ||= trace_method(:app_file) { mounter_options[:app_file] }
+      end
+
+      def root
+        @__root ||= trace_method(:root) { File.expand_path("#{app_file}/../") }
+      end
+
+      def public_folder
+        @public_folder ||= trace_method(:public_folder) { "" }
+      end
+
+      def app_name
+        @__app_name ||= mounter_options[:app_name] || self.to_s.underscore.to_sym
+      end
+
+      def setup_application!
+        @configured ||= trace_method(:setup_application!) do
+          $LOAD_PATH.concat(prerequisites)
+          require_dependencies if root.start_with?(Padrino.root)
+          true
+        end
+      end
+
+      private
+
+      def require_dependencies
+        Padrino.require_dependencies(dependencies, :force => true)
+      end
+
+      def trace_method(method_name)
+        value = baseclass.send(method_name) if baseclass != self && baseclass.respond_to?(method_name)
+        value || yield
+      end
+
+      def baseclass
+        @__baseclass ||= respond_to?(:superclass) ? superclass : self
+      end
+    end
+  end
+end

data/lib/padrino-core/mounter.rb

@@ -1,4 +1,4 @@
-require 'delegate'
+require 'padrino-core/mounter/application_extension'
 
 module Padrino
   ##
@@ -14,55 +14,6 @@ module Padrino
     class MounterException < RuntimeError
     end
 
-    class ApplicationWrapper < SimpleDelegator
-      attr_accessor :uri_root
-      attr_writer :public_folder
-
-      def initialize(app, options = {})
-        @options = options
-        super(app)
-      end
-
-      def dependencies
-        @__dependencies ||= Dir["#{root}/**/*.rb"]
-      end
-
-      def prerequisites
-        @__prerequisites ||= []
-      end
-
-      def app_file
-        return @__app_file if @__app_file
-        obj = __getobj__
-        @__app_file = obj.respond_to?(:app_file) ? obj.app_file : @options[:app_file]
-      end
-
-      def root
-        return @__root if @__root
-        obj = __getobj__
-        @__root = obj.respond_to?(:root) ? obj.root : File.expand_path("#{app_file}/../")
-      end
-
-      def public_folder
-        return @public_folder if @public_folder
-        obj = __getobj__
-        @public_folder = obj.respond_to?(:public_folder) ? obj.public_folder : ""
-      end
-
-      def app_name
-        @__app_name ||= @options[:app_name] || __getobj__.to_s.underscore.to_sym
-      end
-
-      def setup_application!
-        @configured ||=
-          begin
-            $LOAD_PATH.concat(prerequisites)
-            Padrino.require_dependencies(dependencies, :force => true) if root.start_with?(Padrino.root)
-            true
-          end
-      end
-    end
-
     attr_accessor :name, :uri_root, :app_file, :app_class, :app_root, :app_obj, :app_host, :cascade
 
     ##
@@ -83,7 +34,10 @@ module Padrino
       @app_file  = options[:app_file]  || locate_app_file
       @app_obj   = options[:app_obj]   || app_constant || locate_app_object
       ensure_app_file! || ensure_app_object!
-      @app_obj   = ApplicationWrapper.new(@app_obj, options) unless padrino_application?
+      unless padrino_application?
+        @app_obj.extend ApplicationExtension
+        @app_obj.mounter_options = options
+      end
       @app_root  = options[:app_root]  || (@app_obj.respond_to?(:root) && @app_obj.root || File.dirname(@app_file))
       @uri_root  = "/"
       @cascade   = options[:cascade] ? true == options[:cascade] ? DEFAULT_CASCADE.dup : Array(options[:cascade]) : []
@@ -174,7 +128,7 @@ module Padrino
     def named_routes
       app_obj.routes.map { |route|
         route_name = route.name.to_s
-        route_name = 
+        route_name =
           if route.controller
             route_name.split(" ", 2).map{|name| ":#{name}" }.join(", ")
           else

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

data/padrino-core.gemspec

@@ -27,9 +27,7 @@ Gem::Specification.new do |s|
   if ENV["SINATRA_EDGE"]
     s.add_dependency("sinatra")
   else
-    # remove this rack dependency after Sinatra > 1.4.5
-    s.add_dependency("rack", "< 1.6.0")
-    s.add_dependency("sinatra", "~> 1.4.2")
+    s.add_dependency("sinatra", "~> 1.4.6")
   end
   s.add_dependency("mustermann19")
   s.add_dependency("thor", "~> 0.18")

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

@@ -3,6 +3,10 @@ class RackApp
   def self.call(_)
     [200, {}, ["hello rack app"]]
   end
+
+  def self.prerequisites
+    super
+  end
 end
 
 RackApp2 = lambda{|_| [200, {}, ["hello rack app2"]] }

data/test/helper.rb

@@ -12,7 +12,6 @@ require 'padrino-core'
 
 require 'ext/minitest-spec'
 require 'ext/rack-test-methods'
-require 'ext/rack-test-utils'
 
 class MiniTest::Spec
   include Rack::Test::Methods

data/test/test_filters.rb

@@ -386,4 +386,15 @@ describe "Filters" do
     assert_equal 'We broke after', body
     assert_equal 'Been now and after', doodle
   end
+
+  it 'should trigger filters if superclass responds to :filters' do
+    class FilterApp < Padrino::Application
+      before { @foo = "foo" }
+    end
+    mock_app FilterApp do
+      get("/") { @foo }
+    end
+    get "/"
+    assert_equal "foo", body
+  end
 end

data/test/test_mounter.rb

@@ -269,6 +269,7 @@ describe "Mounter" do
       assert_equal "hello sinatra app", res.body
       res = Rack::MockRequest.new(app).get("/sinatra_app/static.html")
       assert_equal "hello static file\n", res.body
+      assert_equal [], RackApp.prerequisites
     end
 
     it 'should support the Rack Application inside padrino project' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta1
+  version: 0.13.0.beta2
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,42 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
+        version: 0.13.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta1
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 0.13.0.beta2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: mustermann19
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,7 @@ files:
 - lib/padrino-core/logger.rb
 - lib/padrino-core/module.rb
 - lib/padrino-core/mounter.rb
+- lib/padrino-core/mounter/application_extension.rb
 - lib/padrino-core/path_router.rb
 - lib/padrino-core/path_router/compiler.rb
 - lib/padrino-core/path_router/error_handler.rb