middleman-core 3.1.0.rc.2 → 3.1.0.rc.3

data/lib/vendored-middleman-deps/{padrino-core-0.10.7 → padrino-core-0.11.2}/lib/padrino-core/version.rb

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

data/lib/vendored-middleman-deps/{padrino-core-0.10.7 → padrino-core-0.11.2}/padrino-core.gemspec

@@ -30,9 +30,14 @@ Gem::Specification.new do |s|
   # s.post_install_message << " as shown here:\e[0m https://gist.github.com/1d36a35794dbbd664ea4"
   # s.post_install_message << "\n\e[32m" + ("*" * 20) + "\n\e[0m"
 
-  s.add_dependency("tilt", "~> 1.3.0")
-  s.add_dependency("sinatra", "~> 1.3.1")
-  s.add_dependency("http_router", "~> 0.10.2")
-  s.add_dependency("thor", "~> 0.15.2")
-  s.add_dependency("activesupport", "~> 3.2.0")
+  s.add_dependency("tilt", "~> 1.3.7")
+  if ENV["SINATRA_EDGE"]
+    s.add_dependency("sinatra")
+  else
+    s.add_dependency("sinatra", "~> 1.4.2")
+  end
+  s.add_dependency("http_router", "~> 0.11.0")
+  s.add_dependency("thor", "~> 0.17.0")
+  s.add_dependency("activesupport", ">= 3.1.0")
+  s.add_dependency("rack-protection", ">= 1.5.0")
 end

data/lib/vendored-middleman-deps/padrino-core-0.11.2/test/fixtures/app_gem/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in app_gem.gemspec
+gemspec

data/lib/vendored-middleman-deps/padrino-core-0.11.2/test/fixtures/app_gem/app/app.rb

@@ -0,0 +1,3 @@
+class AppGem::App < Padrino::Application
+  set :version, AppGem::VERSION
+end

data/lib/vendored-middleman-deps/padrino-core-0.11.2/test/fixtures/app_gem/app_gem.gemspec

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/app_gem/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Florian Gilcher"]
+  gem.email         = ["florian.gilcher@asquera.de"]
+  gem.description   = %q{TODO: Write a gem description}
+  gem.summary       = %q{TODO: Write a gem summary}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "app_gem"
+  gem.require_paths = ["app", "lib"]
+  gem.version       = AppGem::VERSION
+end

data/lib/vendored-middleman-deps/padrino-core-0.11.2/test/fixtures/app_gem/lib/app_gem.rb

@@ -0,0 +1,7 @@
+require 'padrino'
+
+module AppGem
+  extend Padrino::Module
+
+  gem! 'app_gem'
+end

data/lib/vendored-middleman-deps/padrino-core-0.11.2/test/fixtures/app_gem/lib/app_gem/version.rb

@@ -0,0 +1,3 @@
+module AppGem
+  VERSION = "0.0.1"
+end

data/lib/vendored-middleman-deps/{padrino-core-0.10.7 → padrino-core-0.11.2}/test/mini_shoulda.rb

@@ -1,7 +1,7 @@
 gem 'minitest'
-require 'minitest/spec'
 require 'minitest/autorun'
-require 'mocha' # Load mocha after minitest
+require 'minitest/spec'
+require 'mocha/setup'
 
 begin
   require 'ruby-debug'

data/lib/vendored-middleman-deps/{padrino-core-0.10.7 → padrino-core-0.11.2}/test/test_application.rb

@@ -1,17 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
+require 'haml'
 
 class PadrinoPristine < Padrino::Application; end
-class PadrinoTestApp < Padrino::Application; end
+class PadrinoTestApp  < Padrino::Application; end
 class PadrinoTestApp2 < Padrino::Application; end
 
 describe "Application" do
-  def setup
-    Padrino.clear!
-  end
-
-  def teardown
-    remove_views
-  end
+  before { Padrino.clear! }
+  after  { remove_views }
 
   context 'for application functionality' do
 
@@ -19,24 +15,36 @@ describe "Application" do
       assert File.identical?(__FILE__, PadrinoPristine.app_file)
       assert_equal :padrino_pristine, PadrinoPristine.app_name
       assert_equal :test, PadrinoPristine.environment
-      assert_equal Padrino.root("views"), PadrinoPristine.views
-      assert PadrinoPristine.raise_errors
+      assert_equal Padrino.root('views'), PadrinoPristine.views
+      assert  PadrinoPristine.raise_errors
       assert !PadrinoPristine.logging
       assert !PadrinoPristine.sessions
       assert !PadrinoPristine.dump_errors
       assert !PadrinoPristine.show_exceptions
-      assert PadrinoPristine.raise_errors
+      assert  PadrinoPristine.raise_errors
       assert !Padrino.configure_apps
     end
 
+    should 'check haml options on production' do
+      assert defined?(Haml), 'Haml not defined'
+      assert_equal :test, PadrinoPristine.environment
+      assert !PadrinoPristine.haml[:ugly]
+      Padrino.stub :env, :production do
+        PadrinoPristine.send :default_configuration!
+        assert_equal :production, Padrino.env
+        assert_equal :production, PadrinoPristine.environment
+        assert PadrinoPristine.haml[:ugly]
+        PadrinoPristine.environment = :test
+      end
+    end
+
     should 'check padrino specific options' do
       assert !PadrinoPristine.instance_variable_get(:@_configured)
       PadrinoPristine.send(:setup_application!)
       assert_equal :padrino_pristine, PadrinoPristine.app_name
       assert_equal 'StandardFormBuilder', PadrinoPristine.default_builder
-      assert PadrinoPristine.instance_variable_get(:@_configured)
+      assert  PadrinoPristine.instance_variable_get(:@_configured)
       assert !PadrinoPristine.reload?
-      assert !PadrinoPristine.flash
     end
 
     should 'set global project settings' do
@@ -48,18 +56,27 @@ describe "Application" do
       assert_equal PadrinoTestApp.session_secret, PadrinoTestApp2.session_secret
     end
 
+    should 'be able to configure_apps multiple times' do
+      Padrino.configure_apps { set :foo1, "bar" }
+      Padrino.configure_apps { set :foo1, "bam" }
+      Padrino.configure_apps { set :foo2, "baz" }
+      PadrinoTestApp.send(:default_configuration!)
+      assert_equal "bam", PadrinoTestApp.settings.foo1, "should have foo1 assigned to bam"
+      assert_equal "baz", PadrinoTestApp.settings.foo2, "should have foo2 assigned to baz"
+    end
+
     should "have shared sessions accessible in project" do
       Padrino.configure_apps { enable :sessions; set :session_secret, 'secret' }
       Padrino.mount("PadrinoTestApp").to("/write")
       Padrino.mount("PadrinoTestApp2").to("/read")
-      PadrinoTestApp.tap { |app| app.send(:default_configuration!)
-        app.get("/") { session[:foo] = "shared" } }
-      PadrinoTestApp2.tap { |app| app.send(:default_configuration!)
-        app.get("/") { session[:foo] } }
-      browser = Rack::Test::Session.new(Rack::MockSession.new(Padrino.application))
-      browser.get '/write'
-      browser.get '/read'
-      assert_equal 'shared', browser.last_response.body
+      PadrinoTestApp.send :default_configuration!
+      PadrinoTestApp.get('/') { session[:foo] = "shared" }
+      PadrinoTestApp2.send(:default_configuration!)
+      PadrinoTestApp2.get('/') { session[:foo] }
+      @app = Padrino.application
+      get '/write'
+      get '/read'
+      assert_equal 'shared', body
     end
 
     # compare to: test_routing: allow global provides

data/lib/vendored-middleman-deps/padrino-core-0.11.2/test/test_csrf_protection.rb

@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "Application" do
+  before { Padrino.clear! }
+  after  { remove_views }
+
+  context 'CSRF protection' do
+    context "with CSRF protection on" do
+      before do
+        mock_app do
+          enable :sessions
+          enable :protect_from_csrf
+          post('/'){ 'HI' }
+        end
+      end
+
+      should "not allow requests without tokens" do
+        post "/"
+        assert_equal 403, status
+      end
+
+      should "allow requests with correct tokens" do
+        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
+        assert_equal 200, status
+      end
+
+      should "not allow requests with incorrect tokens" do
+        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
+        assert_equal 403, status
+      end
+    end
+
+    context "without CSRF protection on" do
+      before do
+        mock_app do
+          enable :sessions
+          disable :protect_from_csrf
+          post('/'){ 'HI' }
+        end
+      end
+
+      should "allows requests without tokens" do
+        post "/"
+        assert_equal 200, status
+      end
+
+      should "allow requests with correct tokens" do
+        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
+        assert_equal 200, status        
+      end
+
+      should "allow requests with incorrect tokens" do
+        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
+        assert_equal 200, status
+      end
+    end
+
+    context "with optional CSRF protection" do
+      before do
+        mock_app do
+          enable :sessions
+          enable :protect_from_csrf
+          set :allow_disabled_csrf, true
+          post('/on') { 'HI' }
+          post('/off', :csrf_protection => false) { 'HI' }
+        end
+      end
+
+      should "allow access to routes with csrf_protection off" do
+        post "/off"
+        assert_equal 200, status
+      end
+
+      should "not allow access to routes with csrf_protection on" do
+        post "/on"
+        assert_equal 403, status
+      end
+    end
+  end
+end

data/lib/vendored-middleman-deps/{padrino-core-0.10.7 → padrino-core-0.11.2}/test/test_filters.rb

@@ -275,4 +275,74 @@ describe "Filters" do
     get '/foo'
     assert_equal 'before', test
   end
+
+  should "call before filters only once" do
+    once = ''
+    mock_app do
+      error 500 do
+        'error 500'
+      end
+      before do
+        once += 'before'
+      end
+      get :index do
+        raise Exception, 'Oops'
+      end
+    end
+
+    get '/'
+    assert_equal 'before', once
+  end
+
+  should 'catch exceptions in before filters' do
+    doodle = nil
+    mock_app do
+      after do
+        doodle = 'Been after'
+      end
+      before do
+        raise StandardError, "before"
+      end
+      get :index do
+        doodle = 'Been now'
+      end
+      error 500 do
+        "We broke #{env['sinatra.error'].message}"
+      end
+    end
+
+    get '/'
+    assert_equal 'We broke before', body
+    assert_equal nil, doodle
+  end
+
+  should 'catch exceptions in after filters if no exceptions caught before' do
+    doodle = ''
+    mock_app do
+      after do
+        doodle += ' and after'
+        raise StandardError, "after"
+      end
+      get :foo do
+        doodle = 'Been now'
+        raise StandardError, "now"
+      end
+      get :index do
+        doodle = 'Been now'
+      end
+      error 500 do
+        "We broke #{env['sinatra.error'].message}"
+      end
+    end
+
+    get '/foo'
+    assert_equal 'We broke now', body
+    assert_equal 'Been now', doodle
+
+    doodle = ''
+    get '/'
+    assert_equal 'We broke after', body
+    assert_equal 'Been now and after', doodle
+  end
+
 end

data/lib/vendored-middleman-deps/padrino-core-0.11.2/test/test_flash.rb

@@ -0,0 +1,168 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe Padrino::Flash do
+  context 'storage' do
+    before do
+      @storage = Padrino::Flash::Storage.new(
+        :success => 'Success msg',
+        :error   => 'Error msg',
+        :notice  => 'Notice msg',
+        :custom  => 'Custom msg'
+      )
+      @storage[:one] = 'One msg'
+      @storage[:two] = 'Two msg'
+    end
+
+    should 'acts like hash' do
+      assert_respond_to @storage, :[]
+    end
+
+    should 'know its size' do
+      assert_equal 4, @storage.length
+      assert_equal @storage.length, @storage.size
+    end
+
+    should 'sweep its content' do
+      assert_equal 2, @storage.sweep.size
+      assert_empty @storage.sweep
+    end
+
+    should 'discard everything' do
+      assert_empty @storage.discard.sweep
+    end
+
+    should 'discard specified key' do
+      assert_equal 1, @storage.discard(:one).sweep.size
+    end
+
+    should 'keep everything' do
+      assert_equal 2, @storage.sweep.keep.sweep.size
+    end
+
+    should 'keep only specified key' do
+      assert_equal 1, @storage.sweep.keep(:one).sweep.size
+    end
+
+    should 'not know the values you set right away' do
+      @storage[:foo] = 'bar'
+      assert_nil @storage[:foo]
+    end
+
+    should 'knows the values you set next time' do
+      @storage[:foo] = 'bar'
+      @storage.sweep
+      assert_equal 'bar', @storage[:foo]
+    end
+
+    should 'set values for now' do
+      @storage.now[:foo] = 'bar'
+      assert_equal 'bar', @storage[:foo]
+    end
+
+    should 'forgets values you set only for now next time' do
+      @storage.now[:foo] = 'bar'
+      @storage.sweep
+      assert_nil @storage[:foo]
+    end
+  end
+
+  routes = Proc.new do
+    get :index do
+      params[:key] ? flash[params[:key].to_sym].to_s : flash.now.inspect
+    end
+
+    post :index do
+      params.each { |k,v| flash[k.to_sym] = v.to_s }
+      flash.next.inspect
+    end
+
+    get :session do
+      settings.sessions?.inspect
+    end
+
+    get :redirect do
+      redirect url(:index, :key => :foo), 301, :foo => 'redirected!'
+    end
+
+    get :success do
+      flash.success = 'Yup'
+    end
+
+    get :error do
+      flash.error = 'Arg'
+    end
+
+    get :notice do
+      flash.notice = 'Mmm'
+    end
+  end
+
+  context 'padrino application without sessions' do
+    before { mock_app(&routes) }
+
+    should 'show nothing' do
+      get '/'
+      assert_equal '{}', body
+    end
+
+    should 'set a flash' do
+      post '/', :foo => :bar
+      assert_equal '{:foo=>"bar"}', body
+    end
+  end
+
+  context 'padrino application with sessions' do
+    before do
+      mock_app { enable :sessions; class_eval(&routes) }
+    end
+
+    should 'be sure have sessions enabled' do
+      assert @app.sessions
+      get '/session'
+      assert_equal 'true', body
+    end
+
+    should 'show nothing' do
+      get '/'
+      assert_equal '{}', body
+    end
+
+    should 'set a flash' do
+      post '/', :foo => :bar
+      assert_equal '{:foo=>"bar"}', body
+    end
+
+    should 'get a flash' do
+      post '/', :foo => :bar
+      get  '/', :key => :foo
+      assert_equal 'bar', body
+      post '/'
+      assert_equal '{}', body
+    end
+
+    should 'follow redirects with flash' do
+      get '/redirect'
+      follow_redirect!
+      assert_equal 'redirected!', body
+      assert 301, status
+    end
+
+    should 'set success' do
+      get '/success'
+      get '/', :key => :success
+      assert_equal 'Yup', body
+    end
+
+    should 'set error' do
+      get '/error'
+      get '/', :key => :error
+      assert_equal 'Arg', body
+    end
+
+    should 'set notice' do
+      get '/notice'
+      get '/', :key => :notice
+      assert_equal 'Mmm', body
+    end
+  end
+end