}[http://travis-ci.org/padrino/padrino-framework]
{
}[https://gemnasium.com/padrino/padrino-framework]
{
}[https://codeclimate.com/github/padrino/padrino-framework]
+{
}[https://gitter.im/padrino/padrino-framework]
+{
}[https://www.codetriage.com/padrino/padrino-framework]
+
== Preface
Padrino is a ruby framework built upon the excellent {Sinatra Web Library}[http://www.sinatrarb.com].
@@ -34,58 +37,68 @@ Form Helpers:: Builder support such as: form_tag, form_for, field_set_tag, text_
Text Helpers:: Useful formatting like: time_ago_in_words, js_escape_html, sanitize_html.
Mailer:: Fast and simple delivery support for sending emails (akin to ActionMailer).
Caching:: Simple route and fragment caching to easily speed up your web requests.
-Admin:: Builtin Admin interface (like Django)
+Admin:: Built-in Admin interface (like Django)
Logging:: Provide a unified logger that can interact with your ORM or any library.
Reloading:: Automatically reloads server code during development.
Localization:: Full support of I18n language localization and can auto-set user's locale.
Keep in mind, developers are able to individually pull in these modular components
-{into existing Sinatra applications}[http://www.padrinorb.com/guides/standalone-usage-in-sinatra]
+{into existing Sinatra applications}[http://padrinorb.com/guides/advanced-usage/standalone-usage-in-sinatra/]
or use them altogether for a full-stack Padrino application.
== Installation
-To install the padrino framework, simply grab the latest version from gemcutter:
+To install the padrino framework, simply grab the latest version from {RubyGems}[https://rubygems.org]:
$ gem install padrino
This will install the necessary padrino gems to get you started.
-Now you are ready to use this gem to enhance your sinatra projects or to create new Padrino applications.
+Now you are ready to use this gem to enhance your Sinatra projects or to create new Padrino applications.
For a more detailed look at installing Padrino,
-check out the {Installation Guide}[http://www.padrinorb.com/guides/installation].
+check out the {Installation Guide}[http://padrinorb.com/guides/getting-started/installation/].
== Usage
Padrino is a framework which builds on the existing functionality of Sinatra and provides a variety of
-additional tools and helpers to build upon that foundation. This README and Padrino documentation in general will focus
-on the enhancements to the core Sinatra functionality. To use Padrino, one should be familiar with the basic
+additional tools and helpers to build upon that foundation. This README and Padrino documentation in general will focus on the enhancements to the core Sinatra functionality. To use Padrino, one should be familiar with the basic
usage of Sinatra itself.
-You can also check out the {Getting Started}[http://www.padrinorb.com/guides/getting-started] guide
-to learn more about how Sinatra and Padrino work together.
+You can also check out the {Why Learn Padrino?}[http://padrinorb.com/guides/introduction/why-learn-padrino/] introduction to learn more about how Sinatra and Padrino work together.
-For information on how to use a specific gem in isolation within an existing Sinatra project, checkout the guide for
-{Using Padrino within Sinatra}[http://www.padrinorb.com/guides/standalone-usage-in-sinatra].
+For information on how to use a specific gem in isolation within an existing Sinatra project, checkout the guide for {Using Padrino within Sinatra}[http://padrinorb.com/guides/advanced-usage/standalone-usage-in-sinatra/].
== Getting Started
-Once a developer understands Sinatra, Padrino is quite easy to get comfortable with since Padrino is simply a superset
-of existing sinatra functionality!
+Once a developer understands Sinatra, Padrino is quite easy to get comfortable with since Padrino is simply a superset of existing Sinatra functionality!
-First, be sure to read over the {Getting Started}[http://www.padrinorb.com/guides/getting-started] guide
+First, be sure to read over the {Getting Started}[http://padrinorb.com/guides/getting-started/overview/] guide
to learn more about how Sinatra and Padrino work together.
Best way to learn more about building Padrino applications is to read following resources:
-* {Padrino Guides}[http://www.padrinorb.com/guides] - Guides outlining the major functionality within Padrino.
-* {Blog Tutorial}[http://www.padrinorb.com/guides/blog-tutorial] - Step-by-step guide to building a blog application with Padrino.
-* {Padrino API}[http://www.padrinorb.com/api/index.html] - YARD documentation for the Padrino framework.
-* {Quick Overview}[http://www.padrinorb.com/guides/basic-projects] - Outlines basic generation commands.
+* {Padrino Guides}[http://padrinorb.com/guides] - Guides outlining the major functionality within Padrino.
+* {Blog Tutorial}[http://padrinorb.com/guides/getting-started/blog-tutorial/] - Step-by-step guide to building a blog application with Padrino.
+* {Padrino API}[http://www.rubydoc.info/github/padrino/padrino-framework] - YARD documentation for the Padrino framework.
+* {Quick Overview}[http://padrinorb.com/guides/getting-started/basic-projects/] - Outlines basic generation commands.
The individual Padrino sub-gems also contain README's which outlines their functionality.
+== Further Questions
+
+Can't find an answer in the resources above?
+
+* Ask any questions on the {gitter channel}[https://gitter.im/padrino/padrino-framework].
+
+== Bug reporting
+
+Log it onto Github by {creating a new issue}[http://github.com/padrino/padrino-framework/issues].
+
+Be sure to include all relevant information, like the versions of Padrino, Rack, Sinatra, Ruby and operating system you are using.
+
+A minimal project showing the issue published on Github with Gemfile.lock is also extremely helpful.
+
== Copyright
-Copyright (c) 2012-2013 Padrino. See LICENSE for details.
+Copyright (c) 2010-2016 Padrino. See LICENSE for details.
diff --git a/Rakefile b/Rakefile
index 53c44ca32..3ea6b33d6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,26 +1,11 @@
# rake bump[X.X.X] && rake publish
-require 'rubygems' unless defined?(Gem)
-require 'fileutils' unless defined?(FileUtils)
+require 'fileutils'
require 'rake'
-require 'yard'
require File.expand_path("../padrino-core/lib/padrino-core/version.rb", __FILE__)
-ROOT = File.expand_path(File.dirname(__FILE__))
-GEM_NAME = 'padrino-framework'
-
-padrino_gems = %w[
- padrino-core
- padrino-support
- padrino-helpers
- padrino-mailer
- padrino-cache
- padrino-admin
- padrino-gen
- padrino-performance
- padrino
-]
-
-GEM_PATHS = padrino_gems.freeze
+load File.expand_path('../padrino/subgems.rb', __FILE__)
+GEM_PATHS = PADRINO_GEMS.keys
+ROOT = File.expand_path(File.dirname(__FILE__))
def sh_rake(command)
sh "#{Gem.ruby} -S rake #{command}", :verbose => true
@@ -47,7 +32,7 @@ end
desc "Clean pkg and other stuff"
task :uninstall do
- padrino_gems.each {|gem|
+ GEM_PATHS.each {|gem|
system("gem uninstall #{gem} --force -I -x 2>/dev/null")
}
end
@@ -70,11 +55,18 @@ end
desc "Executes a fresh install removing all padrino version and then reinstall all gems"
task :fresh => [:uninstall, :install, :clean]
-desc "Pushes repository to GitHub"
-task :push do
- say "Updating and verifying submodules"
+desc "Pulls latest commits and updates submodules"
+task :pull do
+ say "Pulling latest commits"
+ sh "git checkout master"
+ sh "git pull origin master"
+ say "Updating submodules"
sh "git submodule foreach git pull origin master"
sh "ls padrino-gen/lib/padrino-gen/generators/templates/static/README.rdoc"
+end
+
+desc "Pushes repository to GitHub"
+task :push => :pull do
say "Pushing to github..."
sh "git tag #{Padrino.version}"
sh "git push origin master"
@@ -93,31 +85,24 @@ task :release => :publish
desc "Run tests for all padrino stack gems"
task :test do
- # Omit the padrino metagem since no tests there
- GEM_PATHS[0..-2].each do |g|
+ GEM_PATHS.each do |g|
# Hardcode the 'cd' into the command and do not use Dir.chdir because this causes random tests to fail
sh "cd #{File.join(ROOT, g)} && #{Gem.ruby} -S rake test"
end
end
-padrino_gems.each do |element|
+GEM_PATHS.each do |element|
desc "Run tests for #{element} component"
task element.to_s do
sh "cd #{element} && #{Gem.ruby} -S rake test"
end
end
-desc "Run tests for all padrino stack gems"
-task :default => :test
-
desc "Generate documentation for the Padrino framework"
task :doc do
+ require 'yard'
YARD::CLI::Yardoc.new.run
end
-desc "Publish doc on padrinorb.com/api"
-task :pdoc => :doc do
- say "Publishing doc on padrinorb.com ..."
- sh "scp -r doc/* root@lps2.lipsiasoft.com:/mnt/www/apps/padrino/public/api/"
- sh "rm -rf doc"
-end
+desc "Run tests for all padrino stack gems"
+task :default => :test
diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
index 676e5c0bc..68e57e472 100644
--- a/gem_rake_helper.rb
+++ b/gem_rake_helper.rb
@@ -1,22 +1,21 @@
-require 'rubygems' unless defined?(Gem)
-require 'rake'
-require 'rake/testtask'
+require 'bundler/setup'
require 'bundler/gem_tasks'
+require 'rake/testtask'
require 'yard'
# Skip the releasing tag
class Bundler::GemHelper
- def release_gem(*args)
- guard_clean
- built_gem_path = build_gem
- rubygem_push(built_gem_path)
+ def version_tag
+ "#{version}"
end
end
Rake::TestTask.new(:test) do |test|
test.libs << 'test'
+ test.libs << '../padrino/test'
test.test_files = Dir['test/**/test_*.rb']
test.verbose = true
+ test.warning = false
end
YARD::Rake::YardocTask.new
diff --git a/load_paths.rb b/load_paths.rb
deleted file mode 100644
index e02cead5c..000000000
--- a/load_paths.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-if defined?(Gem)
- gem 'bundler'
-else
- require 'rubygems'
-end
-require 'bundler/setup'
diff --git a/padrino-admin/README.rdoc b/padrino-admin/README.rdoc
index 7d77bf8cc..6a63931ba 100644
--- a/padrino-admin/README.rdoc
+++ b/padrino-admin/README.rdoc
@@ -13,7 +13,7 @@ Access Control:: Supports authentication and role permissions for your applicati
=== Admin Dashboard Usage
For a complete look at usage of the Admin dashboard functionality, be sure to check out the
-{Padrino Admin}[http://www.padrinorb.com/guides/padrino-admin] guide.
+{Padrino Admin}[http://padrinorb.com/guides/features/padrino-admin/] guide.
Create a new project:
@@ -63,8 +63,8 @@ In this example +if+ we visit URLs that start with /+customer+/+orders+ or /+car
to our :+login_page+ "/login". Once we are correctly logged in we can visit these pages.
For a more complete look at using the Admin panel functionality and access features, be sure to check out the
-{Padrino Admin}[http://www.padrinorb.com/guides/padrino-admin] guide.
+{Padrino Admin}[http://padrinorb.com/guides/features/padrino-admin/] guide.
== Copyright
-Copyright (c) 2011-2013 Padrino. See LICENSE for details.
+Copyright (c) 2011-2015 Padrino. See LICENSE for details.
diff --git a/padrino-admin/Rakefile b/padrino-admin/Rakefile
index 8e6cc7613..e682baf84 100644
--- a/padrino-admin/Rakefile
+++ b/padrino-admin/Rakefile
@@ -1,7 +1,3 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
namespace :bootstrap do
diff --git a/padrino-admin/lib/padrino-admin.rb b/padrino-admin/lib/padrino-admin.rb
index 983acf20f..97d1712bd 100644
--- a/padrino-admin/lib/padrino-admin.rb
+++ b/padrino-admin/lib/padrino-admin.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/array/conversions'
require 'padrino-core'
require 'padrino-helpers'
diff --git a/padrino-admin/lib/padrino-admin/access_control.rb b/padrino-admin/lib/padrino-admin/access_control.rb
index c9eb7fbcf..adc93d489 100644
--- a/padrino-admin/lib/padrino-admin/access_control.rb
+++ b/padrino-admin/lib/padrino-admin/access_control.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/class/attribute_accessors'
-
module Padrino
module Admin
class AccessControlError < StandardError
@@ -14,12 +12,20 @@ class << self
#
def registered(app)
app.register Padrino::Admin unless app.extensions.include?(Padrino::Admin)
- app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym unless app.respond_to?(:session_id)
+ app.set :session_id, "_padrino_#{Padrino.env}_#{app.app_name}" unless app.respond_to?(:session_id)
app.set :admin_model, 'Account' unless app.respond_to?(:admin_model)
app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
app.helpers Padrino::Admin::Helpers::ViewHelpers
app.before { login_required }
- app.send(:cattr_accessor, :access_control)
+ app.class_eval do
+ class << self
+ attr_accessor :access_control
+ end
+ def access_control
+ self.class.access_control
+ end
+ end
+
app.send(:access_control=, Padrino::Admin::AccessControl::Base.new)
end
alias :included :registered
@@ -57,7 +63,7 @@ def roles
def project_modules(account)
role = account.role.to_sym rescue :any
authorizations = @authorizations.find_all { |auth| auth.roles.include?(role) }
- authorizations.map(&:project_modules).flatten.uniq
+ authorizations.flat_map(&:project_modules).uniq
end
##
@@ -96,7 +102,7 @@ def project_modules(account)
# = link_to 'Profile', url(:accounts, :edit, :id => current_account.id)
#
def allowed?(account=nil, path=nil)
- path = "/" if path.blank?
+ path = "/" if path.nil? || path.empty?
role = account.role.to_sym rescue nil
authorizations = @authorizations.find_all { |auth| auth.roles.include?(:any) }
allowed_paths = authorizations.map(&:allowed).flatten.uniq
diff --git a/padrino-admin/lib/padrino-admin/generators/admin_app.rb b/padrino-admin/lib/padrino-admin/generators/admin_app.rb
index 99204199c..7d70d4c5b 100644
--- a/padrino-admin/lib/padrino-admin/generators/admin_app.rb
+++ b/padrino-admin/lib/padrino-admin/generators/admin_app.rb
@@ -49,7 +49,7 @@ def create_admin
tmp_ext = options[:renderer] || fetch_component_choice(:renderer)
unless supported_ext.include?(tmp_ext.to_sym)
- say "<= Your are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use -e haml or -e erb or -e slim", :yellow
+ say "<= You are using '#{tmp_ext}' and for admin we only support '#{supported_ext.join(', ')}'. Please use #{supported_ext.map { |ext| '-e ' + ext.to_s }.join(' or ')}", :yellow
raise SystemExit
end
@@ -76,7 +76,8 @@ def create_admin
template "templates/app.rb.tt", destination_root(@admin_path + "/app.rb")
inject_into_file destination_root('config/apps.rb'), "\nPadrino.mount(\"#{@app_name}::#{@admin_name}\", :app_file => Padrino.root('#{@admin_path}/app.rb')).to(\"/#{@admin_path}\")\n", :before => /^Padrino.mount.*\.to\('\/'\)$/
unless options[:destroy]
- insert_middleware 'ActiveRecord::ConnectionAdapters::ConnectionManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
+ insert_middleware 'ConnectionPoolManagement', @admin_path if [:minirecord, :activerecord].include?(orm)
+ insert_middleware 'IdentityMap', @admin_path if orm == :datamapper
end
params = [
@@ -134,6 +135,8 @@ def create_admin
require_dependencies('bcrypt')
end
+ require_dependencies 'activesupport', :version => ">= 3.1"
+
# A nicer select box.
# TODO FIXME This doesn't make much sense in here. Review.
# gsub_file destination_root("admin/views/#{@model_plural}/_form.#{ext}"), "f.text_field :role, :class => :text_field", "f.select :role, :options => access_control.roles"
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt
index e4b18f27b..66a0e1ff5 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/account/datamapper.rb.tt
@@ -44,6 +44,11 @@ class <%= @model_name %>
::BCrypt::Password.new(crypted_password) == password
end
+ def password=(password)
+ self.crypted_password = nil if password.present?
+ @password = password
+ end
+
private
def password_required
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt
index 021807872..14948eeba 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/account/seeds.rb.tt
@@ -6,21 +6,22 @@
# shell.say name
#
email = shell.ask "Which email do you want use for logging into admin?"
-password = shell.ask "Tell me the password to use:"
+password = shell.ask "Tell me the password to use:", :echo => false
shell.say ""
-account = <%= @model_name %>.create(:email => email, :name => "Foo", :surname => "Bar", :password => password, :password_confirmation => password, :role => "admin")
+account = <%= @model_name %>.new(:email => email, :name => "Foo", :surname => "Bar", :password => password, :password_confirmation => password, :role => "admin")
if account.valid?
+ account.save
shell.say "================================================================="
shell.say "<%= @model_name %> has been successfully created, now you can login with:"
shell.say "================================================================="
shell.say " email: #{email}"
- shell.say " password: #{password}"
+ shell.say " password: #{?* * password.length}"
shell.say "================================================================="
else
- shell.say "Sorry but some thing went wrong!"
+ shell.say "Sorry, but something went wrong!"
shell.say ""
account.errors.full_messages.each { |m| shell.say " - #{m}" }
end
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/app.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/app.rb.tt
index 79c33c4f0..23cabd307 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/app.rb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/app.rb.tt
@@ -1,3 +1,6 @@
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
+
module <%= @app_name %>
class <%= @admin_name %> < Padrino::Application
register Padrino::Mailer
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
index fd6a8dd20..d1036d1b7 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt
@@ -20,7 +20,7 @@
<%%= pat(:delete, :model => "<%= @orm.name_singular %>") %>
- <%%- form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do %>
+ <%% form_tag url(:<%= @orm.name_plural %>, :destroy, :id => <%= @orm.name_singular %>.id), :method => :delete do %>
<%%= submit_tag pat(:delete), :class =>'list-row-action-popover-delete-one-btn btn btn-danger btn-small' %>
+
<%% end %>
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt b/padrino-admin/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt
index cd023f116..3e2cf7395 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt
@@ -18,10 +18,10 @@
.container
=link_to 'Padrino', url(:base, :index), :class => 'navbar-brand', :title => 'Padrino Admin'
%ul.nav.navbar-nav.pull-right
- %li.navbar-edit-account=link_to tag_icon(:user), url(:accounts, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
+ %li.navbar-edit-account=link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
%li.navbar-logout
- =button_to :logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form' do
- =content_tag :button, tag_icon('power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
+ = button_to :logout, url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form', :submit_options => { :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } do
+ = tag_icon('power-off')
%ul.nav.navbar-nav.pull-left
- project_modules.each do |project_module|
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/page/controller.rb.tt b/padrino-admin/lib/padrino-admin/generators/templates/page/controller.rb.tt
index aec61b0ea..dd9d7d7e1 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/page/controller.rb.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/page/controller.rb.tt
@@ -95,7 +95,7 @@
<% else %>
if <%= @orm.multiple_destroy(@orm.name_plural) %>
<% end %>
- flash[:success] = pat(:destroy_many_success, :model => '<%= @orm.name_plural.capitalize %>', :ids => "#{ids.to_sentence}")
+ flash[:success] = pat(:destroy_many_success, :model => '<%= @orm.name_plural.capitalize %>', :ids => "#{ids.join(', ')}")
end
redirect url(:<%= @orm.name_plural %>, :index)
end
diff --git a/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt b/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt
index 961ba1718..e42d04166 100644
--- a/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt
+++ b/padrino-admin/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt
@@ -20,8 +20,9 @@ html lang='en'
ul class='nav navbar-nav pull-right'
li class='navbar-edit-account' = link_to tag_icon(:user), url(:<%= @model_plural %>, :edit, :id => current_account.id), :title => pat(:profile), :class => 'navbar-nav-link'
- li class='navbar-logout' = button_to(pat(:logout), url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form') do
- = content_tag :button, tag_icon(:'power-off'), :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link'
+ li class='navbar-logout'
+ = button_to pat(:logout), url(:sessions, :destroy), :method => :delete, :class => 'navbar-nav-form', :submit_options => { :type => :submit, :title => pat(:logout), :class => 'navbar-nav-form-link' } do
+ = tag_icon(:'power-off')
ul class='nav navbar-nav pull-left'
- project_modules.each do |project_module|
diff --git a/padrino-admin/lib/padrino-admin/helpers/authentication_helpers.rb b/padrino-admin/lib/padrino-admin/helpers/authentication_helpers.rb
index d907b82ea..5dc2b9d73 100644
--- a/padrino-admin/lib/padrino-admin/helpers/authentication_helpers.rb
+++ b/padrino-admin/lib/padrino-admin/helpers/authentication_helpers.rb
@@ -78,7 +78,7 @@ def redirect_back_or_default(default)
private
def access_denied
- if login_page.present?
+ if login_page
redirect url(login_page)
else
halt 401, "You don't have permission for this resource"
diff --git a/padrino-admin/lib/padrino-admin/helpers/view_helpers.rb b/padrino-admin/lib/padrino-admin/helpers/view_helpers.rb
index df5349516..a5c0f3bc1 100644
--- a/padrino-admin/lib/padrino-admin/helpers/view_helpers.rb
+++ b/padrino-admin/lib/padrino-admin/helpers/view_helpers.rb
@@ -39,7 +39,7 @@ def tag_icon(icon, tag = nil)
# pat(:profile, "My Profile")
#
def padrino_admin_translate(word, *args)
- options = args.extract_options!
+ options = args.last.is_a?(Hash) ? args.pop : {}
options[:default] ||= word.to_s.humanize
t("padrino.admin.#{word}", options)
end
diff --git a/padrino-admin/lib/padrino-admin/locale/admin/cs.yml b/padrino-admin/lib/padrino-admin/locale/admin/cs.yml
index c930abe5d..d338ffd48 100644
--- a/padrino-admin/lib/padrino-admin/locale/admin/cs.yml
+++ b/padrino-admin/lib/padrino-admin/locale/admin/cs.yml
@@ -35,7 +35,7 @@ cs:
edit_warning: "Nelze najít %{model} s ID %{id}."
update_title: "Úpravy %{model}"
update_success: " %{model} s ID %{id} byl úspěšně aktualizován."
- update_error: "Nelze aktualizovat %{modelu}."
+ update_error: "Nelze aktualizovat %{model}."
update_warning: "Nelze najít %{model} s ID %{id}"
delete_title: "Delete %{model}?"
delete_success: " %{model} s ID %{id} byl úspěšně odstraněn."
diff --git a/padrino-admin/lib/padrino-admin/locale/admin/ro.yml b/padrino-admin/lib/padrino-admin/locale/admin/ro.yml
index 38d1de155..88da2595a 100644
--- a/padrino-admin/lib/padrino-admin/locale/admin/ro.yml
+++ b/padrino-admin/lib/padrino-admin/locale/admin/ro.yml
@@ -37,7 +37,7 @@ ro:
update_success: "%{model} cu ID-ul %{id} a fost actualizat cu succes."
update_error: "Nu sa putut actualiza %{model}."
update_warning: "Nu am putut găsi %{model} cu ID-ul %{id}"
- delete_title: "Ștergere %{modelu}?"
+ delete_title: "Ștergere %{model}?"
delete_success: "%{model} cu ID-ul %{id} a fost șters cu succes."
delete_error: "Imposibil de șters %{model}!"
delete_warning: "Nu am putut găsi %{model} cu ID-ul %{id}."
diff --git a/padrino-admin/lib/padrino-admin/locale/admin/ru.yml b/padrino-admin/lib/padrino-admin/locale/admin/ru.yml
index ecf52a6f1..5e4863750 100644
--- a/padrino-admin/lib/padrino-admin/locale/admin/ru.yml
+++ b/padrino-admin/lib/padrino-admin/locale/admin/ru.yml
@@ -4,7 +4,7 @@ ru:
login:
title: "Войти"
email: "Email"
- password: "пароль"
+ password: "Пароль"
bypass: "Пропустить авторизацию?"
sign_in: "Войти"
error: "Неправильный Email или пароль"
diff --git a/padrino-admin/test/fixtures/data_mapper.rb b/padrino-admin/test/fixtures/data_mapper.rb
deleted file mode 100644
index 79ffe6bc8..000000000
--- a/padrino-admin/test/fixtures/data_mapper.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'jdbc/sqlite3' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-require 'digest/sha1'
-
-DataMapper.setup(:default, 'sqlite3::memory:')
-
-# Fake Category Model
-class Category
- include DataMapper::Resource
- property :id, Serial
- property :name, String
- belongs_to :account
-end
-
-# Fake Account Model
-class Account
- include DataMapper::Resource
- include DataMapper::Validate
- attr_accessor :password, :password_confirmation
-
- # Properties
- property :id, Serial
- property :name, String
- property :surname, String
- property :email, String
- property :crypted_password, String
- property :salt, String
- property :role, String
-
- has n, :categories
- def self.admin; first(:role => "admin"); end
- def self.editor; first(:role => "editor"); end
-
- ##
- # This method is used from AuthenticationHelper
- #
- def self.find_by_id(id)
- get(id)
- end
-end
-
-DataMapper.auto_migrate!
-
-# We build some fake accounts
-admin = Account.create(:name => "DAddYE", :role => "admin", :email => "d.dagostino@lipsiasoft.com",
- :password => "some", :password_confirmation => "some")
-editor = Account.create(:name => "Dexter", :role => "editor", :email => "editor@lipsiasoft.com",
- :password => "some", :password_confirmation => "some")
-
-%w(News Press HowTo).each do |c|
- admin.categories.create(:name => c)
- editor.categories.create(:name => c)
-end
diff --git a/padrino-admin/test/fixtures/sequel.rb b/padrino-admin/test/fixtures/sequel.rb
new file mode 100644
index 000000000..5606accc4
--- /dev/null
+++ b/padrino-admin/test/fixtures/sequel.rb
@@ -0,0 +1,89 @@
+require 'digest/sha1'
+require 'sequel'
+require 'sequel/extensions/migration'
+
+Sequel::Model.db =
+ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+ require 'jdbc/sqlite3'
+ Sequel.connect("jdbc:sqlite::memory:")
+ else
+ require 'sqlite3'
+ Sequel.sqlite(":memory:")
+ end
+
+migration = Sequel.migration do
+ up do
+ create_table :accounts do
+ primary_key :id
+ String :name
+ String :surname
+ String :email
+ String :crypted_password
+ String :role
+ end
+
+ create_table :sections do
+ primary_key :id
+ foreign_key :account_id
+ String :name
+ end
+
+ create_table :friends do
+ primary_key :id
+ String :name
+ String :age
+ String :email
+ end
+
+ create_table :pages do
+ primary_key :id
+ String :name
+ String :body
+ end
+ end
+
+ down do
+ drop_table :accounts
+ end
+end
+
+migration.apply(Sequel::Model.db, :up)
+
+class Friend < Sequel::Model
+end
+
+class Page < Sequel::Model
+end
+
+# Fake Section Model
+class Section < Sequel::Model
+ many_to_one :account
+end
+
+# Fake Account Model
+class Account < Sequel::Model
+ attr_accessor :password, :password_confirmation
+
+ one_to_many :sections
+
+ def self.admin; first(:role => "admin"); end
+ def self.editor; first(:role => "editor"); end
+
+ ##
+ # Replace ActiveRecord method.
+ #
+ def self.find_by_id(id)
+ self[id] rescue nil
+ end
+end
+
+# We build some fake accounts
+admin = Account.create(:name => "DAddYE", :role => "admin", :email => "d.dagostino@lipsiasoft.com",
+ :password => "some", :password_confirmation => "some")
+editor = Account.create(:name => "Dexter", :role => "editor", :email => "editor@lipsiasoft.com",
+ :password => "some", :password_confirmation => "some")
+
+%w(News Press HowTo).each do |c|
+ admin.add_section(:name => c)
+ editor.add_section(:name => c)
+end
diff --git a/padrino-admin/test/generators/test_account_model_generator.rb b/padrino-admin/test/generators/test_account_model_generator.rb
index f39fcd0b0..0ddffe84c 100644
--- a/padrino-admin/test/generators/test_account_model_generator.rb
+++ b/padrino-admin/test/generators/test_account_model_generator.rb
@@ -12,7 +12,7 @@
describe 'activerecord' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
@@ -24,7 +24,7 @@
describe 'minirecord' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=minirecord') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=minirecord') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
@@ -36,7 +36,7 @@
describe 'datamapper' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
@@ -48,7 +48,7 @@
describe 'mongoid' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=mongoid') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=mongoid') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
@@ -60,7 +60,7 @@
describe 'mongomapper' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=mongomapper') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=mongomapper') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
@@ -72,7 +72,7 @@
describe 'ohm' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=ohm') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=ohm') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
@@ -84,7 +84,7 @@
describe 'sequel' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=sequel') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
@@ -96,7 +96,7 @@
describe 'couchrest' do
before do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=couchrest') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=couchrest') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@model = "#{@apptmp}/sample_project/models/account.rb"
end
diff --git a/padrino-admin/test/generators/test_admin_app_generator.rb b/padrino-admin/test/generators/test_admin_app_generator.rb
index c68198e23..19a3df5f5 100644
--- a/padrino-admin/test/generators/test_admin_app_generator.rb
+++ b/padrino-admin/test/generators/test_admin_app_generator.rb
@@ -24,28 +24,28 @@
end
it "should fail if we don't specify an orm on the project" do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-e=haml') }
assert_raises(SystemExit) { @out, @err = capture_io { generate(:admin_app, "-r=#{@apptmp}/sample_project") } }
end
it "should store and apply session_secret" do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
end
it "should generate the admin app" do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- assert_file_exists("#{@apptmp}/sample_project")
- assert_file_exists("#{@apptmp}/sample_project/admin")
+ assert_dir_exists("#{@apptmp}/sample_project")
+ assert_dir_exists("#{@apptmp}/sample_project/admin")
assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
- assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
+ assert_dir_exists("#{@apptmp}/sample_project/admin/controllers")
assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
- assert_file_exists("#{@apptmp}/sample_project/admin/views")
- assert_file_exists("#{@apptmp}/sample_project/public/admin")
- assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+ assert_dir_exists("#{@apptmp}/sample_project/admin/views")
+ assert_dir_exists("#{@apptmp}/sample_project/public/admin")
+ assert_dir_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets/application.css")
assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets/bootstrap.css")
assert_file_exists("#{@apptmp}/sample_project/public/admin/javascripts/application.js")
@@ -60,14 +60,14 @@
end
it "should generate the master app" do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project", '--admin-name=master') }
assert_file_exists("#{@apptmp}/sample_project/master/app.rb")
end
# users can override certain templates from a generators/templates folder in the destination_root
it "should use custom generator templates from the project root, if they exist" do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
custom_template_path = "#{@apptmp}/sample_project/generators/templates/slim/app/layouts/"
`mkdir -p #{custom_template_path} && echo "h1 = 'Hello, custom generator' " > #{custom_template_path}application.slim.tt`
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
@@ -81,9 +81,9 @@
describe "renderers" do
it 'should correctly generate a new padrino admin application with haml renderer (default)' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- assert_file_exists("#{@apptmp}/sample_project/admin/views")
+ assert_dir_exists("#{@apptmp}/sample_project/admin/views")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.haml")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.haml")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.haml")
@@ -96,9 +96,9 @@
end
it 'should correctly generate a new padrino admin application with erb renderer' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- assert_file_exists("#{@apptmp}/sample_project/admin/views")
+ assert_dir_exists("#{@apptmp}/sample_project/admin/views")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.erb")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.erb")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.erb")
@@ -111,9 +111,9 @@
end
it 'should correctly generate a new padrino admin application with slim renderer' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- assert_file_exists("#{@apptmp}/sample_project/admin/views")
+ assert_dir_exists("#{@apptmp}/sample_project/admin/views")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.slim")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.slim")
assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.slim")
@@ -127,7 +127,7 @@
end
it 'should correctly generate a new padrino admin application with a custom model' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=slim') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project", '-m=User') }
assert_no_match_in_file(/[^_]account/i, "#{@apptmp}/sample_project/admin/controllers/users.rb")
assert_match_in_file(/[^_]user/i, "#{@apptmp}/sample_project/admin/controllers/users.rb")
@@ -151,16 +151,16 @@
# Remember that --root/-r in the admin_app generator refers to the project's location, not the admin's location
# inside it. See https://github.com/padrino/padrino-framework/issues/854#issuecomment-14749356
skip
- # capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+ # capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
# capture_io { generate(:admin_app,"-a=/admin", "--root=#{@apptmp}/sample_project") }
- # assert_file_exists("#{@apptmp}/sample_project")
- # assert_file_exists("#{@apptmp}/sample_project/admin")
+ # assert_dir_exists("#{@apptmp}/sample_project")
+ # assert_dir_exists("#{@apptmp}/sample_project/admin")
# assert_file_exists("#{@apptmp}/sample_project/admin/app.rb")
# assert_file_exists("#{@apptmp}/sample_project/admin/controllers")
# assert_file_exists("#{@apptmp}/sample_project/admin/controllers/accounts.rb")
# assert_file_exists("#{@apptmp}/sample_project/admin/controllers/base.rb")
# assert_file_exists("#{@apptmp}/sample_project/admin/controllers/sessions.rb")
- # assert_file_exists("#{@apptmp}/sample_project/admin/views")
+ # assert_dir_exists("#{@apptmp}/sample_project/admin/views")
# assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/_form.haml")
# assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/edit.haml")
# assert_file_exists("#{@apptmp}/sample_project/admin/views/accounts/index.haml")
@@ -170,8 +170,8 @@
# assert_file_exists("#{@apptmp}/sample_project/admin/views/base/index.haml")
# assert_file_exists("#{@apptmp}/sample_project/admin/views/layouts/application.haml")
# assert_file_exists("#{@apptmp}/sample_project/admin/views/sessions/new.haml")
- # assert_file_exists("#{@apptmp}/sample_project/public/admin")
- # assert_file_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
+ # assert_dir_exists("#{@apptmp}/sample_project/public/admin")
+ # assert_dir_exists("#{@apptmp}/sample_project/public/admin/stylesheets")
# assert_file_exists("#{@apptmp}/sample_project/models/account.rb")
# assert_no_file_exists("#{@apptmp}/sample_project/models/account.rb")
# assert_file_exists("#{@apptmp}/sample_project/db/seeds.rb")
@@ -181,26 +181,40 @@
describe "activerecord middleware" do
it 'should add it for #activerecord' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- assert_match_in_file(/ use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+ assert_match_in_file(/ use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
end
it 'should add it #minirecord' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=minirecord', '-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=minirecord', '-e=haml') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- assert_match_in_file(/ use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+ assert_match_in_file(/ use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
end
it 'should not add it for #datamapper' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- assert_no_match_in_file(/ use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/admin/app.rb")
+ assert_no_match_in_file(/ use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/admin/app.rb")
+ end
+ end
+
+ describe "datamapper middleware" do
+ it 'should add it for #datamapper' do
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=datamapper', '-e=haml') }
+ capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+ assert_match_in_file(/ use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
+ end
+
+ it 'should not add it for #activerecord' do
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=haml') }
+ capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+ assert_no_match_in_file(/ use IdentityMap/m, "#{@apptmp}/sample_project/admin/app.rb")
end
end
it 'should not conflict with existing seeds file' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord', '-e=erb') }
# Add seeds file
FileUtils.mkdir_p @apptmp + '/sample_project/db' unless File.exist?(@apptmp + '/sample_project/db')
@@ -212,7 +226,7 @@
refute_match /Overwrite\s.*?\/db\/seeds.rb/, out
assert_file_exists "#{@apptmp}/sample_project/db/seeds.old"
- assert_match_in_file 'Account.create(', "#{@apptmp}/sample_project/db/seeds.rb"
+ assert_match_in_file 'Account.new(', "#{@apptmp}/sample_project/db/seeds.rb"
end
end
end
diff --git a/padrino-admin/test/generators/test_admin_page_generator.rb b/padrino-admin/test/generators/test_admin_page_generator.rb
index 0f21b5507..7073ab9a9 100644
--- a/padrino-admin/test/generators/test_admin_page_generator.rb
+++ b/padrino-admin/test/generators/test_admin_page_generator.rb
@@ -1,16 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + '/../helper')
-
-class Person
- def self.properties
- [:id, :name, :age, :email].map { |c| OpenStruct.new(:name => c) }
- end
-end
-
-class Page
- def self.properties
- [:id, :name, :body].map { |c| OpenStruct.new(:name => c) }
- end
-end
+require File.join(File.dirname(__FILE__), '../fixtures/sequel')
describe "AdminPageGenerator" do
before do
@@ -30,100 +19,100 @@ def self.properties
end
it 'should fail without an existent model' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=activerecord') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=activerecord') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
assert_raises(Padrino::Admin::Generators::OrmError) { generate(:admin_page, 'foo', "-r=#{@apptmp}/sample_project") }
end
it 'should correctly generate a new page' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-e=haml') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
- assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
- assert_match_in_file "SampleProject::Admin.controllers :people do", "#{@apptmp}/sample_project/admin/controllers/people.rb"
- assert_match_in_file "role.project_module :people, '/people'", "#{@apptmp}/sample_project/admin/app.rb"
+ capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+ capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
+ assert_file_exists "#{@apptmp}/sample_project/admin/controllers/friends.rb"
+ assert_match_in_file "SampleProject::Admin.controllers :friends do", "#{@apptmp}/sample_project/admin/controllers/friends.rb"
+ assert_match_in_file "role.project_module :friends, '/friends'", "#{@apptmp}/sample_project/admin/app.rb"
assert_match_in_file "elsif Padrino.env == :development && params[:bypass]", "#{@apptmp}/sample_project/admin/controllers/sessions.rb"
end
# users can override certain templates from a generators/templates folder in the destination_root
it "should use custom generator templates from the project root, if they exist" do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-e=haml') }
custom_template_path = "#{@apptmp}/sample_project/generators/templates/haml/page/"
`mkdir -p #{custom_template_path} && echo "%h1= 'Hello, custom generator' " > #{custom_template_path}index.haml.tt`
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
- assert_match_in_file(/Hello, custom generator/, "#{@apptmp}/sample_project/admin/views/people/index.haml")
+ capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+ capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
+ assert_match_in_file(/Hello, custom generator/, "#{@apptmp}/sample_project/admin/views/friends/index.haml")
end
describe "renderers" do
it 'should correctly generate a new page with haml' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-e=haml') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.haml"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.haml"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.haml"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.haml"
+ capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+ capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.haml"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.haml"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.haml"
%w(name age email).each do |field|
- assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
- assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+ assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
+ assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
end
assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.haml"
end
it 'should correctly generate a new page with erb' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=erb') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-e=erb') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.erb"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.erb"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.erb"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.erb"
+ capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+ capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.erb"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.erb"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.erb"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.erb"
%w(name age email).each do |field|
- assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.erb"
- assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.erb"
+ assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.erb"
+ assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.erb"
end
assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.erb"
end
it 'should correctly generate a new page with slim' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=slim') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-e=slim') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:admin_page, 'person', "--root=#{@apptmp}/sample_project") }
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.slim"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.slim"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.slim"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.slim"
+ capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "--root=#{@apptmp}/sample_project") }
+ capture_io { generate(:admin_page, 'friend', "--root=#{@apptmp}/sample_project") }
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.slim"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.slim"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.slim"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.slim"
%w(name age email).each do |field|
- assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.slim"
- assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.slim"
+ assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.slim"
+ assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.slim"
end
assert_match_in_file "check_box_tag :bypass", "#{@apptmp}/sample_project/admin/views/sessions/new.slim"
end
end
it 'should correctly generate a new padrino admin application with multiple models at the same time' do
- capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '-d=datamapper','-e=haml') }
+ capture_io { generate(:project, 'sample_project', '-e=slim', "--root=#{@apptmp}", '-d=sequel','-e=haml') }
capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
- capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
+ capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "-root=#{@apptmp}/sample_project") }
capture_io { generate(:model, 'page', "name:string", "body:string", "-root=#{@apptmp}/sample_project") }
- capture_io { generate(:admin_page, 'person', 'page', "--root=#{@apptmp}/sample_project") }
- # For Person
- assert_file_exists "#{@apptmp}/sample_project/admin/controllers/people.rb"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/_form.haml"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/edit.haml"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/index.haml"
- assert_file_exists "#{@apptmp}/sample_project/admin/views/people/new.haml"
+ capture_io { generate(:admin_page, 'friend', 'page', "--root=#{@apptmp}/sample_project") }
+ # For Friend
+ assert_file_exists "#{@apptmp}/sample_project/admin/controllers/friends.rb"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/edit.haml"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/index.haml"
+ assert_file_exists "#{@apptmp}/sample_project/admin/views/friends/new.haml"
%w(name age email).each do |field|
- assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
- assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/people/_form.haml"
+ assert_match_in_file "label :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
+ assert_match_in_file "text_field :#{field}", "#{@apptmp}/sample_project/admin/views/friends/_form.haml"
end
- assert_match_in_file "role.project_module :people, '/people'", "#{@apptmp}/sample_project/admin/app.rb"
+ assert_match_in_file "role.project_module :friends, '/friends'", "#{@apptmp}/sample_project/admin/app.rb"
# For Page
assert_file_exists "#{@apptmp}/sample_project/admin/controllers/pages.rb"
assert_file_exists "#{@apptmp}/sample_project/admin/views/pages/_form.haml"
diff --git a/padrino-admin/test/helper.rb b/padrino-admin/test/helper.rb
index 06aec6a8b..076d05b87 100644
--- a/padrino-admin/test/helper.rb
+++ b/padrino-admin/test/helper.rb
@@ -1,18 +1,16 @@
ENV['RACK_ENV'] = 'test'
PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
-require File.expand_path('../../../load_paths', __FILE__)
require 'minitest/autorun'
require 'minitest/pride'
require 'mocha/setup'
require 'rack/test'
-require 'rack'
require 'thor/group'
+require 'sequel/model'
require 'padrino-admin'
-require 'dm-core'
-require 'dm-migrations'
-require 'dm-validations'
-require 'dm-aggregates'
+
+require 'ext/minitest-spec'
+require 'ext/rack-test-methods'
Padrino::Generators.load_components!
@@ -32,8 +30,10 @@ class MiniTest::Spec
# given. Used in setup or individual spec methods to establish
# the application.
def mock_app(base=Padrino::Application, &block)
- @app = Sinatra.new(base, &block)
- @app.register Padrino::Helpers
+ @app = Sinatra.new base do
+ register Padrino::Helpers
+ instance_eval &block
+ end
end
def app
@@ -44,34 +44,4 @@ def app
def generate(name, *params)
"Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)
end
-
- # Assert_file_exists('/tmp/app')
- def assert_file_exists(file_path)
- assert File.exist?(file_path), "File at path '#{file_path}' does not exist!"
- end
-
- # Assert_no_file_exists('/tmp/app')
- def assert_no_file_exists(file_path)
- assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!"
- end
-
- # Asserts that a file matches the pattern
- def assert_match_in_file(pattern, file)
- File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file)
- end
-
- def assert_no_match_in_file(pattern, file)
- File.exist?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file)
- end
-
- # Delegate other missing methods to response.
- def method_missing(name, *args, &block)
- if response && response.respond_to?(name)
- response.send(name, *args, &block)
- else
- super(name, *args, &block)
- end
- end
-
- alias :response :last_response
end
diff --git a/padrino-admin/test/test_admin_application.rb b/padrino-admin/test/test_admin_application.rb
index 7022c4dbe..063997bd0 100644
--- a/padrino-admin/test/test_admin_application.rb
+++ b/padrino-admin/test/test_admin_application.rb
@@ -3,27 +3,26 @@
describe "AdminApplication" do
def setup
- load_fixture 'data_mapper'
+ load_fixture 'sequel'
end
describe "session id setting" do
it "should provide it if it doesn't exist" do
mock_app do
+ set :app_name, 'session_id_tester'
register Padrino::Admin::AccessControl
end
- assert_equal @app.session_id, "_padrino_#{File.basename(Padrino.root)}_#{@app.app_name}".to_sym
+ assert_equal "_padrino_test_session_id_tester", @app.session_id
end
- # it "should preserve it if it already existed" do
- # Padrino.configure_apps { enable :sessions; set :session_id, "foo" }
-
- # mock_app do
- # register Padrino::Admin::AccessControl
- # end
-
- # assert_equal @app.session_id, "foo"
- # end
+ it "should preserve it if it already existed" do
+ mock_app do
+ set :session_id, "foo"
+ register Padrino::Admin::AccessControl
+ end
+ assert_equal "foo", @app.session_id
+ end
end
it 'should require correctly login' do
@@ -109,7 +108,7 @@ def setup
end
# Prepare a basic page
- get "/login(/:role)" do
+ get "/login(/:role)?" do
set_current_account(Account.send(params[:role])) if params[:role]
"logged as #{params[:role] || "any"}"
end
@@ -268,4 +267,21 @@ def setup
get "/modules"
assert_equal "admin => /admin", body
end
+
+ it 'should use different access control for different apps' do
+ app1 = Sinatra.new Padrino::Application do
+ register Padrino::Admin::AccessControl
+ access_control.roles_for :any do |role|
+ role.project_module :foo, "/foo"
+ end
+ end
+ app2 = Sinatra.new Padrino::Application do
+ register Padrino::Admin::AccessControl
+ access_control.roles_for :any do |role|
+ role.project_module :bar, "/bar"
+ end
+ end
+ assert_equal '/foo', app1.access_control.project_modules(:any).first.path
+ assert_equal '/bar', app2.access_control.project_modules(:any).first.path
+ end
end
diff --git a/padrino-admin/test/test_locale.rb b/padrino-admin/test/test_locale.rb
index bc7a2ac7c..caec76110 100644
--- a/padrino-admin/test/test_locale.rb
+++ b/padrino-admin/test/test_locale.rb
@@ -6,20 +6,20 @@
it "should have a vaild #{name} locale for admin" do
base = YAML.load_file(file)
base = base[name]['padrino']['admin']
- assert base.present?
- assert base['save'].present?
- assert base['cancel'].present?
- assert base['list'].present?
- assert base['edit'].present?
- assert base['new'].present?
- assert base['show'].present?
- assert base['delete'].present?
- assert base['confirm'].present?
- assert base['created_at'].present?
- assert base['all'].present?
- assert base['profile'].present?
- assert base['settings'].present?
- assert base['logout'].present?
+ assert base
+ assert base['save']
+ assert base['cancel']
+ assert base['list']
+ assert base['edit']
+ assert base['new']
+ assert base['show']
+ assert base['delete']
+ assert base['confirm']
+ assert base['created_at']
+ assert base['all']
+ assert base['profile']
+ assert base['settings']
+ assert base['logout']
end
end
end
diff --git a/padrino-cache/README.rdoc b/padrino-cache/README.rdoc
index 43abdb4d8..a4a9ac3e3 100644
--- a/padrino-cache/README.rdoc
+++ b/padrino-cache/README.rdoc
@@ -6,7 +6,7 @@ This component enables caching of an application's response contents on
both page- and fragment-levels. Output cached in this manner is
persisted, until it expires or is actively expired, in a configurable store
of your choosing. Most popular key/value stores work out of the box. Take a look
-at the [Moneta documentation](http://rubydoc.info/gems/moneta) for a list of all supported stores.
+at the {Moneta documentation}[http://rubydoc.info/gems/moneta] for a list of all supported stores.
== Caching Quickstart
@@ -21,7 +21,7 @@ cached based on request URL, with one cache entry per URL.
This behavior is referred to as "page-level caching." If this strategy meets
your needs, you can enable it very easily:
- # Basic, page-level caching
+ # Page-level caching
class SimpleApp < Padrino::Application
register Padrino::Cache
enable :caching
@@ -276,7 +276,7 @@ You can manage your cache from anywhere in your app:
The Padrino cache constructor `Padrino::Cache.new` calls `Moneta.new` to create a cache instance. Please refer to the [Moneta documentation](http://rubydoc.info/gems/moneta) if you
have special requirements, for example if you want to configure the marshalling mechanism or use a more exotic backend.
-==== Application Caching Options
+=== Application Caching Options
set :cache, Padrino::Cache.new(:LRUHash)
set :cache, Padrino::Cache.new(:Memcached)
@@ -343,4 +343,4 @@ Page-level expiration works exactly like the example above--by using
== Copyright
-Copyright (c) 2011-2013 Padrino. See LICENSE for details.
+Copyright (c) 2011-2015 Padrino. See LICENSE for details.
diff --git a/padrino-cache/Rakefile b/padrino-cache/Rakefile
index f33347d26..da75d43e2 100644
--- a/padrino-cache/Rakefile
+++ b/padrino-cache/Rakefile
@@ -1,5 +1 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
\ No newline at end of file
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
diff --git a/padrino-cache/lib/padrino-cache.rb b/padrino-cache/lib/padrino-cache.rb
index c58bb3455..68fc19ce0 100644
--- a/padrino-cache/lib/padrino-cache.rb
+++ b/padrino-cache/lib/padrino-cache.rb
@@ -3,7 +3,6 @@
require 'padrino-helpers'
FileSet.glob_require('padrino-cache/{helpers}/*.rb', __FILE__)
require 'moneta'
-require 'padrino-cache/legacy_store'
module Padrino
class << self
@@ -98,9 +97,11 @@ def registered(app)
app.helpers Padrino::Cache::Helpers::CacheStore
app.helpers Padrino::Cache::Helpers::Fragment
app.helpers Padrino::Cache::Helpers::Page
- app.set :cache, Padrino::Cache.new(:File,
- :dir => Padrino.root('tmp', defined?(app.app_name) ? app.app_name.to_s : '', 'cache'))
- app.disable :caching
+ unless app.respond_to?(:cache)
+ cache_dir = Padrino.root('tmp', defined?(app.app_name) ? app.app_name.to_s : '', 'cache')
+ app.set :cache, Padrino::Cache.new(:File, :dir => cache_dir)
+ end
+ app.disable :caching unless app.respond_to?(:caching)
included(app)
end
@@ -116,12 +117,7 @@ def padrino_route_added(route, verb, path, args, options, block)
def self.new(name, options = {})
# Activate expiration by default
options[:expires] = true unless options.include?(:expires)
- a = Moneta.new(name, options)
- Moneta.build do
- # Use proxy to support deprecated Padrino interface
- use LegacyStore
- adapter a
- end
+ Moneta.new(name, options)
end
Padrino.cache = Padrino::Cache.new(:LRUHash)
diff --git a/padrino-cache/lib/padrino-cache/helpers/cache_object.rb b/padrino-cache/lib/padrino-cache/helpers/cache_object.rb
index 9508abffe..5dc98e56b 100644
--- a/padrino-cache/lib/padrino-cache/helpers/cache_object.rb
+++ b/padrino-cache/lib/padrino-cache/helpers/cache_object.rb
@@ -5,7 +5,8 @@ module ObjectCache
def cache_object(key, opts = {})
if settings.caching?
began_at = Time.now
- if value = settings.cache[key.to_s]
+ if settings.cache.key?(key.to_s)
+ value = settings.cache[key.to_s]
logger.debug "GET Object", began_at, key.to_s if defined?(logger)
else
value = yield
diff --git a/padrino-cache/lib/padrino-cache/helpers/fragment.rb b/padrino-cache/lib/padrino-cache/helpers/fragment.rb
index 976ea4f1d..3a114f4db 100644
--- a/padrino-cache/lib/padrino-cache/helpers/fragment.rb
+++ b/padrino-cache/lib/padrino-cache/helpers/fragment.rb
@@ -51,9 +51,10 @@ module Fragment
def cache(key, opts = {}, &block)
if settings.caching?
began_at = Time.now
- if value = settings.cache[key.to_s]
+ if settings.cache.key?(key.to_s)
+ value = settings.cache[key.to_s]
logger.debug "GET Fragment", began_at, key.to_s if defined?(logger)
- concat_content(value.html_safe)
+ concat_content(value.to_s.html_safe)
else
value = capture_html(&block)
settings.cache.store(key.to_s, value, opts)
diff --git a/padrino-cache/lib/padrino-cache/helpers/page.rb b/padrino-cache/lib/padrino-cache/helpers/page.rb
index 12fc56973..2d3a5a56b 100644
--- a/padrino-cache/lib/padrino-cache/helpers/page.rb
+++ b/padrino-cache/lib/padrino-cache/helpers/page.rb
@@ -63,11 +63,6 @@ def expires(time)
@route.cache_expires = time
end
- def expires_in(time)
- warn 'expires_in has been deprecated in favour of expires'
- expires(time)
- end
-
##
# This helper is used within a route or route to indicate the name in the cache.
#
@@ -135,7 +130,7 @@ def save_cached_response(cache_expires)
content = {
:body => @_response_buffer,
- :content_type => @_content_type
+ :content_type => response.content_type
}
settings.cache.store(route_cache_key, content, :expires => cache_expires)
diff --git a/padrino-cache/lib/padrino-cache/legacy_store.rb b/padrino-cache/lib/padrino-cache/legacy_store.rb
deleted file mode 100644
index e3a0e5fc3..000000000
--- a/padrino-cache/lib/padrino-cache/legacy_store.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-module Padrino
- module Cache
- class LegacyStore < Moneta::Proxy
- ##
- # Return the a value for the given key
- #
- # @param [String] key
- # cache key
- #
- # @example
- # # with MyApp.cache.set('records', records)
- # MyApp.cache.get('records')
- #
- # @api public
- def get(key)
- warn 'cache.get(key) has been deprecated in favour of cache[key]'
- self[key]
- end
-
- ##
- # Set the value for a given key and optionally with an expire time
- # Default expiry time is 86400.
- #
- # @param [String] key
- # cache key
- # @param value
- # value of cache key
- #
- # @example
- # MyApp.cache.set('records', records)
- # MyApp.cache.set('records', records, :expires => 30) # => 30 seconds
- #
- # @api public
- def set(key, value, opts = nil)
- warn opts ? 'cache.set(key, value, opts) has been deprecated in favour of cache.store(key, value, opts)' :
- 'cache.set(key, value) has been deprecated in favour of cache[key] = value'
- store(key, value, opts || {})
- end
-
- ##
- # Reinitialize your cache
- #
- # @example
- # # with: MyApp.cache.set('records', records)
- # MyApp.cache.flush
- # MyApp.cache.get('records') # => nil
- #
- # @api public
- def flush
- warn 'cache.flush has been deprecated in favour of cache.clear'
- clear
- end
-
- # (see Moneta::Proxy#store)
- def store(key, value, options = {})
- if options[:expires_in]
- warn 'Option :expires_in has been deprecated in favour of :expires'
- options[:expires] = options.delete(:expires_in).to_i
- end
- if options[:expires] && options[:expires] < 0
- warn 'The use of negative expiration values is deprecated, use :expires => false'
- options[:expires] = false
- end
- adapter.store(key, value, options)
- end
- end
- end
-end
diff --git a/padrino-cache/padrino-cache.gemspec b/padrino-cache/padrino-cache.gemspec
index c40e033f4..557125ddb 100644
--- a/padrino-cache/padrino-cache.gemspec
+++ b/padrino-cache/padrino-cache.gemspec
@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("padrino-core", Padrino.version)
s.add_runtime_dependency("padrino-helpers", Padrino.version)
- s.add_runtime_dependency("moneta", ["~> 0.7.0"])
+ s.add_runtime_dependency("moneta", ["~> 1.0.0"])
end
diff --git a/padrino-cache/test/helper.rb b/padrino-cache/test/helper.rb
index e6a51c153..40665696d 100644
--- a/padrino-cache/test/helper.rb
+++ b/padrino-cache/test/helper.rb
@@ -1,6 +1,24 @@
ENV['RACK_ENV'] = 'test'
PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
-require File.expand_path('../../../load_paths', __FILE__)
-require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'helper')
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'rack/test'
require 'padrino-cache'
+
+require 'ext/rack-test-methods'
+
+class MiniTest::Spec
+ include Rack::Test::Methods
+
+ # Sets up a Sinatra::Base subclass defined with the block
+ # given. Used in setup or individual spec methods to establish
+ # the application.
+ def mock_app(base=Padrino::Application, &block)
+ @app = Sinatra.new(base, &block)
+ end
+
+ def app
+ Rack::Lint.new(@app)
+ end
+end
diff --git a/padrino-cache/test/test_legacy_store.rb b/padrino-cache/test/test_legacy_store.rb
deleted file mode 100644
index e6c336ff6..000000000
--- a/padrino-cache/test/test_legacy_store.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-describe Padrino::Cache::LegacyStore do
- def setup
- @test_key = "val_#{Time.now.to_i}"
- end
-
- def teardown
- Padrino.cache.clear
- end
-
- class Foo
- def bar; "bar"; end
- end
-
- it "return nil trying to get a value that doesn't exist" do
- Padrino.cache.flush
- assert_equal nil, Padrino.cache.get(@test_key)
- end
-
- it 'set and get an object with marshal' do
- Padrino.cache.set(@test_key, Foo.new)
- assert_equal "bar", Padrino.cache.get(@test_key).bar
- end
-
- it 'set and get a nil value' do
- Padrino.cache.set(@test_key, nil)
- assert_equal '', Padrino.cache.get(@test_key).to_s
- end
-
- it 'set and get a raw value' do
- Padrino.cache.set(@test_key, 'foo')
- assert_equal 'foo', Padrino.cache.get(@test_key)
- end
-
- it "set a value that expires" do
- init_time = ( Time.now - 20 )
- Time.stub(:now, init_time) { Padrino.cache.set(@test_key, 'test', :expires_in => 1) }
- Time.stub(:now, init_time + 20) { assert_equal nil, Padrino.cache.get(@test_key) }
- end
-
- it "be able to cache forever" do
- Padrino.cache.set('forever', 'cached', :expires_in => -1)
- 2.times { |i| assert_equal 'cached', Padrino.cache.get('forever') }
- end
-
- it 'delete a value' do
- Padrino.cache.set(@test_key, 'test')
- assert_equal 'test', Padrino.cache.get(@test_key)
- Padrino.cache.delete(@test_key)
- assert_equal nil, Padrino.cache.get(@test_key)
- end
-end
diff --git a/padrino-cache/test/test_moneta_store.rb b/padrino-cache/test/test_moneta_store.rb
index c88fbd19e..ce30d0be8 100644
--- a/padrino-cache/test/test_moneta_store.rb
+++ b/padrino-cache/test/test_moneta_store.rb
@@ -15,7 +15,7 @@ def bar; "bar"; end
it "return nil trying to get a value that doesn't exist" do
Padrino.cache.clear
- assert_equal nil, Padrino.cache[@test_key]
+ assert_nil Padrino.cache[@test_key]
end
it 'set and get an object with marshal' do
@@ -36,7 +36,7 @@ def bar; "bar"; end
it "set a value that expires" do
init_time = ( Time.now - 20 )
Time.stub(:now, init_time) { Padrino.cache.store(@test_key, 'test', :expires => 1) }
- Time.stub(:now, init_time + 20) { assert_equal nil, Padrino.cache[@test_key] }
+ Time.stub(:now, init_time + 20) { assert_nil Padrino.cache[@test_key] }
end
it "be able to cache forever" do
@@ -48,6 +48,6 @@ def bar; "bar"; end
Padrino.cache[@test_key] = 'test'
assert_equal 'test', Padrino.cache[@test_key]
Padrino.cache.delete(@test_key)
- assert_equal nil, Padrino.cache[@test_key]
+ assert_nil Padrino.cache[@test_key]
end
end
diff --git a/padrino-cache/test/test_padrino_cache.rb b/padrino-cache/test/test_padrino_cache.rb
index b093069af..3ae2c970e 100644
--- a/padrino-cache/test/test_padrino_cache.rb
+++ b/padrino-cache/test/test_padrino_cache.rb
@@ -296,14 +296,14 @@
get '/404'
assert_equal 'fancy 404', body
assert_equal 404, status
- assert_equal nil, @app.cache['/404']
+ assert_nil @app.cache['/404']
get '/404'
assert_equal 'fancy 404', body
assert_equal 404, status
get '/503'
assert_equal 'fancy 503', body
assert_equal 503, status
- assert_equal nil, @app.cache['/503']
+ assert_nil @app.cache['/503']
get '/503'
assert_equal 'fancy 503', body
assert_equal 503, status
@@ -457,4 +457,68 @@
assert_equal 4, called_times_a
assert_equal 2, called_times_b
end
+
+ it "preserve the app's `caching` setting if set before registering the module" do
+ mock_app do
+ enable :caching
+ register Padrino::Cache
+ end
+
+ assert @app.caching
+ end
+
+ it "preserve the app's `cache` setting if set before registering the module" do
+ mock_app do
+ set :cache, Padrino::Cache.new(:Memory)
+ register Padrino::Cache
+ end
+
+ adapter = @app.cache.adapter
+ while adapter.respond_to? :adapter
+ adapter = adapter.adapter
+ end
+ assert_kind_of Moneta::Adapters::Memory, adapter
+ end
+
+ it "should check key existence" do
+ count1, count2 = 0, 0
+ mock_app do
+ register Padrino::Cache
+ enable :caching
+ get "/" do
+ cache(:foo) do
+ count1 += 1
+ nil
+ end
+ count1.inspect
+ end
+
+ get "/object" do
+ cache_object(:bar) do
+ count2 += 1
+ nil
+ end
+ count2.inspect
+ end
+ end
+ 2.times { get "/" }
+ assert_equal "1", body
+ 2.times { get "/object" }
+ assert_equal "1", body
+ end
+
+ it 'should cache full mime type of content_type' do
+ mock_app do
+ register Padrino::Cache
+ enable :caching
+ get '/foo', :cache => true do
+ content_type :json, :charset => 'utf-8'
+ '{}'
+ end
+ end
+ get "/foo"
+ assert_equal 'application/json;charset=utf-8', last_response.content_type
+ get "/foo"
+ assert_equal 'application/json;charset=utf-8', last_response.content_type
+ end
end
diff --git a/padrino-core/README.rdoc b/padrino-core/README.rdoc
index 12eaf53ad..9bbf9ca54 100644
--- a/padrino-core/README.rdoc
+++ b/padrino-core/README.rdoc
@@ -34,7 +34,7 @@ Reloading:: Automatically reloads server code during development.
Localization:: Full support of I18n language localization and can auto-set user's locale.
Keep in mind, the user will be able to pull in these components
-{seperately into existing Sinatra applications}[http://www.padrinorb.com/guides/standalone-usage-in-sinatra]
+{seperately into existing Sinatra applications}[http://padrinorb.com/guides/advanced-usage/standalone-usage-in-sinatra/]
or use them altogether for a comprehensive upgrade to Sinatra (a full-stack Padrino application).
== Installation
@@ -47,7 +47,7 @@ This will install the necessary padrino gems to get you started.
Now you are ready to use this gem to enhance your sinatra projects or to create new Padrino applications.
For a more detailed look at Padrino installation,
-check out the {Installation Guide}[http://www.padrinorb.com/guides/installation].
+check out the {Installation Guide}[http://padrinorb.com/guides/getting-started/installation/].
== Usage
@@ -57,20 +57,20 @@ on the enhancements to the core Sinatra functionality. To use Padrino, one shoul
usage of Sinatra itself.
Please check out the
-{Understanding Sinatra}[http://www.padrinorb.com/guides/underlying-sinatra-overview] guide
+{Understanding Sinatra}[http://padrinorb.com/guides/introduction/why-learn-padrino/#learning-to-love-sinatra] guide
to learn more about these fundamentals.
For information on how to use a specific gem in isolation within an existing Sinatra project, checkout the guide for
-{Using Padrino in Sinatra}[http://www.padrinorb.com/guides/standalone-usage-in-sinatra].
+{Using Padrino in Sinatra}[http://padrinorb.com/guides/advanced-usage/standalone-usage-in-sinatra/].
== Getting Started
Once a developer understands Sinatra, Padrino is quite easy to get comfortable with since Padrino is simply a superset
of existing Sinatra Functionality! Best way to get started with building Padrino applications is to read following resources:
-* {Blog Tutorial}[http://www.padrinorb.com/guides/blog-tutorial] - Step-by-step guide to building a blog application with Padrino.
-* {Quick Overview}[http://www.padrinorb.com/guides/basic-projects] - Outlines basic generation commands.
-* {Padrino Examples}[http://www.padrinorb.com/guides/examples] - List of known Padrino applications which can serve as examples.
+* {Blog Tutorial}[http://padrinorb.com/guides/getting-started/blog-tutorial/] - Step-by-step guide to building a blog application with Padrino.
+* {Quick Overview}[http://padrinorb.com/guides/getting-started/basic-projects/] - Outlines basic generation commands.
+* {Padrino Examples}[http://padrinorb.com/guides/introduction/examples/] - List of known Padrino applications which can serve as examples.
== Enhanced Base Application (padrino-core)
@@ -104,10 +104,10 @@ Let us first take a look at the simplest possible Padrino application:
end
end
-=== Enhanced Route Definitions and Controllers
-
For a complete overview of the Padrino routing and controller system,
-check out the {Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
+check out the {Routing and Controller guide}[http://padrinorb.com/guides/controllers/overview/].
+
+=== Enhanced Route Definitions and Controllers
Suppose we wanted to add additional routes to our Padrino application, and we want to organize the routes
within a more structured layout. Simply add a controllers or app/controllers folder and create a file as such:
@@ -175,7 +175,7 @@ When you visit :+show+ and your I18n.locale == :ru Padrino try to look for "admi
they try "admin/show.ru.*" then "admin/show.js.*" if none match return "admin/show.erb" (or other engine i.e. haml)
For a complete overview of the routing and controller system, check out the
-{Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
+{Routing and Controller guide}[http://padrinorb.com/guides/controllers/overview/].
=== Rendering
@@ -191,7 +191,7 @@ The existing render function works as well if an engine type should be specified
render :haml, 'account/index'
For a complete overview of the Padrino rendering system, check out the
-{Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
+{Routing and Controller guide}[http://padrinorb.com/guides/controllers/rendering/].
=== Layout
@@ -206,7 +206,7 @@ With Padrino you can (like rails do) use for your custom layout, disable it
layout :custom
For a complete overview of the layout functionality,
-check out the {Routing and Controller guide}[http://www.padrinorb.com/guides/controllers].
+check out the {Routing and Controller guide}[http://padrinorb.com/guides/controllers/layouts/].
=== Mounting Applications
@@ -221,7 +221,7 @@ Padrino stores application mounting information by default within config/app
to keep all information regarding what applications are mounted to which uri's.
For a complete look at mounting applications within a Padrino project,
-check out the guide on {Mounting Applications}[http://www.padrinorb.com/guides/mounting-applications].
+check out the guide on {Mounting Applications}[http://padrinorb.com/guides/features/mounting-applications/].
=== Auto Load Paths
@@ -231,7 +231,7 @@ as a convention for establishing database connection. Also, any files within the
automatically by Padrino.
For a complete overview of auto-loaded paths within Padrino,
-check out the {Padrino Development Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
+check out the {Padrino Development Guide}[http://padrinorb.com/guides/features/development-commands/#auto-load-paths].
=== Application Logging
@@ -248,7 +248,7 @@ within your app and any controller or views:
end
For a complete overview of Padrino logger functionality, check out the
-{Padrino Development Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
+{Padrino Development Guide}[http://padrinorb.com/guides/features/development-commands/].
=== Development Reloader
@@ -260,7 +260,7 @@ This makes rapid development much easier and provides a better alternative to 's
which requires the application server to be restarted which makes requests take much longer to complete.
For a complete overview of code reloading in development,
-check out the {Padrino Development Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
+check out the {Padrino Development Guide}[http://padrinorb.com/guides/features/development-commands/#development-reloader].
=== Terminal Commands
@@ -287,8 +287,8 @@ You can also create custom rake tasks as well. Using these commands can simplify
making development that much smoother.
For a complete overview of Padrino terminal commands, check out the
-{Padrino Commands Guide}[http://www.padrinorb.com/guides/development-and-terminal-commands].
+{Padrino Commands Guide}[http://padrinorb.com/guides/features/development-commands/#terminal-commands].
== Copyright
-Copyright (c) 2011-2013 Padrino. See LICENSE for details.
+Copyright (c) 2011-2015 Padrino. See LICENSE for details.
diff --git a/padrino-core/Rakefile b/padrino-core/Rakefile
index f33347d26..da75d43e2 100644
--- a/padrino-core/Rakefile
+++ b/padrino-core/Rakefile
@@ -1,5 +1 @@
-# coding:utf-8
-RAKE_ROOT = __FILE__
-
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
\ No newline at end of file
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
diff --git a/padrino-core/bin/padrino b/padrino-core/bin/padrino
index ccc4c62e2..7befe644f 100755
--- a/padrino-core/bin/padrino
+++ b/padrino-core/bin/padrino
@@ -1,9 +1,9 @@
#!/usr/bin/env ruby
-require 'rubygems' unless defined?(Gem)
-require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
+require 'padrino-core/cli/binstub'
+Padrino.replace_with_binstub('padrino')
padrino_core_path = File.expand_path('../../lib', __FILE__)
$:.unshift(padrino_core_path) if File.directory?(padrino_core_path) && !$:.include?(padrino_core_path)
require 'padrino-core/cli/base'
-Padrino::Cli::Base.start(ARGV)
\ No newline at end of file
+Padrino::Cli::Base.start(ARGV)
diff --git a/padrino-core/lib/padrino-core.rb b/padrino-core/lib/padrino-core.rb
index 7eeee343f..d73c78d3d 100644
--- a/padrino-core/lib/padrino-core.rb
+++ b/padrino-core/lib/padrino-core.rb
@@ -1,6 +1,8 @@
require 'sinatra/base'
require 'padrino-core/version'
require 'padrino-support'
+require 'padrino-support/inflections'
+require 'padrino-core/configuration'
require 'padrino-core/application'
require 'padrino-core/caller'
@@ -25,6 +27,7 @@ module Padrino
class ApplicationLoadError < RuntimeError # @private
end
+ extend Configuration
extend Loader
class << self
@@ -66,10 +69,10 @@ def env
# No applications were mounted.
#
def application
- warn 'WARNING! No apps are mounted. Please, mount apps in `config/apps.rb`' unless Padrino.mounted_apps.present?
+ warn 'WARNING! No apps are mounted. Please, mount apps in `config/apps.rb`' if Padrino.mounted_apps.empty?
router = Padrino::Router.new
Padrino.mounted_apps.each { |app| app.map_onto(router) }
- middleware.present? ? add_middleware(router) : router
+ middleware.empty? ? router : add_middleware(router)
end
##
@@ -109,8 +112,8 @@ def global_configurations
# @return [NilClass]
#
def set_encoding
- Encoding.default_external = Encoding::UTF_8
- Encoding.default_internal = Encoding::UTF_8
+ # remove after 0.15
+ warn 'Warning! Padrino.set_encoding is deprecated. Padrino no longer manages ruby default encodings'
nil
end
diff --git a/padrino-core/lib/padrino-core/application.rb b/padrino-core/lib/padrino-core/application.rb
index 5fbda87ad..8c03402ff 100644
--- a/padrino-core/lib/padrino-core/application.rb
+++ b/padrino-core/lib/padrino-core/application.rb
@@ -26,26 +26,14 @@ def logger
Padrino.logger
end
- # TODO: Remove this hack (issue #863) after getting rid of thread-unsafe http_router:
- if RUBY_PLATFORM == "java"
- alias_method :original_call, :call
- def call(*args)
- settings.init_mutex.synchronize do
- instance_eval{ undef :call }
- class_eval{ alias_method :call, :original_call }
- instance_eval{ undef :original_call }
- super(*args)
- end
- end
- end
-
class << self
def inherited(base)
begun_at = Time.now
CALLERS_TO_IGNORE.concat(PADRINO_IGNORE_CALLERS)
+ super(base)
+ base.prerequisites.replace(self.prerequisites.dup)
base.default_configuration!
logger.devel :setup, begun_at, base
- super(base)
end
##
@@ -65,7 +53,6 @@ def reload!
reset_router!
Padrino.require_dependencies(settings.app_file, :force => true)
require_dependencies
- default_filters
default_routes
default_errors
I18n.reload! if defined?(I18n)
@@ -149,7 +136,7 @@ def dependencies
'controllers.rb',
'helpers/**/*.rb',
'helpers.rb',
- ].map { |file| Dir.glob(File.join(settings.root, file)) }.flatten
+ ].flat_map{ |file| Dir.glob(File.join(settings.root, file)) }
end
##
@@ -175,12 +162,6 @@ def default(option, *args, &block)
set(option, *args, &block) unless respond_to?(option)
end
- # Deprecated
- def load_paths
- warn 'Padrino::Application#load_paths is deprecated. Please, use #prerequisites'
- []
- end
-
protected
##
diff --git a/padrino-core/lib/padrino-core/application/application_setup.rb b/padrino-core/lib/padrino-core/application/application_setup.rb
index 244142111..6f2bf786d 100644
--- a/padrino-core/lib/padrino-core/application/application_setup.rb
+++ b/padrino-core/lib/padrino-core/application/application_setup.rb
@@ -13,7 +13,7 @@ module ClassMethods
#
def default_configuration!
set :app_file, File.expand_path(caller_files.first || $0)
- set :app_name, settings.to_s.underscore.to_sym
+ set :app_name, Inflections.underscore(settings).to_sym
set :environment, Padrino.env
set :reload, proc { development? }
@@ -22,11 +22,6 @@ def default_configuration!
set :method_override, true
set :default_builder, 'StandardFormBuilder'
- # TODO: Remove this hack after getting rid of thread-unsafe http_router:
- if RUBY_PLATFORM == "java"
- set :init_mutex, Mutex.new
- end
-
default_paths
default_security
global_configuration
@@ -42,13 +37,22 @@ def default_configuration!
def setup_application!
return if @_configured
require_dependencies
- default_filters
default_routes
default_errors
setup_locale
+ precompile_routes!
@_configured = true
end
+ def precompile_routes?
+ settings.respond_to?(:precompile_routes) && settings.precompile_routes?
+ end
+
+ def precompile_routes!
+ compiled_router.prepare!
+ compiled_router.engine.compile!
+ end
+
private
def default_paths
@@ -58,6 +62,7 @@ def default_paths
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
@@ -98,6 +103,7 @@ def default_prerequisites
# Also initializes the application after setting up the middleware.
def setup_default_middleware(builder)
setup_sessions builder
+ builder.use Sinatra::ExtendedRack if defined?(EventMachine)
builder.use Padrino::ShowExceptions if show_exceptions?
builder.use Padrino::Logger::Rack, uri_root if Padrino.logger && logging?
builder.use Padrino::Reloader::Rack if reload?
@@ -109,16 +115,6 @@ def setup_default_middleware(builder)
setup_application!
end
- ##
- # This filter it's used for know the format of the request, and
- # automatically set the content type.
- #
- def default_filters
- before do
- response['Content-Type'] = 'text/html;charset=utf-8' unless @_content_type
- end
- end
-
##
# We need to add almost __sinatra__ images.
#
diff --git a/padrino-core/lib/padrino-core/application/flash.rb b/padrino-core/lib/padrino-core/application/flash.rb
index 8edfe79c9..30224a2f4 100644
--- a/padrino-core/lib/padrino-core/application/flash.rb
+++ b/padrino-core/lib/padrino-core/application/flash.rb
@@ -185,11 +185,11 @@ module Helpers
#
# @overload redirect(url, status_code)
# @param [String] url
- # @param [Fixnum] status_code
+ # @param [Integer] status_code
#
# @overload redirect(url, status_code, flash_messages)
# @param [String] url
- # @param [Fixnum] status_code
+ # @param [Integer] status_code
# @param [Hash] flash_messages
#
# @overload redirect(url, flash_messages)
@@ -203,7 +203,7 @@ module Helpers
# @since 0.10.8
# @api public
def redirect(url, *args)
- flashes = args.extract_options!
+ flashes = args.last.is_a?(Hash) ? args.pop : {}
flashes.each do |type, message|
message = I18n.translate(message) if message.is_a?(Symbol) && defined?(I18n)
diff --git a/padrino-core/lib/padrino-core/application/params_protection.rb b/padrino-core/lib/padrino-core/application/params_protection.rb
index 1a6622e3b..4335a7a39 100644
--- a/padrino-core/lib/padrino-core/application/params_protection.rb
+++ b/padrino-core/lib/padrino-core/application/params_protection.rb
@@ -1,9 +1,3 @@
-begin
- require 'active_support/core_ext/object/deep_dup' # AS 4.1
-rescue LoadError => ex
- require 'active_support/core_ext/hash/deep_dup' # AS >= 3.1
-end
-
module Padrino
##
# Padrino application module providing means for mass-assignment protection.
@@ -45,7 +39,7 @@ module ClassMethods
def params(*allowed_params)
allowed_params = prepare_allowed_params(allowed_params)
condition do
- @original_params = params.deep_dup
+ @original_params = Utils.deep_dup(params)
filter_params!(params, allowed_params)
end
end
@@ -99,8 +93,8 @@ def filter_params!(params, allowed_params)
type = allowed_params[key]
next if value.kind_of?(Array) && type
case
- when type.kind_of?(Hash)
- if key == key.pluralize
+ when type.kind_of?(Hash) && value.kind_of?(Hash)
+ if key == Inflections.pluralize(key) && value.values.first.kind_of?(Hash)
value.each do |array_index,array_value|
value[array_index] = filter_params!(array_value, type)
end
diff --git a/padrino-core/lib/padrino-core/application/routing.rb b/padrino-core/lib/padrino-core/application/routing.rb
index 46b622e32..3c963a4d2 100644
--- a/padrino-core/lib/padrino-core/application/routing.rb
+++ b/padrino-core/lib/padrino-core/application/routing.rb
@@ -1,6 +1,6 @@
require 'padrino-support'
+require 'padrino-core/path_router' unless defined?(PathRouter)
require 'padrino-core/ext/sinatra'
-require 'padrino-core/ext/http_router'
require 'padrino-core/filter'
module Padrino
@@ -21,6 +21,14 @@ module Routing
# Raised when a route was invalid or cannot be processed.
class UnrecognizedException < RuntimeError; end
+ # Raised when block arity was nonzero and was not same with
+ # captured parameter length.
+ class BlockArityError < ArgumentError
+ def initialize(path, block_arity, required_arity)
+ super "route block arity does not match path '#{path}' (#{block_arity} for #{required_arity})"
+ end
+ end
+
class Parent < String
attr_reader :map
attr_reader :optional
@@ -206,13 +214,14 @@ def add_filter(type, &block)
# before :agent => /IE/ do; ...; end
# # => match +HTTP_USER_AGENT+ containing +IE+
#
- # @see http://www.padrinorb.com/guides/controllers#route-filters
+ # @see http://padrinorb.com/guides/controllers/route-filters/
#
def construct_filter(*args, &block)
- options = args.extract_options!
+ options = args.last.is_a?(Hash) ? args.pop : {}
if except = options.delete(:except)
fail "You cannot use :except with other options specified" unless args.empty? && options.empty?
- options = Array(except).extract_options!
+ except = Array(except)
+ options = except.last.is_a?(Hash) ? except.pop : {}
end
Filter.new(!except, @_controller, options, Array(except || args), &block)
end
@@ -241,7 +250,8 @@ def construct_filter(*args, &block)
# end
# end
#
- def parent(name, options={})
+ def parent(name = nil, options={})
+ return super() unless name
defaults = { :optional => false, :map => name.to_s }
options = defaults.merge(options)
@_parent = Array(@_parent) unless @_parent.is_a?(Array)
@@ -249,16 +259,14 @@ def parent(name, options={})
end
##
- # Using HttpRouter, for features and configurations.
+ # Using PathRouter, for features and configurations.
#
# @example
# router.add('/greedy/:greed')
# router.recognize('/simple')
#
- # @see http://github.com/joshbuddy/http_router
- #
def router
- @router ||= HttpRouter.new
+ @router ||= PathRouter.new
block_given? ? yield(@router) : @router
end
alias :urls :router
@@ -267,13 +275,12 @@ def compiled_router
if @deferred_routes
deferred_routes.each do |routes|
routes.each do |(route, dest)|
- route.to(dest)
+ route.to(&dest)
route.before_filters.flatten!
route.after_filters.flatten!
end
end
@deferred_routes = nil
- router.sort!
end
router
end
@@ -310,9 +317,8 @@ def reset_router!
# # => [:foo_bar, :id => :mine]
#
def recognize_path(path)
- responses = @router.recognize(Rack::MockRequest.env_for(path))
- responses = responses[0] if responses[0].is_a?(Array)
- [responses[0].path.route.name, responses[0].params]
+ responses = @router.recognize_path(path)
+ [responses[0], responses[1]]
end
##
@@ -332,13 +338,21 @@ def recognize_path(path)
# url(:index, :fragment => 'comments')
#
def url(*args)
- params = args.extract_options!
+ params = args.last.is_a?(Hash) ? args.pop : {}
fragment = params.delete(:fragment) || params.delete(:anchor)
- path = make_path_with_params(args, value_to_param(params.symbolize_keys))
- rebase_url(fragment ? path << '#' << fragment : path)
+ path = make_path_with_params(args, value_to_param(params))
+ rebase_url(fragment ? path << '#' << fragment.to_s : path)
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)
@@ -363,23 +377,39 @@ def rebase_url(url)
new_url << conform_uri(uri_root) if defined?(uri_root)
new_url << url
else
- url.blank? ? '/' : url
+ url.empty? ? '/' : url
+ end
+ end
+
+ ##
+ # Processes the existing path and prepends the 'parent' parameters onto the route
+ # Used for calculating path in route method.
+ #
+ def process_path_for_parent_params(path, parent_params)
+ parent_prefix = parent_params.flatten.compact.uniq.map do |param|
+ map = (param.respond_to?(:map) && param.map ? param.map : param.to_s)
+ part = "#{map}/:#{Inflections.singularize(param)}_id/"
+ part = "(#{part})?" if param.respond_to?(:optional) && param.optional?
+ part
end
+
+ [parent_prefix, path].flatten.join("")
end
private
+ # temporary variables named @_parent, @_provides, @_use_format, @_cache, @_expires, @_map, @_conditions, @_accepts, @_params
CONTROLLER_OPTIONS = [ :parent, :provides, :use_format, :cache, :expires, :map, :conditions, :accepts, :params ].freeze
# Saves controller options, yields the block, restores controller options.
def with_new_options(*args)
- options = args.extract_options!
+ options = args.last.is_a?(Hash) ? args.pop : {}
CONTROLLER_OPTIONS.each{ |key| replace_instance_variable("@_#{key}", options.delete(key)) }
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
@@ -400,7 +430,7 @@ def make_path_with_params(args, params)
names, params_array = args.partition{ |arg| arg.is_a?(Symbol) }
name = names[0, 2].join(" ").to_sym
compiled_router.path(name, *(params_array << params))
- rescue HttpRouter::InvalidRouteException
+ rescue PathRouter::InvalidRouteException
raise Padrino::Routing::UnrecognizedException, "Route mapping for url(#{name.inspect}) could not be found"
end
@@ -464,14 +494,13 @@ def route(verb, path, *args, &block)
else raise
end
- # Do padrino parsing. We dup options so we can build HEAD request correctly.
route_options = options.dup
route_options[:provides] = @_provides if @_provides
route_options[:accepts] = @_accepts if @_accepts
route_options[:params] = @_params unless @_params.nil? || route_options.include?(:params)
# Add Sinatra condition to check rack-protection failure.
- if protect_from_csrf && (report_csrf_failure || allow_disabled_csrf)
+ if respond_to?(:protect_from_csrf) && protect_from_csrf && (report_csrf_failure || allow_disabled_csrf)
unless route_options.has_key?(:csrf_protection)
route_options[:csrf_protection] = true
end
@@ -480,12 +509,13 @@ def route(verb, path, *args, &block)
path, *route_options[:with] = path if path.is_a?(Array)
action = path
path, name, route_parents, options, route_options = *parse_route(path, route_options, verb)
- options.reverse_merge!(@_conditions) if @_conditions
+ options = @_conditions.merge(options) if @_conditions
method_name = "#{verb} #{path}"
- unbound_method = generate_method(method_name, &block)
+ unbound_method = generate_method(method_name.to_sym, &block)
- block = if block.arity == 0
+ block_arity = block.arity
+ block = if block_arity == 0
proc{ |request, _| unbound_method.bind(request).call }
else
proc{ |request, block_params| unbound_method.bind(request).call(*block_params) }
@@ -493,8 +523,8 @@ def route(verb, path, *args, &block)
invoke_hook(:route_added, verb, path, block)
- # HTTPRouter route construction
- route = router.add(path, route_options)
+ path[0, 0] = "/" if path == "(.:format)?"
+ route = router.add(verb, path, route_options)
route.name = name if name
route.action = action
priority_name = options.delete(:priority) || :normal
@@ -502,27 +532,35 @@ def route(verb, path, *args, &block)
route.cache = options.key?(:cache) ? options.delete(:cache) : @_cache
route.cache_expires = options.key?(:expires) ? options.delete(:expires) : @_expires
route.parent = route_parents ? (route_parents.count == 1 ? route_parents.first : route_parents) : route_parents
- route.add_request_method(verb.downcase.to_sym)
route.host = options.delete(:host) if options.key?(:host)
route.user_agent = options.delete(:agent) if options.key?(:agent)
if options.key?(:default_values)
defaults = options.delete(:default_values)
- route.add_default_values(defaults) if defaults
+ #route.options[:default_values] = defaults if defaults
+ route.default_values = defaults if defaults
end
- options.delete_if do |option, _args|
- if route.significant_variable_names.include?(option)
- route.add_match_with(option => Array(_args).first)
+ options.delete_if do |option, captures|
+ if route.significant_variable_names.include?(option.to_s)
+ route.capture[option] = Array(captures).first
true
end
end
# Add Sinatra conditions.
- options.each{ |option, args| route.respond_to?(option) ? route.send(option, *args) : send(option, *args) }
+ options.each do |option, _args|
+ option = :provides_format if option == :provides
+ route.respond_to?(option) ? route.send(option, *_args) : send(option, *_args)
+ end
conditions, @conditions = @conditions, []
route.custom_conditions.concat(conditions)
invoke_hook(:padrino_route_added, route, verb, path, args, options, block)
+ block_parameter_length = route.block_parameter_length
+ if block_arity > 0 && block_parameter_length != block_arity
+ fail BlockArityError.new(route.path, block_arity, block_parameter_length)
+ end
+
# Add Application defaults.
route.before_filters << @filters[:before]
route.after_filters << @filters[:after]
@@ -543,13 +581,14 @@ def route(verb, path, *args, &block)
# controllers, parents, 'with' parameters, and other options.
#
def parse_route(path, options, verb)
+ path = path.dup if path.kind_of?(String)
route_options = {}
if options[:params] == true
options.delete(:params)
elsif options.include?(:params)
options[:params] ||= []
- options[:params] += options[:with] if options[:with]
+ options[:params] |= Array(options[:with]) if options[:with]
end
# We need check if path is a symbol, if that it's a named route.
@@ -576,8 +615,8 @@ def parse_route(path, options, verb)
options.delete(:accepts) if options[:accepts].nil?
- if @_use_format or format_params = options[:provides]
- process_path_for_provides(path, format_params)
+ if @_use_format || options[:provides]
+ process_path_for_provides(path)
# options[:add_match_with] ||= {}
# options[:add_match_with][:format] = /[^\.]+/
end
@@ -586,7 +625,7 @@ def parse_route(path, options, verb)
unless controller.empty?
# Now we need to add our controller path only if not mapped directly
- if map.blank? and !absolute_map
+ if !map && !absolute_map
controller_path = controller.join("/")
path.gsub!(%r{^\(/\)|/\?}, "")
path = File.join(controller_path, path) unless @_map
@@ -600,7 +639,7 @@ def parse_route(path, options, verb)
end
# Add any controller level map to the front of the path.
- path = "#{@_map}/#{path}".squeeze('/') unless absolute_map or @_map.blank?
+ path = "#{@_map}/#{path}".squeeze('/') unless absolute_map || !@_map
# Small reformats
path.gsub!(%r{/\?$}, '(/)') # Remove index path
@@ -617,11 +656,10 @@ def parse_route(path, options, verb)
name = options.delete(:name) if name.nil? && options.key?(:name)
if name
controller_name = controller.join("_")
- name = "#{controller_name} #{name}".to_sym unless controller_name.blank?
+ name = "#{controller_name} #{name}".to_sym unless controller_name.empty?
end
- # Merge in option defaults.
- options.reverse_merge!(:default_values => @_defaults)
+ options[:default_values] = @_defaults unless options.has_key?(:default_values)
[path, name, parent_params, options, route_options]
end
@@ -636,27 +674,12 @@ def process_path_for_with_params(path, with_params)
end.join("/"))
end
- ##
- # Processes the existing path and prepends the 'parent' parameters onto the route
- # Used for calculating path in route method.
- #
- def process_path_for_parent_params(path, parent_params)
- parent_prefix = parent_params.flatten.compact.uniq.map do |param|
- map = (param.respond_to?(:map) && param.map ? param.map : param.to_s)
- part = "#{map}/:#{param.to_s.singularize}_id/"
- part = "(#{part})" if param.respond_to?(:optional) && param.optional?
- part
- end
-
- [parent_prefix, path].flatten.join("")
- end
-
##
# Processes the existing path and appends the 'format' suffix onto the route.
# Used for calculating path in route method.
#
- def process_path_for_provides(path, format_params)
- path << "(.:format)" unless path[-10, 10] == '(.:format)'
+ def process_path_for_provides(path)
+ path << "(.:format)?" unless path[-11, 11] == '(.:format)?'
end
##
@@ -688,6 +711,10 @@ def process_path_for_provides(path, format_params)
#
def provides(*types)
@_use_format = true
+ provides_format(*types)
+ end
+
+ def provides_format(*types)
mime_types = types.map{ |type| mime_type(CONTENT_TYPE_ALIASES[type] || type) }
condition do
return provides_format?(types, params[:format].to_sym) if params[:format]
@@ -706,10 +733,9 @@ def provides(*types)
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
- halt 406 unless catch_all
- false
+ catch_all ? true : halt(406)
end
end
end
@@ -727,7 +753,7 @@ def accepts(*types)
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
@@ -807,12 +833,12 @@ def recognize_path(path)
#
def current_path(*path_params)
if path_params.last.is_a?(Hash)
- path_params[-1] = params.merge(path_params[-1].with_indifferent_access)
+ path_params[-1] = params.merge(path_params[-1])
else
path_params << params
end
- path_params[-1] = path_params[-1].symbolize_keys
+ path_params[-1] = Utils.symbolize_keys(path_params[-1])
@route.path(*path_params)
end
@@ -843,11 +869,11 @@ def static_file?(path_info)
#
# Method for deliver static files.
#
- def static!
+ def static!(options = {})
if path = static_file?(request.path_info)
env['sinatra.static_file'] = path
cache_control(*settings.static_cache_control) if settings.static_cache_control?
- send_file(path, :disposition => nil)
+ send_file(path, options)
end
end
@@ -870,7 +896,6 @@ def static!
#
def content_type(type=nil, params={})
return @_content_type unless type
- params.delete(:charset) if type == :json
super(type, params)
@_content_type = type
end
@@ -880,7 +905,7 @@ def content_type(type=nil, params={})
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)
@@ -890,7 +915,7 @@ def provides_format?(types, format)
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
@@ -899,10 +924,13 @@ def mime_symbol(media_type)
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
def dispatch!
+ @params = defined?(Sinatra::IndifferentHash) ? Sinatra::IndifferentHash[@request.params] : indifferent_params(@request.params)
+ force_encoding(@params)
invoke do
static! if settings.static? && (request.get? || request.head?)
route!
@@ -918,19 +946,26 @@ def dispatch!
end
end
- def route!(base=settings, pass_block=nil)
+ def route!(base = settings, pass_block = nil)
Thread.current['padrino.instance'] = self
+ first_time = true
+
+ routes = base.compiled_router.call(@request) do |route, params|
+ next if route.user_agent && !(route.user_agent =~ @request.user_agent)
+ original_params, parent_layout = @params.dup, @layout
+ returned_pass_block = invoke_route(route, params, first_time)
+ pass_block = returned_pass_block if returned_pass_block
+ first_time = false if first_time
+ @params, @layout = original_params, parent_layout
+ end
- if base.compiled_router && result = base.compiled_router.call(@request.env)
- if result.respond_to?(:each)
- route_eval do
- response.headers.merge!(result[1])
- route_missing if status(result[0]) == 404
- route_missing if (allow = response['Allow']) && allow.include?(request.env['REQUEST_METHOD'])
- end
+ unless routes.empty?
+ verb = request.request_method
+ candidacies, allows = routes.partition{|route| route.verb == verb }
+ if candidacies.empty?
+ response["Allows"] = allows.map(&:verb).join(", ")
+ halt 405
end
- else
- filter! :before
end
if base.superclass.respond_to?(:router)
@@ -939,9 +974,45 @@ def route!(base=settings, pass_block=nil)
end
route_eval(&pass_block) if pass_block
-
route_missing
end
+
+ def invoke_route(route, params, first_time)
+ @_response_buffer = nil
+ @route = request.route_obj = route
+ captured_params = captures_from_params(params)
+
+ # Should not overwrite params by given query
+ @params.merge!(params) do |key, original, newval|
+ @route.significant_variable_names.include?(key) ? newval : original
+ end 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
+
+ catch(:pass) do
+ begin
+ (route.before_filters - settings.filters[:before]).each{|block| instance_eval(&block) }
+ @layout = route.use_layout if route.use_layout
+ route.custom_conditions.each {|block| pass if block.bind(self).call == false }
+ route_response = route.block[self, captured_params]
+ @_response_buffer = route_response.instance_of?(Array) ? route_response.last : route_response
+ halt(route_response)
+ ensure
+ (route.after_filters - settings.filters[:after]).each {|block| instance_eval(&block) }
+ end
+ end
+ end
+
+ def captures_from_params(params)
+ if params[:captures].instance_of?(Array) && !params[:captures].empty?
+ params.delete(:captures)
+ else
+ params.values_at(*route.matcher.names).flatten
+ end
+ end
end
end
end
diff --git a/padrino-core/lib/padrino-core/caller.rb b/padrino-core/lib/padrino-core/caller.rb
index f3129eb3e..9a01c798d 100644
--- a/padrino-core/lib/padrino-core/caller.rb
+++ b/padrino-core/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)
##
diff --git a/padrino-core/lib/padrino-core/cli/adapter.rb b/padrino-core/lib/padrino-core/cli/adapter.rb
index d50badd2e..4edfbbd7c 100644
--- a/padrino-core/lib/padrino-core/cli/adapter.rb
+++ b/padrino-core/lib/padrino-core/cli/adapter.rb
@@ -1,21 +1,32 @@
+require 'padrino-support'
+
module Padrino
module Cli
module Adapter
class << self
# Start for the given options a rackup handler
def start(options)
- Padrino.run!(options.symbolize_keys)
+ Padrino.run!(Utils.symbolize_keys(options))
end
# Method that stop (if exist) a running Padrino.application
def stop(options)
- options.symbolize_keys!
+ options = Utils.symbolize_keys(options)
if File.exist?(options[:pid])
pid = File.read(options[:pid]).to_i
- print "=> Sending INT to process with pid #{pid} wait "
- Process.kill(2, pid) rescue nil
+ puts "=> Sending INT to process with pid #{pid}"
+ begin
+ Process.kill(2, pid)
+ rescue Errno::ESRCH, RangeError => error
+ puts error.message
+ exit
+ rescue Errno::EPERM => error
+ puts error.message
+ abort
+ end
else
puts "=> #{options[:pid]} not found!"
+ abort
end
end
end
diff --git a/padrino-core/lib/padrino-core/cli/base.rb b/padrino-core/lib/padrino-core/cli/base.rb
index e7596c181..6f54bd58e 100644
--- a/padrino-core/lib/padrino-core/cli/base.rb
+++ b/padrino-core/lib/padrino-core/cli/base.rb
@@ -4,7 +4,7 @@ module Padrino
module Cli
class Base < Launcher
desc "rake", "Execute rake tasks."
- method_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development
+ method_option :environment, :type => :string, :aliases => "-e"
method_option :list, :type => :string, :aliases => "-T", :desc => "Display the tasks (matching optional PATTERN) with descriptions, then exit."
method_option :trace, :type => :boolean, :aliases => "-t", :desc => "Turn on invoke/execute tracing, enable full backtrace."
def rake(*args)
@@ -28,16 +28,20 @@ def rake(*args)
def console(*args)
prepare :console
require File.expand_path("../../version", __FILE__)
- ARGV.clear
- require 'irb'
- begin
- require "irb/completion"
- rescue LoadError
- end
require File.expand_path('config/boot.rb')
puts "=> Loading #{Padrino.env} console (Padrino v.#{Padrino.version})"
require File.expand_path('../console', __FILE__)
- IRB.start
+ ARGV.clear
+ if defined? Pry
+ Pry.start
+ else
+ require 'irb'
+ begin
+ require "irb/completion"
+ rescue LoadError
+ end
+ IRB.start
+ end
end
desc "generate", "Executes the Padrino generator with given options (alternatively use 'gen' or 'g')."
diff --git a/padrino-core/lib/padrino-core/cli/binstub.rb b/padrino-core/lib/padrino-core/cli/binstub.rb
new file mode 100644
index 000000000..bc4efc1d7
--- /dev/null
+++ b/padrino-core/lib/padrino-core/cli/binstub.rb
@@ -0,0 +1,27 @@
+module Padrino
+ ##
+ # Replaces the current process with it's binstub.
+ #
+ def self.replace_with_binstub(executable)
+ begin
+ return if Bundler.definition.missing_specs.empty?
+ rescue NameError, NoMethodError, Bundler::GemfileNotFound
+ end
+
+ project_root = Dir.pwd
+ until project_root.empty?
+ break if File.file?(File.join(project_root, 'Gemfile'))
+ project_root = project_root.rpartition('/').first
+ end
+
+ if %w(Gemfile .components).all? { |file| File.file?(File.join(project_root, file)) }
+ binstub = File.join(project_root, 'bin', executable)
+ if File.file?(binstub)
+ exec Gem.ruby, binstub, *ARGV
+ else
+ puts 'Please run `bundler install --binstubs` from your project root to generate bundle-specific executables'
+ exit!
+ end
+ end
+ end
+end
diff --git a/padrino-core/lib/padrino-core/cli/launcher.rb b/padrino-core/lib/padrino-core/cli/launcher.rb
index 6f15b9893..0bb113754 100644
--- a/padrino-core/lib/padrino-core/cli/launcher.rb
+++ b/padrino-core/lib/padrino-core/cli/launcher.rb
@@ -6,7 +6,7 @@ class Launcher < Thor
include Thor::Actions
class_option :chdir, :type => :string, :aliases => "-c", :desc => "Change to dir before starting."
- class_option :environment, :type => :string, :aliases => "-e", :required => true, :default => :development, :desc => "Padrino Environment."
+ class_option :environment, :type => :string, :aliases => "-e", :desc => "Padrino Environment."
class_option :help, :type => :boolean, :desc => "Show help usage"
desc "start", "Starts the Padrino application (alternatively use 's')."
@@ -70,13 +70,17 @@ def server_options(options)
def prepare(task)
if options.help?
help(task.to_s)
- raise SystemExit
+ exit
+ end
+ if options.environment
+ ENV["RACK_ENV"] = options.environment.to_s
+ else
+ ENV["RACK_ENV"] ||= 'development'
end
- ENV["RACK_ENV"] ||= options.environment.to_s
chdir(options.chdir)
unless File.exist?('config/boot.rb')
puts "=> Could not find boot file in: #{options.chdir}/config/boot.rb !!!"
- raise SystemExit
+ abort
end
end
@@ -90,6 +94,10 @@ def chdir(dir)
puts "=> Specified Padrino root '#{dir}' cannot be accessed by the current user!"
end
end
+
+ def self.exit_on_failure?
+ true
+ end
end
end
end
diff --git a/padrino-core/lib/padrino-core/cli/rake.rb b/padrino-core/lib/padrino-core/cli/rake.rb
index 5275c8769..da084ba5c 100644
--- a/padrino-core/lib/padrino-core/cli/rake.rb
+++ b/padrino-core/lib/padrino-core/cli/rake.rb
@@ -10,7 +10,6 @@
module PadrinoTasks
def self.init(init=false)
- $LOAD_PATH.unshift(File.expand_path("lib"))
Padrino::Tasks.files.flatten.uniq.each { |rakefile| Rake.application.add_import(rakefile) rescue puts "<= Failed load #{ext}" }
load(File.expand_path('../rake_tasks.rb', __FILE__))
Rake.application.load_imports
diff --git a/padrino-core/lib/padrino-core/cli/rake_tasks.rb b/padrino-core/lib/padrino-core/cli/rake_tasks.rb
index 9d3e1e4d8..4c5f12597 100644
--- a/padrino-core/lib/padrino-core/cli/rake_tasks.rb
+++ b/padrino-core/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
@@ -16,13 +8,10 @@
end
end
-# Loads skeleton Padrino environment, no models, no application settings.
task :skeleton do
- module Padrino::Reloader
- def self.safe_load(file, options)
- super unless file.include?('/models/')
- end
- end
+ PADRINO_ROOT ||= Rake.application.original_dir
+ require 'padrino-core'
+ Padrino.send(:dependency_paths).reject!{ |path| path.include?('/models/') }
require File.expand_path('config/boot.rb', Rake.application.original_dir)
end
@@ -33,7 +22,7 @@ def self.safe_load(file, options)
def list_app_routes(app, args)
app_routes = app.named_routes
- app_routes.reject! { |r| r.identifier.to_s !~ /#{args.query}/ } if args.query.present?
+ app_routes.reject! { |r| r.identifier.to_s !~ /#{args.query}/ } if args.query && !args.query.empty?
app_routes.map! { |r| [r.verb, r.name, r.path] }
return if app_routes.empty?
shell.say "\nApplication: #{app.app_class}", :yellow
@@ -46,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|
@@ -60,3 +62,11 @@ def list_app_routes(app, args)
list_app_routes(app, args) if app
end
end
+
+Dir["{lib/tasks/**,tasks/**,test,spec}/*.rake"].each do |file|
+ begin
+ load(File.expand_path(file))
+ rescue LoadError => e
+ warn "#{file}: #{e.message}"
+ end
+end
diff --git a/padrino-core/lib/padrino-core/configuration.rb b/padrino-core/lib/padrino-core/configuration.rb
new file mode 100644
index 000000000..f9a2bad3b
--- /dev/null
+++ b/padrino-core/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
diff --git a/padrino-core/lib/padrino-core/ext/http_router.rb b/padrino-core/lib/padrino-core/ext/http_router.rb
deleted file mode 100644
index 5d0d1f32e..000000000
--- a/padrino-core/lib/padrino-core/ext/http_router.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-require 'http_router' unless defined?(HttpRouter)
-
-class HttpRouter
- def rewrite_partial_path_info(env, request); end
- def rewrite_path_info(env, request); end
-
- def process_destination_path(path, env)
- Thread.current['padrino.instance'].instance_eval do
- request.route_obj = path.route
- @_response_buffer = nil
- @route = path.route
- @params ||= {}
- @params.update(env['router.params'])
- @block_params = if match_data = env['router.request'].extra_env['router.regex_match']
- params_list = match_data.to_a
- params_list.shift
- @params[:captures] = params_list
- params_list
- else
- env['router.request'].params
- end
- # Provide access to the current controller to the request
- # Now we can eval route, but because we have "throw halt" we need to be
- # (en)sure to reset old layout and run controller after filters.
- original_params = @params
- parent_layout = @layout
- successful = false
- begin
- filter! :before
- (@route.before_filters - settings.filters[:before]).each { |block| instance_eval(&block) }
- @layout = path.route.use_layout if path.route.use_layout
- @route.custom_conditions.each { |block| pass if block.bind(self).call == false }
- halt_response = catch(:halt) { route_eval { @route.dest[self, @block_params] } }
- @_response_buffer = halt_response.is_a?(Array) ? halt_response.last : halt_response
- successful = true
- halt halt_response
- ensure
- (@route.after_filters - settings.filters[:after]).each { |block| instance_eval(&block) } if successful
- @layout = parent_layout
- @params = original_params
- end
- end
- end
-
- class Route
- VALID_HTTP_VERBS.replace %w[GET POST PUT PATCH DELETE HEAD OPTIONS LINK UNLINK]
-
- attr_accessor :use_layout, :controller, :action, :cache, :cache_key, :cache_expires, :parent
-
- def before_filters(&block)
- @_before_filters ||= []
- @_before_filters << block if block_given?
-
- @_before_filters
- end
-
- def after_filters(&block)
- @_after_filters ||= []
- @_after_filters << block if block_given?
-
- @_after_filters
- end
-
- def custom_conditions(&block)
- @_custom_conditions ||= []
- @_custom_conditions << block if block_given?
-
- @_custom_conditions
- end
-
- def significant_variable_names
- @significant_variable_names ||= if @original_path.is_a?(String)
- @original_path.scan(/(^|[^\\])[:\*]([a-zA-Z0-9_]+)/).map{|p| p.last.to_sym}
- elsif @original_path.is_a?(Regexp) and @original_path.respond_to?(:named_captures)
- @original_path.named_captures.keys.map(&:to_sym)
- else
- []
- end
- end
-
- def to(dest = nil, &dest_block)
- @dest = dest || dest_block || raise("you didn't specify a destination")
-
- @router.current_order ||= 0
- @order = @router.current_order
- @router.current_order += 1
-
- if @dest.respond_to?(:url_mount=)
- urlmount = UrlMount.new(@path_for_generation, @default_values || {}) # TODO url mount should accept nil here.
- urlmount.url_mount = @router.url_mount if @router.url_mount
- @dest.url_mount = urlmount
- end
- self
- end
-
- attr_accessor :order
-
- end
-
- attr_accessor :current_order
-
- def sort!
- @routes.sort!{ |a, b| a.order <=> b.order }
- end
-
- class Node::Glob
- def to_code
- id = root.next_counter
- "request.params << (globbed_params#{id} = [])
- until request.path.empty?
- globbed_params#{id} << request.path.shift
- #{super}
- end
- request.path[0,0] = globbed_params#{id}
- request.params.pop"
- end
- end
-
- class Node::SpanningRegex
- def to_code
- params_count = @ordered_indicies.size
- whole_path_var = "whole_path#{root.next_counter}"
- "#{whole_path_var} = request.joined_path
- if match = #{@matcher.inspect}.match(#{whole_path_var}) and match.begin(0).zero?
- _#{whole_path_var} = request.path.dup
- " << param_capturing_code << "
- remaining_path = #{whole_path_var}[match[0].size + (#{whole_path_var}[match[0].size] == ?/ ? 1 : 0), #{whole_path_var}.size]
- request.path = remaining_path.split('/')
- #{node_to_code}
- request.path = _#{whole_path_var}
- request.params.slice!(#{-params_count}, #{params_count})
- end
- "
- end
- end
-
- # Monkey patching the Request class. Using Rack::Utils.unescape rather than
- # URI.unescape which can't handle utf-8 chars
- class Request
- def initialize(path, rack_request)
- @rack_request = rack_request
- @path = path.split(/\//).map{|part| Rack::Utils.unescape(part) }
- @path.shift if @path.first == ''
- @path.push('') if path[-1] == ?/
- @extra_env = {}
- @params = []
- @acceptable_methods = Set.new
- end
- end
-
- class Node::Path
- def to_code
- path_ivar = inject_root_ivar(self)
- "#{"if !callback && request.path.size == 1 && request.path.first == '' && (request.rack_request.head? || request.rack_request.get?) && request.rack_request.path_info[-1] == ?/
- catch(:pass) do
- response = ::Rack::Response.new
- response.redirect(request.rack_request.path_info[0, request.rack_request.path_info.size - 1], 302)
- return response.finish
- end
- end" if router.redirect_trailing_slash?}
-
- #{"if request.#{router.ignore_trailing_slash? ? 'path_finished?' : 'path.empty?'}" unless route.match_partially}
- catch(:pass) do
- if callback
- request.called = true
- callback.call(Response.new(request, #{path_ivar}))
- else
- env = request.rack_request.dup.env
- env['router.request'] = request
- env['router.params'] ||= {}
- #{"env['router.params'].merge!(Hash[#{param_names.inspect}.zip(request.params)])" if dynamic?}
- env['router.params'] = env['router.params'].with_indifferent_access
- @router.rewrite#{"_partial" if route.match_partially}_path_info(env, request)
- response = @router.process_destination_path(#{path_ivar}, env)
- return response unless router.pass_on_response(response)
- end
- end
- #{"end" unless route.match_partially}"
- end
- end
-end
diff --git a/padrino-core/lib/padrino-core/ext/sinatra.rb b/padrino-core/lib/padrino-core/ext/sinatra.rb
index a435b0ae6..8ad72935a 100644
--- a/padrino-core/lib/padrino-core/ext/sinatra.rb
+++ b/padrino-core/lib/padrino-core/ext/sinatra.rb
@@ -13,17 +13,3 @@ def action
route_obj && route_obj.action
end
end
-
-##
-# This patches Sinatra to accept UTF-8 urls on JRuby 1.7.6
-#
-if RUBY_ENGINE == 'jruby' && defined?(JRUBY_VERSION) && JRUBY_VERSION > '1.7.4'
- class Sinatra::Base
- class << self
- alias_method :old_generate_method, :generate_method
- def generate_method(method_name, &block)
- old_generate_method(method_name.to_sym, &block)
- end
- end
- end
-end
diff --git a/padrino-core/lib/padrino-core/filter.rb b/padrino-core/lib/padrino-core/filter.rb
index b3a2d2a20..fa4f1c313 100644
--- a/padrino-core/lib/padrino-core/filter.rb
+++ b/padrino-core/lib/padrino-core/filter.rb
@@ -3,7 +3,11 @@ class Filter
attr_reader :block
def initialize(mode, scoped_controller, options, args, &block)
- @mode, @scoped_controller, @options, @args, @block = mode, scoped_controller, options, args, block
+ @mode = mode
+ @scoped_controller = scoped_controller
+ @options = options
+ @args = args
+ @block = block
end
def apply?(request)
@@ -27,7 +31,8 @@ def scoped_controller_name
end
def match_with_arguments?(request)
- route, path = request.route_obj, request.path_info
+ route = request.route_obj
+ path = request.path_info
@args.any? do |argument|
if argument.instance_of?(Symbol)
next unless route
diff --git a/padrino-core/lib/padrino-core/loader.rb b/padrino-core/lib/padrino-core/loader.rb
index 5d79ab96d..c9b812cc7 100644
--- a/padrino-core/lib/padrino-core/loader.rb
+++ b/padrino-core/lib/padrino-core/loader.rb
@@ -51,16 +51,28 @@ def load!
return false if loaded?
began_at = Time.now
@_called_from = first_caller
- set_encoding
Padrino.logger
Reloader.lock!
before_load.each(&:call)
require_dependencies(*dependency_paths)
after_load.each(&:call)
logger.devel "Loaded Padrino in #{Time.now - began_at} seconds"
+ precompile_all_routes!
Thread.current[:padrino_loaded] = true
end
+ ##
+ # Precompiles all routes if :precompile_routes is set to true
+ #
+ def precompile_all_routes!
+ mounted_apps.each do |app|
+ app_obj = app.app_obj
+ next unless app_obj.respond_to?(:precompile_routes?) && app_obj.precompile_routes?
+ app_obj.setup_application!
+ logger.devel "Precompiled routes of #{app_obj} (routes size #{app_obj.compiled_router.routes.size})"
+ end
+ end
+
##
# Clear the padrino env.
#
@@ -72,6 +84,7 @@ def clear!
@_dependency_paths = nil
before_load.clear
after_load.clear
+ global_configurations.clear
Reloader.clear!
Thread.current[:padrino_loaded] = nil
end
@@ -129,11 +142,12 @@ def loaded?
# require_dependencies("#{Padrino.root}/lib/**/*.rb")
#
def require_dependencies(*paths)
- options = paths.extract_options!.merge( :cyclic => true )
- files = paths.flatten.map{ |path| Dir.glob(path).sort_by{ |filename| filename.count('/') } }.flatten.uniq
+ 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
until files.empty?
- error, fatal, loaded = nil, nil, nil
+ error = fatal = loaded = nil
files.dup.each do |file|
begin
@@ -141,6 +155,7 @@ def require_dependencies(*paths)
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
@@ -169,18 +184,6 @@ def dependency_paths
@_dependency_paths ||= default_dependency_paths + modules_dependency_paths
end
- # Deprecated
- def set_load_paths(*)
- warn 'Padrino.set_load_paths is deprecated. Please, use $LOAD_PATH.concat(paths)'
- []
- end
-
- # Deprecated
- def load_paths
- warn 'Padrino.load_paths is deprecated. Please, use Padrino::Application#prerequisites'
- []
- end
-
private
def modules_dependency_paths
@@ -192,8 +195,7 @@ def default_dependency_paths
"#{root}/config/database.rb",
"#{root}/lib/**/*.rb",
"#{root}/models/**/*.rb",
- "#{root}/shared/lib/**/*.rb",
- "#{root}/shared/models/**/*.rb",
+ "#{root}/shared/**/*.rb",
"#{root}/config/apps.rb",
]
end
diff --git a/padrino-core/lib/padrino-core/logger.rb b/padrino-core/lib/padrino-core/logger.rb
index 13198e530..61f823916 100644
--- a/padrino-core/lib/padrino-core/logger.rb
+++ b/padrino-core/lib/padrino-core/logger.rb
@@ -1,3 +1,5 @@
+require 'pathname'
+
# Defines the log level for a Padrino project.
PADRINO_LOG_LEVEL = ENV['PADRINO_LOG_LEVEL'] unless defined?(PADRINO_LOG_LEVEL)
@@ -70,6 +72,9 @@ module Extensions
if args.size > 1
bench(args[0], args[1], args[2], name)
else
+ if location = resolve_source_location(caller(1).shift)
+ args.unshift(location)
+ end if enable_source_location?
push(args * '', name)
end
end
@@ -79,6 +84,28 @@ module Extensions
end
end
+ SOURCE_LOCATION_REGEXP = /^(.*?):(\d+?)(?::in `.+?')?$/.freeze
+
+ ##
+ # Returns true if :source_location is set to true.
+ #
+ def enable_source_location?
+ respond_to?(:source_location?) && source_location?
+ end
+
+ ##
+ # Resolves a filename and line-number from caller.
+ #
+ def resolve_source_location(message)
+ path, line = *message.scan(SOURCE_LOCATION_REGEXP).first
+ return unless path && line
+ root = Padrino.root
+ path = File.realpath(path) if Pathname.new(path).relative?
+ if path.start_with?(root) && !path.start_with?(Padrino.root("vendor"))
+ "[#{path.gsub("#{root}/", "")}:#{line}] "
+ end
+ end
+
##
# Append a to development logger a given action with time.
#
@@ -237,6 +264,9 @@ def stylized_level(level)
#
# :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 '<%%= pat(:cancel) %>
<%% end %>
+ show_exceptions setting")
+ end
end
end
diff --git a/padrino-core/test/test_csrf_protection.rb b/padrino-core/test/test_csrf_protection.rb
index 4b2a8bc5e..05b5c5556 100644
--- a/padrino-core/test/test_csrf_protection.rb
+++ b/padrino-core/test/test_csrf_protection.rb
@@ -6,6 +6,7 @@
describe 'CSRF protection' do
describe "with CSRF protection on" do
before do
+ @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
mock_app do
enable :sessions
enable :protect_from_csrf
@@ -19,25 +20,24 @@
end
it 'should allow requests with correct tokens' do
- post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
+ post "/", {"authenticity_token" => @token}, 'rack.session' => {:csrf => @token}
assert_equal 200, status
end
it 'should not allow requests with incorrect tokens' do
- post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
+ post "/", {"authenticity_token" => "b"}, 'rack.session' => {:csrf => @token}
assert_equal 403, status
end
it 'should allow requests with correct X-CSRF-TOKEN' do
- post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "a"
+ post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => @token
assert_equal 200, status
end
it 'should not allow requests with incorrect X-CSRF-TOKEN' do
- post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "b"
+ post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => "b"
assert_equal 403, status
end
-
end
describe "without CSRF protection on" do
@@ -142,6 +142,7 @@
describe "with custom protection options" do
before do
+ @token = Rack::Protection::AuthenticityToken.random_token rescue "a_token"
mock_app do
enable :sessions
set :protect_from_csrf, :authenticity_param => 'foobar', :message => 'sucker!'
@@ -150,7 +151,7 @@
end
it 'should allow configuring protection options' do
- post "/a", {"foobar" => "a"}, 'rack.session' => {:csrf => "a"}
+ post "/a", {"foobar" => @token}, 'rack.session' => {:csrf => @token}
assert_equal 200, status
end
diff --git a/padrino-core/test/test_dependencies.rb b/padrino-core/test/test_dependencies.rb
index d50790fb9..2937c0aca 100644
--- a/padrino-core/test/test_dependencies.rb
+++ b/padrino-core/test/test_dependencies.rb
@@ -53,5 +53,17 @@
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
diff --git a/padrino-core/test/test_filters.rb b/padrino-core/test/test_filters.rb
index 6478e4ecf..40f954b7f 100644
--- a/padrino-core/test/test_filters.rb
+++ b/padrino-core/test/test_filters.rb
@@ -300,6 +300,24 @@
assert_equal 'before', test
end
+ it 'should ensure the call of before_filter at the first time' do
+ once = ''
+ mock_app do
+ before do
+ once += 'before'
+ end
+ get :index do
+ raise Exception, 'Oops'
+ end
+ post :index do
+ raise Exception, 'Oops'
+ end
+ end
+
+ post '/'
+ assert_equal 'before', once
+ end
+
it 'should call before filters only once' do
once = ''
mock_app do
@@ -319,7 +337,7 @@
end
it 'should catch exceptions in before filters' do
- doodle = nil
+ doodle = ''
mock_app do
after do
doodle = 'Been after'
@@ -337,7 +355,7 @@
get '/'
assert_equal 'We broke before', body
- assert_equal nil, doodle
+ assert_equal '', doodle
end
it 'should catch exceptions in after filters if no exceptions caught before' do
@@ -369,4 +387,14 @@
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
diff --git a/padrino-core/test/test_flash.rb b/padrino-core/test/test_flash.rb
index ab5e06087..5ed3d52e3 100644
--- a/padrino-core/test/test_flash.rb
+++ b/padrino-core/test/test_flash.rb
@@ -45,7 +45,7 @@
it 'should not know the values you set right away' do
@storage[:foo] = 'bar'
- assert_nil @storage[:foo]
+ refute_includes @storage, :foo
end
it 'should knows the values you set next time' do
@@ -62,7 +62,7 @@
it 'should forgets values you set only for now next time' do
@storage.now[:foo] = 'bar'
@storage.sweep
- assert_nil @storage[:foo]
+ refute_includes @storage, :foo
end
end
diff --git a/padrino-core/test/test_locale.rb b/padrino-core/test/test_locale.rb
index 9eb9cebaa..af17ca350 100644
--- a/padrino-core/test/test_locale.rb
+++ b/padrino-core/test/test_locale.rb
@@ -6,16 +6,16 @@
name = File.basename(file, '.yml')
it "should should have correct locale for #{name}" do
base = base_original[name]['date']['formats']
- assert base['default'].present?
- assert base['short'].present?
- assert base['long'].present?
- assert base['only_day'].present?
+ assert base['default']
+ assert base['short']
+ assert base['long']
+ assert base['only_day']
base = base_original[name]['date']
- assert base['day_names'].present?
- assert base['abbr_day_names'].present?
- assert base['month_names'].present?
- assert base['abbr_month_names'].present?
- assert base['order'].present?
+ assert base['day_names']
+ assert base['abbr_day_names']
+ assert base['month_names']
+ assert base['abbr_month_names']
+ assert base['order']
end
end
end
diff --git a/padrino-core/test/test_logger.rb b/padrino-core/test/test_logger.rb
index 42d064406..e1566e25d 100644
--- a/padrino-core/test/test_logger.rb
+++ b/padrino-core/test/test_logger.rb
@@ -1,5 +1,7 @@
+#coding:utf-8
require File.expand_path(File.dirname(__FILE__) + '/helper')
require 'logger'
+require 'tempfile'
describe "PadrinoLogger" do
before do
@@ -36,6 +38,28 @@ def setup_logger(options={})
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
@@ -58,6 +82,30 @@ def setup_logger(options={})
assert_match /log via alias/, @log.string
end
+ it 'should not blow up on mixed or broken encodings' do
+ setup_logger(:log_level => :error, :auto_flush => false)
+ binary_data = "\xD0".force_encoding('BINARY')
+ utf8_data = 'фыв'
+ @logger.error binary_data
+ @logger.error utf8_data
+ @logger.flush
+ assert @log.string.include?(utf8_data)
+ assert @log.string.force_encoding('BINARY').include?(binary_data)
+ end
+
+ it 'should sanitize mixed or broken encodings if said so' do
+ encoding = 'windows-1251'
+ setup_logger(:log_level => :error, :auto_flush => false, :sanitize_encoding => encoding)
+ @log.string.encode! encoding
+ binary_data = "\xD0".force_encoding('BINARY')
+ utf8_data = 'фыв'
+ @logger.error binary_data
+ @logger.error utf8_data
+ @logger.flush
+ assert @log.string.force_encoding(encoding).include?("?\n".encode(encoding))
+ assert @log.string.force_encoding(encoding).include?(utf8_data.encode(encoding))
+ end
+
it 'should log an application' do
mock_app do
enable :logging
@@ -148,7 +196,9 @@ def add(level, text)
before do
@save_logger = Padrino.logger
@log = StringIO.new
- Padrino.logger = FancyLogger.new(@log)
+ new_logger = FancyLogger.new(@log)
+ new_logger.extend(Padrino::Logger::Extensions)
+ capture_io { Padrino.logger = new_logger }
end
after do
@@ -175,11 +225,34 @@ def add(level, text)
end
end
+describe "binary logger" do
+ before do
+ @save_logger = Padrino.logger
+ @log = StringIO.new
+ new_logger = Logger.new(@log)
+ new_logger.formatter = proc do |_, _, _, message|
+ "#{message.size}"
+ end
+ capture_io { Padrino.logger = new_logger }
+ end
+
+ after do
+ Padrino.logger = @save_logger
+ end
+
+ it 'should not convert parameters to strings before formatting' do
+ logger.info({:a => 2})
+ assert_equal "1", @log.string
+ end
+end
+
describe "alternate logger: stdlib logger" do
before do
@log = StringIO.new
@save_logger = Padrino.logger
- Padrino.logger = Logger.new(@log)
+ new_logger = Logger.new(@log)
+ new_logger.extend(Padrino::Logger::Extensions)
+ capture_io { Padrino.logger = new_logger }
end
after do
@@ -248,3 +321,48 @@ def access_to_mock_app
end
end
end
+
+describe "options :source_location" do
+ before do
+ Padrino::Logger::Config[:test][:source_location] = true
+ Padrino::Logger.setup!
+ end
+
+ def stub_root(base_path = File.expand_path("."), &block)
+ callable = proc{ |*args| File.join(base_path, *args) }
+ Padrino.stub(:root, callable, &block)
+ end
+
+ 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:#{__LINE__-1}\] hello world/, Padrino.logger.log.string
+ end
+
+ it 'should output source_location if file path is relative' do
+ stub_message = "test/test_logger.rb:269:in `test'"
+ Padrino::Logger.logger.stub(:caller, [stub_message]){ stub_root { Padrino.logger.debug("hello relative path") }}
+ assert_match /\[test\/test_logger\.rb:269\] hello relative path/, Padrino.logger.log.string
+ end
+
+ it 'should not output source_location if :source_location is set to false' do
+ Padrino::Logger::Config[:test][:source_location] = false
+ Padrino::Logger.setup!
+ stub_root { Padrino.logger.debug("hello world") }
+ assert_match /hello world/, Padrino.logger.log.string
+ refute_match /\[.+?\] hello world/, Padrino.logger.log.string
+ end
+
+ it 'should not output source_location unless file path is not started with Padrino.root' do
+ stub_root("/unknown/path/") { Padrino.logger.debug("hello boy") }
+ assert_match /hello boy/, Padrino.logger.log.string
+ refute_match /\[.+?\] hello boy/, Padrino.logger.log.string
+ end
+
+ it 'should not output source_location if source file path is started with Padrino.root + vendor' do
+ base_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/')
+ stub_message = File.expand_path(File.dirname(__FILE__) + '/fixtures/vendor/logger.rb') + ":291:in `test'"
+ Padrino::Logger.logger.stub(:caller, [stub_message]) { stub_root(base_path) { Padrino.logger.debug("hello vendor") } }
+ assert_match /hello vendor/, Padrino.logger.log.string
+ refute_match /\[.+?\] hello vendor/, Padrino.logger.log.string
+ end
+end
diff --git a/padrino-core/test/test_mounter.rb b/padrino-core/test/test_mounter.rb
index 0efefc08d..c122b9a26 100644
--- a/padrino-core/test/test_mounter.rb
+++ b/padrino-core/test/test_mounter.rb
@@ -181,7 +181,7 @@ class ::TwoApp < Padrino::Application
assert_equal "posts show", first_route.identifier.to_s
assert_equal "(:posts, :show)", first_route.name
assert_equal "GET", first_route.verb
- assert_equal "/posts/show/:id(.:format)", first_route.path
+ assert_equal "/posts/show/:id(.:format)?", first_route.path
another_route = Padrino.mounted_apps[1].named_routes[2]
assert_equal "users create", another_route.identifier.to_s
assert_equal "(:users, :create)", another_route.name
@@ -253,5 +253,61 @@ def spec.full_gem_path
assert_equal AppGem::App, mounter.app_obj
assert_equal Padrino.root('public'), mounter.app_obj.public_folder
end
+
+ it 'should support the Rack Application' 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).to('/rack_app')
+ Padrino.mount('rack_app2', :app_class => 'RackApp2', :app_file => path).to('/rack_app2')
+ Padrino.mount('sinatra_app', :app_class => 'SinatraApp', :app_file => path).to('/sinatra_app')
+ app = Padrino.application
+ res = Rack::MockRequest.new(app).get("/rack_app")
+ assert_equal "hello rack app", res.body
+ res = Rack::MockRequest.new(app).get("/rack_app2")
+ assert_equal "hello rack app2", res.body
+ res = Rack::MockRequest.new(app).get("/sinatra_app")
+ 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 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')
+ require path
+ require api_path
+ Padrino.mount('api_app', :app_class => 'DemoProject::API', :app_file => api_path).to('/api')
+ Padrino.mount('main_app', :app_class => 'DemoProject::App').to('/')
+ app = Padrino.application
+ res = Rack::MockRequest.new(app).get("/")
+ assert_equal "padrino app", res.body
+ res = Rack::MockRequest.new(app).get("/api/hey")
+ assert_equal "api app", res.body
+ assert defined?(DemoProject::APILib)
+ end
+
+ it "should not load dependency files if app's root isn't started with Padrino.root" do
+ path = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/demo_project/app')
+ fake_path = File.expand_path(File.dirname(__FILE__) + "/fixtures/apps/external_apps/fake_root")
+ require path
+ require fake_path
+ Padrino.mount("fake_root", :app_class => "FakeRoot").to('/fake_root')
+ Padrino.mount('main_app', :app_class => 'DemoProject::App').to('/')
+ Padrino.stub(:root, File.expand_path(File.dirname(__FILE__) + "/fixtures/apps/demo_project")) do
+ Padrino.application
+ end
+ assert !defined?(FakeLib)
+ end
end
end
diff --git a/padrino-core/test/test_params_protection.rb b/padrino-core/test/test_params_protection.rb
index 54f0388af..4055bcfba 100644
--- a/padrino-core/test/test_params_protection.rb
+++ b/padrino-core/test/test_params_protection.rb
@@ -1,5 +1,4 @@
require File.expand_path(File.dirname(__FILE__) + '/helper')
-require 'active_support/core_ext/hash/conversions'
describe "Padrino::ParamsProtection" do
before do
@@ -7,6 +6,7 @@
@kim = { 'name' => 'Kim Bauer', 'position' => 'daughter', 'child' => @teri }
@jack = { 'name' => 'Jack Bauer', 'position' => 'terrorist', 'child' => @kim }
@family = { 'name' => 'Bauer', 'persons' => { 1 => @teri, 2 => @kim, 3 => @jack } }
+ @jack_query = Padrino::Utils.build_uri_query(@jack)
end
it 'should drop all parameters except allowed ones' do
@@ -17,7 +17,7 @@
''
end
end
- post '/basic?' + @jack.to_query
+ post '/basic?' + @jack_query
assert_equal({ 'name' => @jack['name'] }, result)
end
@@ -29,7 +29,7 @@
''
end
end
- post '/basic?' + @jack.to_query
+ post '/basic?' + @jack_query
assert_equal(@jack, result)
end
@@ -41,7 +41,7 @@
''
end
end
- post '/basic?' + @jack.to_query
+ post '/basic?' + @jack_query
assert_equal(
[
{ 'name' => @jack['name'], 'child' => { 'name' => @kim['name'], 'child' => { 'name' => @teri['name'] } } },
@@ -59,7 +59,7 @@
''
end
end
- post '/basic?' + @jack.to_query
+ post '/basic?' + @jack_query
assert_equal({ 'name' => @jack['name'], 'position' => 'anti-terrorist' }, result)
end
@@ -71,10 +71,22 @@
''
end
end
- post '/basic/24/42?' + @jack.to_query
+ post '/basic/24/42?' + @jack_query
assert_equal({ 'name' => @jack['name'], 'id' => '24', 'tag' => '42' }, result)
end
+ it 'should not fail if :with is not an Array' do
+ result = nil
+ mock_app do
+ post :basic, :with => :id, :params => [ :id ] do
+ result = params
+ ''
+ end
+ end
+ post '/basic/24?' + @jack_query
+ assert_equal({ 'id' => '24' }, result)
+ end
+
it 'should understand true or false values' do
result = nil
mock_app do
@@ -87,9 +99,9 @@
''
end
end
- get '/hide/1?' + @jack.to_query
+ get '/hide/1?' + @jack_query
assert_equal({"id"=>"1"}, result)
- get '/show/1?' + @jack.to_query
+ get '/show/1?' + @jack_query
assert_equal({"id"=>"1"}.merge(@jack), result)
end
@@ -121,13 +133,13 @@
end
end
end
- post '/persons/create?' + @jack.to_query
+ post '/persons/create?' + @jack_query
assert_equal({ 'name' => @jack['name'], 'position' => 'terrorist' }, result)
post '/persons/update/1?name=Chloe+O\'Brian&position=hacker'
assert_equal({ 'id' => '1', 'name' => 'Chloe O\'Brian' }, result)
- post '/persons/delete?' + @jack.to_query
+ post '/persons/delete?' + @jack_query
assert_equal(@jack, result)
- post '/persons/destroy/1?' + @jack.to_query
+ post '/persons/destroy/1?' + @jack_query
assert_equal({"id"=>"1"}, result)
get '/noparam?a=1;b=2'
assert_equal({}, result)
@@ -141,7 +153,7 @@
''
end
end
- post '/family?' + @family.to_query
+ post '/family?' + Padrino::Utils.build_uri_query(@family)
assert_equal({"persons" => {"3" => {"name" => @jack["name"]}, "2" => {"name" => @kim["name"]}, "1" => {"name" => @teri["name"]}}}, result)
end
@@ -153,7 +165,31 @@
''
end
end
- post '/family?names[]=Jack&names[]=Kim&names[]=Teri'
+ post '/family?' + Padrino::Utils.build_uri_query(:names => %w{Jack Kim Teri})
assert_equal({"names" => %w[Jack Kim Teri]}, result)
end
+
+ it 'should tolerate weird inflections' do
+ result = nil
+ mock_app do
+ post :i, :params => [ :gotta => [ :what ] ] do
+ result = params
+ ''
+ end
+ end
+ post '/i?' + Padrino::Utils.build_uri_query(:gotta => { :what => 'go', :who => 'self' })
+ assert_equal({"gotta" => {"what" => "go"}}, result)
+ end
+
+ it 'should drop the key if the data type does not match route configuration' do
+ result = nil
+ mock_app do
+ post :i, :params => [ :gotta => [ :what ] ] do
+ result = params
+ ''
+ end
+ end
+ post '/i?gotta=go'
+ assert_equal({}, result)
+ end
end
diff --git a/padrino-core/test/test_reloader_complex.rb b/padrino-core/test/test_reloader_complex.rb
index 7e4a696b9..ab3faa386 100644
--- a/padrino-core/test/test_reloader_complex.rb
+++ b/padrino-core/test/test_reloader_complex.rb
@@ -43,8 +43,8 @@
new_phrase = "The magick number is: #{rand(2**255)}!"
buffer = File.read(Complex1Demo.app_file)
- new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
- new_buffer.gsub!(/get\(:destroy\)/, 'get(:destroy, :with => :id)')
+ new_buffer = buffer.sub(/The magick number is: \d+!/, new_phrase)
+ new_buffer.sub!(/get\(:destroy\)/, 'get(:destroy, :with => :id)')
begin
File.open(Complex1Demo.app_file, "w") { |f| f.write(new_buffer) }
Time.stub(:now, Time.now + 2) { get "/complex_2_demo" }
diff --git a/padrino-core/test/test_reloader_external.rb b/padrino-core/test/test_reloader_external.rb
new file mode 100644
index 000000000..b8f376aa7
--- /dev/null
+++ b/padrino-core/test/test_reloader_external.rb
@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/reloadable_apps/main/app')
+
+describe "ExternalReloader" do
+ describe "for external app" do
+ before do
+ Padrino.clear!
+ Padrino.mount("ReloadableApp::External").to("/reloadable/external")
+ Padrino.mount("ReloadableApp::Main").to("/reloadable")
+ Padrino.load!
+ end
+
+ it "should avoid reloading the file if its path is not started with Padrino.root" do
+ @app = Padrino.application
+ Padrino.stub(:root, File.expand_path(File.dirname(__FILE__) + '/fixtures/reloadable_apps/main')) do
+ get "/reloadable/external/base"
+ end
+ assert_equal "Hello External App", body
+ end
+ end
+end
diff --git a/padrino-core/test/test_reloader_simple.rb b/padrino-core/test/test_reloader_simple.rb
index 51245b5c3..99bbbc01d 100644
--- a/padrino-core/test/test_reloader_simple.rb
+++ b/padrino-core/test/test_reloader_simple.rb
@@ -61,7 +61,7 @@
assert ok?
new_phrase = "The magick number is: #{rand(2**255)}!"
buffer = File.read(SimpleDemo.app_file)
- new_buffer = buffer.gsub(/The magick number is: \d+!/, new_phrase)
+ new_buffer = buffer.sub(/The magick number is: \d+!/, new_phrase)
begin
File.open(SimpleDemo.app_file, "w") { |f| f.write(new_buffer) }
Time.stub(:now, Time.now + 2) { get "/" }
@@ -79,8 +79,8 @@
get "/rand"
assert ok?
last_body = body
- assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
- assert_equal 1, @app.errors.size
+ assert_equal 1, @app.filters[:before].size
+ assert_equal 0, @app.errors.reject{ |key, _| [404, Sinatra::NotFound].include? key }.size
assert_equal 2, @app.filters[:after].size # app + content-type + padrino-flash
assert_equal 0, @app.middleware.size
assert_equal 4, @app.routes.size # GET+HEAD of "/" + GET+HEAD of "/rand" = 4
@@ -89,8 +89,8 @@
@app.reload!
get "/rand"
refute_equal last_body, body
- assert_equal 2, @app.filters[:before].size # one is ours the other is default_filter for content type
- assert_equal 1, @app.errors.size
+ assert_equal 1, @app.filters[:before].size
+ assert_equal 0, @app.errors.reject{ |key, _| [404, Sinatra::NotFound].include? key }.size
assert_equal 2, @app.filters[:after].size
assert_equal 0, @app.middleware.size
assert_equal 4, @app.routes.size # GET+HEAD of "/" = 2
diff --git a/padrino-support/test/test_support_lite.rb b/padrino-core/test/test_reloader_storage.rb
similarity index 63%
rename from padrino-support/test/test_support_lite.rb
rename to padrino-core/test/test_reloader_storage.rb
index b6fd64823..6908aa41c 100644
--- a/padrino-support/test/test_support_lite.rb
+++ b/padrino-core/test/test_reloader_storage.rb
@@ -1,19 +1,20 @@
require File.expand_path(File.dirname(__FILE__) + '/helper')
-describe "ObjectSpace" do
+describe "Padrino::Reloader::Storage" do
describe "#classes" do
it 'should take an snapshot of the current loaded classes' do
- snapshot = ObjectSpace.classes
+ snapshot = Padrino::Reloader::Storage.send(:object_classes)
assert_equal snapshot.include?(Padrino::Logger), true
end
it 'should return a Set object' do
- snapshot = ObjectSpace.classes
+ snapshot = Padrino::Reloader::Storage.send(:object_classes)
assert_equal snapshot.kind_of?(Set), true
end
it 'should be able to process a the class name given a block' do
- klasses = ObjectSpace.classes do |klass|
+ klasses = Padrino::Reloader::Storage.send(:object_classes) do |klass|
+ next unless klass.respond_to?(:name) # fix JRuby < 1.7.22
if klass.name =~ /^Padrino::/
klass
end
@@ -28,22 +29,23 @@
describe "#new_classes" do
before do
- @snapshot = ObjectSpace.classes
+ @snapshot = Padrino::Reloader::Storage.send(:object_classes)
end
it 'should return list of new classes' do
+ skip
class OSTest; end
module OSTestModule; class B; end; end
- new_classes = ObjectSpace.new_classes(@snapshot)
+ new_classes = Padrino::Reloader::Storage.send(:new_classes, @snapshot)
- assert_equal new_classes.size, 2
+ assert_equal new_classes.size, 3
assert_equal new_classes.include?(OSTest), true
assert_equal new_classes.include?(OSTestModule::B), true
end
it 'should return a Set object' do
- new_classes = ObjectSpace.new_classes(@snapshot)
+ new_classes = Padrino::Reloader::Storage.send(:new_classes, @snapshot)
assert_equal new_classes.kind_of?(Set), true
end
end
diff --git a/padrino-core/test/test_reloader_system.rb b/padrino-core/test/test_reloader_system.rb
index 22b3b7c37..fd86f36ef 100644
--- a/padrino-core/test/test_reloader_system.rb
+++ b/padrino-core/test/test_reloader_system.rb
@@ -2,6 +2,7 @@
require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/kiq')
require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system')
require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/static')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/custom_dependencies/custom_dependencies')
describe "SystemReloader" do
describe 'for wierd and difficult reload events' do
@@ -46,16 +47,6 @@ def shmamily
end
end
- it 'should tamper with LOAD_PATH' do
- skip
- SystemDemo.load_paths.each do |lib_dir|
- assert_includes $LOAD_PATH, lib_dir
- end
- Padrino.send(:default_load_paths).each do |lib_dir|
- assert_includes $LOAD_PATH, lib_dir
- end
- end
-
it 'should not fail horribly on reload event with non-padrino apps' do
Padrino.mount("kiq").to("/")
Padrino.reload!
@@ -119,5 +110,50 @@ def instance_test
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
+
+ describe 'reloading custom dependencies' do
+ let(:custom_dependency_path) { File.dirname(__FILE__) + '/fixtures/apps/custom_dependencies/my_dependencies' }
+ let(:custom_dependency) { File.join(custom_dependency_path, 'my_dependency.rb') }
+
+ before do
+ @app = CustomDependencies
+ Padrino.clear!
+ Padrino.mount(CustomDependencies).to("/")
+ Padrino.dependency_paths << custom_dependency_path + '/*.rb'
+ Padrino.load!
+ get '/'
+ end
+
+ it 'should discover changed dependencies' do
+ FileUtils.touch(custom_dependency)
+ assert Padrino::Reloader.changed?, 'Change to custom dependency has not been recognised'
+ end
+ end
+
+ describe 'reloading module constants' do
+ it 'should remove constants of misdesigned modules' do
+ skip
+ Padrino.clear!
+ require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/concerned/app.rb')
+ @app = SystemConcernedClassDemo
+ Padrino.mount(SystemConcernedClassDemo).to("/")
+ get '/'
+
+ original_value = BadModule.instance_variable_get(:@happy_global_variable)
+ FileUtils.touch File.dirname(__FILE__) + '/fixtures/apps/concerned/models/mixins/badmodule.rb'
+ Padrino.reload!
+ assert_equal original_value, BadModule.instance_variable_get(:@happy_global_variable)
+ end
end
end
diff --git a/padrino-core/test/test_restful_routing.rb b/padrino-core/test/test_restful_routing.rb
index d47eab3c7..aeb839d52 100644
--- a/padrino-core/test/test_restful_routing.rb
+++ b/padrino-core/test/test_restful_routing.rb
@@ -4,8 +4,8 @@
it 'should perform restul routing' do
mock_app do
controller :parent => :parents do
- get :index do
- "#{url_for(:index, params[:parent_id])} get"
+ get :index, :with => :asset_id do
+ "#{url_for(:index, params[:parent_id], :asset_id => params[:asset_id])} get"
end
put :index, :with => :asset_id do
@@ -21,8 +21,8 @@
end
end
end
- get "/parents/1"
- assert_equal "/parents/1 get", body
+ get "/parents/1/hi"
+ assert_equal "/parents/1/hi get", body
put "/parents/1/hi"
assert_equal "/parents/1/hi put", body
post "/parents/1/hi"
diff --git a/padrino-core/test/test_router.rb b/padrino-core/test/test_router.rb
index d0fee875f..cac3ad932 100644
--- a/padrino-core/test/test_router.rb
+++ b/padrino-core/test/test_router.rb
@@ -94,13 +94,13 @@ def setup
res = Rack::MockRequest.new(map).get("/werewolf")
assert_equal 404, res.status
- assert_equal nil, res["X-API"]
- assert_equal nil, res["X-ScriptName"]
- assert_equal nil, res["X-PathInfo"]
+ refute_includes res, "X-API"
+ refute_includes res, "X-ScriptName"
+ refute_includes res, "X-PathInfo"
res = Rack::MockRequest.new(map).get("/bar/mitzvah")
assert res.ok?
- assert_equal nil, res["X-API"]
+ refute_includes res, "X-API"
assert_equal 'text/plain', res["Content-Type"]
assert_equal "/bar", res["X-ScriptName"]
assert_equal "/mitzvah", res["X-PathInfo"]
@@ -114,7 +114,7 @@ def setup
res = Rack::MockRequest.new(map).get("/bar/scary")
assert_equal 404, res.status
- assert_equal nil, res["X-API"]
+ refute_includes res, "X-API"
assert_equal 'text/plain', res["Content-Type"]
assert_equal "/bar", res["X-ScriptName"]
assert_equal "/scary", res["X-PathInfo"]
diff --git a/padrino-core/test/test_routing.rb b/padrino-core/test/test_routing.rb
index a64cf9469..5aab6e293 100644
--- a/padrino-core/test/test_routing.rb
+++ b/padrino-core/test/test_routing.rb
@@ -3,6 +3,30 @@
class FooError < RuntimeError; end
+class RegexpLookAlike
+ # RegexpLookAlike#to_s, RegexpLookAlike#names and MatchData#names must be defined.
+ class MatchData
+ def captures
+ ["this", "is", "a", "test"]
+ end
+
+ def names
+ ["one", "two", "three", "four"]
+ end
+ end
+
+ def names
+ ["one", "two", "three", "four"]
+ end
+
+ def to_s
+ "/this/is/a/test/"
+ end
+
+ def match(string)
+ ::RegexpLookAlike::MatchData.new if string == "/this/is/a/test/"
+ end
+end
describe "Routing" do
before do
@@ -30,6 +54,22 @@ class FooError < RuntimeError; end
assert_equal headers['Cache-Control'], 'public, must-revalidate, max-age=300'
end # static max_age
+ it 'should render static files with custom status via options' do
+ mock_app do
+ set :static, true
+ set :public_folder, File.dirname(__FILE__)
+
+ post '/*' do
+ static!(:status => params[:status])
+ end
+ end
+
+ post "/#{File.basename(__FILE__)}?status=422"
+ assert_equal response.status, 422
+ assert_equal File.size(__FILE__).to_s, response['Content-Length']
+ assert response.headers.include?('Last-Modified')
+ end
+
it 'should ignore trailing delimiters for basic route' do
mock_app do
get("/foo"){ "okey" }
@@ -45,6 +85,17 @@ class FooError < RuntimeError; end
assert_equal "tester", body
end
+ it 'should recognize route even if paths are duplicated' do
+ mock_app do
+ get(:index) {}
+ get(:index, :with => :id) {}
+ get(:index, :with => :id, :provides => :json) {}
+ end
+ assert_equal "/", @app.url_for(:index)
+ assert_equal "/1234", @app.url_for(:index, :id => "1234")
+ assert_equal "/1234.json?baz=baz", @app.url_for(:index, :id => "1234", :format => "json", :baz => "baz")
+ end
+
it 'should fail with unrecognized route exception when not found' do
mock_app do
get(:index){ "okey" }
@@ -218,6 +269,8 @@ class FooError < RuntimeError; end
get(:hash, :with => :id){ url(:hash, :id => 1) }
get(:anchor) { url(:anchor, :anchor => 'comments') }
get(:fragment) { url(:anchor, :fragment => 'comments') }
+ get(:fragment2) { url(:anchor, :fragment => :comments) }
+ get(:gangsta) { url(:gangsta, :foo => { :bar => :baz }, :hoge => :fuga) }
get([:hash, :id]){ url(:hash, :id => 1) }
get(:array, :with => :id){ url(:array, 23) }
get([:array, :id]){ url(:array, 23) }
@@ -232,6 +285,7 @@ class FooError < RuntimeError; end
post(:foo, '', :with => :id){ |id| "/#{id}" }
delete(:drugs, :with => [:id, 'destroy']){ |id| "/drugs/#{id}/destroy" }
delete(:drugs, '', :with => [:id, 'destroy']){ |id| "/#{id}/destroy" }
+ get(:splatter, "/splatter/*/*"){ |a, b| url(:splatter, :splat => ["123", "456"]) }
end
get "/foo"
assert_equal "/foo", body
@@ -243,6 +297,8 @@ class FooError < RuntimeError; end
assert_equal "/anchor#comments", body
get "/fragment"
assert_equal "/anchor#comments", body
+ get "/fragment2"
+ assert_equal "/anchor#comments", body
get "/array/23"
assert_equal "/array/23", body
get "/hash_with_extra/1"
@@ -263,6 +319,10 @@ class FooError < RuntimeError; end
assert_equal "/drugs/123/destroy", body
delete "/123/destroy"
assert_equal "/123/destroy", body
+ get "/gangsta"
+ assert_equal "/gangsta?foo%5Bbar%5D=baz&hoge=fuga", body
+ get "/splatter/123/456"
+ assert_equal "/splatter/123/456", body
end
it 'should generate url with format' do
@@ -390,6 +450,16 @@ class Test < Padrino::Application
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 }
@@ -435,7 +505,6 @@ class Test < Padrino::Application
end
it 'should allow "." in param values' do
- skip # TODO fix this?
mock_app do
get('/id/:email', :provides => [:json]) { |email, format| [email, format] * '/' }
end
@@ -481,7 +550,7 @@ class Test < Padrino::Application
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
@@ -507,14 +576,14 @@ class Test < Padrino::Application
it 'should inject the action name into the request' do
mock_app do
controller :posts do
- get('/omnomnom(/:id)') { request.action.inspect }
+ get('/omnomnom(/:id)?') { request.action.inspect }
controller :mini do
get([:a, :b, :c]) { request.action.inspect }
end
end
end
get "/posts/omnomnom"
- assert_equal "\"/omnomnom(/:id)\"", body
+ assert_equal "\"/omnomnom(/:id)?\"", body
get "/mini/a/b/c"
assert_equal ":a", body
end
@@ -595,8 +664,8 @@ class Test < Padrino::Application
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"
@@ -711,12 +780,27 @@ class Test < Padrino::Application
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
@@ -955,7 +1039,7 @@ class Test < Padrino::Application
it 'should allow optionals' do
mock_app do
- get(:show, :map => "/stories/:type(/:category)") do
+ get(:show, :map => "/stories/:type(/:category)?") do
"#{params[:type]}/#{params[:category]}"
end
end
@@ -1163,6 +1247,17 @@ class Test < Padrino::Application
assert_equal "lang is en", body
end
+ it 'should override default values when parameters are passed' do
+ mock_app do
+ controller lang: :it do
+ get(:index, map: '/:lang') { "lang is #{params[:lang]}" }
+ end
+ end
+ assert_equal '/pt', @app.url(:index, lang: 'pt')
+ get '/pt'
+ assert_equal 'lang is pt', body
+ end
+
it 'should transitions to the next matching route on pass' do
mock_app do
get '/:foo' do
@@ -1503,7 +1598,7 @@ def authorize(username, password)
it 'should works with optionals params' do
mock_app do
- get("/foo(/:bar)") { params[:bar] }
+ get("/foo(/:bar)?") { params[:bar] }
end
get "/foo/bar"
@@ -1651,7 +1746,7 @@ def authorize(username, password)
it 'should use optionals params' do
mock_app do
- get(:index, :map => "/(:foo(/:bar))") { "#{params[:foo]}-#{params[:bar]}" }
+ get(:index, :map => "/:foo(/:bar)?") { "#{params[:foo]}-#{params[:bar]}" }
end
get "/foo"
assert_equal "foo-", body
@@ -1824,8 +1919,6 @@ def authorize(username, password)
end
it 'should reset provides for routes that did not use it' do
- skip
- #FIXME
mock_app do
get('/foo', :provides => :js){}
get('/bar'){}
@@ -2009,7 +2102,7 @@ def authorize(username, password)
mock_app do
get(:index) { "%s %s" % [params[:account][:name], params[:account][:surname]] }
end
- get "/?account[name]=foo&account[surname]=bar"
+ get "/?" + Padrino::Utils.build_uri_query(:account => { :name => 'foo', :surname => 'bar' })
assert_equal 'foo bar', body
get @app.url(:index, "account[name]" => "foo", "account[surname]" => "bar")
assert_equal 'foo bar', body
@@ -2067,14 +2160,14 @@ def authorize(username, password)
get(:simple, :map => "/simple/:id") { }
get(:with_format, :with => :id, :provides => :js) { }
end
- assert_equal [:"foo bar", { :id => "fantastic" }], @app.recognize_path(@app.url(:foo, :bar, :id => :fantastic))
- assert_equal [:"foo bar", { :id => "18" }], @app.recognize_path(@app.url(:foo, :bar, :id => 18))
- assert_equal [:simple, { :id => "bar" }], @app.recognize_path(@app.url(:simple, :id => "bar"))
- assert_equal [:simple, { :id => "true" }], @app.recognize_path(@app.url(:simple, :id => true))
- assert_equal [:simple, { :id => "9" }], @app.recognize_path(@app.url(:simple, :id => 9))
- assert_equal [:with_format, { :id => "bar", :format => "js" }], @app.recognize_path(@app.url(:with_format, :id => "bar", :format => :js))
- assert_equal [:with_format, { :id => "true", :format => "js" }], @app.recognize_path(@app.url(:with_format, :id => true, :format => "js"))
- assert_equal [:with_format, { :id => "9", :format => "js" }], @app.recognize_path(@app.url(:with_format, :id => 9, :format => :js))
+ assert_equal [:"foo bar", { "id" => "fantastic" }], @app.recognize_path(@app.url(:foo, :bar, :id => :fantastic))
+ assert_equal [:"foo bar", { "id" => "18" }], @app.recognize_path(@app.url(:foo, :bar, :id => 18))
+ assert_equal [:simple, { "id" => "bar" }], @app.recognize_path(@app.url(:simple, :id => "bar"))
+ assert_equal [:simple, { "id" => "true" }], @app.recognize_path(@app.url(:simple, :id => true))
+ assert_equal [:simple, { "id" => "9" }], @app.recognize_path(@app.url(:simple, :id => 9))
+ assert_equal [:with_format, { "id" => "bar", "format" => "js" }], @app.recognize_path(@app.url(:with_format, :id => "bar", :format => :js))
+ assert_equal [:with_format, { "id" => "true", "format" => "js" }], @app.recognize_path(@app.url(:with_format, :id => true, :format => "js"))
+ assert_equal [:with_format, { "id" => "9", "format" => "js" }], @app.recognize_path(@app.url(:with_format, :id => 9, :format => :js))
end
it 'should have current_path' do
@@ -2124,4 +2217,219 @@ def authorize(username, password)
get '/users//'
assert_equal 404, status
end
+
+ it "should support splat params" do
+ mock_app do
+ get "/say/*/to/*" do
+ params[:splat].inspect
+ end
+ end
+ get "/say/hello/to/world"
+ assert_equal %Q[["hello", "world"]], body
+ end
+
+ it "should recognize the route containing splat params if path is ended with slash" do
+ mock_app do
+ get "/splat/*" do
+ "slash!"
+ end
+ end
+ get "/splat"
+ assert_equal 404, status
+ get "/splat/"
+ assert_equal "slash!", body
+ end
+
+ it "should match correctly paths even if the free regex route exists" do
+ mock_app do
+ get %r{/b/(?yellow
" } - # In this case, block is the html to evaluate - def assert_has_tag(name, attributes = {}, &block) - html = block && block.call - matcher = HaveSelector.new(name, attributes) - raise "Please specify a block!" if html.blank? - assert matcher.matches?(html), matcher.failure_message - end - - # assert_has_no_tag, tag(:h1, :content => "yellow") { "green
" } - # In this case, block is the html to evaluate - def assert_has_no_tag(name, attributes = {}, &block) - html = block && block.call - attributes.merge!(:count => 0) - matcher = HaveSelector.new(name, attributes) - raise "Please specify a block!" if html.blank? - assert matcher.matches?(html), matcher.failure_message - end - - # assert_file_exists('/tmp/app') - def assert_file_exists(file_path) - assert File.exist?(file_path), "File at path '#{file_path}' does not exist!" - end - alias :assert_dir_exists :assert_file_exists - - # assert_no_file_exists('/tmp/app') - def assert_no_file_exists(file_path) - assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!" - end - alias :assert_no_dir_exists :assert_no_file_exists - - # Asserts that a file matches the pattern - def assert_match_in_file(pattern, file) - File.exist?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file) - end - - def assert_no_match_in_file(pattern, file) - File.exist?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file) - end - # expects_generated :model, "post title:string body:text" def expects_generated(generator, params="") Padrino.expects(:bin_gen).with(generator, *params.split(' ')).returns(true) @@ -101,10 +66,10 @@ def expects_generated(generator, params="") # expects_generated_project :test => :shoulda, :orm => :activerecord, :dev => true def expects_generated_project(options={}) - project_root = options[:root] - project_name = options[:name] - settings = options.slice!(:name, :root) - components = settings.sort_by { |k, v| k.to_s }.map { |component, value| "--#{component}=#{value}" } + options = options.dup + project_root = options.delete(:root) + project_name = options.delete(:name) + components = options.sort_by{ |k, v| k.to_s }.map{ |component, value| "--#{component}=#{value}" } params = [project_name, *components].push("-r=#{project_root}") Padrino.expects(:bin_gen).with(*params.unshift('project')).returns(true) end @@ -120,7 +85,7 @@ def expects_dependencies(name) # expects_initializer :test, "# Example" def expects_initializer(name, body,options={}) #options.reverse_merge!(:root => "/tmp/sample_project") - path = File.join(options[:root],'lib',"#{name}_initializer.rb") + path = File.join(options[:root],'config/initializers',"#{name}.rb") instance = mock instance.expects(:invoke!).at_least_once include_text = " register #{name.to_s.camelize}Initializer\n" @@ -134,11 +99,3 @@ def expects_rake(command,options={}) Padrino.expects(:bin).with("rake", command, "-c=#{options[:root]}").returns(true) end end - -module Webrat - module Logging - def logger # # @private - @logger = nil - end - end -end diff --git a/padrino-gen/test/test_app_generator.rb b/padrino-gen/test/test_app_generator.rb index 0d6233f53..ac839382b 100644 --- a/padrino-gen/test/test_app_generator.rb +++ b/padrino-gen/test/test_app_generator.rb @@ -20,13 +20,13 @@ def teardown it 'should create correctly a new padrino application' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } capture_io { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") } - assert_file_exists("#{@apptmp}/sample_project") - assert_file_exists("#{@apptmp}/sample_project/demo") + assert_dir_exists("#{@apptmp}/sample_project") + assert_dir_exists("#{@apptmp}/sample_project/demo") assert_file_exists("#{@apptmp}/sample_project/demo/app.rb") - assert_file_exists("#{@apptmp}/sample_project/demo/controllers") - assert_file_exists("#{@apptmp}/sample_project/demo/helpers") - assert_file_exists("#{@apptmp}/sample_project/demo/views") - assert_file_exists("#{@apptmp}/sample_project/demo/views/layouts") + assert_dir_exists("#{@apptmp}/sample_project/demo/controllers") + assert_dir_exists("#{@apptmp}/sample_project/demo/helpers") + assert_dir_exists("#{@apptmp}/sample_project/demo/views") + assert_dir_exists("#{@apptmp}/sample_project/demo/views/layouts") assert_dir_exists("#{@apptmp}/sample_project/public/demo") assert_match_in_file("Padrino.mount('SampleProject::Demo', :app_file => Padrino.root('demo/app.rb')).to('/demo')", "#{@apptmp}/sample_project/config/apps.rb") assert_match_in_file('module SampleProject', "#{@apptmp}/sample_project/demo/app.rb") @@ -38,13 +38,13 @@ def teardown it 'should create correctly a new padrino application with an underscore name' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } capture_io { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") } - assert_file_exists("#{@apptmp}/sample_project") - assert_file_exists("#{@apptmp}/sample_project/demo_app") + assert_dir_exists("#{@apptmp}/sample_project") + assert_dir_exists("#{@apptmp}/sample_project/demo_app") assert_file_exists("#{@apptmp}/sample_project/demo_app/app.rb") - assert_file_exists("#{@apptmp}/sample_project/demo_app/controllers") - assert_file_exists("#{@apptmp}/sample_project/demo_app/helpers") - assert_file_exists("#{@apptmp}/sample_project/demo_app/views") - assert_file_exists("#{@apptmp}/sample_project/demo_app/views/layouts") + assert_dir_exists("#{@apptmp}/sample_project/demo_app/controllers") + assert_dir_exists("#{@apptmp}/sample_project/demo_app/helpers") + assert_dir_exists("#{@apptmp}/sample_project/demo_app/views") + assert_dir_exists("#{@apptmp}/sample_project/demo_app/views/layouts") assert_dir_exists("#{@apptmp}/sample_project/public/demo_app") assert_match_in_file("Padrino.mount('SampleProject::DemoApp', :app_file => Padrino.root('demo_app/app.rb')).to('/demo_app')", "#{@apptmp}/sample_project/config/apps.rb") assert_match_in_file('module SampleProject', "#{@apptmp}/sample_project/demo_app/app.rb") @@ -56,8 +56,8 @@ def teardown it 'should generate tiny app skeleton' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } capture_io { generate(:app, 'demo','--tiny',"--root=#{@apptmp}/sample_project") } - assert_file_exists("#{@apptmp}/sample_project") - assert_file_exists("#{@apptmp}/sample_project/demo") + assert_dir_exists("#{@apptmp}/sample_project") + assert_dir_exists("#{@apptmp}/sample_project/demo") assert_file_exists("#{@apptmp}/sample_project/demo/helpers.rb") assert_file_exists("#{@apptmp}/sample_project/demo/controllers.rb") assert_file_exists("#{@apptmp}/sample_project/demo/mailers.rb") @@ -75,7 +75,7 @@ def teardown capture_io { generate(:controller, 'demo_items', "-r=#{@apptmp}/sample_project", '-a=demo') } assert_match_in_file(/SampleProject::Demo.controllers :demo_items do/m, "#{@apptmp}/sample_project/demo/controllers/demo_items.rb") assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/demo/helpers/demo_items_helper.rb") - assert_file_exists("#{@apptmp}/sample_project/demo/views/demo_items") + assert_dir_exists("#{@apptmp}/sample_project/demo/views/demo_items") end it 'should correctly create a new mailer inside a padrino application' do @@ -128,5 +128,15 @@ def teardown assert_dir_exists("#{@apptmp}/sample_project/kernel/helpers") assert_file_exists("#{@apptmp}/sample_project/kernel/app.rb") end + + it 'should allow to pass upcased name as the app name' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } + out, err = capture_io { generate(:app, 'API', "--root=#{@apptmp}/sample_project", "--force") } + assert_dir_exists("#{@apptmp}/sample_project/public/api") + assert_dir_exists("#{@apptmp}/sample_project/api/controllers") + assert_dir_exists("#{@apptmp}/sample_project/api/helpers") + assert_file_exists("#{@apptmp}/sample_project/api/app.rb") + assert_match_in_file(/class API < Padrino::Application/, "#{@apptmp}/sample_project/api/app.rb") + end end end diff --git a/padrino-gen/test/test_component_generator.rb b/padrino-gen/test/test_component_generator.rb index 0375e2bf5..39460180f 100644 --- a/padrino-gen/test/test_component_generator.rb +++ b/padrino-gen/test/test_component_generator.rb @@ -17,7 +17,6 @@ def teardown end end - describe "add components" do it 'should properly generate default' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } @@ -73,10 +72,9 @@ def teardown end end - describe "component changes" do it 'should when allow changes, will be applied' do - capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") } + capture_io { generate(:project, 'sample_project', '--renderer=slim', "--root=#{@apptmp}") } components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components") assert_equal 'slim', components_chosen[:renderer] Readline.stubs(:readline).returns('yes').once @@ -85,8 +83,9 @@ def teardown components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components") assert_equal 'haml', components_chosen[:renderer] end + it 'should when deny changes, will not be applied' do - capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") } + capture_io { generate(:project, 'sample_project', '--renderer=slim', "--root=#{@apptmp}") } components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components") assert_equal 'slim', components_chosen[:renderer] Readline.stubs(:readline).returns('no').once @@ -96,5 +95,4 @@ def teardown assert_equal 'slim', components_chosen[:renderer] end end - end diff --git a/padrino-gen/test/test_controller_generator.rb b/padrino-gen/test/test_controller_generator.rb index 71b39a200..481ee80d5 100644 --- a/padrino-gen/test/test_controller_generator.rb +++ b/padrino-gen/test/test_controller_generator.rb @@ -6,6 +6,7 @@ def setup `mkdir -p #{@apptmp}` @controller_path = "#{@apptmp}/sample_project/app/controllers/demo_items.rb" @controller_test_path = "#{@apptmp}/sample_project/test/app/controllers/demo_items_controller_test.rb" + @controller_with_parent_test_path = "#{@apptmp}/sample_project/test/app/controllers/user_items_controller_test.rb" @helper_path = "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb" @helper_test_path = "#{@apptmp}/sample_project/test/app/helpers/demo_items_helper_test.rb" end @@ -21,12 +22,17 @@ def teardown assert_no_file_exists("#{@apptmp}/app/controllers/demo.rb") end + it 'should fail with NameError if given invalid namespace names' do + capture_io { generate(:project, "sample", "--root=#{@apptmp}") } + assert_raises(::NameError) { capture_io { generate(:controller, "wrong/name", "--root=#{@apptmp}/sample") } } + end + it 'should generate controller within existing project' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") } assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path) assert_match_in_file(/helpers DemoItemsHelper/, @helper_path) - assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items") + assert_dir_exists("#{@apptmp}/sample_project/app/views/demo_items") assert_file_exists(@controller_test_path) end @@ -46,7 +52,7 @@ def teardown capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/warepedia") } assert_match_in_file(/Warepedia::App.controllers :demo_items do/m, "#{@apptmp}/warepedia/app/controllers/demo_items.rb") assert_match_in_file(/helpers DemoItemsHelper/, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb") - assert_file_exists("#{@apptmp}/warepedia/app/views/demo_items") + assert_dir_exists("#{@apptmp}/warepedia/app/views/demo_items") end it 'should generate controller in specified app' do @@ -55,8 +61,9 @@ def teardown capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } assert_match_in_file(/SampleProject::Subby.controllers :demo_items do/m, @controller_path.gsub('app','subby')) assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb") - assert_file_exists("#{@apptmp}/sample_project/subby/views/demo_items") - assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby')) + assert_dir_exists("#{@apptmp}/sample_project/subby/views/demo_items") + assert_match_in_file(/describe "\/demo_items" do/m, @controller_test_path.gsub('app','subby')) + assert_match_in_file(/get "\/demo_items"/m, @controller_test_path.gsub('app','subby')) end it 'should generate controller with specified layout' do @@ -75,6 +82,8 @@ def teardown capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '-p=user') } assert_match_in_file(/SampleProject::App.controllers :demo_items, :parent => :user do/m, @controller_path) + assert_match_in_file(/describe "\/user\/:user_id\/demo_items" do/, @controller_test_path) + assert_match_in_file(/get "\/user\/1\/demo_items"/, @controller_test_path) end it 'should generate controller without specified parent' do @@ -100,7 +109,7 @@ def teardown capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") } assert_match_in_file(/SampleProject::App.controllers :demo_items do/m, @controller_path) assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") - assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items") + assert_dir_exists("#{@apptmp}/sample_project/app/views/demo_items") assert_no_file_exists("#{@apptmp}/sample_project/test") end @@ -108,17 +117,12 @@ def teardown capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") } assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby')) - assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app','subby')) - assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby')) - end - - it 'should generate controller test for riot' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot') } - capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } - capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } - assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby')) - assert_match_in_file(/context "DemoItemsController" do/m, @controller_test_path.gsub('app','subby')) + assert_match_in_file(/describe "\/demo_items" do/m, @controller_test_path.gsub('app','subby')) + assert_match_in_file(/describe "\/user\/:user_id\/user_items"/, @controller_with_parent_test_path.gsub('app','subby')) + assert_match_in_file(/get "\/demo_items"/m, @controller_test_path.gsub('app','subby')) + assert_match_in_file(/get "\/user\/1\/user_items"/m, @controller_with_parent_test_path.gsub('app','subby')) assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby')) end @@ -126,8 +130,12 @@ def teardown capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest') } capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") } assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app', 'subby')) - assert_match_in_file(/describe "DemoItemsController" do/m, @controller_test_path.gsub('app', 'subby')) + assert_match_in_file(/describe "\/demo_items" do/m, @controller_test_path.gsub('app', 'subby')) + assert_match_in_file(/describe "\/user\/:user_id\/user_items"/, @controller_with_parent_test_path.gsub('app','subby')) + assert_match_in_file(/get "\/demo_items"/m, @controller_test_path.gsub('app','subby')) + assert_match_in_file(/get "\/user\/1\/user_items"/m, @controller_with_parent_test_path.gsub('app','subby')) assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby')) end @@ -135,7 +143,11 @@ def teardown capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') } capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } - assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb") + capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") } + assert_match_in_file(/describe "\/demo_items" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb") + assert_match_in_file(/describe "\/user\/:user_id\/user_items"/,"#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb") + assert_match_in_file(/get "\/demo_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb") + assert_match_in_file(/get "\/user\/1\/user_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb") assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, "#{@apptmp}/sample_project/spec/subby/helpers/demo_items_helper_spec.rb") end @@ -143,35 +155,41 @@ def teardown capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') } capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") } expected_pattern = /class DemoItemsControllerTest < Test::Unit::TestCase/m + expected_pattern2 = /class UserItemsControllerTest < Test::Unit::TestCase/m assert_match_in_file(expected_pattern, @controller_test_path.gsub('app','subby')) assert_match_in_file(/(\/\.\.){2}/m, @controller_test_path.gsub('app','subby')) + assert_match_in_file(expected_pattern2, @controller_with_parent_test_path.gsub('app','subby')) assert_match_in_file(/context "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby')) assert_file_exists(@helper_test_path.gsub('app','subby')) assert_file_exists("#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb") end - it 'should generate controller test for steak' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=steak') } + it 'should generate controller test for cucumber' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=cucumber') } capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } - assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb") - assert_match_in_file(/feature "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/acceptance/controllers/demo_items_controller_spec.rb") - assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, "#{@apptmp}/sample_project/spec/subby/helpers/demo_items_helper_spec.rb") + capture_io { generate(:controller, 'UserItems','-a=/subby', "-r=#{@apptmp}/sample_project", "-p=user") } + assert_match_in_file(/describe "\/demo_items" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb") + assert_match_in_file(/describe "\/user\/:user_id\/user_items"/, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb") + assert_match_in_file(/get "\/demo_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb") + assert_match_in_file(/get "\/user\/1\/user_items"/m, "#{@apptmp}/sample_project/spec/subby/controllers/user_items_controller_spec.rb") + assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb") end - it 'should generate controller test for cucumber' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=cucumber') } + it "should generate controller test for testunit" do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testunit') } capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } - assert_match_in_file(/describe "DemoItemsController" do/m, "#{@apptmp}/sample_project/spec/subby/controllers/demo_items_controller_spec.rb") - assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb") + assert_match_in_file(/class DemoItemsControllerTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb") end + it 'should correctly generate file names' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') } capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") } - assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items") + assert_dir_exists("#{@apptmp}/sample_project/app/views/demo_items") assert_file_exists("#{@apptmp}/sample_project/app/controllers/demo_items.rb") assert_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb") @@ -190,7 +208,7 @@ def teardown it 'should not generate helper within existing project' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') } capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project", '--no-helper') } - assert_file_exists("#{@apptmp}/sample_project/app/views/demo_items") + assert_dir_exists("#{@apptmp}/sample_project/app/views/demo_items") assert_file_exists("#{@apptmp}/sample_project/app/controllers/demo_items.rb") assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/demo_items_controller_spec.rb") assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") diff --git a/padrino-gen/test/test_generator.rb b/padrino-gen/test/test_generator.rb index 858a454c8..afc32adbe 100644 --- a/padrino-gen/test/test_generator.rb +++ b/padrino-gen/test/test_generator.rb @@ -3,7 +3,7 @@ describe "Generator" do describe "the generator" do it 'should have default generators' do - %w{controller mailer migration model app plugin component task}.each do |gen| + %w{controller mailer migration model app plugin component task helper}.each do |gen| assert Padrino::Generators.mappings.has_key?(gen.to_sym) assert_equal "Padrino::Generators::#{gen.camelize}", Padrino::Generators.mappings[gen.to_sym].name assert Padrino::Generators.mappings[gen.to_sym].respond_to?(:start) diff --git a/padrino-gen/test/test_helper_generator.rb b/padrino-gen/test/test_helper_generator.rb new file mode 100644 index 000000000..53ab45f3e --- /dev/null +++ b/padrino-gen/test/test_helper_generator.rb @@ -0,0 +1,132 @@ +require File.expand_path(File.dirname(__FILE__) + '/helper') + +describe "HelperGenerator" do + def setup + @apptmp = "#{Dir.tmpdir}/padrino-tests/#{SecureRandom.hex}" + `mkdir -p #{@apptmp}` + @helper_path = "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb" + @helper_test_path = "#{@apptmp}/sample_project/test/app/helpers/demo_items_helper_test.rb" + end + + def teardown + `rm -rf #{@apptmp}` + end + + describe 'the helper generator' do + it 'should fail outside app root' do + out, err = capture_io { generate(:helper, 'demo', "-r=#{@apptmp}") } + assert_match(/not at the root/, out) + assert_no_file_exists("#{@apptmp}/app/helpers/demo_helper.rb") + end + + it 'should fail with NameError if given invalid namespace names' do + capture_io { generate(:project, "sample", "--root=#{@apptmp}") } + assert_raises(::NameError) { capture_io { generate(:helper, "wrong/name", "--root=#{@apptmp}/sample") } } + end + + it 'should generate helper within existing project' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } + capture_io { generate(:helper, 'DemoItems', "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/module SampleProject/, @helper_path) + assert_match_in_file(/class App/, @helper_path) + assert_match_in_file(/module DemoItemsHelper/, @helper_path) + assert_match_in_file(/helpers DemoItemsHelper/, @helper_path) + assert_file_exists(@helper_path) + assert_file_exists(@helper_test_path) + end + + it 'should generate helper within existing project with weird name' do + capture_io { generate(:project, 'warepedia', "--root=#{@apptmp}", '--script=none', '-t=bacon') } + capture_io { generate(:helper, 'DemoItems', "-r=#{@apptmp}/warepedia") } + assert_match_in_file(/helpers DemoItemsHelper/, "#{@apptmp}/warepedia/app/helpers/demo_items_helper.rb") + end + + it 'should generate helper in specified app' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } + capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/subby/helpers/demo_items_helper.rb") + end + + it 'should not fail if we do not have test component' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none') } + capture_io { generate(:helper, 'DemoItems', "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/helpers DemoItemsHelper/m, "#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") + assert_no_file_exists("#{@apptmp}/sample_project/test") + end + + it 'should generate helper test for bacon' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } + capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby')) + end + + it 'should generate helper test for minitest' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest') } + capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby')) + end + + it 'should generate helper test for rspec' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') } + capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, "#{@apptmp}/sample_project/spec/subby/helpers/demo_items_helper_spec.rb") + end + + it 'should generate helper test for shoulda' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=shoulda') } + capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + expected_pattern = /class DemoItemsHelperTest < Test::Unit::TestCase/m + assert_match_in_file(/context "SampleProject::Subby::DemoItemsHelper" do/m, @helper_test_path.gsub('app','subby')) + assert_file_exists(@helper_test_path.gsub('app','subby')) + assert_file_exists("#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb") + end + + it "should generate helper test for testunit" do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=testunit', '--script=none') } + capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/class DemoItemsHelperTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb") + assert_match_in_file(/@helpers\.extend SampleProject::Subby::DemoItemsHelper/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb") + end + + it 'should correctly generate file names' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') } + capture_io { generate(:helper, 'DemoItems', "-r=#{@apptmp}/sample_project") } + assert_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") + assert_file_exists("#{@apptmp}/sample_project/spec/app/helpers/demo_items_helper_spec.rb") + end + end + + describe "the helper destroy option" do + it 'should destroy helper files' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } + capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') } + assert_no_file_exists(@helper_path) + assert_no_file_exists(@helper_test_path) + assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") + end + + it 'should destroy helper files with rspec' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') } + capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'demo_items',"-r=#{@apptmp}/sample_project",'-d') } + assert_no_file_exists(@helper_path) + assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") + assert_no_file_exists("#{@apptmp}/sample_project/spec/app/helpers/demo_items_helper_spec.rb") + end + + it 'should destroy helper files in sub apps' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } + capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project") } + capture_io { generate(:helper, 'demo_items',"-a=/subby","-r=#{@apptmp}/sample_project",'-d') } + assert_no_file_exists("#{@apptmp}/sample_project/app/helpers/demo_items_helper.rb") + end + end +end diff --git a/padrino-gen/test/test_mailer_generator.rb b/padrino-gen/test/test_mailer_generator.rb index 7efe76878..0a420c718 100644 --- a/padrino-gen/test/test_mailer_generator.rb +++ b/padrino-gen/test/test_mailer_generator.rb @@ -17,6 +17,11 @@ def teardown assert_no_file_exists('/tmp/app/mailers/demo_mailer.rb') end + it 'should fail with NameError if given invalid namespace names' do + capture_io { generate(:project, "sample", "--root=#{@apptmp}") } + assert_raises(::NameError) { capture_io { generate(:mailer, "wrong/name", "--root=#{@apptmp}/sample") } } + end + it 'should generate mailer in specified app' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } diff --git a/padrino-gen/test/test_migration_generator.rb b/padrino-gen/test/test_migration_generator.rb index 4709825dc..9e1126711 100644 --- a/padrino-gen/test/test_migration_generator.rb +++ b/padrino-gen/test/test_migration_generator.rb @@ -17,6 +17,11 @@ def teardown assert_no_file_exists("#{@apptmp}/db/migrate") end + it 'should fail with NameError if given invalid namespace names' do + capture_io { generate(:project, "sample", "--root=#{@apptmp}") } + assert_raises(::NameError) { capture_io { generate(:migration, "wrong/name", "--root=#{@apptmp}/sample") } } + end + it 'should fail if we do not use an adapter' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') } assert_raises(SystemExit) { capture_io { generate(:migration, 'AddEmailToUsers', "-r=#{@apptmp}/sample_project") } } @@ -47,7 +52,7 @@ def teardown describe "the default migration numbering" do it 'should properly calculate version number' do - capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } + capture_io { generate(:project, 'sample_project', '--migration_format=number', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } capture_io { generate(:migration, 'add_email_to_person', "email:string", "-r=#{@apptmp}/sample_project") } capture_io { generate(:migration, 'add_name_to_person', "email:string", "-r=#{@apptmp}/sample_project") } capture_io { generate(:migration, 'add_age_to_user', "email:string", "-r=#{@apptmp}/sample_project") } @@ -59,7 +64,7 @@ def teardown describe "the timestamped migration numbering" do it 'should properly calculate version number' do - capture_io { generate(:project, 'sample_project', "--migration_format=timestamp", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } + capture_io { generate(:project, 'sample_project', '--migration_format=timestamp', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } time = stop_time_for_test.utc.strftime("%Y%m%d%H%M%S") @@ -85,8 +90,11 @@ def teardown end describe 'the migration generator for activerecord' do - it 'should generate migration for generic needs' do + before do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') } + end + + it 'should generate migration for generic needs' do response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb" assert_match_in_file(/class ModifyUserFields/m, migration_file_path) @@ -95,8 +103,7 @@ def teardown end it 'should generate migration for adding columns' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') } - migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] + migration_params = ['AddEmailToUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] response_success = capture_io { generate(:migration, *migration_params) } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb" assert_match_in_file(/class AddEmailToUsers/m, migration_file_path) @@ -107,8 +114,7 @@ def teardown end it 'should generate migration for removing columns' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') } - migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] + migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] response_success = capture_io { generate(:migration, *migration_params) } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb" assert_match_in_file(/class RemoveEmailFromUsers/m, migration_file_path) @@ -120,8 +126,11 @@ def teardown end describe 'the migration generator for datamapper' do - it 'should generate migration for generic needs' do + before do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') } + end + + it 'should generate migration for generic needs' do response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb" assert_match_in_file(/migration\s1.*?:modify_user_fields/m, migration_file_path) @@ -130,8 +139,7 @@ def teardown end it 'should generate migration for adding columns' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') } - migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] + migration_params = ['AddEmailToUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] response_success = capture_io { generate(:migration, *migration_params) } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb" assert_match_in_file(/migration\s1.*?:add_email_to_users/m, migration_file_path) @@ -142,8 +150,7 @@ def teardown end it 'should generate migration for removing columns' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') } - migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] + migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] response_success = capture_io { generate(:migration, *migration_params) } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb" assert_match_in_file(/migration\s1.*?:remove_email_from_users/m, migration_file_path) @@ -154,7 +161,6 @@ def teardown end it 'should properly version migration files' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') } response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") } response_success = capture_io { generate(:migration, 'ModifyUserFields2', "-r=#{@apptmp}/sample_project") } response_success = capture_io { generate(:migration, 'ModifyUserFields3', "-r=#{@apptmp}/sample_project") } @@ -165,8 +171,11 @@ def teardown end describe 'the migration generator for sequel' do - it 'should generate migration for generic needs' do + before do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } + end + + it 'should generate migration for generic needs' do response_success = capture_io { generate(:migration, 'ModifyUserFields', "-r=#{@apptmp}/sample_project") } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_modify_user_fields.rb" assert_match_in_file(/Sequel\.migration/m, migration_file_path) @@ -175,8 +184,7 @@ def teardown end it 'should generate migration for adding columns' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } - migration_params = ['AddEmailToUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] + migration_params = ['AddEmailToUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] response_success = capture_io { generate(:migration, *migration_params) } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_add_email_to_users.rb" assert_match_in_file(/Sequel\.migration/m, migration_file_path) @@ -187,8 +195,7 @@ def teardown end it 'should generate migration for removing columns' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } - migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] + migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] response_success = capture_io { generate(:migration, *migration_params) } migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb" assert_match_in_file(/Sequel\.migration/m, migration_file_path) @@ -200,21 +207,21 @@ def teardown end describe "the migration destroy option" do + before do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } + @migration_params = ['RemoveEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] + end it 'should destroy the migration files' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } - migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] - capture_io { generate(:migration, *migration_params) } + capture_io { generate(:migration, *@migration_params) } capture_io { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') } assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_remove_email_from_users.rb") end it 'should destroy the migration file regardless of number' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') } - migration_params = ['RemoveEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] - migration_param2 = ['AddEmailFromUsers', "email:string", "age:integer", "-r=#{@apptmp}/sample_project"] + migration_param2 = ['AddEmailFromUsers', 'email:string', 'age:integer', "-r=#{@apptmp}/sample_project"] capture_io { generate(:migration, *migration_param2) } - capture_io { generate(:migration, *migration_params) } + capture_io { generate(:migration, *@migration_params) } capture_io { generate(:migration, 'RemoveEmailFromUsers', "-r=#{@apptmp}/sample_project",'-d') } assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/002_remove_email_from_users.rb") end diff --git a/padrino-gen/test/test_model_generator.rb b/padrino-gen/test/test_model_generator.rb index b857bc2b4..7e42ed57f 100644 --- a/padrino-gen/test/test_model_generator.rb +++ b/padrino-gen/test/test_model_generator.rb @@ -79,14 +79,14 @@ def teardown it 'should generate a default type value for fields' do current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S") capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') } - capture_io { generate(:model, 'person', "name", "age:integer", "email", "-r=#{@apptmp}/sample_project") } - migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb" - assert_match_in_file(/class CreatePeople < ActiveRecord::Migration/m, migration_file_path) - assert_match_in_file(/ create_table :people/m, migration_file_path) + capture_io { generate(:model, 'friend', "name", "age:integer", "email", "-r=#{@apptmp}/sample_project") } + migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb" + assert_match_in_file(/class CreateFriends < ActiveRecord::Migration/m, migration_file_path) + assert_match_in_file(/ create_table :friends/m, migration_file_path) assert_match_in_file(/ t.string :name/m, migration_file_path) assert_match_in_file(/ t.integer :age/m, migration_file_path) assert_match_in_file(/ t.string :email/m, migration_file_path) - assert_match_in_file(/ drop_table :people/m, migration_file_path) + assert_match_in_file(/ drop_table :friends/m, migration_file_path) end it 'should abort if model name already exists' do @@ -119,7 +119,8 @@ def teardown describe "model generator using activerecord" do it 'should add activerecord middleware' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=activerecord') } - assert_match_in_file(/ use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/app/app.rb") + assert_match_in_file(/ use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/app/app.rb") + assert_file_exists("#{@apptmp}/sample_project/lib/connection_pool_management_middleware.rb") end it 'should generate model file' do @@ -148,14 +149,14 @@ def teardown it 'should generate migration file with given fields' do current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S") capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') } - capture_io { generate(:model, 'person', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") } - migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb" - assert_match_in_file(/class CreatePeople < ActiveRecord::Migration/m, migration_file_path) - assert_match_in_file(/ create_table :people/m, migration_file_path) + capture_io { generate(:model, 'friend', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") } + migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb" + assert_match_in_file(/class CreateFriends < ActiveRecord::Migration/m, migration_file_path) + assert_match_in_file(/ create_table :friends/m, migration_file_path) assert_match_in_file(/ t.string :name/m, migration_file_path) assert_match_in_file(/ t.integer :age/m, migration_file_path) assert_match_in_file(/ t.string :email/m, migration_file_path) - assert_match_in_file(/ drop_table :people/m, migration_file_path) + assert_match_in_file(/ drop_table :friends/m, migration_file_path) end end @@ -170,8 +171,9 @@ def teardown end it 'should add activerecord middleware' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=activerecord') } - assert_match_in_file(/ use ActiveRecord::ConnectionAdapters::ConnectionManagemen/m, "#{@apptmp}/sample_project/app/app.rb") + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=minirecord') } + assert_match_in_file(/ use ConnectionPoolManagement/m, "#{@apptmp}/sample_project/app/app.rb") + assert_file_exists("#{@apptmp}/sample_project/lib/connection_pool_management_middleware.rb") end it 'should generate model file' do @@ -212,6 +214,12 @@ def teardown # DATAMAPPER describe "model generator using datamapper" do + it 'should add activerecord middleware' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') } + assert_match_in_file(/ use IdentityMap/m, "#{@apptmp}/sample_project/app/app.rb") + assert_file_exists("#{@apptmp}/sample_project/lib/identity_map_middleware.rb") + end + it 'should generate model file with camelized name' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') } capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") } @@ -231,12 +239,12 @@ def teardown it 'should properly generate version numbers' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') } capture_io { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") } - capture_io { generate(:model, 'person', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") } + capture_io { generate(:model, 'friend', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") } capture_io { generate(:model, 'account', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") } assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/user.rb") assert_match_in_file(/migration 1, :create_users do/m, "#{@apptmp}/sample_project/db/migrate/001_create_users.rb") - assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/person.rb") - assert_match_in_file(/migration 2, :create_people do/m, "#{@apptmp}/sample_project/db/migrate/002_create_people.rb") + assert_match_in_file(/class Friend\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/friend.rb") + assert_match_in_file(/migration 2, :create_friends do/m, "#{@apptmp}/sample_project/db/migrate/002_create_friends.rb") assert_match_in_file(/class Account\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/account.rb") assert_match_in_file(/migration 3, :create_accounts do/m, "#{@apptmp}/sample_project/db/migrate/003_create_accounts.rb") end @@ -244,15 +252,15 @@ def teardown it 'should generate migration with given fields' do current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S") capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') } - capture_io { generate(:model, 'person', "name:string", "created_at:date_time", "email:string", "-r=#{@apptmp}/sample_project") } - assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/person.rb") - migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb" - assert_match_in_file(/migration 1, :create_people do/m, migration_file_path) - assert_match_in_file(/create_table :people do/m, migration_file_path) + capture_io { generate(:model, 'friend', "name:string", "created_at:date_time", "email:string", "-r=#{@apptmp}/sample_project") } + assert_match_in_file(/class Friend\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/friend.rb") + migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb" + assert_match_in_file(/migration 1, :create_friends do/m, migration_file_path) + assert_match_in_file(/create_table :friends do/m, migration_file_path) assert_match_in_file(/column :name, DataMapper::Property::String/m, migration_file_path) assert_match_in_file(/column :created_at, DataMapper::Property::DateTime/m, migration_file_path) assert_match_in_file(/column :email, DataMapper::Property::String/m, migration_file_path) - assert_match_in_file(/drop_table :people/m, migration_file_path) + assert_match_in_file(/drop_table :friends/m, migration_file_path) end end @@ -274,15 +282,15 @@ def teardown it 'should generate migration file with given properties' do current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S") capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=sequel') } - capture_io { generate(:model, 'person', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") } - migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb" - assert_match_in_file(/class Person < Sequel::Model/m, "#{@apptmp}/sample_project/models/person.rb") + capture_io { generate(:model, 'friend', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") } + migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_friends.rb" + assert_match_in_file(/class Friend < Sequel::Model/m, "#{@apptmp}/sample_project/models/friend.rb") assert_match_in_file(/Sequel\.migration do/m, migration_file_path) - assert_match_in_file(/create_table :people/m, migration_file_path) + assert_match_in_file(/create_table :friends/m, migration_file_path) assert_match_in_file(/String :name/m, migration_file_path) assert_match_in_file(/Integer :age/m, migration_file_path) assert_match_in_file(/DateTime :created/m, migration_file_path) - assert_match_in_file(/drop_table :people/m, migration_file_path) + assert_match_in_file(/drop_table :friends/m, migration_file_path) end end @@ -427,27 +435,6 @@ def teardown assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb") end - # RIOT - it 'should generate test file for riot' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot', '-d=activerecord') } - capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } - capture_io { generate(:model, 'SomeUser', "-r=#{@apptmp}/sample_project") } - assert_match_in_file(/context "SomeUser Model" do/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb") - assert_match_in_file(/SomeUser.new/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb") - assert_match_in_file(/asserts\("that record is not nil"\) \{ \!topic.nil\? \}/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb") - assert_match_in_file(/'(\/\.\.){1}\/test/m, "#{@apptmp}/sample_project/test/models/some_user_test.rb") - end - - it 'should generate test file for riot in specified app' do - capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=riot', '-d=activerecord') } - capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") } - capture_io { generate(:model, 'SomeUser', "-a=/subby", "-r=#{@apptmp}/sample_project") } - assert_match_in_file(/context "SomeUser Model" do/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb") - assert_match_in_file(/SomeUser.new/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb") - assert_match_in_file(/asserts\("that record is not nil"\) \{ \!topic.nil\? \}/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb") - assert_match_in_file(/'(\/\.\.){2}\/test/m, "#{@apptmp}/sample_project/test/subby/models/some_user_test.rb") - end - # MINITEST it 'should generate test file for minitest' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=minitest', '-d=activerecord') } diff --git a/padrino-gen/test/test_plugin_generator.rb b/padrino-gen/test/test_plugin_generator.rb index b77726eb9..244f8e4b5 100644 --- a/padrino-gen/test/test_plugin_generator.rb +++ b/padrino-gen/test/test_plugin_generator.rb @@ -54,6 +54,7 @@ def teardown it 'should resolve generic url properly' do template_file = 'http://www.example.com/test.rb' + FakeWeb.register_uri :get, template_file, :body => '' project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {}) project_gen.expects(:apply).with(template_file).returns(true).once capture_io { project_gen.invoke_all } @@ -71,6 +72,7 @@ def teardown it 'should resolve official template' do template_file = 'sampleblog' resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/templates/sampleblog_template.rb" + FakeWeb.register_uri :get, resolved_path, :body => template_file project_gen = Padrino::Generators::Project.new(['sample_project'], ["-p=#{template_file}", "-r=#{@apptmp}"], {}) project_gen.expects(:apply).with(resolved_path).returns(true).once capture_io { project_gen.invoke_all } @@ -86,6 +88,7 @@ def teardown it 'should resolve official plugin' do template_file = 'hoptoad' resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/plugins/hoptoad_plugin.rb" + FakeWeb.register_uri :get, resolved_path, :body => template_file plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{}) plugin_gen.expects(:in_app_root?).returns(true).once plugin_gen.expects(:apply).with(resolved_path).returns(true).once @@ -95,9 +98,11 @@ def teardown it 'should print a warning if template cannot be found' do template_file = 'hwat' resolved_path = "https://raw.github.com/padrino/padrino-recipes/master/plugins/hwat_plugin.rb" + FakeWeb.register_uri :get, resolved_path, :status => 404 plugin_gen = Padrino::Generators::Plugin.new([ template_file], ["-r=#{@apptmp}/sample_project"],{}) plugin_gen.expects(:in_app_root?).returns(true).once - plugin_gen.expects(:say).with("The template at #{resolved_path} could not be found!", :red).returns(true).once + # Use regex to ignore trailing whitespace in message + plugin_gen.expects(:say).with{ |message, color| (message =~ /The template at #{resolved_path} could not be loaded:.*404.*/) && (color == :red) }.returns(true).once capture_io { plugin_gen.invoke_all } end end diff --git a/padrino-gen/test/test_project_generator.rb b/padrino-gen/test/test_project_generator.rb index 6d0beefcf..02a5f606a 100644 --- a/padrino-gen/test/test_project_generator.rb +++ b/padrino-gen/test/test_project_generator.rb @@ -14,13 +14,13 @@ def teardown describe 'the project generator' do it 'should allow simple generator to run and create base_app with no options' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } - assert_file_exists("#{@apptmp}/sample_project") + assert_dir_exists("#{@apptmp}/sample_project") assert_match_in_file(/module SampleProject/,"#{@apptmp}/sample_project/app/app.rb") assert_match_in_file(/class App < Padrino::Application/,"#{@apptmp}/sample_project/app/app.rb") assert_match_in_file("Padrino.mount('SampleProject::App', :app_file => Padrino.root('app/app.rb')).to('/')", "#{@apptmp}/sample_project/config/apps.rb") assert_file_exists("#{@apptmp}/sample_project/config/boot.rb") assert_file_exists("#{@apptmp}/sample_project/Rakefile") - assert_file_exists("#{@apptmp}/sample_project/bin/sample_project") + assert_file_exists("#{@apptmp}/sample_project/exe/sample_project") assert_file_exists("#{@apptmp}/sample_project/public/favicon.ico") assert_dir_exists("#{@apptmp}/sample_project/public/images") assert_dir_exists("#{@apptmp}/sample_project/public/javascripts") @@ -31,12 +31,12 @@ def teardown it 'should generate a valid name' do capture_io { generate(:project, 'project.com', "--root=#{@apptmp}") } - assert_file_exists("#{@apptmp}/project.com") + assert_dir_exists("#{@apptmp}/project.com") assert_match_in_file(/module ProjectCom/, "#{@apptmp}/project.com/app/app.rb") assert_match_in_file(/class App < Padrino::Application/, "#{@apptmp}/project.com/app/app.rb") assert_match_in_file("Padrino.mount('ProjectCom::App', :app_file => Padrino.root('app/app.rb')).to('/')", "#{@apptmp}/project.com/config/apps.rb") capture_io { generate(:app, 'ws-dci-2011', "--root=#{@apptmp}/project.com") } - assert_file_exists("#{@apptmp}/project.com/ws_dci_2011") + assert_dir_exists("#{@apptmp}/project.com/ws_dci_2011") assert_match_in_file(/module ProjectCom/, "#{@apptmp}/project.com/ws_dci_2011/app.rb") assert_match_in_file(/class WsDci2011 < Padrino::Application/, "#{@apptmp}/project.com/ws_dci_2011/app.rb") assert_match_in_file("Padrino.mount('ProjectCom::WsDci2011', :app_file => Padrino.root('ws_dci_2011/app.rb')).to('/ws_dci_2011')", "#{@apptmp}/project.com/config/apps.rb") @@ -44,12 +44,12 @@ def teardown it 'should generate nested path with dashes in name' do capture_io { generate(:project, 'sample-project', "--root=#{@apptmp}") } - assert_file_exists("#{@apptmp}/sample-project") + assert_dir_exists("#{@apptmp}/sample-project") assert_match_in_file(/module SampleProject/, "#{@apptmp}/sample-project/app/app.rb") assert_match_in_file(/class App < Padrino::Application/, "#{@apptmp}/sample-project/app/app.rb") assert_match_in_file("Padrino.mount('SampleProject::App', :app_file => Padrino.root('app/app.rb')).to('/')", "#{@apptmp}/sample-project/config/apps.rb") capture_io { generate(:app, 'ws-dci-2011', "--root=#{@apptmp}/sample-project") } - assert_file_exists("#{@apptmp}/sample-project/ws_dci_2011") + assert_dir_exists("#{@apptmp}/sample-project/ws_dci_2011") assert_match_in_file(/module SampleProject/, "#{@apptmp}/sample-project/ws_dci_2011/app.rb") assert_match_in_file(/class WsDci2011 < Padrino::Application/, "#{@apptmp}/sample-project/ws_dci_2011/app.rb") assert_match_in_file("Padrino.mount('SampleProject::WsDci2011', :app_file => Padrino.root('ws_dci_2011/app.rb')).to('/ws_dci_2011')", "#{@apptmp}/sample-project/config/apps.rb") @@ -62,13 +62,13 @@ def teardown it 'should display the right path' do out, err = capture_io { generate(:project, 'project', "--root=/tmp") } - assert_file_exists("/tmp/project") + assert_dir_exists("/tmp/project") assert_match(/cd \/tmp\/project/, out) end it 'should allow specifying alternate application name' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--app=base_app') } - assert_file_exists("#{@apptmp}/sample_project") + assert_dir_exists("#{@apptmp}/sample_project") assert_match_in_file(/module SampleProject/,"#{@apptmp}/sample_project/app/app.rb") assert_match_in_file(/class BaseApp < Padrino::Application/,"#{@apptmp}/sample_project/app/app.rb") assert_match_in_file("Padrino.mount('SampleProject::BaseApp', :app_file => Padrino.root('app/app.rb')).to('/')", "#{@apptmp}/sample_project/config/apps.rb") @@ -101,8 +101,8 @@ def teardown it 'should generate tiny skeleton' do capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}") } - assert_file_exists("#{@apptmp}/sample_project") - assert_file_exists("#{@apptmp}/sample_project/app") + assert_dir_exists("#{@apptmp}/sample_project") + assert_dir_exists("#{@apptmp}/sample_project/app") assert_file_exists("#{@apptmp}/sample_project/app/controllers.rb") assert_file_exists("#{@apptmp}/sample_project/app/helpers.rb") assert_file_exists("#{@apptmp}/sample_project/app/mailers.rb") @@ -172,15 +172,15 @@ def teardown assert_equal 'none', components_chosen[:test] assert_equal 'none', components_chosen[:mock] assert_equal 'none', components_chosen[:script] - assert_equal 'slim', components_chosen[:renderer] + assert_equal 'none', components_chosen[:renderer] end it 'should create components file containing options chosen' do - component_options = ['--orm=datamapper', '--test=riot', '--mock=mocha', '--script=prototype', '--renderer=erb', '--stylesheet=less'] + component_options = ['--orm=datamapper', '--test=rspec', '--mock=mocha', '--script=prototype', '--renderer=erb', '--stylesheet=less'] capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", *component_options) } components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components") assert_equal 'datamapper', components_chosen[:orm] - assert_equal 'riot', components_chosen[:test] + assert_equal 'rspec', components_chosen[:test] assert_equal 'mocha', components_chosen[:mock] assert_equal 'prototype', components_chosen[:script] assert_equal 'erb', components_chosen[:renderer] @@ -188,10 +188,10 @@ def teardown end it 'should output to log components being applied' do - component_options = ['--orm=datamapper', '--test=riot', '--mock=mocha', '--script=prototype', '--renderer=erb','--stylesheet=less'] + component_options = ['--orm=datamapper', '--test=rspec', '--mock=mocha', '--script=prototype', '--renderer=erb','--stylesheet=less'] out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", *component_options) } assert_match(/applying.*?datamapper.*?orm/, out) - assert_match(/applying.*?riot.*?test/, out) + assert_match(/applying.*?rspec.*?test/, out) assert_match(/applying.*?mocha.*?mock/, out) assert_match(/applying.*?prototype.*?script/, out) assert_match(/applying.*?erb.*?renderer/, out) @@ -208,16 +208,15 @@ def teardown assert_file_exists("#{@apptmp}/sample_project/tmp/.keep") assert_file_exists("#{@apptmp}/sample_project/log/.keep") end - end - describe "a generator for mock component" do - it 'should properly generate for rr and riot' do - out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--mock=rr', '--test=riot', '--script=none') } - assert_match(/applying.*?rr.*?mock/, out) - assert_match_in_file(/gem 'rr'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/require 'riot\/rr'/, "#{@apptmp}/sample_project/test/test_config.rb") + it 'should allow to pass upcased name as the app name' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", "--app=API") } + assert_file_exists("#{@apptmp}/sample_project/app/app.rb") + assert_match_in_file(/class API < Padrino::Application/, "#{@apptmp}/sample_project/app/app.rb") end + end + describe "a generator for mock component" do it 'should properly generate for rr and minitest' do out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--mock=rr', '--test=minitest', '--script=none') } assert_match(/applying.*?rr.*?mock/, out) @@ -245,13 +244,6 @@ def teardown assert_match_in_file(/gem 'mocha'/, "#{@apptmp}/sample_project/Gemfile") assert_match_in_file(/conf.mock_with :mocha/m, "#{@apptmp}/sample_project/spec/spec_helper.rb") end - - it 'should properly generate for mocha and riot' do - out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=riot', '--mock=mocha', '--script=none') } - assert_match(/applying.*?mocha.*?mock/, out) - assert_match_in_file(/gem 'mocha'.*require => false/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/require 'mocha\/api'/, "#{@apptmp}/sample_project/test/test_config.rb") - end end describe "the generator for orm components" do @@ -336,7 +328,7 @@ def teardown end it 'should properly generate sqlite3' do - out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=activerecord', '--adapter=sqlite3') } + out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=activerecord', '--adapter=sqlite') } assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/sample_project/Gemfile") assert_match_in_file(/sample_project_development.db/, "#{@apptmp}/sample_project/config/database.rb") assert_match_in_file(%r{:adapter => 'sqlite3'}, "#{@apptmp}/sample_project/config/database.rb") @@ -401,7 +393,7 @@ def teardown it 'should properly generate for mongoid' do out, err = capture_io { generate(:project, 'project.com', "--root=#{@apptmp}", '--orm=mongoid', '--script=none') } assert_match(/applying.*?mongoid.*?orm/, out) - assert_match_in_file(/gem 'mongoid', '~>3.0.0'/, "#{@apptmp}/project.com/Gemfile") + assert_match_in_file(/gem 'mongoid'/, "#{@apptmp}/project.com/Gemfile") assert_match_in_file(/Mongoid::Config.sessions =/, "#{@apptmp}/project.com/config/database.rb") end @@ -452,7 +444,7 @@ def teardown it 'should properly generate for erb' do out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=erb', '--script=none') } assert_match(/applying.*?erb.*?renderer/, out) - assert_match_in_file(/gem 'erubis'/, "#{@apptmp}/sample_project/Gemfile") + assert_match_in_file(/gem 'erubi'/, "#{@apptmp}/sample_project/Gemfile") end it 'should properly generate for haml' do @@ -500,14 +492,6 @@ def teardown assert_file_exists("#{@apptmp}/sample_project/public/javascripts/application.js") end - it 'should properly generate for rightjs' do - out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=rightjs') } - assert_match(/applying.*?rightjs.*?script/, out) - assert_file_exists("#{@apptmp}/sample_project/public/javascripts/right.js") - assert_file_exists("#{@apptmp}/sample_project/public/javascripts/right-ujs.js") - assert_file_exists("#{@apptmp}/sample_project/public/javascripts/application.js") - end - it 'should properly generate for ext-core' do out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=extcore') } assert_match(/applying.*?extcore.*?script/, out) @@ -540,23 +524,6 @@ def teardown assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake") end - it 'should properly generate for riot' do - out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=riot', '--script=none') } - assert_match(/applying.*?riot.*?test/, out) - assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/:require => 'rack\/test'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/:group => 'test'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/gem 'riot'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/include Rack::Test::Methods/, "#{@apptmp}/sample_project/test/test_config.rb") - assert_match_in_file(/RACK_ENV = 'test' unless defined\?\(RACK_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb") - assert_match_in_file(/Riot::Situation/, "#{@apptmp}/sample_project/test/test_config.rb") - assert_match_in_file(/Riot::Context/, "#{@apptmp}/sample_project/test/test_config.rb") - assert_match_in_file(/SampleProject::App\.tap/, "#{@apptmp}/sample_project/test/test_config.rb") - assert_file_exists("#{@apptmp}/sample_project/test/test.rake") - assert_match_in_file(/Rake::TestTask\.new\("test:\#/,"#{@apptmp}/sample_project/test/test.rake") - assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake") - end - it 'should properly generate for rspec' do out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=rspec', '--script=none') } assert_match(/applying.*?rspec.*?test/, out) @@ -585,20 +552,6 @@ def teardown assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake") end - it 'should properly generate for steak' do - out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=steak', '--script=none') } - assert_match(/applying.*?steak.*?test/, out) - assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/:require => 'rack\/test'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/:group => 'test'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/gem 'steak'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/RACK_ENV = 'test' unless defined\?\(RACK_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb") - assert_match_in_file(/RSpec.configure/, "#{@apptmp}/sample_project/spec/spec_helper.rb") - assert_file_exists("#{@apptmp}/sample_project/spec/spec.rake") - assert_match_in_file(/RSpec::Core::RakeTask\.new\("spec:\#/,"#{@apptmp}/sample_project/spec/spec.rake") - assert_match_in_file(/task 'spec' => spec_tasks/,"#{@apptmp}/sample_project/spec/spec.rake") - end - it 'should properly generate for minitest' do out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=minitest', '--script=none') } assert_match(/applying.*?minitest.*?test/, out) @@ -642,7 +595,7 @@ def teardown it 'should properly generate for sass' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=sass') } assert_match_in_file(/gem 'sass'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/lib/sass_initializer.rb") + assert_match_in_file(/module SassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/config/initializers/sass.rb") assert_match_in_file(/register SassInitializer/m, "#{@apptmp}/sample_project/app/app.rb") assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets") end @@ -650,16 +603,16 @@ def teardown it 'should properly generate for less' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=less') } assert_match_in_file(/gem 'rack-less'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/module LessInitializer.*Rack::Less/m, "#{@apptmp}/sample_project/lib/less_initializer.rb") + assert_match_in_file(/module LessInitializer.*Rack::Less/m, "#{@apptmp}/sample_project/config/initializers/less.rb") assert_match_in_file(/register LessInitializer/m, "#{@apptmp}/sample_project/app/app.rb") assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets") end it 'should properly generate for compass' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=compass') } - assert_match_in_file(/gem 'compass'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/Compass.configure_sass_plugin\!/, "#{@apptmp}/sample_project/lib/compass_plugin.rb") - assert_match_in_file(/module CompassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/lib/compass_plugin.rb") + assert_match_in_file(/gem 'compass-blueprint'/, "#{@apptmp}/sample_project/Gemfile") + assert_match_in_file(/Compass.configure_sass_plugin\!/, "#{@apptmp}/sample_project/config/initializers/compass.rb") + assert_match_in_file(/module CompassInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/config/initializers/compass.rb") assert_match_in_file(/register CompassInitializer/m, "#{@apptmp}/sample_project/app/app.rb") assert_file_exists("#{@apptmp}/sample_project/app/stylesheets/application.scss") @@ -669,8 +622,8 @@ def teardown it 'should properly generate for scss' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=haml','--script=none','--stylesheet=scss') } assert_match_in_file(/gem 'haml'/, "#{@apptmp}/sample_project/Gemfile") - assert_match_in_file(/module ScssInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/lib/scss_initializer.rb") - assert_match_in_file(/Sass::Plugin.options\[:syntax\] = :scss/m, "#{@apptmp}/sample_project/lib/scss_initializer.rb") + assert_match_in_file(/module ScssInitializer.*Sass::Plugin::Rack/m, "#{@apptmp}/sample_project/config/initializers/scss.rb") + assert_match_in_file(/Sass::Plugin.options\[:syntax\] = :scss/m, "#{@apptmp}/sample_project/config/initializers/scss.rb") assert_match_in_file(/register ScssInitializer/m, "#{@apptmp}/sample_project/app/app.rb") assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets") end @@ -684,19 +637,10 @@ def teardown assert_file_exists("#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb") assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb") assert_match_in_file(/RSpec\.describe "Controller" do/, "#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb") + assert_match_in_file(/get "\/"/, "#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb") assert_match_in_file(/RSpec.describe "SampleProject::App::Helper" do/, "#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb") end - it "should properly generate for steak" do - capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=steak") } - assert_dir_exists("#{@apptmp}/sample_project/spec/") - assert_file_exists("#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb") - assert_file_exists("#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb") - assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb") - assert_match_in_file(/describe "Controller" do/, "#{@apptmp}/sample_project/spec/app/controllers/controllers_spec.rb") - assert_match_in_file(/describe "SampleProject::App::Helper" do/, "#{@apptmp}/sample_project/spec/app/helpers/helpers_spec.rb") - end - it "should properly generate for cucumber" do capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=cucumber") } assert_dir_exists("#{@apptmp}/sample_project/spec/") @@ -727,16 +671,6 @@ def teardown assert_match_in_file(/describe "SampleProject::App::Helper"/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb") end - it "should properly generate for riot" do - capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=riot") } - assert_dir_exists("#{@apptmp}/sample_project/test/") - assert_file_exists("#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb") - assert_file_exists("#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb") - assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/test/test_config.rb") - assert_match_in_file(/context "Controller" do/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb") - assert_match_in_file(/describe "SampleProject::App::Helper"/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb") - end - it "should properly generate for shoulda" do capture_io { generate(:project,'sample_project', '--tiny', "--root=#{@apptmp}", "--test=shoulda") } assert_dir_exists("#{@apptmp}/sample_project/test/") @@ -747,5 +681,19 @@ def teardown assert_match_in_file(/class SampleProject::App::HelperTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb") end + it "should properly generate for testunit" do + out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=testunit', '--script=none', '--tiny') } + assert_match(/applying.*?testunit.*?test/, out) + assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile") + assert_match_in_file(/:require => 'rack\/test'/, "#{@apptmp}/sample_project/Gemfile") + assert_match_in_file(/:group => 'test'/, "#{@apptmp}/sample_project/Gemfile") + assert_match_in_file(/gem 'test-unit'/, "#{@apptmp}/sample_project/Gemfile") + assert_match_in_file(/RACK_ENV = 'test' unless defined\?\(RACK_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb") + assert_file_exists("#{@apptmp}/sample_project/test/test.rake") + assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake") + assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/test/test_config.rb") + assert_match_in_file(/class ControllerTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb") + assert_match_in_file(/class SampleProject::App::HelperTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb") + end end end diff --git a/padrino-gen/test/test_sql_helpers.rb b/padrino-gen/test/test_sql_helpers.rb new file mode 100644 index 000000000..5671cc701 --- /dev/null +++ b/padrino-gen/test/test_sql_helpers.rb @@ -0,0 +1,105 @@ +require File.expand_path(File.dirname(__FILE__) + "/helper") +require File.expand_path(File.dirname(__FILE__) + "/../lib/padrino-gen/padrino-tasks/sql-helpers") + +describe "SqlHelpers" do + def setup + Process.expects(:wait) + end + + describe "create_db" do + describe "postgres" do + it "does not set PGPASSWORD when password is nil" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.create_db("postgres", nil, nil, nil, "database", nil, nil) + end + + it "does not set PGPASSWORD when password is blank" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.create_db("postgres", nil, "", nil, "database", nil, nil) + end + + it "sets PGPASSWORD when password is present" do + Process.expects(:spawn).with() do |environment, *args| + environment == {"PGPASSWORD" => "hunter2"} + end + Padrino::Generators::SqlHelpers.create_db("postgres", nil, "hunter2", nil, "database", nil, nil) + end + end + + describe "mysql" do + it "does not set MYSQL_PWD when password is nil" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.create_db("mysql", nil, nil, nil, "database", nil, nil) + end + + it "does not set MYSQL_PWD when password is blank" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.create_db("mysql", nil, "", nil, "database", nil, nil) + end + + it "sets MYSQL_PWD when password is present" do + Process.expects(:spawn).with() do |environment, *args| + environment == {"MYSQL_PWD" => "hunter2"} + end + Padrino::Generators::SqlHelpers.create_db("mysql", nil, "hunter2", nil, "database", nil, nil) + end + end + end + + describe "drop_db" do + describe "postgres" do + it "does not set PGPASSWORD when password is nil" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.drop_db("postgres", nil, nil, nil, "database") + end + + it "does not set PGPASSWORD when password is blank" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.drop_db("postgres", nil, "", nil, "database") + end + + it "sets PGPASSWORD when password is present" do + Process.expects(:spawn).with() do |environment, *args| + environment == {"PGPASSWORD" => "hunter2"} + end + Padrino::Generators::SqlHelpers.drop_db("postgres", nil, "hunter2", nil, "database") + end + end + + describe "mysql" do + it "does not set MYSQL_PWD when password is nil" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.drop_db("mysql", nil, nil, nil, "database") + end + + it "does not set MYSQL_PWD when password is blank" do + Process.expects(:spawn).with() do |environment, *args| + environment == {} + end + Padrino::Generators::SqlHelpers.drop_db("mysql", nil, "", nil, "database") + end + + it "sets MYSQL_PWD when password is present" do + Process.expects(:spawn).with() do |environment, *args| + environment == {"MYSQL_PWD" => "hunter2"} + end + Padrino::Generators::SqlHelpers.drop_db("mysql", nil, "hunter2", nil, "database") + end + end + end +end + diff --git a/padrino-gen/test/test_task_generator.rb b/padrino-gen/test/test_task_generator.rb index 095c7cc0e..d95b1b9b1 100644 --- a/padrino-gen/test/test_task_generator.rb +++ b/padrino-gen/test/test_task_generator.rb @@ -17,6 +17,11 @@ def teardown assert_no_file_exists('/tmp/tasks/foo.rake') end + it 'should fail with NameError if given invalid namespace names' do + capture_io { generate(:project, "sample", "--root=#{@apptmp}") } + assert_raises(::NameError) { capture_io { generate(:task, "wrong/name", "--root=#{@apptmp}/sample") } } + end + it 'should generate filename properly' do capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } capture_io { generate(:task, 'DemoTask', "--namespace=Sample", "--description='This is a sample'", "-r=#{@apptmp}/sample_project") } @@ -49,5 +54,12 @@ def teardown assert_match_in_file(/desc "This is a sample"/, file_path) assert_match_in_file(/task :demo_task => :environment do/, file_path) end + + it 'should preserve spaces' do + capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") } + Padrino.bin_gen('task', 'DemoTask', "--namespace=Sample", "--description=This is a sample", "-r=#{@apptmp}/sample_project", :out => File::NULL) + file_path = "#{@apptmp}/sample_project/tasks/sample_demo_task.rake" + assert_match_in_file(/desc "This is a sample"/, file_path) + end end end diff --git a/padrino-helpers/README.rdoc b/padrino-helpers/README.rdoc index 0e2049d02..d9c88c9b3 100644 --- a/padrino-helpers/README.rdoc +++ b/padrino-helpers/README.rdoc @@ -53,7 +53,7 @@ to the template through the use of concat_content. Note have been built templates using the same syntax. For more information on using output helpers, check out the guide for -{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers]. +{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/output-helpers/]. === Tag Helpers @@ -74,7 +74,7 @@ The input_tag is used to build tags that are related to accepting input from the Note that all of these accept html options and result in returning a string containing html tags. For more information on using tag helpers, check out the guide for -{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers]. +{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/tag-helpers/]. === Asset Helpers @@ -95,7 +95,7 @@ simple view template: %p= image_tag 'padrino.png', :width => '35', :class => 'logo' For more information on using asset helpers, check out the guide for -{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers]. +{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/asset-helpers/]. === Form Helpers @@ -120,7 +120,7 @@ example of constructing a non-object form would be: = submit_tag "Remove" For more information on using form helpers, check out the guide for -{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers]. +{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/form-helpers/]. === FormBuilders @@ -153,7 +153,7 @@ A form_for using these basic fields might look like: %p = f.submit "Create", :class => 'button' -Forms can also accept nested attributes using `fields_for` within the form builder in recent releases. Check out the guide for {Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers] to learn more about nested forms. +Forms can also accept nested attributes using `fields_for` within the form builder in recent releases. Check out the guide for {Padrino Helpers}[http://padrinorb.com/guides/application-helpers/form-builders/] to learn more about nested forms. There is also an additional StandardFormBuilder which builds on the abstract fields that can be used within a form_for. @@ -179,7 +179,7 @@ and would generate this html (with each input contained in a paragraph and conta You can also easily build your own FormBuilder which allows for customized fields and behavior. For more information on using the Padrino form builders, check out the guide for -{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers]. +{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/standard-form-builder/]. === Format Helpers @@ -207,7 +207,7 @@ Format helpers also includes a number of useful text manipulation functions such These helpers can be invoked from any route or view within your application. For more information on using the format helpers, check out the guide for -{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers]. +{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/format-helpers/]. === Render Helpers @@ -232,8 +232,8 @@ Finally, we have the all-important partials support for rendering mini-templates partial 'photo/_item', :collection => @photos For more information on using the render and partial helpers, check out the guide for -{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers]. +{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/render-helpers/]. == Copyright -Copyright (c) 2011-2013 Padrino. See LICENSE for details. +Copyright (c) 2011-2015 Padrino. See LICENSE for details. diff --git a/padrino-helpers/Rakefile b/padrino-helpers/Rakefile index f33347d26..da75d43e2 100644 --- a/padrino-helpers/Rakefile +++ b/padrino-helpers/Rakefile @@ -1,5 +1 @@ -# coding:utf-8 -RAKE_ROOT = __FILE__ - -require 'rubygems' -require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') \ No newline at end of file +require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') diff --git a/padrino-helpers/lib/padrino-helpers.rb b/padrino-helpers/lib/padrino-helpers.rb index 3b9a98bbe..ce2264e3b 100644 --- a/padrino-helpers/lib/padrino-helpers.rb +++ b/padrino-helpers/lib/padrino-helpers.rb @@ -1,12 +1,9 @@ require 'padrino-support' +require 'padrino-support/inflections' require 'i18n' require 'enumerator' -require 'active_support/time_with_zone' # next extension depends on this -require 'active_support/core_ext/string/conversions' # to_date -require 'active_support/option_merger' # with_options -require 'active_support/core_ext/object/with_options' # with_options -require 'active_support/inflector' # humanize -require 'active_support/core_ext/hash/except' # Hash#except + +# remove at 0.14 require 'padrino/rendering' FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__) @@ -42,8 +39,9 @@ class << self # end # def registered(app) + require 'padrino/rendering' app.register Padrino::Rendering - app.set :default_builder, 'StandardFormBuilder' + app.set :default_builder, 'StandardFormBuilder' unless app.respond_to?(:default_builder) included(app) end diff --git a/padrino-helpers/lib/padrino-helpers/asset_tag_helpers.rb b/padrino-helpers/lib/padrino-helpers/asset_tag_helpers.rb index eab6fb7e4..73da475b3 100644 --- a/padrino-helpers/lib/padrino-helpers/asset_tag_helpers.rb +++ b/padrino-helpers/lib/padrino-helpers/asset_tag_helpers.rb @@ -24,17 +24,17 @@ module AssetTagHelpers # # @example # flash_tag(:notice, :id => 'flash-notice') - # # Generates:flash-notice
+ # # Generates: flash-notice
# flash_tag(:error, :success)
# # Generates: flash-error
# # flash-success
#
def flash_tag(*args)
- options = args.extract_options!
+ options = args.last.is_a?(Hash) ? args.pop : {}
bootstrap = options.delete(:bootstrap) if options[:bootstrap]
- args.inject(ActiveSupport::SafeBuffer.new) do |html,kind|
- flash_text = ActiveSupport::SafeBuffer.new << flash[kind]
- next html if flash_text.blank?
+ args.inject(SafeBuffer.new) do |html,kind|
+ next html unless flash[kind]
+ flash_text = SafeBuffer.new << flash[kind]
flash_text << content_tag(:button, '×'.html_safe, {:type => :button, :class => :close, :'data-dismiss' => :alert}) if bootstrap
html << content_tag(:div, flash_text, { :class => kind }.update(options))
end
@@ -67,22 +67,25 @@ def flash_tag(*args)
#
# @example
# link_to('click me', '/dashboard', :class => 'linky')
+ # # Generates click me
+ #
# link_to('click me', '/dashboard', :remote => true)
+ # # Generates click me
+ #
# link_to('click me', '/dashboard', :method => :delete)
- # link_to('click me', :class => 'blocky') do; end
+ # # Generates click me
+ #
+ # link_to('/dashboard', :class => 'blocky') { 'click me' }
+ # # Generates click me
#
# Note that you can pass :+if+ or :+unless+ conditions, but if you provide :current as
# condition padrino return true/false if the request.path_info match the given url.
#
def link_to(*args, &block)
- options = args.extract_options!
+ options = args.last.is_a?(Hash) ? args.pop : {}
name = block_given? ? '' : args.shift
href = args.first
- if fragment = options[:fragment] || options[:anchor]
- warn 'Options :anchor and :fragment are deprecated for #link_to. Please use :fragment for #url'
- href << '#' << fragment.to_s
- end
- options.reverse_merge!(:href => href || '#')
+ options = { :href => href ? escape_link(href) : '#' }.update(options)
return name unless parse_conditions(href, options)
block_given? ? content_tag(:a, options, &block) : content_tag(:a, name, options)
end
@@ -113,7 +116,7 @@ def link_to(*args, &block)
#
def feed_tag(mime, url, options={})
full_mime = (mime == :atom) ? 'application/atom+xml' : 'application/rss+xml'
- tag(:link, options.reverse_merge(:rel => 'alternate', :type => full_mime, :title => mime, :href => url))
+ tag(:link, { :rel => 'alternate', :type => full_mime, :title => mime, :href => url }.update(options))
end
##
@@ -133,16 +136,18 @@ def feed_tag(mime, url, options={})
# @return [String] Mail link html tag with specified +options+.
#
# @example
- # # Generates: me@demo.com
# mail_to "me@demo.com"
- # # Generates: My Email
+ # # Generates: me@demo.com
+ #
# mail_to "me@demo.com", "My Email"
+ # # Generates: My Email
#
def mail_to(email, caption=nil, mail_options={})
- html_options = mail_options.slice!(:cc, :bcc, :subject, :body)
- mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@')
- mail_href = "mailto:#{email}"; mail_href << "?#{mail_query}" if mail_query.present?
- link_to((caption || email), mail_href, html_options)
+ mail_options, html_options = mail_options.partition{ |key,_| [:cc, :bcc, :subject, :body].include?(key) }
+ mail_query = Rack::Utils.build_query(Hash[mail_options]).gsub(/\+/, '%20').gsub('%40', '@')
+ mail_href = "mailto:#{email}"
+ mail_href << "?#{mail_query}" unless mail_query.empty?
+ link_to((caption || email), mail_href, Hash[html_options])
end
##
@@ -156,14 +161,14 @@ def mail_to(email, caption=nil, mail_options={})
# @return [String] Meta html tag with specified +options+.
#
# @example
- # # Generates:
# meta_tag "weblog,news", :name => "keywords"
+ # # Generates:
#
- # # Generates:
# meta_tag "text/html; charset=UTF-8", 'http-equiv' => "Content-Type"
+ # # Generates:
#
def meta_tag(content, options={})
- options.reverse_merge!("content" => content)
+ options = { "content" => content }.update(options)
tag(:meta, options)
end
@@ -184,8 +189,8 @@ def meta_tag(content, options={})
# favicon_tag 'favicon.png', :type => 'image/ico'
#
def favicon_tag(source, options={})
- type = File.extname(source).gsub('.','')
- options = options.dup.reverse_merge!(:href => image_path(source), :rel => 'icon', :type => "image/#{type}")
+ type = File.extname(source).sub('.','')
+ options = { :href => image_path(source), :rel => 'icon', :type => "image/#{type}" }.update(options)
tag(:link, options)
end
@@ -203,12 +208,24 @@ def favicon_tag(source, options={})
# image_tag('icons/avatar.png')
#
def image_tag(url, options={})
- options.reverse_merge!(:src => image_path(url))
+ options = { :src => image_path(url) }.update(options)
+ options[:alt] ||= image_alt(url) unless url.to_s =~ /\A(?:cid|data):|\A\Z/
tag(:img, options)
end
##
- # Returns an html script tag for each of the sources provided.
+ # Returns a string suitable for an alt attribute of img element.
+ #
+ # @param [String] src
+ # The source path for the image tag.
+ # @return [String] The alt attribute value.
+ #
+ def image_alt(src)
+ File.basename(src, '.*').sub(/-[[:xdigit:]]{32,64}\z/, '').tr('-_', ' ').capitalize
+ end
+
+ ##
+ # Returns a html link tag for each of the sources provided.
# You can pass in the filename without extension or a symbol and we search it in your +appname.public_folder+
# like app/public/stylesheets for inclusion. You can provide also a full path.
#
@@ -226,14 +243,14 @@ def stylesheet_link_tag(*sources)
options = {
:rel => 'stylesheet',
:type => 'text/css'
- }.update(sources.extract_options!.symbolize_keys)
- sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all,source|
+ }.update(sources.last.is_a?(Hash) ? Utils.symbolize_keys(sources.pop) : {})
+ sources.flatten.inject(SafeBuffer.new) do |all,source|
all << tag(:link, { :href => asset_path(:css, source) }.update(options))
end
end
##
- # Returns an html script tag for each of the sources provided.
+ # Returns a html script tag for each of the sources provided.
# You can pass in the filename without extension or a symbol and we search it in your +appname.public_folder+
# like app/public/javascript for inclusion. You can provide also a full path.
#
@@ -249,8 +266,8 @@ def stylesheet_link_tag(*sources)
def javascript_include_tag(*sources)
options = {
:type => 'text/javascript'
- }.update(sources.extract_options!.symbolize_keys)
- sources.flatten.inject(ActiveSupport::SafeBuffer.new) do |all,source|
+ }.update(sources.last.is_a?(Hash) ? Utils.symbolize_keys(sources.pop) : {})
+ sources.flatten.inject(SafeBuffer.new) do |all,source|
all << content_tag(:script, nil, { :src => asset_path(:js, source) }.update(options))
end
end
@@ -298,7 +315,7 @@ def image_path(src)
#
def asset_path(kind, source = nil)
kind, source = source, kind if source.nil?
- source = asset_normalize_extension(kind, URI.escape(source.to_s))
+ source = asset_normalize_extension(kind, escape_link(source.to_s))
return source if source =~ ABSOLUTE_URL_PATTERN || source =~ /^\//
source = File.join(asset_folder_name(kind), source)
timestamp = asset_timestamp(source)
diff --git a/padrino-helpers/lib/padrino-helpers/form_builder/abstract_form_builder.rb b/padrino-helpers/lib/padrino-helpers/form_builder/abstract_form_builder.rb
index 346f6d222..5b71f20f1 100644
--- a/padrino-helpers/lib/padrino-helpers/form_builder/abstract_form_builder.rb
+++ b/padrino-helpers/lib/padrino-helpers/form_builder/abstract_form_builder.rb
@@ -1,5 +1,3 @@
-require 'padrino-helpers/form_builder/deprecated_builder_methods'
-
module Padrino
module Helpers
module FormBuilder
@@ -8,8 +6,6 @@ class AbstractFormBuilder
attr_accessor :template, :object, :multipart
attr_reader :namespace, :is_nested, :parent_form, :nested_index, :attributes_name, :model_name
- include DeprecatedBuilderMethods
-
def initialize(template, object, options={})
@template = template
fail "FormBuilder template must be initialized" unless template
@@ -17,7 +13,7 @@ def initialize(template, object, options={})
fail "FormBuilder object must be present. If there's no object, use a symbol instead (i.e. :user)" unless object
@options = options
@namespace = options[:namespace]
- @model_name = options[:as] || @object.class.to_s.underscore.gsub(/\//, '_')
+ @model_name = options[:as] || Inflections.underscore(@object.class).tr('/', '_')
nested = options[:nested]
if @is_nested = nested && (nested_parent = nested[:parent]) && nested_parent.respond_to?(:object)
@parent_form = nested_parent
@@ -35,9 +31,7 @@ def error_message_on(field, options={})
end
def label(field, options={}, &block)
- options[:id] ||= nil
- options[:caption] ||= I18n.t("#{model_name}.attributes.#{field}", :count => 1, :default => field.to_s.humanize, :scope => :models) + ': '
- @template.label_tag(field_id(field), default_options(field, options), &block)
+ @template.label_tag(field_id(field), { :caption => "#{field_human_name(field)}: " }.update(options), &block)
end
def hidden_field(field, options={})
@@ -110,17 +104,45 @@ def radio_button(field, options={})
def file_field(field, options={})
self.multipart = true
- @template.file_field_tag field_name(field), default_options(field, options).except(:value)
+ @template.file_field_tag field_name(field), default_options(field, options).reject{ |key, _| key == :value }
end
def submit(*args)
- @template.submit_tag *args
+ @template.submit_tag(*args)
end
def image_submit(source, options={})
@template.image_submit_tag source, options
end
+ def datetime_field(field, options={})
+ @template.datetime_field_tag field_name(field), default_options(field, options)
+ end
+
+ def datetime_local_field(field, options={})
+ @template.datetime_local_field_tag field_name(field), default_options(field, options)
+ end
+
+ def date_field(field, options={})
+ @template.date_field_tag field_name(field), default_options(field, options)
+ end
+
+ def month_field(field, options={})
+ @template.month_field_tag field_name(field), default_options(field, options)
+ end
+
+ def week_field(field, options={})
+ @template.week_field_tag field_name(field), default_options(field, options)
+ end
+
+ def time_field(field, options={})
+ @template.time_field_tag field_name(field), default_options(field, options)
+ end
+
+ def color_field(field, options={})
+ @template.color_field_tag field_name(field), default_options(field, options)
+ end
+
##
# Supports nested fields for a child model within a form.
# f.fields_for :addresses
@@ -133,7 +155,7 @@ def fields_for(child_association, collection=nil, options={}, &block)
include_index = default_collection.respond_to?(:each)
nested_options = { :parent => self, :association => child_association }
- Array(collection).each_with_index.inject(ActiveSupport::SafeBuffer.new) do |all,(child_instance,index)|
+ Array(collection).each_with_index.inject(SafeBuffer.new) do |all,(child_instance,index)|
nested_options[:index] = options[:index] || (include_index ? index : nil)
all << @template.fields_for(child_instance, { :nested => nested_options, :builder => self.class }, &block) << "\n"
end
@@ -147,7 +169,24 @@ def csrf_token_field
# Returns the known field types for a Formbuilder.
def self.field_types
- [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select]
+ [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select,
+ :number_field, :telephone_field, :email_field, :search_field, :url_field,
+ :datetime_field, :datetime_local_field, :date_field, :month_field, :week_field, :time_field, :color_field,
+ ]
+ end
+
+ ##
+ # Returns the human name of the field. Look that use builtin I18n.
+ #
+ def field_human_name(field)
+ I18n.translate("#{model_name}.attributes.#{field}", :count => 1, :default => Inflections.humanize(field), :scope => :models)
+ end
+
+ ##
+ # Returns the object's models name.
+ #
+ def object_model_name(explicit_object=object)
+ explicit_object.is_a?(Symbol) ? explicit_object : explicit_object.class.to_s.underscore.gsub(/\//, '_')
end
##
@@ -157,7 +196,7 @@ def self.field_types
# field_name(:street) => "user[addresses_attributes][0][street]"
def field_name(field=nil)
result = field_name_fragment
- result << "[#{field}]" unless field.blank?
+ result << "[#{field}]" if field
result
end
@@ -170,8 +209,8 @@ def field_name(field=nil)
def field_id(field=nil, value=nil)
result = (namespace && !is_nested) ? "#{namespace}_" : ''
result << field_id_fragment
- result << "_#{field}" unless field.blank?
- result << "_#{value}" unless value.blank?
+ result << "_#{field}" if field
+ result << "_#{value}" if value
result
end
@@ -193,7 +232,7 @@ def field_value(field)
# Returns a record from template instance or create a record of specified class.
#
def build_object(symbol)
- @template.instance_variable_get("@#{symbol}") || symbol.to_s.camelize.constantize.new
+ @template.instance_variable_get("@#{symbol}") || Inflections.constantize(Inflections.camelize(symbol)).new
end
##
@@ -203,7 +242,7 @@ def labeled_group(field, options={})
options = { :id => field_id(field), :selected => field_value(field) }.update(options)
options.update(error_class(field)){ |_,*values| values.compact.join(' ') }
selected_values = resolve_checked_values(field, options)
- variants_for_group(options).inject(ActiveSupport::SafeBuffer.new) do |html, (caption,value)|
+ variants_for_group(options).inject(SafeBuffer.new) do |html, (caption,value)|
variant_id = "#{options[:id]}_#{value}"
attributes = { :value => value, :id => variant_id, :checked => selected_values.include?(value) }
caption = yield(attributes) << ' ' << caption
@@ -269,7 +308,7 @@ def field_id_fragment
def error_class(field)
error = @object.errors[field] if @object.respond_to?(:errors)
- error.blank? ? {} : { :class => 'invalid' }
+ error.nil? || error.empty? ? {} : { :class => 'invalid' }
end
def default_options(field, options, defaults={})
diff --git a/padrino-helpers/lib/padrino-helpers/form_builder/deprecated_builder_methods.rb b/padrino-helpers/lib/padrino-helpers/form_builder/deprecated_builder_methods.rb
deleted file mode 100644
index 1b342688e..000000000
--- a/padrino-helpers/lib/padrino-helpers/form_builder/deprecated_builder_methods.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-module Padrino
- module Helpers
- module FormBuilder
- module DeprecatedBuilderMethods
- ##
- # Returns true if the value matches the value in the field.
- # field_has_value?(:gender, 'male')
- def values_matches_field?(field, value)
- logger.warn "##{__method__} is deprecated"
- value.present? && (field_value(field).to_s == value.to_s || field_value(field).to_s == 'true')
- end
-
- ##
- # Add a :invalid css class to the field if it contain an error.
- #
- def field_error(field, options)
- logger.warn "##{__method__} is deprecated"
- error = @object.errors[field] rescue nil
- error.blank? ? options[:class] : [options[:class], :invalid].flatten.compact.join(" ")
- end
-
- def nested_form?
- logger.warn "##{__method__} is deprecated"
- @options[:nested] && @options[:nested][:parent] && @options[:nested][:parent].respond_to?(:object)
- is_nested && object.respond_to?(:new_record?) && !object.new_record? && object.id
- end
-
- ##
- # Returns a new record of the type specified in the object
- #
- def build_object(object_or_symbol)
- logger.warn "##{__method__} is deprecated"
- object_or_symbol.is_a?(Symbol) ? @template.instance_variable_get("@#{object_or_symbol}") || object_class(object_or_symbol).new : object_or
- end
-
- ##
- # Returns the object's models name.
- #
- def object_model_name(explicit_object=object)
- logger.warn "##{__method__} is deprecated"
- return @options[:as] if root_form? && @options[:as].is_a?(Symbol)
- explicit_object.is_a?(Symbol) ? explicit_object : explicit_object.class.to_s.underscore.gsub(/\//, '_')
- end
-
- ##
- # Returns the class type for the given object.
- #
- def object_class(explicit_object)
- logger.warn "##{__method__} is deprecated"
- explicit_object.is_a?(Symbol) ? explicit_object.to_s.camelize.constantize : explicit_object.class
- @object.respond_to?(field) ? @object.send(field) : ''
- end
-
- ##
- # Returns true if this form is the top-level (not nested).
- # Returns a record from template instance or create a record of specified class.
- #
- def root_form?
- logger.warn "##{__method__} is deprecated"
- !nested_form?
- end
-
- def build_object(symbol)
- logger.warn "##{__method__} is deprecated"
- @template.instance_variable_get("@#{symbol}") || symbol.to_s.camelize.constantize.new
- end
-
- def field_result
- logger.warn "##{__method__} is deprecated"
- result = []
- result << object_model_name if root_form?
- result
- end
-
- def merge_default_options!(field, options)
- logger.warn "##{__method__} is deprecated"
- options.reverse_merge!(:value => field_value(field), :id => field_id(field))
- options.merge!(:class => field_error(field, options))
- end
-
- def result_options
- logger.warn "##{__method__} is deprecated"
- {
- :parent_form => @options[:nested][:parent],
- :nested_index => @options[:nested][:index],
- :attributes_name => "#{@options[:nested][:association]}_attributes"
- }
- end
- end
- end
- end
-end
diff --git a/padrino-helpers/lib/padrino-helpers/form_builder/standard_form_builder.rb b/padrino-helpers/lib/padrino-helpers/form_builder/standard_form_builder.rb
index 3078a36ff..54494961e 100644
--- a/padrino-helpers/lib/padrino-helpers/form_builder/standard_form_builder.rb
+++ b/padrino-helpers/lib/padrino-helpers/form_builder/standard_form_builder.rb
@@ -17,7 +17,10 @@ class StandardFormBuilder < AbstractFormBuilder
(self.field_types - [ :hidden_field, :radio_button ]).each do |field_type|
class_eval <<-EOF
def #{field_type}_block(field, options={}, label_options={})
- label_options.reverse_merge!(:caption => options.delete(:caption)) if options[:caption]
+ if options[:caption]
+ options = options.dup
+ label_options = { :caption => options.delete(:caption) }.update(label_options)
+ end
field_html = label(field, label_options)
field_html << #{field_type}(field, options)
@template.content_tag(:p, field_html)
diff --git a/padrino-helpers/lib/padrino-helpers/form_helpers.rb b/padrino-helpers/lib/padrino-helpers/form_helpers.rb
index 43290c693..7e4c67a5b 100644
--- a/padrino-helpers/lib/padrino-helpers/form_helpers.rb
+++ b/padrino-helpers/lib/padrino-helpers/form_helpers.rb
@@ -45,7 +45,7 @@ def form_for(object, url, options={}, &block)
instance = builder_instance(object, options)
# this can erect instance.multipart flag if the block calls instance.file_field
html = capture_html(instance, &block)
- options = { :multipart => instance.multipart }.update(options.except(:namespace, :as))
+ options = { :multipart => instance.multipart }.update(options.reject{ |key,_| [:namespace, :as].include?(key) })
form_tag(url, options) { html }
end
@@ -90,7 +90,7 @@ def fields_for(object, options={}, &block)
#
def form_tag(url, options={}, &block)
options = {
- :action => url,
+ :action => escape_link(url),
:protect_from_csrf => is_protected_from_csrf?,
'accept-charset' => 'UTF-8'
}.update(options)
@@ -121,7 +121,7 @@ def form_tag(url, options={}, &block)
# hidden_form_method_field('delete')
#
def hidden_form_method_field(desired_method)
- return ActiveSupport::SafeBuffer.new if desired_method.blank? || desired_method.to_s =~ /get|post/i
+ return SafeBuffer.new if desired_method.nil? || desired_method.to_s =~ /get|post/i
hidden_field_tag(:_method, :value => desired_method)
end
@@ -143,9 +143,8 @@ def hidden_form_method_field(desired_method)
# field_set_tag("Office", :class => 'office-set') { }
#
def field_set_tag(*args, &block)
- options = args.extract_options!
- legend_text = args.first
- legend_html = legend_text.blank? ? ActiveSupport::SafeBuffer.new : content_tag(:legend, legend_text)
+ options = args.last.is_a?(Hash) ? args.pop : {}
+ legend_html = args.empty? ? SafeBuffer.new : content_tag(:legend, args.first)
concat_content content_tag(:fieldset, legend_html << capture_html(&block), options)
end
@@ -168,8 +167,8 @@ def field_set_tag(*args, &block)
# label_tag :username, :class => 'long-label' do ... end
#
def label_tag(name, options={}, &block)
- options = { :caption => "#{name.to_s.humanize}: ", :for => name }.update(options)
- caption_text = ActiveSupport::SafeBuffer.new << options.delete(:caption)
+ options = { :caption => "#{Inflections.humanize(name)}: ", :for => name }.update(options)
+ caption_text = SafeBuffer.new << options.delete(:caption)
caption_text << "* ".html_safe if options.delete(:required)
if block_given?
@@ -397,9 +396,8 @@ def hidden_field_tag(name, options={})
# text_area_tag :username, :class => 'long', :value => "Demo?"
#
def text_area_tag(name, options={})
- inner_html = "\n#{options.delete(:value)}"
- options = { :name => name, :rows => "", :cols => "" }.update(options)
- content_tag(:textarea, inner_html, options)
+ inner_html = TagHelpers::NEWLINE + options.delete(:value).to_s
+ content_tag(:textarea, inner_html, { :name => name }.update(options))
end
##
@@ -513,10 +511,11 @@ def button_tag(caption, options = {})
##
# Constructs a submit button from the given options.
#
- # @param [String] caption (defaults to: +Submit+)
- # The caption for the submit button.
- # @param [Hash] options
- # The html options for the input field.
+ # @overload submit_tag(options={})
+ # @param [Hash] options The html options for the input field.
+ # @overload submit_tag(caption, options={})
+ # @param [String] caption The caption for the submit button.
+ # @param [Hash] options The html options for the input field.
#
# @return [String] The html submit button based on the +options+ specified.
#
@@ -525,7 +524,7 @@ def button_tag(caption, options = {})
# submit_tag :class => 'btn'
#
def submit_tag(*args)
- options = args.extract_options!
+ options = args.last.is_a?(Hash) ? args.pop : {}
caption = args.length >= 1 ? args.first : "Submit"
input_tag(:submit, { :value => caption }.merge(options))
end
@@ -550,11 +549,11 @@ def image_submit_tag(source, options={})
##
# Creates a form containing a single button that submits to the URL.
#
- # @overload button_to(name, url, options={})
+ # @overload button_to(caption, url, options={})
# @param [String] caption The text caption.
# @param [String] url The url href.
# @param [Hash] options The html options.
- # @overload button_to(name, options={}, &block)
+ # @overload button_to(url, options={}, &block)
# @param [String] url The url href.
# @param [Hash] options The html options.
# @param [Proc] block The button content.
@@ -579,12 +578,17 @@ def image_submit_tag(source, options={})
# #
#
def button_to(*args, &block)
- options = args.extract_options!.dup
+ options = args.last.is_a?(Hash) ? args.pop : {}
name, url = *args
options['data-remote'] = 'true' if options.delete(:remote)
submit_options = options.delete(:submit_options) || {}
- block ||= proc { submit_tag(name, submit_options) }
- form_tag(url || name, options, &block)
+ form_tag(url || name, options) do
+ if block_given?
+ content_tag(:button, capture_html(&block), submit_options)
+ else
+ submit_tag(name, submit_options)
+ end
+ end
end
##
@@ -614,6 +618,185 @@ def range_field_tag(name, options = {})
input_tag(:range, options)
end
+ DATETIME_ATTRIBUTES = [:value, :max, :min].freeze
+ COLOR_CODE_REGEXP = /\A#([0-9a-fA-F]{3}){1,2}\z/.freeze
+
+ ##
+ # Constructs a datetime tag from the given options.
+ #
+ # @example
+ # datetime_field_tag('datetime_with_min_max', :min => DateTime.new(1993, 2, 24, 12, 30, 45),
+ # :max => DateTime.new(2000, 4, 1, 12, 0, 0))
+ # datetime_field_tag('datetime_with_value', :value => DateTime.new(2000, 4, 1, 12, 0, 0))
+ #
+ # @param [String] name
+ # The name of the datetime field.
+ # @param [Hash] options
+ # The html options for the datetime field.
+ # @option options [DateTime, String] :min
+ # The min date time of the datetime field.
+ # @option options [DateTime, String] :max
+ # The max date time of the datetime field.
+ # @option options [DateTime, String] :value
+ # The value of the datetime field. See examples for details.
+ # @return [String] The html datetime field
+ #
+ def datetime_field_tag(name, options = {})
+ options = { :name => name }.update(options)
+ options = convert_attributes_into_datetime("%Y-%m-%dT%T.%L%z", options)
+ input_tag(:datetime, options)
+ end
+
+ ##
+ # Constructs a datetime-local tag from the given options.
+ #
+ # @example
+ # datetime_local_field_tag('datetime_local_with_min_max', :min => DateTime.new(1993, 2, 24, 12, 30, 45),
+ # :max => DateTime.new(2000, 4, 1, 12, 0, 0))
+ # datetime_local_field_tag('datetime_local_with_value', :value => DateTime.new(2000, 4, 1, 12, 0, 0))
+ #
+ # @param [String] name
+ # The name of the datetime local field.
+ # @param [Hash] options
+ # The html options for the datetime-local field.
+ # @option options [DateTime, String] :min
+ # The min date time of the datetime-local field.
+ # @option options [DateTime, String] :max
+ # The max date time of the datetime-local field.
+ # @option options [DateTime, String] :value
+ # The value of the datetime field. See examples for details.
+ # @return [String] The html datetime-local field
+ #
+ def datetime_local_field_tag(name, options = {})
+ options = { :name => name }.update(options)
+ options = convert_attributes_into_datetime("%Y-%m-%dT%T", options)
+ input_tag(:"datetime-local", options)
+ end
+
+ ##
+ # Constructs a date tag from the given options.
+ #
+ # @example
+ # date_field_tag('date_with_min_max', :min => DateTime.new(1993, 2, 24),
+ # :max => DateTime.new(2000, 4, 1))
+ # date_field_tag('date_with_value', :value => DateTime.new(2000, 4, 1))
+ #
+ # @param [String] name
+ # The name of the date field.
+ # @param [Hash] options
+ # The html options for the date field.
+ # @option options [DateTime, String] :min
+ # The min date time of the date field.
+ # @option options [DateTime, String] :max
+ # The max date time of the date field.
+ # @option options [DateTime, String] :value
+ # The value of the date field. See examples for details.
+ # @return [String] The html date field
+ #
+ def date_field_tag(name, options = {})
+ options = { :name => name }.update(options)
+ options = convert_attributes_into_datetime("%Y-%m-%d", options)
+ input_tag(:date, options)
+ end
+
+ ##
+ # Constructs a month tag from the given options.
+ #
+ # @example
+ # month_field_tag('month_with_min_max', :min => DateTime.new(1993, 2, 24),
+ # :max => DateTime.new(2000, 4, 1))
+ # month_field_tag('month_with_value', :value => DateTime.new(2000, 4, 1))
+ #
+ # @param [String] name
+ # The name of the month field.
+ # @param [Hash] options
+ # The html options for the month field.
+ # @option options [DateTime, String] :min
+ # The min month time of the month field.
+ # @option options [DateTime, String] :max
+ # The max month time of the month field.
+ # @option options [DateTime, String] :value
+ # The value of the month field. See examples for details.
+ # @return [String] The html month field
+ #
+ def month_field_tag(name, options = {})
+ options = { :name => name }.update(options)
+ options = convert_attributes_into_datetime("%Y-%m", options)
+ input_tag(:month, options)
+ end
+
+ ##
+ # Constructs a week tag from the given options.
+ #
+ # @example
+ # week_field_tag('week_with_min_max', :min => DateTime.new(1993, 2, 24),
+ # :max => DateTime.new(2000, 4, 1))
+ # week_field_tag('week_with_value', :value => DateTime.new(2000, 4, 1))
+ #
+ # @param [String] name
+ # The name of the week field.
+ # @param [Hash] options
+ # The html options for the week field.
+ # @option options [DateTime, String] :min
+ # The min week time of the week field.
+ # @option options [DateTime, String] :max
+ # The max week time of the week field.
+ # @option options [DateTime, String] :value
+ # The value of the week field. See examples for details.
+ # @return [String] The html week field
+ #
+ def week_field_tag(name, options = {})
+ options = { :name => name }.update(options)
+ options = convert_attributes_into_datetime("%Y-W%W", options)
+ input_tag(:week, options)
+ end
+
+ ##
+ # Constructs a time tag from the given options.
+ #
+ # @example
+ # time_field_tag('time_with_min_max', :max => Time.new(1993, 2, 24, 1, 19, 12),
+ # :min => Time.new(2008, 6, 21, 13, 30, 0))
+ # time_field_tag('time_with_value', :value => Time.new(2008, 6, 21, 13, 30, 0))
+ #
+ # @param [String] name
+ # The name of the time field.
+ # @param [Hash] options
+ # The html options for the time field.
+ # @option options [Time, DateTime, String] :min
+ # The min time of the time field.
+ # @option options [Time, DateTime, String] :max
+ # The max time of the time field.
+ # @option options [Time, DateTime, String] :value
+ # The value of the time field. See examples for details.
+ # @return [String] The html time field
+ #
+ def time_field_tag(name, options = {})
+ options = { :name => name }.update(options)
+ options = convert_attributes_into_datetime("%T.%L", options)
+ input_tag(:time, options)
+ end
+
+ ##
+ # Constructs a color tag from the given options.
+ #
+ # @example
+ # color_field_tag('color', :value => "#ff0000")
+ # color_field_tag('color', :value => "#f00")
+ #
+ # @param [String] name
+ # The name of the color field.
+ # @param [Hash] options
+ # The html options for the color field.
+ # @option options [String] :value
+ # The value of the color field. See examples for details.
+ #
+ def color_field_tag(name, options = {})
+ options = { :name => name }.update(options)
+ options[:value] = adjust_color(options[:value])
+ input_tag(:color, options)
+ end
+
private
##
@@ -625,9 +808,49 @@ def range_field_tag(name, options = {})
def builder_instance(object, options={})
default_builder = respond_to?(:settings) && settings.default_builder || 'StandardFormBuilder'
builder_class = options.delete(:builder) || default_builder
- builder_class = "Padrino::Helpers::FormBuilder::#{builder_class}".constantize if builder_class.is_a?(String)
+ builder_class = Padrino::Helpers::FormBuilder.const_get(builder_class) if builder_class.is_a?(String)
builder_class.new(self, object, options)
end
+
+ ##
+ # Converts value into DateTime.
+ #
+ # @example
+ # datetime_value('1993-02-24T12:30:45') #=> #
#
- # tag :img, :src => 'sinatra.jpg, :data => { :nsfw => false, :geo => [34.087, -118.407] }
+ # tag :img, :src => 'sinatra.jpg', :data => { :nsfw => false, :geo => [34.087, -118.407] }
# # => 
#
def tag(name, options = nil, open = false)
@@ -235,6 +235,19 @@ def tag(name, options = nil, open = false)
"<#{name}#{attributes}#{open ? '>' : ' />'}".html_safe
end
+ ##
+ # Returns an escaped document link.
+ #
+ # @example
+ # escape_link('http://example.com/spaced link')
+ # # => 'http://example.com/spaced%20link'
+ # escape_link('already%20partially escaped')
+ # # => 'already%20partially%20escaped'
+ #
+ def escape_link(link)
+ link.gsub(' ', '%20')
+ end
+
private
##
@@ -259,7 +272,8 @@ def tag_attributes(options)
# Escape tag values to their HTML/XML entities.
#
def escape_value(string)
- string.to_s.gsub(ESCAPE_REGEXP) { |char| ESCAPE_VALUES[char] }
+ string = string.collect(&:to_s).join(' ') if string.is_a?(Array)
+ string.to_s.gsub(ESCAPE_REGEXP, ESCAPE_VALUES)
end
##
@@ -267,7 +281,7 @@ def escape_value(string)
#
def nested_values(attribute, hash)
hash.inject('') do |all,(key,value)|
- attribute_with_name = "#{attribute}-#{key.to_s.dasherize}"
+ attribute_with_name = "#{attribute}-#{key.to_s.tr('_', '-')}"
all << if value.is_a?(Hash)
nested_values(attribute_with_name, value)
else
diff --git a/padrino-helpers/lib/padrino/core_ext/output_safety.rb b/padrino-helpers/lib/padrino/core_ext/output_safety.rb
new file mode 100644
index 000000000..37a11274a
--- /dev/null
+++ b/padrino-helpers/lib/padrino/core_ext/output_safety.rb
@@ -0,0 +1,25 @@
+if defined?(ActiveSupport::SafeBuffer)
+ SafeBuffer = ActiveSupport::SafeBuffer
+else
+ require 'padrino/safe_buffer'
+
+ SafeBuffer = Padrino::SafeBuffer
+
+ class String
+ def html_safe
+ SafeBuffer.new(self)
+ end
+ end
+
+ class Object
+ def html_safe?
+ false
+ end
+ end
+
+ class Numeric
+ def html_safe?
+ true
+ end
+ end
+end
diff --git a/padrino-helpers/lib/padrino/rendering.rb b/padrino-helpers/lib/padrino/rendering.rb
index ccf505d2b..37fe1676a 100644
--- a/padrino-helpers/lib/padrino/rendering.rb
+++ b/padrino-helpers/lib/padrino/rendering.rb
@@ -1,3 +1,4 @@
+require 'padrino/core_ext/output_safety'
require 'padrino-support'
require 'pathname'
@@ -34,6 +35,11 @@ class TemplateNotFound < RuntimeError
/~$/ # This is for Gedit
] unless defined?(IGNORE_FILE_PATTERN)
+ ##
+ # Defines common content-type alias mappings.
+ #
+ CONTENT_TYPE_ALIASES = { :htm => :html }
+
##
# Default options used in the resolve_template-method.
#
@@ -93,30 +99,6 @@ def layout(name=:layout, &block)
@layout = name
end
- ##
- # Returns the cached template file to render for a given url,
- # content_type and locale. Deprecated since 0.12.1
- #
- # @param [Array+ <%= f.label :datetime %> + <%= f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %> +
++ <%= f.label :datetime_local %> + <%= f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %> +
++ <%= f.label :date %> + <%= f.date_field :date, :max => DateTime.new(2000, 4, 1) %> +
++ <%= f.label :month %> + <%= f.month_field :month, :max => DateTime.new(2000, 4, 1) %> +
++ <%= f.label :week %> + <%= f.week_field :week, :max => DateTime.new(2000, 4, 1) %> +
++ <%= f.label :time %> + <%= f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0) %> +
++ <%= f.label :color %> + <%= f.color_field :color, :value => "#f00" %> +
<%= f.submit "Create", :class => 'success', :id => 'demo-button' %>
<%= f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button' %>
<% end %> diff --git a/padrino-helpers/test/fixtures/markup_app/views/form_for.haml b/padrino-helpers/test/fixtures/markup_app/views/form_for.haml index 59e9573c6..82cd2ac11 100644 --- a/padrino-helpers/test/fixtures/markup_app/views/form_for.haml +++ b/padrino-helpers/test/fixtures/markup_app/views/form_for.haml @@ -38,6 +38,28 @@ %p = f.label :remember_me = f.check_box :remember_me, :value => "1" + %p + = f.label :datetime + = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0) + %p + = f.label :datetime_local + = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0) + %p + = f.label :date + = f.date_field :date, :max => DateTime.new(2000, 4, 1) + %p + = f.label :month + = f.month_field :month, :max => DateTime.new(2000, 4, 1) + %p + = f.label :week + = f.week_field :week, :max => DateTime.new(2000, 4, 1) + %p + = f.label :time + = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0) + %p + = f.label :color + = f.color_field :color, :value => "#f00" + %p = f.submit "Create", :class => 'success', :id => 'demo-button' %p diff --git a/padrino-helpers/test/fixtures/markup_app/views/form_for.slim b/padrino-helpers/test/fixtures/markup_app/views/form_for.slim index cf0ad875e..5ce973514 100644 --- a/padrino-helpers/test/fixtures/markup_app/views/form_for.slim +++ b/padrino-helpers/test/fixtures/markup_app/views/form_for.slim @@ -38,6 +38,27 @@ p = f.label :remember_me = f.check_box :remember_me, :value => "1" + p + = f.label :datetime + = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0) + p + = f.label :datetime_local + = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0) + p + = f.label :date + = f.date_field :date, :max => DateTime.new(2000, 4, 1) + p + = f.label :month + = f.month_field :month, :max => DateTime.new(2000, 4, 1) + p + = f.label :week + = f.week_field :week, :max => DateTime.new(2000, 4, 1) + p + = f.label :time + = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0) + p + = f.label :color + = f.color_field :color, :value => "#f00" p = f.submit "Create", :class => 'success', :id => 'demo-button' p diff --git a/padrino-helpers/test/fixtures/markup_app/views/form_tag.erb b/padrino-helpers/test/fixtures/markup_app/views/form_tag.erb index 9475f707d..a7f6f7f32 100644 --- a/padrino-helpers/test/fixtures/markup_app/views/form_tag.erb +++ b/padrino-helpers/test/fixtures/markup_app/views/form_tag.erb @@ -83,6 +83,27 @@ <%= range_field_tag('ranger_with_min_max', :min => 1, :max => 50) %> <%= range_field_tag('ranger_with_range', :range => 1..5) %> ++ <%= datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) %> +
++ <%= datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) %> +
++ <%= date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %> +
++ <%= month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %> +
++ <%= week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %> +
++ <%= time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0) %> +
++ <%= color_field_tag :color, :value => "#f00" %> +
<% end %> <% field_set_tag(:class => 'buttons') do %> <%= submit_tag "Login" %> diff --git a/padrino-helpers/test/fixtures/markup_app/views/form_tag.haml b/padrino-helpers/test/fixtures/markup_app/views/form_tag.haml index b39a31318..892dba1ff 100644 --- a/padrino-helpers/test/fixtures/markup_app/views/form_tag.haml +++ b/padrino-helpers/test/fixtures/markup_app/views/form_tag.haml @@ -69,6 +69,20 @@ %p = range_field_tag('ranger_with_min_max', :min => 1, :max => 50) = range_field_tag('ranger_with_range', :range => 1..5) + %p + = datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) + %p + = datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) + %p + = date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) + %p + = month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) + %p + = week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) + %p + = time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0) + %p + = color_field_tag :color, :value => "#f00" = field_set_tag(:class => 'buttons') do = submit_tag "Login" = button_tag "Cancel" diff --git a/padrino-helpers/test/fixtures/markup_app/views/form_tag.slim b/padrino-helpers/test/fixtures/markup_app/views/form_tag.slim index ee651cb5e..3db357a7a 100644 --- a/padrino-helpers/test/fixtures/markup_app/views/form_tag.slim +++ b/padrino-helpers/test/fixtures/markup_app/views/form_tag.slim @@ -69,6 +69,20 @@ p = range_field_tag('ranger_with_min_max', :min => 1, :max => 50) = range_field_tag('ranger_with_range', :range => 1..5) + p + = datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) + p + = datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) + p + = date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) + p + = month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) + p + = week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) + p + = time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0) + p + = color_field_tag :color, :value => "#f00" = field_set_tag(:class => 'buttons') do = submit_tag "Login" diff --git a/padrino-helpers/test/fixtures/render_app/app.rb b/padrino-helpers/test/fixtures/render_app/app.rb index 6fa566e44..0b71f3eee 100644 --- a/padrino-helpers/test/fixtures/render_app/app.rb +++ b/padrino-helpers/test/fixtures/render_app/app.rb @@ -91,4 +91,24 @@ class RenderDemo < Padrino::Application content_tag :div, 'go block!' end end + + helpers do + def dive_helper(ext) + # @current_engine, save = nil, @current_engine + form_result = form_tag '/' do + render "dive_inner_#{ext}" + end + # @current_engine = save + content_tag('div', form_result, :class => 'wrapper') + end + end + + get '/double_dive_:ext' do + @ext = params[:ext] + render "dive_outer_#{@ext}" + end + + get '/' do + render 'index' + end end diff --git a/padrino-helpers/test/fixtures/render_app/views/_foo.haml b/padrino-helpers/test/fixtures/render_app/views/_foo.haml new file mode 100644 index 000000000..257cc5642 --- /dev/null +++ b/padrino-helpers/test/fixtures/render_app/views/_foo.haml @@ -0,0 +1 @@ +foo diff --git a/padrino-helpers/test/fixtures/render_app/views/dive_inner_erb.erb b/padrino-helpers/test/fixtures/render_app/views/dive_inner_erb.erb new file mode 100644 index 000000000..17a472a17 --- /dev/null +++ b/padrino-helpers/test/fixtures/render_app/views/dive_inner_erb.erb @@ -0,0 +1,3 @@ +
+
+
diff --git a/padrino-helpers/test/fixtures/render_app/views/dive_inner_haml.haml b/padrino-helpers/test/fixtures/render_app/views/dive_inner_haml.haml
new file mode 100644
index 000000000..51894c5d5
--- /dev/null
+++ b/padrino-helpers/test/fixtures/render_app/views/dive_inner_haml.haml
@@ -0,0 +1,2 @@
+.inner
+ .core
diff --git a/padrino-helpers/test/fixtures/render_app/views/dive_inner_slim.slim b/padrino-helpers/test/fixtures/render_app/views/dive_inner_slim.slim
new file mode 100644
index 000000000..51894c5d5
--- /dev/null
+++ b/padrino-helpers/test/fixtures/render_app/views/dive_inner_slim.slim
@@ -0,0 +1,2 @@
+.inner
+ .core
diff --git a/padrino-helpers/test/fixtures/render_app/views/dive_outer_erb.erb b/padrino-helpers/test/fixtures/render_app/views/dive_outer_erb.erb
new file mode 100644
index 000000000..e705fbdd6
--- /dev/null
+++ b/padrino-helpers/test/fixtures/render_app/views/dive_outer_erb.erb
@@ -0,0 +1,3 @@
+
+<%= dive_helper(@ext) %>
+
diff --git a/padrino-helpers/test/fixtures/render_app/views/dive_outer_haml.haml b/padrino-helpers/test/fixtures/render_app/views/dive_outer_haml.haml
new file mode 100644
index 000000000..d5c9f9ad1
--- /dev/null
+++ b/padrino-helpers/test/fixtures/render_app/views/dive_outer_haml.haml
@@ -0,0 +1,2 @@
+.outer
+ = dive_helper(@ext)
diff --git a/padrino-helpers/test/fixtures/render_app/views/dive_outer_slim.slim b/padrino-helpers/test/fixtures/render_app/views/dive_outer_slim.slim
new file mode 100644
index 000000000..d5c9f9ad1
--- /dev/null
+++ b/padrino-helpers/test/fixtures/render_app/views/dive_outer_slim.slim
@@ -0,0 +1,2 @@
+.outer
+ = dive_helper(@ext)
diff --git a/padrino-helpers/test/fixtures/render_app/views/index.haml b/padrino-helpers/test/fixtures/render_app/views/index.haml
new file mode 100644
index 000000000..e21574b2b
--- /dev/null
+++ b/padrino-helpers/test/fixtures/render_app/views/index.haml
@@ -0,0 +1 @@
+= partial 'foo'
diff --git a/padrino-helpers/test/fixtures/render_app/views/layouts/application.haml b/padrino-helpers/test/fixtures/render_app/views/layouts/application.haml
new file mode 100644
index 000000000..69efccd41
--- /dev/null
+++ b/padrino-helpers/test/fixtures/render_app/views/layouts/application.haml
@@ -0,0 +1,5 @@
+!!!
+%html
+ %body
+ application
+ = yield
diff --git a/padrino-helpers/test/helper.rb b/padrino-helpers/test/helper.rb
index 113ab371d..aad055855 100644
--- a/padrino-helpers/test/helper.rb
+++ b/padrino-helpers/test/helper.rb
@@ -1,26 +1,25 @@
ENV['RACK_ENV'] = 'test'
-require File.expand_path('../../../load_paths', __FILE__)
require 'minitest/autorun'
require 'minitest/pride'
require 'mocha/setup'
require 'rack/test'
-require 'webrat'
-require 'padrino-helpers'
-require 'active_support/time'
require 'builder'
+require 'padrino-helpers'
+require 'padrino/rendering'
+require 'tilt/liquid'
+require 'tilt/builder'
+
+require 'ext/minitest-spec'
+require 'ext/rack-test-methods'
+require 'padrino/test-methods'
class MiniTest::Spec
include Padrino::Helpers::OutputHelpers
include Padrino::Helpers::TagHelpers
include Padrino::Helpers::AssetTagHelpers
include Rack::Test::Methods
- include Webrat::Methods
- include Webrat::Matchers
-
- Webrat.configure do |config|
- config.mode = :rack
- end
+ include Padrino::TestMethods
def stop_time_for_test
time = Time.now
@@ -28,35 +27,9 @@ def stop_time_for_test
return time
end
- # assert_has_tag(:h1, :content => "yellow") { "yellow
" } - # In this case, block is the html to evaluate - def assert_has_tag(name, attributes = {}, &block) - html = block && block.call - assert html.html_safe?, 'html_safe? failed' - matcher = HaveSelector.new(name, attributes) - raise "Please specify a block!" if html.blank? - assert matcher.matches?(html), matcher.failure_message - end - - # assert_has_no_tag, tag(:h1, :content => "yellow") { "green
" } - # In this case, block is the html to evaluate - def assert_has_no_tag(name, attributes = {}, &block) - html = block && block.call - attributes.merge!(:count => 0) - matcher = HaveSelector.new(name, attributes) - raise "Please specify a block!" if html.blank? - assert matcher.matches?(html), matcher.failure_message - end - - # Asserts that a file matches the pattern - def assert_match_in_file(pattern, file) - assert File.exist?(file), "File '#{file}' does not exist!" - assert_match pattern, File.read(file) - end - # mock_model("Business", :new_record? => true) =>
'
+ assert_equal image_tag('/absolute/pic.gif'), ''
end
end
@@ -237,7 +247,7 @@ def flash
time = stop_time_for_test
actual_html = stylesheet_link_tag('style')
expected_options = { :rel => "stylesheet", :type => "text/css" }
- assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { actual_html }
+ assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}"))
assert actual_html.html_safe?
end
@@ -245,14 +255,14 @@ def flash
time = stop_time_for_test
expected_options = { :rel => "stylesheet", :type => "text/css" }
actual_html = stylesheet_link_tag('example/demo/style')
- assert_has_tag('link', expected_options.merge(:href => "/stylesheets/example/demo/style.css?#{time.to_i}")) { actual_html }
+ assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/stylesheets/example/demo/style.css?#{time.to_i}"))
end
it 'should display stylesheet link item with absolute path' do
time = stop_time_for_test
expected_options = { :rel => "stylesheet", :type => "text/css" }
actual_html = stylesheet_link_tag('/css/style')
- assert_has_tag('link', expected_options.merge(:href => "/css/style.css")) { actual_html }
+ assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/css/style.css"))
end
it 'should display stylesheet link item with uri root' do
@@ -260,27 +270,27 @@ def flash
time = stop_time_for_test
expected_options = { :rel => "stylesheet", :type => "text/css" }
actual_html = stylesheet_link_tag('style')
- assert_has_tag('link', expected_options.merge(:href => "/blog/stylesheets/style.css?#{time.to_i}")) { actual_html }
+ assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/blog/stylesheets/style.css?#{time.to_i}"))
end
it 'should display stylesheet link items' do
time = stop_time_for_test
actual_html = stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
- assert_has_tag('link', :rel => "stylesheet", :type => "text/css", :count => 3) { actual_html }
- assert_has_tag('link', :href => "/stylesheets/style.css?#{time.to_i}") { actual_html }
- assert_has_tag('link', :href => "/stylesheets/layout.css?#{time.to_i}") { actual_html }
- assert_has_tag('link', :href => "http://google.com/style.css") { actual_html }
+ assert_html_has_tag(actual_html, 'link', :rel => "stylesheet", :type => "text/css", :count => 3)
+ assert_html_has_tag(actual_html, 'link', :href => "/stylesheets/style.css?#{time.to_i}")
+ assert_html_has_tag(actual_html, 'link', :href => "/stylesheets/layout.css?#{time.to_i}")
+ assert_html_has_tag(actual_html, 'link', :href => "http://google.com/style.css")
assert_equal actual_html, stylesheet_link_tag(['style', 'layout.css', 'http://google.com/style.css'])
end
it 'should not use a timestamp if stamp setting is false' do
self.class.expects(:asset_stamp).returns(false)
expected_options = { :rel => "stylesheet", :type => "text/css" }
- assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css")) { stylesheet_link_tag('style') }
+ assert_html_has_tag(stylesheet_link_tag('style'), 'link', expected_options.merge(:href => "/stylesheets/style.css"))
end
it 'should display stylesheet link used custom options' do
- assert_has_tag('link', :rel => 'stylesheet', :media => 'screen') { stylesheet_link_tag('style', :media => 'screen') }
+ assert_html_has_tag(stylesheet_link_tag('style', :media => 'screen'), 'link', :rel => 'stylesheet', :media => 'screen')
end
end
@@ -288,7 +298,7 @@ def flash
it 'should display javascript item' do
time = stop_time_for_test
actual_html = javascript_include_tag('application')
- assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript")
assert actual_html.html_safe?
end
@@ -297,60 +307,58 @@ def flash
self.class.stubs(:js_asset_folder).returns('js')
assert_equal 'js', asset_folder_name(:js)
actual_html = javascript_include_tag('application')
- assert_has_tag('script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript")
end
it 'should display javascript item for long relative path' do
time = stop_time_for_test
actual_html = javascript_include_tag('example/demo/application')
- assert_has_tag('script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript")
end
it 'should display javascript item for path containing js' do
time = stop_time_for_test
actual_html = javascript_include_tag 'test/jquery.json'
- assert_has_tag('script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript")
end
it 'should display javascript item for path containing period' do
time = stop_time_for_test
actual_html = javascript_include_tag 'test/jquery.min'
- assert_has_tag('script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript")
end
it 'should display javascript item with absolute path' do
- time = stop_time_for_test
actual_html = javascript_include_tag('/js/application')
- assert_has_tag('script', :src => "/js/application.js", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/js/application.js", :type => "text/javascript")
end
it 'should display javascript item with uri root' do
self.class.stubs(:uri_root).returns("/blog")
time = stop_time_for_test
actual_html = javascript_include_tag('application')
- assert_has_tag('script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript")
end
it 'should not append extension to absolute paths' do
- time = stop_time_for_test
actual_html = javascript_include_tag('https://maps.googleapis.com/maps/api/js?key=value&sensor=false')
- assert_has_tag('script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false")
end
it 'should display javascript items' do
time = stop_time_for_test
actual_html = javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
- assert_has_tag('script', :type => "text/javascript", :count => 3) { actual_html }
- assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}") { actual_html }
- assert_has_tag('script', :src => "/javascripts/base.js?#{time.to_i}") { actual_html }
- assert_has_tag('script', :src => "http://google.com/lib.js") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :type => "text/javascript", :count => 3)
+ assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js?#{time.to_i}")
+ assert_html_has_tag(actual_html, 'script', :src => "/javascripts/base.js?#{time.to_i}")
+ assert_html_has_tag(actual_html, 'script', :src => "http://google.com/lib.js")
assert_equal actual_html, javascript_include_tag(['application', 'base.js', 'http://google.com/lib.js'])
end
it 'should not use a timestamp if stamp setting is false' do
self.class.expects(:asset_stamp).returns(false)
actual_html = javascript_include_tag('application')
- assert_has_tag('script', :src => "/javascripts/application.js", :type => "text/javascript") { actual_html }
+ assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js", :type => "text/javascript")
end
end
@@ -358,33 +366,33 @@ def flash
it 'should display favicon' do
time = stop_time_for_test
actual_html = favicon_tag('icons/favicon.png')
- assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => "/images/icons/favicon.png?#{time.to_i}") { actual_html }
+ assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/png', :href => "/images/icons/favicon.png?#{time.to_i}")
end
it 'should match type with file ext' do
time = stop_time_for_test
actual_html = favicon_tag('favicon.ico')
- assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.ico?#{time.to_i}") { actual_html }
+ assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.ico?#{time.to_i}")
end
it 'should allow option overrides' do
time = stop_time_for_test
actual_html = favicon_tag('favicon.png', :type => 'image/ico')
- assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.png?#{time.to_i}") { actual_html }
+ assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.png?#{time.to_i}")
end
end
describe 'for #feed_tag method' do
it 'should generate correctly link tag for rss' do
- assert_has_tag('link', :type => 'application/rss+xml', :rel => 'alternate', :href => "/blog/post.rss", :title => 'rss') { feed_tag :rss, "/blog/post.rss" }
+ assert_html_has_tag(feed_tag(:rss, "/blog/post.rss"), 'link', :type => 'application/rss+xml', :rel => 'alternate', :href => "/blog/post.rss", :title => 'rss')
end
it 'should generate correctly link tag for atom' do
- assert_has_tag('link', :type => 'application/atom+xml', :rel => 'alternate', :href => "/blog/post.atom", :title => 'atom') { feed_tag :atom, "/blog/post.atom" }
+ assert_html_has_tag(feed_tag(:atom, "/blog/post.atom"), 'link', :type => 'application/atom+xml', :rel => 'alternate', :href => "/blog/post.atom", :title => 'atom')
end
it 'should override options' do
- assert_has_tag('link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title') { feed_tag :rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title" }
+ assert_html_has_tag(feed_tag(:rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title"), 'link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title')
end
end
diff --git a/padrino-helpers/test/test_form_builder.rb b/padrino-helpers/test/test_form_builder.rb
index cdb4209eb..c990c3e33 100644
--- a/padrino-helpers/test/test_form_builder.rb
+++ b/padrino-helpers/test/test_form_builder.rb
@@ -31,33 +31,33 @@ def standard_builder(object=@user)
describe 'for #form_for method' do
it 'should display correct form html' do
actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { "Demo" }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :id => 'register', :method => 'post', :content => "Demo") { actual_html }
- assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/register', :id => 'register', :method => 'post', :content => "Demo")
+ assert_html_has_tag(actual_html, 'form input[type=hidden]', :name => '_method', :count => 0) # no method action field
end
it 'should display correct form html with fake object' do
actual_html = form_for(:markup_user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.text_field :username }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :id => 'register', :method => 'post') { actual_html }
- assert_has_tag('form input', :type => 'text', :name => 'markup_user[username]') { actual_html }
- assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/register', :id => 'register', :method => 'post')
+ assert_html_has_tag(actual_html, 'form input', :type => 'text', :name => 'markup_user[username]')
+ assert_html_has_tag(actual_html, 'form input[type=hidden]', :name => '_method', :count => 0) # no method action field
end
it 'should display correct form html for namespaced object' do
actual_html = form_for(Outer::UserAccount.new, '/register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.text_field :username }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post') { actual_html }
- assert_has_tag('form input', :type => 'text', :name => 'outer_user_account[username]') { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post')
+ assert_html_has_tag(actual_html, 'form input', :type => 'text', :name => 'outer_user_account[username]')
end
it 'should display form specifying default builder setting' do
self.expects(:settings).returns(stub(:default_builder => 'FakeFormBuilder', :protect_from_csrf => false)).at_least_once
actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.foo_field }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post') { actual_html }
- assert_has_tag('span', :content => "bar") { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post')
+ assert_html_has_tag(actual_html, 'span', :content => "bar")
end
it 'should display correct form html with remote option' do
actual_html = form_for(@user, '/update', :"accept-charset" => "UTF-8", :remote => true) { "Demo" }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/update', :method => 'post', "data-remote" => 'true') { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/update', :method => 'post', "data-remote" => 'true')
end
it 'should display correct form html with namespace option' do
@@ -65,9 +65,9 @@ def standard_builder(object=@user)
f.text_field(:first_name) << f.fields_for(:role_types) { |role| role.text_field(:name) }
end
- assert_has_no_tag(:form, :namespace => 'foo') { actual_html }
- assert_has_tag(:input, :type => 'text', :name => 'user[first_name]', :id => 'foo_user_first_name') { actual_html }
- assert_has_tag(:input, :type => 'text', :name => 'user[role_types_attributes][0][name]', :id => 'foo_user_role_types_attributes_0_name') { actual_html }
+ assert_html_has_no_tag(actual_html, :form, :namespace => 'foo')
+ assert_html_has_tag(actual_html, :input, :type => 'text', :name => 'user[first_name]', :id => 'foo_user_first_name')
+ assert_html_has_tag(actual_html, :input, :type => 'text', :name => 'user[role_types_attributes][0][name]', :id => 'foo_user_role_types_attributes_0_name')
end
it 'should display correct form html with :as option' do
@@ -75,32 +75,32 @@ def standard_builder(object=@user)
f.text_field(:first_name) << f.fields_for(:role_types) { |role| role.text_field(:name) }
end
- assert_has_no_tag(:form, :as => 'customer') { actual_html }
- assert_has_tag(:input, :type => 'text', :name => 'customer[first_name]', :id => 'customer_first_name') { actual_html }
- assert_has_tag(:input, :type => 'text', :name => 'customer[role_types_attributes][0][name]', :id => 'customer_role_types_attributes_0_name') { actual_html }
+ assert_html_has_no_tag(actual_html, :form, :as => 'customer')
+ assert_html_has_tag(actual_html, :input, :type => 'text', :name => 'customer[first_name]', :id => 'customer_first_name')
+ assert_html_has_tag(actual_html, :input, :type => 'text', :name => 'customer[role_types_attributes][0][name]', :id => 'customer_role_types_attributes_0_name')
end
it 'should display correct form html with remote option and method put' do
actual_html = form_for(@user, '/update', :"accept-charset" => "UTF-8", :remote => true, :method => 'put') { "Demo" }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :method => 'post', "data-remote" => 'true') { actual_html }
- assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :method => 'post', "data-remote" => 'true')
+ assert_html_has_tag(actual_html, 'form input', :type => 'hidden', :name => "_method", :value => 'put')
end
it 'should display correct form html with method :put' do
actual_html = form_for(@user, '/update', :"accept-charset" => "UTF-8", :method => 'put') { "Demo" }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/update', :method => 'post') { actual_html }
- assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/update', :method => 'post')
+ assert_html_has_tag(actual_html, 'form input', :type => 'hidden', :name => "_method", :value => 'put')
end
it 'should display correct form html with method :delete' do
actual_html = form_for(@user, '/destroy', :"accept-charset" => "UTF-8", :method => 'delete') { "Demo" }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/destroy', :method => 'post') { actual_html }
- assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'delete') { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/destroy', :method => 'post')
+ assert_html_has_tag(actual_html, 'form input', :type => 'hidden', :name => "_method", :value => 'delete')
end
it 'should display correct form html with multipart' do
actual_html = form_for(@user, '/register', :"accept-charset" => "UTF-8", :multipart => true) { "Demo" }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data")
end
it 'should support changing form builder type' do
@@ -110,7 +110,7 @@ def standard_builder(object=@user)
it 'should support using default standard builder' do
actual_html = form_for(@user, '/register') { |f| f.text_field_block(:name) }
- assert_has_tag('form p input[type=text]') { actual_html }
+ assert_html_has_tag(actual_html, 'form p input[type=text]')
end
it 'should display fail for form with nil object' do
@@ -118,49 +118,49 @@ def standard_builder(object=@user)
end
it 'should display correct form in haml' do
- visit '/haml/form_for'
- assert_have_selector :form, :action => '/demo', :id => 'demo'
- assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
- assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
- assert_have_selector :input, :name => 'authenticity_token'
+ get "/haml/form_for"
+ assert_response_has_tag :form, :action => '/demo', :id => 'demo'
+ assert_response_has_tag :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
+ assert_response_has_tag :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
+ assert_response_has_tag :input, :name => 'authenticity_token'
end
it 'should display correct form in erb' do
- visit '/erb/form_for'
- assert_have_selector :form, :action => '/demo', :id => 'demo'
- assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
- assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
- assert_have_selector :input, :name => 'authenticity_token'
+ get "/erb/form_for"
+ assert_response_has_tag :form, :action => '/demo', :id => 'demo'
+ assert_response_has_tag :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
+ assert_response_has_tag :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
+ assert_response_has_tag :input, :name => 'authenticity_token'
end
it 'should display correct form in slim' do
- visit '/slim/form_for'
- assert_have_selector :form, :action => '/demo', :id => 'demo'
- assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
- assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
- assert_have_selector :input, :name => 'authenticity_token'
+ get "/slim/form_for"
+ assert_response_has_tag :form, :action => '/demo', :id => 'demo'
+ assert_response_has_tag :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
+ assert_response_has_tag :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
+ assert_response_has_tag :input, :name => 'authenticity_token'
end
it 'should have a class of "invalid" for fields with errors' do
actual_html = form_for(@user, '/register') {|f| f.text_field(:email) }
- assert_has_tag(:input, :type => 'text', :name => 'user[email]', :id => 'user_email', :class => 'invalid') {actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'text', :name => 'user[email]', :id => 'user_email', :class => 'invalid')
end
it 'should not have a class of "invalid" for fields with no errors' do
actual_html = form_for(@user, '/register') {|f| f.text_field(:first_name) }
- assert_has_no_tag(:input, :type => 'text', :name => 'user[first_name]', :id => 'user_first_name', :class => 'invalid') {actual_html }
+ assert_html_has_no_tag(actual_html, :input, :type => 'text', :name => 'user[first_name]', :id => 'user_first_name', :class => 'invalid')
end
end
describe 'for #fields_for method' do
it 'should display correct fields html' do
actual_html = fields_for(@user) { |f| f.text_field(:first_name) }
- assert_has_tag(:input, :type => 'text', :name => 'user[first_name]', :id => 'user_first_name') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'text', :name => 'user[first_name]', :id => 'user_first_name')
end
it 'should display correct fields html with symbol object' do
actual_html = fields_for(:markup_user) { |f| f.text_field(:first_name) }
- assert_has_tag(:input, :type => 'text', :name => 'markup_user[first_name]', :id => 'markup_user_first_name') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'text', :name => 'markup_user[first_name]', :id => 'markup_user_first_name')
end
it 'should display fail for nil object' do
@@ -178,27 +178,27 @@ def standard_builder(object=@user)
end
it 'should display correct simple fields in haml' do
- visit '/haml/fields_for'
- assert_have_selector :form, :action => '/demo1', :id => 'demo-fields-for'
- assert_have_selector '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
- assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
- assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
+ get "/haml/fields_for"
+ assert_response_has_tag :form, :action => '/demo1', :id => 'demo-fields-for'
+ assert_response_has_tag '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
+ assert_response_has_tag '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
+ assert_response_has_tag '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
end
it 'should display correct simple fields in erb' do
- visit '/erb/fields_for'
- assert_have_selector :form, :action => '/demo1', :id => 'demo-fields-for'
- assert_have_selector '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
- assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
- assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
+ get "/erb/fields_for"
+ assert_response_has_tag :form, :action => '/demo1', :id => 'demo-fields-for'
+ assert_response_has_tag '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
+ assert_response_has_tag '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
+ assert_response_has_tag '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
end
it 'should display correct simple fields in slim' do
- visit '/slim/fields_for'
- assert_have_selector :form, :action => '/demo1', :id => 'demo-fields-for'
- assert_have_selector '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
- assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
- assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
+ get "/slim/fields_for"
+ assert_response_has_tag :form, :action => '/demo1', :id => 'demo-fields-for'
+ assert_response_has_tag '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
+ assert_response_has_tag '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
+ assert_response_has_tag '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
end
end
@@ -209,491 +209,491 @@ def standard_builder(object=@user)
describe 'for #error_messages method' do
it 'should display correct form html with no record' do
actual_html = standard_builder(@user_none).error_messages(:header_message => "Demo form cannot be saved")
- assert actual_html.blank?
+ assert_empty actual_html
end
it 'should display correct form html with valid record' do
actual_html = standard_builder.error_messages(:header_message => "Demo form cannot be saved", :style => "foo:bar", :class => "mine")
- assert_has_tag('#field-errors h2', :content => "Demo form cannot be saved") { actual_html }
- assert_has_tag('#field-errors ul li', :content => "B must be valid") { actual_html }
- assert_has_tag('#field-errors ul li', :content => "A must be present") { actual_html }
- assert_has_tag('#field-errors', :style => "foo:bar") { actual_html }
- assert_has_tag('#field-errors', :class => "mine") { actual_html }
+ assert_html_has_tag(actual_html, '#field-errors h2', :content => "Demo form cannot be saved")
+ assert_html_has_tag(actual_html, '#field-errors ul li', :content => "B must be valid")
+ assert_html_has_tag(actual_html, '#field-errors ul li', :content => "A must be present")
+ assert_html_has_tag(actual_html, '#field-errors', :style => "foo:bar")
+ assert_html_has_tag(actual_html, '#field-errors', :class => "mine")
end
it 'should display correct form in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
- assert_have_selector '#demo div.field-errors ul li', :content => "Fake must be valid"
- assert_have_selector '#demo div.field-errors ul li', :content => "Second must be present"
- assert_have_selector '#demo div.field-errors ul li', :content => "Third must be a number"
- assert_have_selector '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
- assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Third must be a number"
+ assert_response_has_tag '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Third must be a number"
+ assert_response_has_tag '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
end
it 'should display correct form in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
- assert_have_selector '#demo div.field-errors ul li', :content => "Fake must be valid"
- assert_have_selector '#demo div.field-errors ul li', :content => "Second must be present"
- assert_have_selector '#demo div.field-errors ul li', :content => "Third must be a number"
- assert_have_selector '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
- assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Third must be a number"
+ assert_response_has_tag '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Third must be a number"
+ assert_response_has_tag '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
end
it 'should display correct form in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
- assert_have_selector '#demo div.field-errors ul li', :content => "Fake must be valid"
- assert_have_selector '#demo div.field-errors ul li', :content => "Second must be present"
- assert_have_selector '#demo div.field-errors ul li', :content => "Third must be a number"
- assert_have_selector '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
- assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
- assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag '#demo div.field-errors ul li', :content => "Third must be a number"
+ assert_response_has_tag '#demo2 div.field-errors h2', :content => "custom MarkupUser cannot be saved!"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag '#demo2 div.field-errors ul li', :content => "Third must be a number"
+ assert_response_has_tag '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
end
end
describe 'for #error_message_on method' do
it 'should display correct form html with no record' do
actual_html = standard_builder(@user_none).error_message_on(:name)
- assert actual_html.blank?
+ assert_empty actual_html
end
it 'should display error for specified invalid object' do
actual_html = standard_builder(@user).error_message_on(:a, :prepend => "foo", :append => "bar")
- assert_has_tag('span.error', :content => "foo must be present bar") { actual_html }
+ assert_html_has_tag(actual_html, 'span.error', :content => "foo must be present bar")
end
it 'should display error for specified invalid object not matching class name' do
@bob = mock_model("User", :first_name => "Frank", :errors => { :foo => "must be bob" })
actual_html = standard_builder(@bob).error_message_on(:foo, :prepend => "foo", :append => "bar")
- assert_has_tag('span.error', :content => "foo must be bob bar") { actual_html }
+ assert_html_has_tag(actual_html, 'span.error', :content => "foo must be bob bar")
end
end
describe 'for #label method' do
it 'should display correct label html' do
actual_html = standard_builder.label(:first_name, :class => 'large', :caption => "F. Name: ")
- assert_has_tag('label', :class => 'large', :for => 'user_first_name', :content => "F. Name: ") { actual_html }
- assert_has_no_tag('label#user_first_name') { actual_html }
+ assert_html_has_tag(actual_html, 'label', :class => 'large', :for => 'user_first_name', :content => "F. Name: ")
+ assert_html_has_no_tag(actual_html, 'label#user_first_name')
end
it 'should set specific content inside the label if a block was provided' do
actual_html = standard_builder.label(:admin, :class => 'large') { input_tag :checkbox }
- assert_has_tag('label', :class => 'large', :for => 'user_admin', :content => "Admin: ") { actual_html }
- assert_has_tag('label input[type=checkbox]') { actual_html }
+ assert_html_has_tag(actual_html, 'label', :class => 'large', :for => 'user_admin', :content => "Admin: ")
+ assert_html_has_tag(actual_html, 'label input[type=checkbox]')
end
it 'should display correct label in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'
- assert_have_selector '#demo label', :content => "About Me: "
- assert_have_selector '#demo2 label', :content => "Nickname: ", :class => 'label'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo label', :content => "Login: ", :class => 'user-label'
+ assert_response_has_tag '#demo label', :content => "About Me: "
+ assert_response_has_tag '#demo2 label', :content => "Nickname: ", :class => 'label'
end
it 'should display correct label in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'
- assert_have_selector '#demo label', :content => "About Me: "
- assert_have_selector '#demo2 label', :content => "Nickname: ", :class => 'label'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo label', :content => "Login: ", :class => 'user-label'
+ assert_response_has_tag '#demo label', :content => "About Me: "
+ assert_response_has_tag '#demo2 label', :content => "Nickname: ", :class => 'label'
end
it 'should display correct label in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'
- assert_have_selector '#demo label', :content => "About Me: "
- assert_have_selector '#demo2 label', :content => "Nickname: ", :class => 'label'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo label', :content => "Login: ", :class => 'user-label'
+ assert_response_has_tag '#demo label', :content => "About Me: "
+ assert_response_has_tag '#demo2 label', :content => "Nickname: ", :class => 'label'
end
end
describe 'for #hidden_field method' do
it 'should display correct hidden field html' do
actual_html = standard_builder.hidden_field(:session_id, :class => 'hidden')
- assert_has_tag('input.hidden[type=hidden]', :value => "54", :id => 'user_session_id', :name => 'user[session_id]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.hidden[type=hidden]', :value => "54", :id => 'user_session_id', :name => 'user[session_id]')
end
it 'should display correct hidden field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
- assert_have_selector '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
+ assert_response_has_tag '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
end
it 'should display correct hidden field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
- assert_have_selector '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
+ assert_response_has_tag '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
end
it 'should display correct hidden field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
- assert_have_selector '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=hidden]', :id => 'markup_user_session_id', :value => "45"
+ assert_response_has_tag '#demo2 input', :type => 'hidden', :name => 'markup_user[session_id]'
end
end
describe 'for #text_field method' do
it 'should display correct text field html' do
actual_html = standard_builder.text_field(:first_name, :class => 'large')
- assert_has_tag('input.large[type=text]', :value => "Joe", :id => 'user_first_name', :name => 'user[first_name]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.large[type=text]', :value => "Joe", :id => 'user_first_name', :name => 'user[first_name]')
end
it 'should display correct text field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
- assert_have_selector '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
+ assert_response_has_tag '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
end
it 'should display correct text field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
- assert_have_selector '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
+ assert_response_has_tag '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
end
it 'should display correct text field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
- assert_have_selector '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input.user-text[type=text]', :id => 'markup_user_username', :value => "John"
+ assert_response_has_tag '#demo2 input', :type => 'text', :class => 'input', :name => 'markup_user[username]'
end
end
describe 'for #number_field method' do
it 'should display correct number field html' do
actual_html = standard_builder.number_field(:age, :class => 'numeric')
- assert_has_tag('input.numeric[type=number]', :id => 'user_age', :name => 'user[age]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.numeric[type=number]', :id => 'user_age', :name => 'user[age]')
end
it 'should display correct number field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input.numeric[type=number]', :id => 'markup_user_age'
end
it 'should display correct number field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input.numeric[type=number]', :id => 'markup_user_age'
end
it 'should display correct number field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input.numeric[type=number]', :id => 'markup_user_age'
end
end
describe 'for #telephone_field method' do
it 'should display correct telephone field html' do
actual_html = standard_builder.telephone_field(:telephone, :class => 'numeric')
- assert_has_tag('input.numeric[type=tel]', :id => 'user_telephone', :name => 'user[telephone]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.numeric[type=tel]', :id => 'user_telephone', :name => 'user[telephone]')
end
it 'should display correct telephone field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
end
it 'should display correct telephone field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
end
it 'should display correct telephone field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
end
end
describe 'for #search_field method' do
it 'should display correct search field html' do
actual_html = standard_builder.search_field(:search, :class => 'string')
- assert_has_tag('input.string[type=search]', :id => 'user_search', :name => 'user[search]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.string[type=search]', :id => 'user_search', :name => 'user[search]')
end
it 'should display correct search field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input.string[type=search]', :id => 'markup_user_search'
end
it 'should display correct search field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input.string[type=search]', :id => 'markup_user_search'
end
it 'should display correct search field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input.string[type=search]', :id => 'markup_user_search'
end
end
describe 'for #email_field method' do
it 'should display correct email field html' do
actual_html = standard_builder.email_field(:email, :class => 'string')
- assert_has_tag('input.string[type=email]', :id => 'user_email', :name => 'user[email]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.string[type=email]', :id => 'user_email', :name => 'user[email]')
end
it 'should display correct email field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input.string[type=email]', :id => 'markup_user_email'
end
it 'should display correct email field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input.string[type=email]', :id => 'markup_user_email'
end
it 'should display correct email field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input.string[type=email]', :id => 'markup_user_email'
end
end
describe 'for #url_field method' do
it 'should display correct url field html' do
actual_html = standard_builder.url_field(:webpage, :class => 'string')
- assert_has_tag('input.string[type=url]', :id => 'user_webpage', :name => 'user[webpage]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.string[type=url]', :id => 'user_webpage', :name => 'user[webpage]')
end
it 'should display correct url field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input.string[type=url]', :id => 'markup_user_webpage'
end
it 'should display correct url field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input.string[type=url]', :id => 'markup_user_webpage'
end
it 'should display correct url field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input.string[type=url]', :id => 'markup_user_webpage'
end
end
describe 'for #check_box method' do
it 'should display correct checkbox html' do
actual_html = standard_builder.check_box(:confirm_destroy, :class => 'large')
- assert_has_tag('input.large[type=checkbox]', :id => 'user_confirm_destroy', :name => 'user[confirm_destroy]') { actual_html }
- assert_has_tag('input[type=hidden]', :name => 'user[confirm_destroy]', :value => '0') { actual_html }
+ assert_html_has_tag(actual_html, 'input.large[type=checkbox]', :id => 'user_confirm_destroy', :name => 'user[confirm_destroy]')
+ assert_html_has_tag(actual_html, 'input[type=hidden]', :name => 'user[confirm_destroy]', :value => '0')
end
it 'should display correct checkbox html when checked' do
actual_html = standard_builder.check_box(:confirm_destroy, :checked => true)
- assert_has_tag('input[type=checkbox]', :checked => 'checked', :name => 'user[confirm_destroy]') { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=checkbox]', :checked => 'checked', :name => 'user[confirm_destroy]')
end
it 'should display correct checkbox html as checked when object value matches' do
@user.stubs(:show_favorites => 'human')
actual_html = standard_builder.check_box(:show_favorites, :value => 'human')
- assert_has_tag('input[type=checkbox]', :checked => 'checked', :name => 'user[show_favorites]') { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=checkbox]', :checked => 'checked', :name => 'user[show_favorites]')
end
it 'should display correct checkbox html as checked when object value is true' do
@user.stubs(:show_favorites => true)
actual_html = standard_builder.check_box(:show_favorites, :value => '1')
- assert_has_tag('input[type=checkbox]', :checked => 'checked', :name => 'user[show_favorites]') { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=checkbox]', :checked => 'checked', :name => 'user[show_favorites]')
end
it 'should display correct checkbox html as unchecked when object value does not match' do
@user.stubs(:show_favorites => 'alien')
actual_html = standard_builder.check_box(:show_favorites, :value => 'human')
- assert_has_no_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
+ assert_html_has_no_tag(actual_html, 'input[type=checkbox]', :checked => 'checked')
end
it 'should display correct checkbox html as unchecked when object value is false' do
@user.stubs(:show_favorites => false)
actual_html = standard_builder.check_box(:show_favorites, :value => '1')
- assert_has_no_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
+ assert_html_has_no_tag(actual_html, 'input[type=checkbox]', :checked => 'checked')
end
it 'should display correct unchecked hidden field when specified' do
actual_html = standard_builder.check_box(:show_favorites, :value => 'female', :uncheck_value => 'false')
- assert_has_tag('input[type=hidden]', :name => 'user[show_favorites]', :value => 'false') { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=hidden]', :name => 'user[show_favorites]', :value => 'false')
end
it 'should display correct checkbox in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
end
it 'should display correct checkbox in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
end
it 'should display correct checkbox in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=checkbox]', :checked => 'checked', :id => 'markup_user_remember_me', :name => 'markup_user[remember_me]'
end
end
describe 'for #check_box_group and #radio_button_group methods' do
it 'should display checkbox group html' do
checkboxes = standard_builder.check_box_group(:role, :collection => @user.role_types, :fields => [:name, :id], :selected => [2,3])
- assert_has_tag('input[type=checkbox]', :value => '1') { checkboxes }
- assert_has_no_tag('input[type=checkbox][checked]', :value => '1') { checkboxes }
- assert_has_tag('input[type=checkbox]', :checked => 'checked', :value => '2') { checkboxes }
- assert_has_tag('label[for=user_role_3] input[name="user[role][]"][value="3"][checked]') { checkboxes }
+ assert_html_has_tag(checkboxes, 'input[type=checkbox]', :value => '1')
+ assert_html_has_no_tag(checkboxes, 'input[type=checkbox][checked]', :value => '1')
+ assert_html_has_tag(checkboxes, 'input[type=checkbox]', :checked => 'checked', :value => '2')
+ assert_html_has_tag(checkboxes, 'label[for=user_role_3] input[name="user[role][]"][value="3"][checked]')
end
it 'should display checkbox group html and extract selected values from the object' do
checkboxes = standard_builder.check_box_group(:roles, :collection => @user.role_types, :fields => [:name, :id])
- assert_has_tag('input[type=checkbox][name="user[roles][]"][value="1"][checked]') { checkboxes }
- assert_has_tag('input[type=checkbox][name="user[roles][]"][value="3"][checked]') { checkboxes }
- assert_has_no_tag('input[type=checkbox][name="user[roles][]"][value="2"][checked]') { checkboxes }
+ assert_html_has_tag(checkboxes, 'input[type=checkbox][name="user[roles][]"][value="1"][checked]')
+ assert_html_has_tag(checkboxes, 'input[type=checkbox][name="user[roles][]"][value="3"][checked]')
+ assert_html_has_no_tag(checkboxes, 'input[type=checkbox][name="user[roles][]"][value="2"][checked]')
end
it 'should display radio group html' do
radios = standard_builder.radio_button_group(:role, :options => %W(red yellow blue), :selected => 'yellow')
- assert_has_tag('input[type=radio]', :value => 'red') { radios }
- assert_has_no_tag('input[type=radio][checked]', :value => 'red') { radios }
- assert_has_tag('input[type=radio]', :checked => 'checked', :value => 'yellow') { radios }
- assert_has_tag('label[for=user_role_blue] input[name="user[role]"][value=blue]') { radios }
+ assert_html_has_tag(radios, 'input[type=radio]', :value => 'red')
+ assert_html_has_no_tag(radios, 'input[type=radio][checked]', :value => 'red')
+ assert_html_has_tag(radios, 'input[type=radio]', :checked => 'checked', :value => 'yellow')
+ assert_html_has_tag(radios, 'label[for=user_role_blue] input[name="user[role]"][value=blue]')
end
it 'should display radio group html and extract selected value from the object' do
radios = standard_builder.radio_button_group(:role, :collection => @user.role_types)
- assert_has_tag('input[type=radio][value="1"][checked]') { radios }
- assert_has_no_tag('input[type=radio][value="2"][checked]') { radios }
+ assert_html_has_tag(radios, 'input[type=radio][value="1"][checked]')
+ assert_html_has_no_tag(radios, 'input[type=radio][value="2"][checked]')
end
end
describe 'for #radio_button method' do
it 'should display correct radio button html' do
actual_html = standard_builder.radio_button(:gender, :value => 'male', :class => 'large')
- assert_has_tag('input.large[type=radio]', :id => 'user_gender_male', :name => 'user[gender]', :value => 'male') { actual_html }
+ assert_html_has_tag(actual_html, 'input.large[type=radio]', :id => 'user_gender_male', :name => 'user[gender]', :value => 'male')
end
it 'should display correct radio button html when checked' do
actual_html = standard_builder.radio_button(:gender, :checked => true)
- assert_has_tag('input[type=radio]', :checked => 'checked', :name => 'user[gender]') { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=radio]', :checked => 'checked', :name => 'user[gender]')
end
it 'should display correct radio button html as checked when object value matches' do
@user.stubs(:gender => 'male')
actual_html = standard_builder.radio_button(:gender, :value => 'male')
- assert_has_tag('input[type=radio]', :checked => 'checked', :name => 'user[gender]') { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=radio]', :checked => 'checked', :name => 'user[gender]')
end
it 'should display correct radio button html as unchecked when object value does not match' do
@user.stubs(:gender => 'male')
actual_html = standard_builder.radio_button(:gender, :value => 'female')
- assert_has_no_tag('input[type=radio]', :checked => 'checked') { actual_html }
+ assert_html_has_no_tag(actual_html, 'input[type=radio]', :checked => 'checked')
end
it 'should display correct radio button in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
- assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
- assert_have_selector '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
+ assert_response_has_tag '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
+ assert_response_has_tag '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
end
it 'should display correct radio button in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
- assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
- assert_have_selector '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
+ assert_response_has_tag '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
+ assert_response_has_tag '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
end
it 'should display correct radio button in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
- assert_have_selector '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
- assert_have_selector '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=radio]', :id => 'markup_user_gender_male', :name => 'markup_user[gender]', :value => 'male'
+ assert_response_has_tag '#demo input[type=radio]', :id => 'markup_user_gender_female', :name => 'markup_user[gender]', :value => 'female'
+ assert_response_has_tag '#demo input[type=radio][checked=checked]', :id => 'markup_user_gender_male'
end
end
describe 'for #text_area method' do
it 'should display correct text_area html' do
actual_html = standard_builder.text_area(:about, :class => 'large')
- assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]') { actual_html }
+ assert_html_has_tag(actual_html, 'textarea.large', :id => 'user_about', :name => 'user[about]')
end
it 'should display correct text_area html and content' do
actual_html = standard_builder.text_area(:about, :value => "Demo", :rows => '5', :cols => '6')
- assert_has_tag('textarea', :id => 'user_about', :content => 'Demo', :rows => '5', :cols => '6') { actual_html }
+ assert_html_has_tag(actual_html, 'textarea', :id => 'user_about', :content => 'Demo', :rows => '5', :cols => '6')
end
it 'should display correct text_area in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
- assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+ assert_response_has_tag '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
end
it 'should display correct text_area in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
- assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+ assert_response_has_tag '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
end
it 'should display correct text_area in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
- assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+ assert_response_has_tag '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
end
end
describe 'for #password_field method' do
it 'should display correct password_field html' do
actual_html = standard_builder.password_field(:code, :class => 'large')
- assert_has_tag('input.large[type=password]', :id => 'user_code', :name => 'user[code]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.large[type=password]', :id => 'user_code', :name => 'user[code]')
end
it 'should display correct password_field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
- assert_have_selector '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
+ assert_response_has_tag '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
end
it 'should display correct password_field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
- assert_have_selector '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
+ assert_response_has_tag '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
end
it 'should display correct password_field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
- assert_have_selector '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input', :type => 'password', :class => 'user-password', :value => 'secret'
+ assert_response_has_tag '#demo2 input', :type => 'password', :class => 'input', :name => 'markup_user[code]'
end
end
describe 'for #file_field method' do
it 'should display correct file_field html' do
actual_html = standard_builder.file_field(:photo, :class => 'large')
- assert_has_tag('input.large[type=file]', :id => 'user_photo', :name => 'user[photo]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.large[type=file]', :id => 'user_photo', :name => 'user[photo]')
end
it 'should display correct file_field in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
- assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ assert_response_has_tag '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
end
it 'should display correct file_field in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
- assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ assert_response_has_tag '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
end
it 'should display correct file_field in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
- assert_have_selector '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input.user-photo', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ assert_response_has_tag '#demo2 input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
end
it 'should display correct form html with multipart, even if no multipart option is specified' do
actual_html = form_for(@user, '/register', :"accept-charset" => "UTF-8") { |f| f.file_field :photo }
- assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
+ assert_html_has_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data")
end
it 'should display correct form html without multipart, if multipart option is specified false' do
actual_html = form_for(@user, '/register', :"accept-charset" => "UTF-8", :multipart => false) { |f| f.file_field :photo }
- assert_has_no_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data") { actual_html }
+ assert_html_has_no_tag(actual_html, 'form', :"accept-charset" => "UTF-8", :action => '/register', :enctype => "multipart/form-data")
end
end
@@ -701,28 +701,28 @@ def standard_builder(object=@user)
describe 'for #select method' do
it 'should display correct select html' do
actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'], :class => 'selecty')
- assert_has_tag('select.selecty', :id => 'user_state', :name => 'user[state]') { actual_html }
- assert_has_tag('select.selecty option', :count => 3) { actual_html }
- assert_has_tag('select.selecty option', :value => 'California', :content => 'California') { actual_html }
- assert_has_tag('select.selecty option', :value => 'Texas', :content => 'Texas') { actual_html }
- assert_has_tag('select.selecty option', :value => 'Wyoming', :content => 'Wyoming') { actual_html }
+ assert_html_has_tag(actual_html, 'select.selecty', :id => 'user_state', :name => 'user[state]')
+ assert_html_has_tag(actual_html, 'select.selecty option', :count => 3)
+ assert_html_has_tag(actual_html, 'select.selecty option', :value => 'California', :content => 'California')
+ assert_html_has_tag(actual_html, 'select.selecty option', :value => 'Texas', :content => 'Texas')
+ assert_html_has_tag(actual_html, 'select.selecty option', :value => 'Wyoming', :content => 'Wyoming')
end
it 'should display correct select html with selected item if it matches value' do
@user.stubs(:state => 'California')
actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'])
- assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
- assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
- assert_has_tag('select option', :value => 'California', :selected => 'selected') { actual_html }
+ assert_html_has_tag(actual_html, 'select', :id => 'user_state', :name => 'user[state]')
+ assert_html_has_tag(actual_html, 'select option', :selected => 'selected', :count => 1)
+ assert_html_has_tag(actual_html, 'select option', :value => 'California', :selected => 'selected')
end
it 'should display correct select html with selected item if it matches full value' do
@user.stubs(:state => 'Cali')
actual_html = standard_builder.select(:state, :options => ['Cali', 'California', 'Texas', 'Wyoming'])
- assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
- assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
- assert_has_tag('select option', :value => 'Cali', :selected => 'selected') { actual_html }
- assert_has_tag('select option', :value => 'California') { actual_html }
+ assert_html_has_tag(actual_html, 'select', :id => 'user_state', :name => 'user[state]')
+ assert_html_has_tag(actual_html, 'select option', :selected => 'selected', :count => 1)
+ assert_html_has_tag(actual_html, 'select option', :value => 'Cali', :selected => 'selected')
+ assert_html_has_tag(actual_html, 'select option', :value => 'California')
end
it 'should display correct select html with multiple selected items' do
@@ -730,92 +730,95 @@ def standard_builder(object=@user)
actual_html = standard_builder.select(
:pickles, :options => [ ['Foo', 'foo'], ['Bar', 'bar'], ['Baz', 'baz'], ['Bar Buz', 'bar buz'] ]
)
- assert_has_tag('option', :value => 'foo', :content => 'Foo', :selected => 'selected') { actual_html }
- assert_has_tag('option', :value => 'bar', :content => 'Bar', :selected => 'selected') { actual_html }
- assert_has_tag('option', :value => 'baz', :content => 'Baz') { actual_html }
- assert_has_tag('option', :value => 'bar buz', :content => 'Bar Buz') { actual_html }
+ assert_html_has_tag(actual_html, 'option', :value => 'foo', :content => 'Foo', :selected => 'selected')
+ assert_html_has_tag(actual_html, 'option', :value => 'bar', :content => 'Bar', :selected => 'selected')
+ assert_html_has_tag(actual_html, 'option', :value => 'baz', :content => 'Baz')
+ assert_html_has_tag(actual_html, 'option', :value => 'bar buz', :content => 'Bar Buz')
end
- it 'should display correct select html with include_blank' do
+ it 'should display correct select html with include_blank true' do
actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'], :include_blank => true)
- assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
- assert_has_tag('select option', :count => 4) { actual_html }
- assert_has_tag('select option:first-child', :content => '') { actual_html }
- assert_has_tag('select option:first-child', :value => '') { actual_html }
+ assert_html_has_tag(actual_html, 'select', :id => 'user_state', :name => 'user[state]')
+ assert_html_has_tag(actual_html, 'select option', :count => 4)
+ assert_html_has_tag(actual_html, 'select option:first-child', :content => '')
+ assert_html_has_tag(actual_html, 'select option:first-child', :value => '')
+ end
+
+ it 'should display correct select html with include_blank string' do
actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'], :include_blank => 'Select')
- assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
- assert_has_tag('select option', :count => 4) { actual_html }
- assert_has_tag('select option:first-child', :content => 'Select') { actual_html }
- assert_has_tag('select option:first-child', :value => '') { actual_html }
+ assert_html_has_tag(actual_html, 'select', :id => 'user_state', :name => 'user[state]')
+ assert_html_has_tag(actual_html, 'select option', :count => 4)
+ assert_html_has_tag(actual_html, 'select option:first-child', :content => 'Select')
+ assert_html_has_tag(actual_html, 'select option:first-child', :value => '')
end
it 'should display correct select html with collection passed in' do
actual_html = standard_builder.select(:role, :collection => @user.role_types, :fields => [:name, :id])
- assert_has_tag('select', :id => 'user_role', :name => 'user[role]') { actual_html }
- assert_has_tag('select option', :count => 3) { actual_html }
- assert_has_tag('select option', :value => '1', :content => 'Admin', :selected => 'selected') { actual_html }
- assert_has_tag('select option', :value => '2', :content => 'Moderate') { actual_html }
- assert_has_tag('select option', :value => '3', :content => 'Limited') { actual_html }
+ assert_html_has_tag(actual_html, 'select', :id => 'user_role', :name => 'user[role]')
+ assert_html_has_tag(actual_html, 'select option', :count => 3)
+ assert_html_has_tag(actual_html, 'select option', :value => '1', :content => 'Admin', :selected => 'selected')
+ assert_html_has_tag(actual_html, 'select option', :value => '2', :content => 'Moderate')
+ assert_html_has_tag(actual_html, 'select option', :value => '3', :content => 'Limited')
end
it 'should display correct select in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
- assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+ assert_response_has_tag '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
end
it 'should display correct select in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
- assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+ assert_response_has_tag '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
end
it 'should display correct select in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
- assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+ assert_response_has_tag '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
end
end
describe 'for #submit method' do
it 'should display correct submit button html with no options' do
actual_html = standard_builder.submit
- assert_has_tag('input[type=submit]', :value => "Submit") { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=submit]', :value => "Submit")
end
it 'should display correct submit button html with no caption' do
actual_html = standard_builder.submit(:class => 'btn')
- assert_has_tag('input.btn[type=submit]', :value => "Submit") { actual_html }
+ assert_html_has_tag(actual_html, 'input.btn[type=submit]', :value => "Submit")
end
it 'should display correct submit button html with nil caption' do
actual_html = standard_builder.submit(nil, :class => 'btn')
- assert_has_tag('input.btn[type=submit]') { actual_html }
+ assert_html_has_tag(actual_html, 'input.btn[type=submit]')
assert actual_html !~ %r{ value \* = }x
end
it 'should display correct submit button html' do
actual_html = standard_builder.submit("Commit", :class => 'large')
- assert_has_tag('input.large[type=submit]', :value => "Commit") { actual_html }
+ assert_html_has_tag(actual_html, 'input.large[type=submit]', :value => "Commit")
end
it 'should display correct submit button in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
- assert_have_selector '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
+ assert_response_has_tag '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
end
it 'should display correct submit button in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
- assert_have_selector '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
+ assert_response_has_tag '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
end
it 'should display correct submit button in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
- assert_have_selector '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input', :type => 'submit', :id => 'demo-button', :class => 'success'
+ assert_response_has_tag '#demo2 input', :type => 'submit', :class => 'button', :value => "Create"
end
end
@@ -826,30 +829,30 @@ def standard_builder(object=@user)
it 'should display correct image submit button html with no options' do
actual_html = standard_builder.image_submit('buttons/ok.png')
- assert_has_tag('input[type=image]', :src => "/images/buttons/ok.png?#{@stamp}") { actual_html }
+ assert_html_has_tag(actual_html, 'input[type=image]', :src => "/images/buttons/ok.png?#{@stamp}")
end
it 'should display correct image submit button html' do
actual_html = standard_builder.image_submit('/system/ok.png', :class => 'large')
- assert_has_tag('input.large[type=image]', :src => "/system/ok.png") { actual_html }
+ assert_html_has_tag(actual_html, 'input.large[type=image]', :src => "/system/ok.png")
end
it 'should display correct image submit button in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
- assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
+ assert_response_has_tag '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
end
it 'should display correct image submit button in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
- assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
+ assert_response_has_tag '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
end
it 'should display correct image submit button in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
- assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input', :type => 'image', :id => 'image-button', :src => "/images/buttons/post.png?#{@stamp}"
+ assert_response_has_tag '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
end
end
@@ -870,10 +873,10 @@ def standard_builder(object=@user)
child_form.text_field(:number) +
child_form.check_box('_destroy')
end
- assert_has_tag('label', :for => 'user_telephone_attributes_number') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_telephone_attributes_number', :name => 'user[telephone_attributes][number]', :value => "4568769876") { actual_html }
- assert_has_tag('input', :type => 'hidden', :name => 'user[telephone_attributes][_destroy]', :value => '0') { actual_html }
- assert_has_tag('input', :type => 'checkbox', :id => 'user_telephone_attributes__destroy', :name => 'user[telephone_attributes][_destroy]', :value => '1') { actual_html }
+ assert_html_has_tag(actual_html, 'label', :for => 'user_telephone_attributes_number')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_telephone_attributes_number', :name => 'user[telephone_attributes][number]', :value => "4568769876")
+ assert_html_has_tag(actual_html, 'input', :type => 'hidden', :name => 'user[telephone_attributes][_destroy]', :value => '0')
+ assert_html_has_tag(actual_html, 'input', :type => 'checkbox', :id => 'user_telephone_attributes__destroy', :name => 'user[telephone_attributes][_destroy]', :value => '1')
end
it 'should display nested children fields one-to-many within form' do
@@ -883,15 +886,15 @@ def standard_builder(object=@user)
html << child_form.text_field(:name)
end
# Address 1 (Saved)
- assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '20') { actual_html }
- assert_has_tag('label', :for => 'user_addresses_attributes_0_name', :content => 'Name') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]') { actual_html }
- assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]') { actual_html }
+ assert_html_has_tag(actual_html, 'input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '20')
+ assert_html_has_tag(actual_html, 'label', :for => 'user_addresses_attributes_0_name', :content => 'Name')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]')
+ assert_html_has_tag(actual_html, 'input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]')
# Address 2 (New)
- assert_has_no_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_1_id') { actual_html }
- assert_has_tag('label', :for => 'user_addresses_attributes_1_name', :content => 'Name') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_1_name', :name => 'user[addresses_attributes][1][name]') { actual_html }
- assert_has_no_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_1__destroy') { actual_html }
+ assert_html_has_no_tag(actual_html, 'input', :type => 'hidden', :id => 'user_addresses_attributes_1_id')
+ assert_html_has_tag(actual_html, 'label', :for => 'user_addresses_attributes_1_name', :content => 'Name')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_addresses_attributes_1_name', :name => 'user[addresses_attributes][1][name]')
+ assert_html_has_no_tag(actual_html, 'input', :type => 'checkbox', :id => 'user_addresses_attributes_1__destroy')
end
it 'should display fields for explicit instance object' do
@@ -901,10 +904,10 @@ def standard_builder(object=@user)
html << child_form.text_field(:name)
html << child_form.check_box('_destroy')
end
- assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '40') { actual_html }
- assert_has_tag('label', :for => 'user_addresses_attributes_0_name', :content => 'Name') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]', :value => "Page") { actual_html }
- assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]', :value => '1') { actual_html }
+ assert_html_has_tag(actual_html, 'input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '40')
+ assert_html_has_tag(actual_html, 'label', :for => 'user_addresses_attributes_0_name', :content => 'Name')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]', :value => "Page")
+ assert_html_has_tag(actual_html, 'input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]', :value => '1')
end
it 'should display fields for collection object' do
@@ -915,15 +918,15 @@ def standard_builder(object=@user)
child_form.check_box('_destroy')
end
# Address 1
- assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '20') { actual_html }
- assert_has_tag('label', :for => 'user_addresses_attributes_0_name', :content => 'Name') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]', :value => "Foo") { actual_html }
- assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]') { actual_html }
+ assert_html_has_tag(actual_html, 'input', :type => 'hidden', :id => 'user_addresses_attributes_0_id', :name => "user[addresses_attributes][0][id]", :value => '20')
+ assert_html_has_tag(actual_html, 'label', :for => 'user_addresses_attributes_0_name', :content => 'Name')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_addresses_attributes_0_name', :name => 'user[addresses_attributes][0][name]', :value => "Foo")
+ assert_html_has_tag(actual_html, 'input', :type => 'checkbox', :id => 'user_addresses_attributes_0__destroy', :name => 'user[addresses_attributes][0][_destroy]')
# Address 3
- assert_has_tag('input', :type => 'hidden', :id => 'user_addresses_attributes_2_id', :value => '50') { actual_html }
- assert_has_tag('label', :for => 'user_addresses_attributes_2_name', :content => 'Name') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_2_name', :name => 'user[addresses_attributes][2][name]', :value => "Walter") { actual_html }
- assert_has_tag('input', :type => 'checkbox', :id => 'user_addresses_attributes_2__destroy') { actual_html }
+ assert_html_has_tag(actual_html, 'input', :type => 'hidden', :id => 'user_addresses_attributes_2_id', :value => '50')
+ assert_html_has_tag(actual_html, 'label', :for => 'user_addresses_attributes_2_name', :content => 'Name')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_addresses_attributes_2_name', :name => 'user[addresses_attributes][2][name]', :value => "Walter")
+ assert_html_has_tag(actual_html, 'input', :type => 'checkbox', :id => 'user_addresses_attributes_2__destroy')
end
it 'should display fields for arbitrarily deep nested forms' do
@@ -934,8 +937,8 @@ def standard_builder(object=@user)
second_child_form.check_box('_destroy')
end
end
- assert_has_tag('label', :for => 'user_addresses_attributes_1_businesses_attributes_0_name', :content => 'Name') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_1_businesses_attributes_0_name', :name => 'user[addresses_attributes][1][businesses_attributes][0][name]') { actual_html }
+ assert_html_has_tag(actual_html, 'label', :for => 'user_addresses_attributes_1_businesses_attributes_0_name', :content => 'Name')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_addresses_attributes_1_businesses_attributes_0_name', :name => 'user[addresses_attributes][1][businesses_attributes][0][name]')
end
it 'should display fields for nested forms with custom indices' do
@@ -951,59 +954,59 @@ def standard_builder(object=@user)
html
end
- assert_has_tag('label', :for => 'user_addresses_attributes_1_businesses_attributes_a_name', :content => 'Name') { actual_html }
- assert_has_tag('input', :type => 'text', :id => 'user_addresses_attributes_1_businesses_attributes_a_name', :name => 'user[addresses_attributes][1][businesses_attributes][a][name]') { actual_html }
+ assert_html_has_tag(actual_html, 'label', :for => 'user_addresses_attributes_1_businesses_attributes_a_name', :content => 'Name')
+ assert_html_has_tag(actual_html, 'input', :type => 'text', :id => 'user_addresses_attributes_1_businesses_attributes_a_name', :name => 'user[addresses_attributes][1][businesses_attributes][a][name]')
end
it 'should display nested children fields in erb' do
- visit '/erb/fields_for'
+ get "/erb/fields_for"
# Telephone
- assert_have_selector('label', :for => 'markup_user_telephone_attributes_number')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
+ assert_response_has_tag('label', :for => 'markup_user_telephone_attributes_number')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
# Address 1 (Saved)
- assert_have_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
- assert_have_selector('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
- assert_have_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
+ assert_response_has_tag('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
+ assert_response_has_tag('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
+ assert_response_has_tag('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
# Address 2 (New)
- assert_have_no_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
- assert_have_selector('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
- assert_have_no_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
+ assert_response_has_no_tag('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
+ assert_response_has_tag('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
+ assert_response_has_no_tag('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
end
it 'should display nested children fields in haml' do
- visit '/haml/fields_for'
+ get "/haml/fields_for"
# Telephone
- assert_have_selector('label', :for => 'markup_user_telephone_attributes_number')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
+ assert_response_has_tag('label', :for => 'markup_user_telephone_attributes_number')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
# Address 1 (Saved)
- assert_have_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
- assert_have_selector('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
- assert_have_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
+ assert_response_has_tag('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
+ assert_response_has_tag('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
+ assert_response_has_tag('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
# Address 2 (New)
- assert_have_no_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
- assert_have_selector('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
- assert_have_no_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
+ assert_response_has_no_tag('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
+ assert_response_has_tag('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
+ assert_response_has_no_tag('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
end
it 'should display nested children fields in slim' do
- visit '/slim/fields_for'
+ get "/slim/fields_for"
# Telephone
- assert_have_selector('label', :for => 'markup_user_telephone_attributes_number')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
+ assert_response_has_tag('label', :for => 'markup_user_telephone_attributes_number')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_telephone_attributes_number', :name => 'markup_user[telephone_attributes][number]', :value => "62634576545")
# Address 1 (Saved)
- assert_have_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
- assert_have_selector('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
- assert_have_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
+ assert_response_has_tag('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_0_id', :name => "markup_user[addresses_attributes][0][id]", :value => '25')
+ assert_response_has_tag('label', :for => 'markup_user_addresses_attributes_0_name', :content => 'Name')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_addresses_attributes_0_name', :name => 'markup_user[addresses_attributes][0][name]')
+ assert_response_has_tag('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_0__destroy', :name => 'markup_user[addresses_attributes][0][_destroy]')
# Address 2 (New)
- assert_have_no_selector('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
- assert_have_selector('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
- assert_have_selector('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
- assert_have_no_selector('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
+ assert_response_has_no_tag('input', :type => 'hidden', :id => 'markup_user_addresses_attributes_1_id')
+ assert_response_has_tag('label', :for => 'markup_user_addresses_attributes_1_name', :content => 'Name')
+ assert_response_has_tag('input', :type => 'text', :id => 'markup_user_addresses_attributes_1_name', :name => 'markup_user[addresses_attributes][1][name]')
+ assert_response_has_no_tag('input', :type => 'checkbox', :id => 'markup_user_addresses_attributes_1__destroy')
end
end
@@ -1014,182 +1017,182 @@ def standard_builder(object=@user)
describe 'for #text_field_block method' do
it 'should display correct text field block html' do
actual_html = standard_builder.text_field_block(:first_name, :class => 'large', :caption => "FName")
- assert_has_tag('p label', :for => 'user_first_name', :content => "FName") { actual_html }
- assert_has_tag('p input.large[type=text]', :value => "Joe", :id => 'user_first_name', :name => 'user[first_name]') { actual_html }
+ assert_html_has_tag(actual_html, 'p label', :for => 'user_first_name', :content => "FName")
+ assert_html_has_tag(actual_html, 'p input.large[type=text]', :value => "Joe", :id => 'user_first_name', :name => 'user[first_name]')
end
it 'should display correct text field block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
- assert_have_selector '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
+ assert_response_has_tag '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
end
it 'should display correct text field block in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
- assert_have_selector '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
+ assert_response_has_tag '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
end
it 'should display correct text field block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
- assert_have_selector '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_username', :content => "Nickname: ", :class => 'label'
+ assert_response_has_tag '#demo2 p input', :type => 'text', :name => 'markup_user[username]', :id => 'markup_user_username'
end
end
describe 'for #text_area_block method' do
it 'should display correct text area block html' do
actual_html = standard_builder.text_area_block(:about, :class => 'large', :caption => "About Me")
- assert_has_tag('p label', :for => 'user_about', :content => "About Me") { actual_html }
- assert_has_tag('p textarea', :id => 'user_about', :name => 'user[about]') { actual_html }
+ assert_html_has_tag(actual_html, 'p label', :for => 'user_about', :content => "About Me")
+ assert_html_has_tag(actual_html, 'p textarea', :id => 'user_about', :name => 'user[about]')
end
it 'should display correct text area block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_about', :content => "About: "
- assert_have_selector '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_about', :content => "About: "
+ assert_response_has_tag '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
end
it 'should display correct text area block in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_about', :content => "About: "
- assert_have_selector '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_about', :content => "About: "
+ assert_response_has_tag '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
end
it 'should display correct text area block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_about', :content => "About: "
- assert_have_selector '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_about', :content => "About: "
+ assert_response_has_tag '#demo2 p textarea', :name => 'markup_user[about]', :id => 'markup_user_about'
end
end
describe 'for #password_field_block method' do
it 'should display correct password field block html' do
actual_html = standard_builder.password_field_block(:keycode, :class => 'large', :caption => "Code: ")
- assert_has_tag('p label', :for => 'user_keycode', :content => "Code: ") { actual_html }
- assert_has_tag('p input.large[type=password]', :id => 'user_keycode', :name => 'user[keycode]') { actual_html }
+ assert_html_has_tag(actual_html, 'p label', :for => 'user_keycode', :content => "Code: ")
+ assert_html_has_tag(actual_html, 'p input.large[type=password]', :id => 'user_keycode', :name => 'user[keycode]')
end
it 'should display correct password field block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
- assert_have_selector '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
+ assert_response_has_tag '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
end
it 'should display correct password field block in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
- assert_have_selector '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
+ assert_response_has_tag '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
end
it 'should display correct password field block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
- assert_have_selector '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_code', :content => "Code: "
+ assert_response_has_tag '#demo2 p input', :type => 'password', :name => 'markup_user[code]', :id => 'markup_user_code'
end
end
describe 'for #file_field_block method' do
it 'should display correct file field block html' do
actual_html = standard_builder.file_field_block(:photo, :class => 'large', :caption => "Photo: ")
- assert_has_tag('p label', :for => 'user_photo', :content => "Photo: ") { actual_html }
- assert_has_tag('p input.large[type=file]', :id => 'user_photo', :name => 'user[photo]') { actual_html }
+ assert_html_has_tag(actual_html, 'p label', :for => 'user_photo', :content => "Photo: ")
+ assert_html_has_tag(actual_html, 'p input.large[type=file]', :id => 'user_photo', :name => 'user[photo]')
end
it 'should display correct file field block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
- assert_have_selector '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
+ assert_response_has_tag '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
end
it 'should display correct file field block in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
- assert_have_selector '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
+ assert_response_has_tag '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
end
it 'should display correct file field block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
- assert_have_selector '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_photo', :content => "Photo: "
+ assert_response_has_tag '#demo2 p input.upload', :type => 'file', :name => 'markup_user[photo]', :id => 'markup_user_photo'
end
end
describe 'for #check_box_block method' do
it 'should display correct check box block html' do
actual_html = standard_builder.check_box_block(:remember_me, :class => 'large', :caption => "Remember session?")
- assert_has_tag('p label', :for => 'user_remember_me', :content => "Remember session?") { actual_html }
- assert_has_tag('p input.large[type=checkbox]', :id => 'user_remember_me', :name => 'user[remember_me]') { actual_html }
+ assert_html_has_tag(actual_html, 'p label', :for => 'user_remember_me', :content => "Remember session?")
+ assert_html_has_tag(actual_html, 'p input.large[type=checkbox]', :id => 'user_remember_me', :name => 'user[remember_me]')
end
it 'should display correct check box block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
- assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
+ assert_response_has_tag '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
end
it 'should display correct check box block in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
- assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
+ assert_response_has_tag '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
end
it 'should display correct check box block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
- assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember me: "
+ assert_response_has_tag '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
end
end
describe 'for #select_block method' do
it 'should display correct select_block block html' do
actual_html = standard_builder.select_block(:country, :options => ['USA', 'Canada'], :class => 'large', :caption => "Your country")
- assert_has_tag('p label', :for => 'user_country', :content => "Your country") { actual_html }
- assert_has_tag('p select', :id => 'user_country', :name => 'user[country]') { actual_html }
- assert_has_tag('p select option', :content => 'USA') { actual_html }
- assert_has_tag('p select option', :content => 'Canada') { actual_html }
+ assert_html_has_tag(actual_html, 'p label', :for => 'user_country', :content => "Your country")
+ assert_html_has_tag(actual_html, 'p select', :id => 'user_country', :name => 'user[country]')
+ assert_html_has_tag(actual_html, 'p select option', :content => 'USA')
+ assert_html_has_tag(actual_html, 'p select option', :content => 'Canada')
end
it 'should display correct select_block block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_state', :content => "State: "
- assert_have_selector '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
- assert_have_selector '#demo2 p select option', :content => 'California'
- assert_have_selector '#demo2 p select option', :content => 'Texas'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_state', :content => "State: "
+ assert_response_has_tag '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
+ assert_response_has_tag '#demo2 p select option', :content => 'California'
+ assert_response_has_tag '#demo2 p select option', :content => 'Texas'
end
it 'should display correct select_block block in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_state', :content => "State: "
- assert_have_selector '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_state', :content => "State: "
+ assert_response_has_tag '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
end
it 'should display correct select_block block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p label', :for => 'markup_user_state', :content => "State: "
- assert_have_selector '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p label', :for => 'markup_user_state', :content => "State: "
+ assert_response_has_tag '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
end
end
describe 'for #submit_block method' do
it 'should display correct submit block html' do
actual_html = standard_builder.submit_block("Update", :class => 'large')
- assert_has_tag('p input.large[type=submit]', :value => 'Update') { actual_html }
+ assert_html_has_tag(actual_html, 'p input.large[type=submit]', :value => 'Update')
end
it 'should display correct submit block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p input', :type => 'submit', :class => 'button'
end
it 'should display correct submit block in erb' do
- visit '/erb/form_for'
- assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
+ get "/erb/form_for"
+ assert_response_has_tag '#demo2 p input', :type => 'submit', :class => 'button'
end
it 'should display correct submit block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p input', :type => 'submit', :class => 'button'
end
end
@@ -1200,17 +1203,255 @@ def standard_builder(object=@user)
it 'should display correct image submit block html' do
actual_html = standard_builder.image_submit_block("buttons/ok.png", :class => 'large')
- assert_has_tag('p input.large[type=image]', :src => "/images/buttons/ok.png?#{@stamp}") { actual_html }
+ assert_html_has_tag(actual_html, 'p input.large[type=image]', :src => "/images/buttons/ok.png?#{@stamp}")
end
it 'should display correct image submit block in haml' do
- visit '/haml/form_for'
- assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
+ get "/haml/form_for"
+ assert_response_has_tag '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
end
it 'should display correct image submit block in slim' do
- visit '/slim/form_for'
- assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
+ get "/slim/form_for"
+ assert_response_has_tag '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
+ end
+ end
+
+ describe 'for #datetime_field method' do
+ it 'should display correct datetime field html' do
+ actual_html = standard_builder.datetime_field(:datetime)
+ assert_html_has_tag(actual_html, 'input[type=datetime]', :id => 'user_datetime', :name => 'user[datetime]')
+ end
+
+ it 'should format DateTime to correct value if min and max and value options exist' do
+ max = DateTime.new(2000, 4, 1, 12, 0, 0)
+ min = DateTime.new(1993, 2, 24, 12, 30, 45)
+ value = DateTime.new(2000, 4, 1, 12, 0, 0)
+ actual_html = standard_builder.datetime_field(:datetime, :max => max, :min => min, :value => value)
+ expected = {
+ :id => 'user_datetime',
+ :max => "2000-04-01T12:00:00.000+0000",
+ :min => "1993-02-24T12:30:45.000+0000",
+ :value => "2000-04-01T12:00:00.000+0000"
+ }
+ assert_html_has_tag(actual_html, 'input[type=datetime]', expected)
+ end
+
+ it 'should display correct datetime field in haml' do
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=datetime]', :id => 'markup_user_datetime', :max => "2000-04-01T12:00:00.000+0000"
+ end
+
+ it 'should display correct datetime field in erb' do
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=datetime]', :id => 'markup_user_datetime', :max => "2000-04-01T12:00:00.000+0000"
+ end
+
+ it 'should display correct datetime field in slim' do
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=datetime]', :id => 'markup_user_datetime', :max => "2000-04-01T12:00:00.000+0000"
+ end
+ end
+
+ describe 'for #datetime_local_field method' do
+ it 'should display correct datetime-local field html' do
+ actual_html = standard_builder.datetime_local_field(:datetime_local)
+ assert_html_has_tag(actual_html, 'input[type=datetime-local]', :id => 'user_datetime_local', :name => 'user[datetime_local]')
+ end
+
+ it 'should format DateTime to correct value if min and max and value options exist' do
+ max = DateTime.new(2000, 4, 1, 12, 0, 0)
+ min = DateTime.new(1993, 2, 24, 12, 30, 45)
+ value = DateTime.new(2000, 4, 1, 12, 0, 0)
+ actual_html = standard_builder.datetime_local_field(:datetime_local, :max => max, :min => min, :value => value)
+ expected = {
+ :id => 'user_datetime_local',
+ :max => "2000-04-01T12:00:00",
+ :min => "1993-02-24T12:30:45",
+ :value => "2000-04-01T12:00:00"
+ }
+ assert_html_has_tag(actual_html, 'input[type=datetime-local]', expected)
+ end
+
+ it 'should display correct datetime-local field in haml' do
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=datetime-local]', :id => 'markup_user_datetime_local'
+ end
+
+ it 'should display correct datetime-local field in erb' do
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=datetime-local]', :id => 'markup_user_datetime_local'
+ end
+
+ it 'should display correct datetime-local field in slim' do
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=datetime-local]', :id => 'markup_user_datetime_local'
+ end
+ end
+
+ describe 'for #date_field method' do
+ it 'should display correct date field html' do
+ actual_html = standard_builder.date_field(:date)
+ assert_html_has_tag(actual_html, 'input[type=date]', :id => 'user_date', :name => 'user[date]')
+ end
+
+ it 'should format DateTime to correct value if min and max and value options exist' do
+ max = DateTime.new(2000, 4, 1)
+ min = DateTime.new(1993, 2, 24)
+ value = DateTime.new(2000, 4, 1)
+ actual_html = standard_builder.date_field(:date, :max => max, :min => min, :value => value)
+ expected = {
+ :id => 'user_date',
+ :max => "2000-04-01",
+ :min => "1993-02-24",
+ :value => "2000-04-01"
+ }
+ assert_html_has_tag(actual_html, 'input[type=date]', expected)
+ end
+
+ it 'should display correct date field in haml' do
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=date]', :id => 'markup_user_date'
+ end
+
+ it 'should display correct date field in erb' do
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=date]', :id => 'markup_user_date'
+ end
+
+ it 'should display correct date field in slim' do
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=date]', :id => 'markup_user_date'
+ end
+ end
+
+ describe 'for #month_field method' do
+ it 'should display correct month field html' do
+ actual_html = standard_builder.month_field(:month)
+ assert_html_has_tag(actual_html, 'input[type=month]', :id => 'user_month', :name => 'user[month]')
+ end
+
+ it 'should format DateTime to correct value if min and max and value options exist' do
+ max = DateTime.new(2000, 4, 1)
+ min = DateTime.new(1993, 2, 24)
+ value = DateTime.new(2000, 4, 1)
+ actual_html = standard_builder.month_field(:month, :max => max, :min => min, :value => value)
+ expected = {
+ :id => 'user_month',
+ :max => "2000-04",
+ :min => "1993-02",
+ :value => "2000-04"
+ }
+ assert_html_has_tag(actual_html, 'input[type=month]', expected)
+ end
+
+ it 'should display correct month field in haml' do
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=month]', :id => 'markup_user_month'
+ end
+
+ it 'should display correct month field in erb' do
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=month]', :id => 'markup_user_month'
+ end
+
+ it 'should display correct month field in slim' do
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=month]', :id => 'markup_user_month'
+ end
+ end
+
+ describe 'for #week_field method' do
+ it 'should display correct week field html' do
+ actual_html = standard_builder.week_field(:week)
+ assert_html_has_tag(actual_html, 'input[type=week]', :id => 'user_week', :name => 'user[week]')
+ end
+
+ it 'should format DateTime to correct value if min and max and value options exist' do
+ max = DateTime.new(2000, 4, 1)
+ min = DateTime.new(1993, 2, 24)
+ value = DateTime.new(2000, 4, 1)
+ actual_html = standard_builder.week_field(:week, :max => max, :min => min, :value => value)
+ expected = {
+ :id => 'user_week',
+ :max => "2000-W13",
+ :min => "1993-W08",
+ :value => "2000-W13"
+ }
+ assert_html_has_tag(actual_html, 'input[type=week]', expected)
+ end
+
+ it 'should display correct week field in haml' do
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=week]', :id => 'markup_user_week'
+ end
+
+ it 'should display correct week field in erb' do
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=week]', :id => 'markup_user_week'
+ end
+
+ it 'should display correct week field in slim' do
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=week]', :id => 'markup_user_week'
+ end
+ end
+
+ describe 'for #time_field method' do
+ it 'should display correct time field html' do
+ actual_html = standard_builder.time_field(:time)
+ assert_html_has_tag(actual_html, 'input[type=time]', :id => 'user_time', :name => 'user[time]')
+ end
+
+ it 'should format DateTime to correct value if min and max and value options exist' do
+ max = Time.new(2008, 6, 21, 13, 30, 0)
+ min = Time.new(1993, 2, 24, 1, 19, 12)
+ value = Time.new(2008, 6, 21, 13, 30, 0)
+ actual_html = standard_builder.time_field(:time, :max => max, :min => min, :value => value)
+ expected = {
+ :id => 'user_time',
+ :max => "13:30:00.000",
+ :min => "01:19:12.000",
+ :value => "13:30:00.000"
+ }
+ assert_html_has_tag(actual_html, 'input[type=time]', expected)
+ end
+
+ it 'should display correct time field in haml' do
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=time]', :id => 'markup_user_time'
+ end
+
+ it 'should display correct time field in erb' do
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=time]', :id => 'markup_user_time'
+ end
+
+ it 'should display correct time field in slim' do
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=time]', :id => 'markup_user_time'
+ end
+ end
+
+ describe 'for #color_field method' do
+ it 'should display correct color field html' do
+ actual_html = standard_builder.color_field(:color)
+ assert_html_has_tag(actual_html, 'input[type=color]', :id => 'user_color', :name => 'user[color]')
+ end
+
+ it 'should display correct color field in haml' do
+ get "/haml/form_for"
+ assert_response_has_tag '#demo input[type=color]', :id => 'markup_user_color', :value => "#ff0000"
+ end
+
+ it 'should display correct color field in erb' do
+ get "/erb/form_for"
+ assert_response_has_tag '#demo input[type=color]', :id => 'markup_user_color', :value => "#ff0000"
+ end
+
+ it 'should display correct color field in slim' do
+ get "/slim/form_for"
+ assert_response_has_tag '#demo input[type=color]', :id => 'markup_user_color', :value => "#ff0000"
end
end
end
diff --git a/padrino-helpers/test/test_form_helpers.rb b/padrino-helpers/test/test_form_helpers.rb
index 86ab8754f..76f7a75db 100644
--- a/padrino-helpers/test/test_form_helpers.rb
+++ b/padrino-helpers/test/test_form_helpers.rb
@@ -15,664 +15,665 @@ def protect_from_csrf; false; end
describe 'for #form_tag method' do
it 'should display correct forms in ruby' do
actual_html = form_tag('/register', :"accept-charset" => "UTF-8", :class => 'test', :method => "post") { "Demo" }
- assert_has_tag(:form, :"accept-charset" => "UTF-8", :class => "test") { actual_html }
- assert_has_tag('form input', :type => 'hidden', :name => '_method', :count => 0) { actual_html }
+ assert_html_has_tag(actual_html, :form, :"accept-charset" => "UTF-8", :class => "test")
+ assert_html_has_tag(actual_html, 'form input', :type => 'hidden', :name => '_method', :count => 0)
end
it 'should display correct text inputs within form_tag' do
actual_html = form_tag('/register', :"accept-charset" => "UTF-8", :class => 'test') { text_field_tag(:username) }
- assert_has_tag('form input', :type => 'text', :name => "username") { actual_html }
+ assert_html_has_tag(actual_html, 'form input', :type => 'text', :name => "username")
+ assert_html_has_no_tag(actual_html, 'form input', :type => 'hidden', :name => "_method")
end
it 'should display correct form with remote' do
actual_html = form_tag('/update', :"accept-charset" => "UTF-8", :class => 'put-form', :remote => true) { "Demo" }
- assert_has_tag(:form, :class => "put-form", :"accept-charset" => "UTF-8", :"data-remote" => 'true') { actual_html }
- assert_has_no_tag(:form, "data-method" => 'post') { actual_html }
+ assert_html_has_tag(actual_html, :form, :class => "put-form", :"accept-charset" => "UTF-8", :"data-remote" => 'true')
+ assert_html_has_no_tag(actual_html, :form, "data-method" => 'post')
end
it 'should display correct form with remote and method is put' do
actual_html = form_tag('/update', :"accept-charset" => "UTF-8", :method => 'put', :remote => true) { "Demo" }
- assert_has_tag(:form, "data-remote" => 'true', :"accept-charset" => "UTF-8") { actual_html }
- assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
+ assert_html_has_tag(actual_html, :form, "data-remote" => 'true', :"accept-charset" => "UTF-8")
+ assert_html_has_tag(actual_html, 'form input', :type => 'hidden', :name => "_method", :value => 'put')
end
it 'should display correct form with method :put' do
actual_html = form_tag('/update', :"accept-charset" => "UTF-8", :class => 'put-form', :method => "put") { "Demo" }
- assert_has_tag(:form, :class => "put-form", :"accept-charset" => "UTF-8", :method => 'post') { actual_html }
- assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
+ assert_html_has_tag(actual_html, :form, :class => "put-form", :"accept-charset" => "UTF-8", :method => 'post')
+ assert_html_has_tag(actual_html, 'form input', :type => 'hidden', :name => "_method", :value => 'put')
end
it 'should display correct form with method :delete and charset' do
actual_html = form_tag('/remove', :"accept-charset" => "UTF-8", :class => 'delete-form', :method => "delete") { "Demo" }
- assert_has_tag(:form, :class => "delete-form", :"accept-charset" => "UTF-8", :method => 'post') { actual_html }
- assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'delete') { actual_html }
+ assert_html_has_tag(actual_html, :form, :class => "delete-form", :"accept-charset" => "UTF-8", :method => 'post')
+ assert_html_has_tag(actual_html, 'form input', :type => 'hidden', :name => "_method", :value => 'delete')
end
it 'should display correct form with charset' do
actual_html = form_tag('/charset', :"accept-charset" => "UTF-8", :class => 'charset-form') { "Demo" }
- assert_has_tag(:form, :class => "charset-form", :"accept-charset" => "UTF-8", :method => 'post') { actual_html }
+ assert_html_has_tag(actual_html, :form, :class => "charset-form", :"accept-charset" => "UTF-8", :method => 'post')
end
it 'should display correct form with multipart encoding' do
actual_html = form_tag('/remove', :"accept-charset" => "UTF-8", :multipart => true) { "Demo" }
- assert_has_tag(:form, :enctype => "multipart/form-data") { actual_html }
+ assert_html_has_tag(actual_html, :form, :enctype => "multipart/form-data")
end
it 'should have an authenticity_token for method :post, :put or :delete' do
%w(post put delete).each do |method|
actual_html = form_tag('/modify', :method => method) { "Demo" }
- assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+ assert_html_has_tag(actual_html, :input, :name => 'authenticity_token')
end
end
it 'should not have an authenticity_token if method: :get' do
actual_html = form_tag('/get', :method => :get) { "Demo" }
- assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+ assert_html_has_no_tag(actual_html, :input, :name => 'authenticity_token')
end
it 'should have an authenticity_token by default' do
actual_html = form_tag('/superadmindelete') { "Demo" }
- assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+ assert_html_has_tag(actual_html, :input, :name => 'authenticity_token')
end
it 'should create csrf meta tags with token and param - #csrf_meta_tags' do
actual_html = csrf_meta_tags
- assert_has_tag(:meta, :name => 'csrf-param') { actual_html }
- assert_has_tag(:meta, :name => 'csrf-token') { actual_html }
+ assert_html_has_tag(actual_html, :meta, :name => 'csrf-param')
+ assert_html_has_tag(actual_html, :meta, :name => 'csrf-token')
end
it 'should have an authenticity_token by default' do
actual_html = form_tag('/superadmindelete') { "Demo" }
- assert_has_tag(:input, :name => 'authenticity_token') { actual_html }
+ assert_html_has_tag(actual_html, :input, :name => 'authenticity_token')
end
it 'should not have an authenticity_token if passing protect_from_csrf: false' do
actual_html = form_tag('/superadmindelete', :protect_from_csrf => false) { "Demo" }
- assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+ assert_html_has_no_tag(actual_html, :input, :name => 'authenticity_token')
end
it 'should not have an authenticity_token if protect_from_csrf is false on app settings' do
self.expects(:settings).returns(UnprotectedApp.new)
actual_html = form_tag('/superadmindelete') { "Demo" }
- assert_has_no_tag(:input, :name => 'authenticity_token') { actual_html }
+ assert_html_has_no_tag(actual_html, :input, :name => 'authenticity_token')
end
it 'should not include protect_from_csrf as an attribute of form element' do
actual_html = form_tag('/superadmindelete', :protect_from_csrf => true){ "Demo" }
- assert_has_no_tag(:form, protect_from_csrf: "true"){ actual_html }
+ assert_html_has_no_tag(actual_html, :form, protect_from_csrf: "true")
end
it 'should display correct forms in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form', :action => '/simple'
- assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
- assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
- assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form', :action => '/simple'
+ assert_response_has_tag 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
+ assert_response_has_tag 'form.simple-form input', :name => 'authenticity_token'
+ assert_response_has_no_tag 'form.no-protection input', :name => 'authenticity_token'
end
it 'should display correct forms in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form', :action => '/simple'
- assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
- assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
- assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form', :action => '/simple'
+ assert_response_has_tag 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
+ assert_response_has_tag 'form.simple-form input', :name => 'authenticity_token'
+ assert_response_has_no_tag 'form.no-protection input', :name => 'authenticity_token'
end
it 'should display correct forms in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form', :action => '/simple'
- assert_have_selector 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
- assert_have_selector 'form.simple-form input', :name => 'authenticity_token'
- assert_have_no_selector 'form.no-protection input', :name => 'authenticity_token'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form', :action => '/simple'
+ assert_response_has_tag 'form.advanced-form', :action => '/advanced', :id => 'advanced', :method => 'get'
+ assert_response_has_tag 'form.simple-form input', :name => 'authenticity_token'
+ assert_response_has_no_tag 'form.no-protection input', :name => 'authenticity_token'
end
end
describe 'for #field_set_tag method' do
it 'should display correct field_sets in ruby' do
actual_html = field_set_tag("Basic", :class => 'basic') { "Demo" }
- assert_has_tag(:fieldset, :class => 'basic') { actual_html }
- assert_has_tag('fieldset legend', :content => "Basic") { actual_html }
+ assert_html_has_tag(actual_html, :fieldset, :class => 'basic')
+ assert_html_has_tag(actual_html, 'fieldset legend', :content => "Basic")
end
it 'should display correct field_sets in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form fieldset', :count => 1
- assert_have_no_selector 'form.simple-form fieldset legend'
- assert_have_selector 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
- assert_have_selector 'form.advanced-form fieldset legend', :content => "Advanced"
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form fieldset', :count => 1
+ assert_response_has_no_tag 'form.simple-form fieldset legend'
+ assert_response_has_tag 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
+ assert_response_has_tag 'form.advanced-form fieldset legend', :content => "Advanced"
end
it 'should display correct field_sets in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form fieldset', :count => 1
- assert_have_no_selector 'form.simple-form fieldset legend'
- assert_have_selector 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
- assert_have_selector 'form.advanced-form fieldset legend', :content => "Advanced"
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form fieldset', :count => 1
+ assert_response_has_no_tag 'form.simple-form fieldset legend'
+ assert_response_has_tag 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
+ assert_response_has_tag 'form.advanced-form fieldset legend', :content => "Advanced"
end
it 'should display correct field_sets in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form fieldset', :count => 1
- assert_have_no_selector 'form.simple-form fieldset legend'
- assert_have_selector 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
- assert_have_selector 'form.advanced-form fieldset legend', :content => "Advanced"
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form fieldset', :count => 1
+ assert_response_has_no_tag 'form.simple-form fieldset legend'
+ assert_response_has_tag 'form.advanced-form fieldset', :count => 1, :class => 'advanced-field-set'
+ assert_response_has_tag 'form.advanced-form fieldset legend', :content => "Advanced"
end
end
describe 'for #error_messages_for method' do
it 'should display correct error messages list in ruby' do
- user = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+ user = mock_model("User", :errors => { :a => "1", :b => "2" })
actual_html = error_messages_for(user)
- assert_has_tag('div.field-errors') { actual_html }
- assert_has_tag('div.field-errors h2', :content => "2 errors prohibited this User from being saved") { actual_html }
- assert_has_tag('div.field-errors p', :content => "There were problems with the following fields:") { actual_html }
- assert_has_tag('div.field-errors ul') { actual_html }
- assert_has_tag('div.field-errors ul li', :count => 2) { actual_html }
+ assert_html_has_tag(actual_html, 'div.field-errors')
+ assert_html_has_tag(actual_html, 'div.field-errors h2', :content => "2 errors prohibited this User from being saved")
+ assert_html_has_tag(actual_html, 'div.field-errors p', :content => "There were problems with the following fields:")
+ assert_html_has_tag(actual_html, 'div.field-errors ul')
+ assert_html_has_tag(actual_html, 'div.field-errors ul li', :count => 2)
end
it 'should display correct error messages list in erb' do
- visit '/erb/form_tag'
- assert_have_no_selector 'form.simple-form .field-errors'
- assert_have_selector 'form.advanced-form .field-errors'
- assert_have_selector 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
- assert_have_selector 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
- assert_have_selector 'form.advanced-form .field-errors ul'
- assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
+ get "/erb/form_tag"
+ assert_response_has_no_tag 'form.simple-form .field-errors'
+ assert_response_has_tag 'form.advanced-form .field-errors'
+ assert_response_has_tag 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
+ assert_response_has_tag 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
+ assert_response_has_tag 'form.advanced-form .field-errors ul'
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :count => 4
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
end
it 'should display correct error messages list in haml' do
- visit '/haml/form_tag'
- assert_have_no_selector 'form.simple-form .field-errors'
- assert_have_selector 'form.advanced-form .field-errors'
- assert_have_selector 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
- assert_have_selector 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
- assert_have_selector 'form.advanced-form .field-errors ul'
- assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
+ get "/haml/form_tag"
+ assert_response_has_no_tag 'form.simple-form .field-errors'
+ assert_response_has_tag 'form.advanced-form .field-errors'
+ assert_response_has_tag 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
+ assert_response_has_tag 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
+ assert_response_has_tag 'form.advanced-form .field-errors ul'
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :count => 4
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
end
it 'should display correct error messages list in slim' do
- visit '/slim/form_tag'
- assert_have_no_selector 'form.simple-form .field-errors'
- assert_have_selector 'form.advanced-form .field-errors'
- assert_have_selector 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
- assert_have_selector 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
- assert_have_selector 'form.advanced-form .field-errors ul'
- assert_have_selector 'form.advanced-form .field-errors ul li', :count => 4
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Second must be present"
- assert_have_selector 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
+ get "/slim/form_tag"
+ assert_response_has_no_tag 'form.simple-form .field-errors'
+ assert_response_has_tag 'form.advanced-form .field-errors'
+ assert_response_has_tag 'form.advanced-form .field-errors h2', :content => "There are problems with saving user!"
+ assert_response_has_tag 'form.advanced-form .field-errors p', :content => "There were problems with the following fields:"
+ assert_response_has_tag 'form.advanced-form .field-errors ul'
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :count => 4
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Email must be an email"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Fake must be valid"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Second must be present"
+ assert_response_has_tag 'form.advanced-form .field-errors ul li', :content => "Third must be a number"
end
end
describe 'for #error_message_on method' do
it 'should display correct error message on specified model name in ruby' do
- @user = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+ @user = mock_model("User", :errors => { :a => "1", :b => "2" })
actual_html = error_message_on(:user, :a, :prepend => "foo", :append => "bar")
- assert_has_tag('span.error', :content => "foo 1 bar") { actual_html }
+ assert_html_has_tag(actual_html, 'span.error', :content => "foo 1 bar")
end
it 'should display correct error message on specified object in ruby' do
- @bob = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+ @bob = mock_model("User", :errors => { :a => "1", :b => "2" })
actual_html = error_message_on(@bob, :a, :prepend => "foo", :append => "bar")
- assert_has_tag('span.error', :content => "foo 1 bar") { actual_html }
+ assert_html_has_tag(actual_html, 'span.error', :content => "foo 1 bar")
end
it 'should display no message when error is not present' do
- @user = mock_model("User", :errors => { :a => "1", :b => "2" }, :blank? => false)
+ @user = mock_model("User", :errors => { :a => "1", :b => "2" })
actual_html = error_message_on(:user, :fake, :prepend => "foo", :append => "bar")
- assert actual_html.blank?
+ assert_empty actual_html
end
it 'should display no message when error is not present in an Array' do
- @user = mock_model("User", :errors => { :a => [], :b => "2" }, :blank? => false)
+ @user = mock_model("User", :errors => { :a => [], :b => "2" })
actual_html = error_message_on(:user, :a, :prepend => "foo", :append => "bar")
- assert actual_html.blank?
+ assert_empty actual_html
end
end
describe 'for #label_tag method' do
it 'should display label tag in ruby' do
actual_html = label_tag(:username, :class => 'long-label', :caption => "Nickname")
- assert_has_tag(:label, :for => 'username', :class => 'long-label', :content => "Nickname") { actual_html }
+ assert_html_has_tag(actual_html, :label, :for => 'username', :class => 'long-label', :content => "Nickname")
end
it 'should display label tag in ruby with required' do
actual_html = label_tag(:username, :caption => "Nickname", :required => true)
- assert_has_tag(:label, :for => 'username', :content => 'Nickname') { actual_html }
- assert_has_tag('label[for=username] span.required', :content => "*") { actual_html }
+ assert_html_has_tag(actual_html, :label, :for => 'username', :content => 'Nickname')
+ assert_html_has_tag(actual_html, 'label[for=username] span.required', :content => "*")
end
it 'should display label tag in ruby with a block' do
actual_html = label_tag(:admin, :class => 'long-label') { input_tag :checkbox }
- assert_has_tag(:label, :for => 'admin', :class => 'long-label', :content => "Admin") { actual_html }
- assert_has_tag('label input[type=checkbox]') { actual_html }
+ assert_html_has_tag(actual_html, :label, :for => 'admin', :class => 'long-label', :content => "Admin")
+ assert_html_has_tag(actual_html, 'label input[type=checkbox]')
end
it 'should display label tag in erb for simple form' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form label', :count => 9
- assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
- assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
- assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form label', :count => 9
+ assert_response_has_tag 'form.simple-form label', :content => "Username", :for => 'username'
+ assert_response_has_tag 'form.simple-form label', :content => "Password", :for => 'password'
+ assert_response_has_tag 'form.simple-form label', :content => "Gender", :for => 'gender'
end
it 'should display label tag in erb for advanced form' do
- visit '/erb/form_tag'
- assert_have_selector 'form.advanced-form label', :count => 11
- assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
- assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
- assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
- assert_have_selector 'form.advanced-form label.photo', :content => "Photo" , :for => 'photo'
- assert_have_selector 'form.advanced-form label.gender', :content => "Gender" , :for => 'gender'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.advanced-form label', :count => 11
+ assert_response_has_tag 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
+ assert_response_has_tag 'form.advanced-form label.first', :content => "Password", :for => 'password'
+ assert_response_has_tag 'form.advanced-form label.about', :content => "About Me", :for => 'about'
+ assert_response_has_tag 'form.advanced-form label.photo', :content => "Photo" , :for => 'photo'
+ assert_response_has_tag 'form.advanced-form label.gender', :content => "Gender" , :for => 'gender'
end
it 'should display label tag in haml for simple form' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form label', :count => 9
- assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
- assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
- assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form label', :count => 9
+ assert_response_has_tag 'form.simple-form label', :content => "Username", :for => 'username'
+ assert_response_has_tag 'form.simple-form label', :content => "Password", :for => 'password'
+ assert_response_has_tag 'form.simple-form label', :content => "Gender", :for => 'gender'
end
it 'should display label tag in haml for advanced form' do
- visit '/haml/form_tag'
- assert_have_selector 'form.advanced-form label', :count => 11
- assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
- assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
- assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
- assert_have_selector 'form.advanced-form label.photo', :content => "Photo" , :for => 'photo'
- assert_have_selector 'form.advanced-form label.gender', :content => "Gender" , :for => 'gender'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.advanced-form label', :count => 11
+ assert_response_has_tag 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
+ assert_response_has_tag 'form.advanced-form label.first', :content => "Password", :for => 'password'
+ assert_response_has_tag 'form.advanced-form label.about', :content => "About Me", :for => 'about'
+ assert_response_has_tag 'form.advanced-form label.photo', :content => "Photo" , :for => 'photo'
+ assert_response_has_tag 'form.advanced-form label.gender', :content => "Gender" , :for => 'gender'
end
it 'should display label tag in slim for simple form' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form label', :count => 9
- assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
- assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
- assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form label', :count => 9
+ assert_response_has_tag 'form.simple-form label', :content => "Username", :for => 'username'
+ assert_response_has_tag 'form.simple-form label', :content => "Password", :for => 'password'
+ assert_response_has_tag 'form.simple-form label', :content => "Gender", :for => 'gender'
end
it 'should display label tag in slim for advanced form' do
- visit '/slim/form_tag'
- assert_have_selector 'form.advanced-form label', :count => 11
- assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
- assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
- assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
- assert_have_selector 'form.advanced-form label.photo', :content => "Photo" , :for => 'photo'
- assert_have_selector 'form.advanced-form label.gender', :content => "Gender" , :for => 'gender'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.advanced-form label', :count => 11
+ assert_response_has_tag 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
+ assert_response_has_tag 'form.advanced-form label.first', :content => "Password", :for => 'password'
+ assert_response_has_tag 'form.advanced-form label.about', :content => "About Me", :for => 'about'
+ assert_response_has_tag 'form.advanced-form label.photo', :content => "Photo" , :for => 'photo'
+ assert_response_has_tag 'form.advanced-form label.gender', :content => "Gender" , :for => 'gender'
end
end
describe 'for #hidden_field_tag method' do
it 'should display hidden field in ruby' do
actual_html = hidden_field_tag(:session_key, :id => 'session_id', :value => '56768')
- assert_has_tag(:input, :type => 'hidden', :id => "session_id", :name => 'session_key', :value => '56768') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'hidden', :id => "session_id", :name => 'session_key', :value => '56768')
end
it 'should display hidden field in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
- assert_have_selector 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+ assert_response_has_tag 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
end
it 'should display hidden field in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
- assert_have_selector 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+ assert_response_has_tag 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
end
it 'should display hidden field in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
- assert_have_selector 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
+ assert_response_has_tag 'form.advanced-form input[type=hidden]', :count => 1, :name => 'session_id', :value => "__secret__"
end
end
describe 'for #text_field_tag method' do
it 'should display text field in ruby' do
actual_html = text_field_tag(:username, :class => 'long')
- assert_has_tag(:input, :type => 'text', :class => "long", :name => 'username') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'text', :class => "long", :name => 'username')
end
it 'should display text field in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form input[type=text]', :count => 1, :name => 'username'
- assert_have_selector 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=text]', :count => 1, :name => 'username'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
end
it 'should display text field in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form input[type=text]', :count => 1, :name => 'username'
- assert_have_selector 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=text]', :count => 1, :name => 'username'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
end
it 'should display text field in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form input[type=text]', :count => 1, :name => 'username'
- assert_have_selector 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=text]', :count => 1, :name => 'username'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=text]', :count => 1, :name => 'username', :id => 'the_username'
end
end
describe 'for #number_field_tag method' do
it 'should display number field in ruby' do
actual_html = number_field_tag(:age, :class => 'numeric')
- assert_has_tag(:input, :type => 'number', :class => 'numeric', :name => 'age') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'number', :class => 'numeric', :name => 'age')
end
it 'should display number field in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
- assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
end
it 'should display number field in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
- assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
end
it 'should display number field in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
- assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
end
end
describe 'for #telephone_field_tag method' do
it 'should display number field in ruby' do
actual_html = telephone_field_tag(:telephone, :class => 'numeric')
- assert_has_tag(:input, :type => 'tel', :class => 'numeric', :name => 'telephone') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'tel', :class => 'numeric', :name => 'telephone')
end
it 'should display telephone field in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
- assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
end
it 'should display telephone field in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
- assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
end
it 'should display telephone field in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
- assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
end
end
describe 'for #search_field_tag method' do
it 'should display search field in ruby' do
actual_html = search_field_tag(:search, :class => 'string')
- assert_has_tag(:input, :type => 'search', :class => 'string', :name => 'search') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'search', :class => 'string', :name => 'search')
end
it 'should display search field in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
- assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
end
it 'should display search field in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
- assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
end
it 'should display search field in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
- assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
end
end
describe 'for #email_field_tag method' do
it 'should display email field in ruby' do
actual_html = email_field_tag(:email, :class => 'string')
- assert_has_tag(:input, :type => 'email', :class => 'string', :name => 'email') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'email', :class => 'string', :name => 'email')
end
it 'should display email field in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
- assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
end
it 'should display email field in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
- assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
end
it 'should display email field in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
- assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
end
end
describe 'for #url_field_tag method' do
it 'should display url field in ruby' do
actual_html = url_field_tag(:webpage, :class => 'string')
- assert_has_tag(:input, :type => 'url', :class => 'string', :name => 'webpage') { actual_html }
+ assert_html_has_tag(actual_html, :input, :type => 'url', :class => 'string', :name => 'webpage')
end
it 'should display url field in erb' do
- visit '/erb/form_tag'
- assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
- assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+ get "/erb/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
end
it 'should display url field in haml' do
- visit '/haml/form_tag'
- assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
- assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+ get "/haml/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
end
it 'should display url field in slim' do
- visit '/slim/form_tag'
- assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
- assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+ get "/slim/form_tag"
+ assert_response_has_tag 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+ assert_response_has_tag 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
end
end
describe 'for #text_area_tag method' do
it 'should display text area in ruby' do
actual_html = text_area_tag(:about, :class => 'long')
- assert_has_tag(:textarea, :class => "long", :name => 'about') { actual_html }
+ assert_html_has_tag(actual_html, :textarea, :class => "long", :name => 'about')
end
it 'should display text area in ruby with specified content' do
actual_html = text_area_tag(:about, :value => "a test", :rows => 5, :cols => 6)
- assert_has_tag(:textarea, :content => "a test", :name => 'about', :rows => "5", :cols => "6") { actual_html }
+ assert_html_has_tag(actual_html, :textarea, :content => "a test", :name => 'about', :rows => "5", :cols => "6")
end
it 'should insert newline to before of content' do
- actual_html = text_area_tag(:about, :value => "\na test")
- assert_has_tag(:textarea, :content => "\na test", :name => 'about') { actual_html }
- assert_match(%r{hello<\\/p>\\n", js_escape_html("\n\r
hello
\r\n") - assert_equal "\\n\\nhello<\\/p>\\n", js_escape_html(ActiveSupport::SafeBuffer.new("\n\r
hello
\r\n")) + assert_equal "\\n\\nhello<\\/p>\\n", js_escape_html(SafeBuffer.new("\n\r
hello
\r\n")) end it 'should escape data-confirm attribute' do assert_equal "bar
', Foo.new.content_tag(:div, 'bar')
end
+
+ it 'should not overwrite default_builder setting' do
+ mock_app do
+ set :default_builder, 'FancyBuilder'
+ register Padrino::Helpers
+ end
+ assert_equal 'FancyBuilder', @app.default_builder
+ end
end
diff --git a/padrino-helpers/test/test_number_helpers.rb b/padrino-helpers/test/test_number_helpers.rb
index 55db4e8b2..16c1f46b1 100644
--- a/padrino-helpers/test/test_number_helpers.rb
+++ b/padrino-helpers/test/test_number_helpers.rb
@@ -28,7 +28,7 @@ def terabytes(number)
it 'should display number_to_currency' do
assert_equal "$1,234,567,890.50", number_to_currency(1234567890.50)
assert_equal "$1,234,567,890.51", number_to_currency(1234567890.506)
- assert_equal "$1,234,567,892", number_to_currency(1234567891.50, {:precision => 0})
+ assert_equal "$1,234,567,892", number_to_currency(1234567891.60, {:precision => 0})
assert_equal "$1,234,567,890.5", number_to_currency(1234567890.50, {:precision => 1})
assert_equal "£1234567890,50", number_to_currency(1234567890.50, {:unit => "£", :separator => ",", :delimiter => ""})
assert_equal "$1,234,567,890.50", number_to_currency("1234567890.50")
@@ -75,14 +75,12 @@ def terabytes(number)
it 'should display number_with_precision' do
assert_equal "111.235", number_with_precision(111.2346)
- assert_equal "31.83", number_with_precision(31.825, :precision => 2)
assert_equal "111.23", number_with_precision(111.2346, :precision => 2)
assert_equal "111.00", number_with_precision(111, :precision => 2)
assert_equal "111.235", number_with_precision("111.2346")
- assert_equal "31.83", number_with_precision("31.825", :precision => 2)
assert_equal "3268", number_with_precision((32.6751 * 100.00), :precision => 0)
- assert_equal "112", number_with_precision(111.50, :precision => 0)
- assert_equal "1234567892", number_with_precision(1234567891.50, :precision => 0)
+ assert_equal "112", number_with_precision(111.60, :precision => 0)
+ assert_equal "1234567892", number_with_precision(1234567891.60, :precision => 0)
# Return non-numeric params unchanged.
assert_equal "x", number_with_precision("x")
@@ -90,8 +88,8 @@ def terabytes(number)
end
it 'should display number_with_precision with custom delimiter and separator' do
- assert_equal '31,83', number_with_precision(31.825, :precision => 2, :separator => ',')
- assert_equal '1.231,83', number_with_precision(1231.825, :precision => 2, :separator => ',', :delimiter => '.')
+ assert_equal '31,83', number_with_precision(31.826, :precision => 2, :separator => ',')
+ assert_equal '1.231,83', number_with_precision(1231.826, :precision => 2, :separator => ',', :delimiter => '.')
end
it 'should display number_to_human_size' do
diff --git a/padrino-helpers/test/test_output_helpers.rb b/padrino-helpers/test/test_output_helpers.rb
index 6523c97a0..fc2531a3e 100644
--- a/padrino-helpers/test/test_output_helpers.rb
+++ b/padrino-helpers/test/test_output_helpers.rb
@@ -8,150 +8,150 @@ def app
describe 'for #content_for method' do
it 'should work for erb templates' do
- visit '/erb/content_for'
- assert_have_selector '.demo h1', :content => "This is content yielded from a content_for", :count => 1
- assert_have_selector '.demo2 h1', :content => "This is content yielded with name Johnny Smith", :count => 1
- assert_have_no_selector '.demo3 p', :content => "One", :class => "duplication"
- assert_have_selector '.demo3 p', :content => "Two", :class => "duplication"
+ get "/erb/content_for"
+ assert_response_has_tag '.demo h1', :content => "This is content yielded from a content_for", :count => 1
+ assert_response_has_tag '.demo2 h1', :content => "This is content yielded with name Johnny Smith", :count => 1
+ assert_response_has_no_tag '.demo3 p', :content => "One", :class => "duplication"
+ assert_response_has_tag '.demo3 p', :content => "Two", :class => "duplication"
end
it 'should work for haml templates' do
- visit '/haml/content_for'
- assert_have_selector '.demo h1', :content => "This is content yielded from a content_for", :count => 1
- assert_have_selector '.demo2 h1', :content => "This is content yielded with name Johnny Smith", :count => 1
- assert_have_no_selector '.demo3 p', :content => "One", :class => "duplication"
- assert_have_selector '.demo3 p', :content => "Two", :class => "duplication"
+ get "/haml/content_for"
+ assert_response_has_tag '.demo h1', :content => "This is content yielded from a content_for", :count => 1
+ assert_response_has_tag '.demo2 h1', :content => "This is content yielded with name Johnny Smith", :count => 1
+ assert_response_has_no_tag '.demo3 p', :content => "One", :class => "duplication"
+ assert_response_has_tag '.demo3 p', :content => "Two", :class => "duplication"
end
it 'should work for slim templates' do
- visit '/slim/content_for'
- assert_have_selector '.demo h1', :content => "This is content yielded from a content_for", :count => 1
- assert_have_selector '.demo2 h1', :content => "This is content yielded with name Johnny Smith", :count => 1
- assert_have_no_selector '.demo3 p', :content => "One", :class => "duplication"
- assert_have_selector '.demo3 p', :content => "Two", :class => "duplication"
+ get "/slim/content_for"
+ assert_response_has_tag '.demo h1', :content => "This is content yielded from a content_for", :count => 1
+ assert_response_has_tag '.demo2 h1', :content => "This is content yielded with name Johnny Smith", :count => 1
+ assert_response_has_no_tag '.demo3 p', :content => "One", :class => "duplication"
+ assert_response_has_tag '.demo3 p', :content => "Two", :class => "duplication"
end
end # content_for
describe "for #content_for? method" do
it 'should work for erb templates' do
- visit '/erb/content_for'
- assert_have_selector '.demo_has_content', :content => "true"
- assert_have_selector '.fake_has_content', :content => "false"
+ get "/erb/content_for"
+ assert_response_has_tag '.demo_has_content', :content => "true"
+ assert_response_has_tag '.fake_has_content', :content => "false"
end
it 'should work for haml templates' do
- visit '/haml/content_for'
- assert_have_selector '.demo_has_content', :content => "true"
- assert_have_selector '.fake_has_content', :content => "false"
+ get "/haml/content_for"
+ assert_response_has_tag '.demo_has_content', :content => "true"
+ assert_response_has_tag '.fake_has_content', :content => "false"
end
it 'should work for slim templates' do
- visit '/slim/content_for'
- assert_have_selector '.demo_has_content', :content => "true"
- assert_have_selector '.fake_has_content', :content => "false"
+ get "/slim/content_for"
+ assert_response_has_tag '.demo_has_content', :content => "true"
+ assert_response_has_tag '.fake_has_content', :content => "false"
end
end # content_for?
describe 'for #capture_html method' do
it 'should work for erb templates' do
- visit '/erb/capture_concat'
- assert_have_selector 'p span', :content => "Captured Line 1", :count => 1
- assert_have_selector 'p span', :content => "Captured Line 2", :count => 1
+ get "/erb/capture_concat"
+ assert_response_has_tag 'p span', :content => "Captured Line 1", :count => 1
+ assert_response_has_tag 'p span', :content => "Captured Line 2", :count => 1
end
it 'should work for haml templates' do
- visit '/haml/capture_concat'
- assert_have_selector 'p span', :content => "Captured Line 1", :count => 1
- assert_have_selector 'p span', :content => "Captured Line 2", :count => 1
+ get "/haml/capture_concat"
+ assert_response_has_tag 'p span', :content => "Captured Line 1", :count => 1
+ assert_response_has_tag 'p span', :content => "Captured Line 2", :count => 1
end
it 'should work for slim templates' do
- visit '/slim/capture_concat'
- assert_have_selector 'p span', :content => "Captured Line 1", :count => 1
- assert_have_selector 'p span', :content => "Captured Line 2", :count => 1
+ get "/slim/capture_concat"
+ assert_response_has_tag 'p span', :content => "Captured Line 1", :count => 1
+ assert_response_has_tag 'p span', :content => "Captured Line 2", :count => 1
end
end
describe 'for #concat_content method' do
it 'should work for erb templates' do
- visit '/erb/capture_concat'
- assert_have_selector 'p', :content => "Concat Line 3", :count => 1
+ get "/erb/capture_concat"
+ assert_response_has_tag 'p', :content => "Concat Line 3", :count => 1
end
it 'should work for haml templates' do
- visit '/haml/capture_concat'
- assert_have_selector 'p', :content => "Concat Line 3", :count => 1
+ get "/haml/capture_concat"
+ assert_response_has_tag 'p', :content => "Concat Line 3", :count => 1
end
it 'should work for slim templates' do
- visit '/slim/capture_concat'
- assert_have_selector 'p', :content => "Concat Line 3", :count => 1
+ get "/slim/capture_concat"
+ assert_response_has_tag 'p', :content => "Concat Line 3", :count => 1
end
end
describe 'for #block_is_template?' do
it 'should work for erb templates' do
- visit '/erb/capture_concat'
- assert_have_selector 'p', :content => "The erb block passed in is a template", :class => 'is_template', :count => 1
- assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template', :count => 1
+ get "/erb/capture_concat"
+ assert_response_has_tag 'p', :content => "The erb block passed in is a template", :class => 'is_template', :count => 1
+ assert_response_has_no_tag 'p', :content => "The ruby block passed in is a template", :class => 'is_template', :count => 1
end
it 'should work for haml templates' do
- visit '/haml/capture_concat'
- assert_have_selector 'p', :content => "The haml block passed in is a template", :class => 'is_template', :count => 1
- assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template', :count => 1
+ get "/haml/capture_concat"
+ assert_response_has_tag 'p', :content => "The haml block passed in is a template", :class => 'is_template', :count => 1
+ assert_response_has_no_tag 'p', :content => "The ruby block passed in is a template", :class => 'is_template', :count => 1
end
it 'should work for slim templates' do
- visit '/slim/capture_concat'
- assert_have_selector 'p', :content => "The slim block passed in is a template", :class => 'is_template', :count => 1
- assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template', :count => 1
+ get "/slim/capture_concat"
+ assert_response_has_tag 'p', :content => "The slim block passed in is a template", :class => 'is_template', :count => 1
+ assert_response_has_no_tag 'p', :content => "The ruby block passed in is a template", :class => 'is_template', :count => 1
end
end
describe 'for #current_engine method' do
it 'should detect correctly current engine for erb' do
- visit '/erb/current_engine'
- assert_have_selector 'p.start', :content => "erb"
- assert_have_selector 'p.haml', :content => "haml"
- assert_have_selector 'p.erb', :content => "erb"
- assert_have_selector 'p.slim', :content => "slim"
- assert_have_selector 'p.end', :content => "erb"
+ get "/erb/current_engine"
+ assert_response_has_tag 'p.start', :content => "erb"
+ assert_response_has_tag 'p.haml', :content => "haml"
+ assert_response_has_tag 'p.erb', :content => "erb"
+ assert_response_has_tag 'p.slim', :content => "slim"
+ assert_response_has_tag 'p.end', :content => "erb"
end
it 'should detect correctly current engine for haml' do
- visit '/haml/current_engine'
- assert_have_selector 'p.start', :content => "haml"
- assert_have_selector 'p.haml', :content => "haml"
- assert_have_selector 'p.erb', :content => "erb"
- assert_have_selector 'p.slim', :content => "slim"
- assert_have_selector 'p.end', :content => "haml"
+ get "/haml/current_engine"
+ assert_response_has_tag 'p.start', :content => "haml"
+ assert_response_has_tag 'p.haml', :content => "haml"
+ assert_response_has_tag 'p.erb', :content => "erb"
+ assert_response_has_tag 'p.slim', :content => "slim"
+ assert_response_has_tag 'p.end', :content => "haml"
end
it 'should detect correctly current engine for slim' do
- visit '/slim/current_engine'
- assert_have_selector 'p.start', :content => "slim"
- assert_have_selector 'p.haml', :content => "haml"
- assert_have_selector 'p.erb', :content => "erb"
- assert_have_selector 'p.slim', :content => "slim"
- assert_have_selector 'p.end', :content => "slim"
+ get "/slim/current_engine"
+ assert_response_has_tag 'p.start', :content => "slim"
+ assert_response_has_tag 'p.haml', :content => "haml"
+ assert_response_has_tag 'p.erb', :content => "erb"
+ assert_response_has_tag 'p.slim', :content => "slim"
+ assert_response_has_tag 'p.end', :content => "slim"
end
end
describe 'for #partial method in simple sinatra application' do
it 'should properly output in erb' do
- visit '/erb/simple_partial'
- assert_have_selector 'p.erb', :content => "erb"
+ get "/erb/simple_partial"
+ assert_response_has_tag 'p.erb', :content => "erb"
end
it 'should properly output in haml' do
- visit '/haml/simple_partial'
- assert_have_selector 'p.haml', :content => "haml"
+ get "/haml/simple_partial"
+ assert_response_has_tag 'p.haml', :content => "haml"
end
it 'should properly output in slim' do
- visit '/slim/simple_partial'
- assert_have_selector 'p.slim', :content => "slim"
+ get "/slim/simple_partial"
+ assert_response_has_tag 'p.slim', :content => "slim"
end
end
end
diff --git a/padrino-helpers/test/test_render_helpers.rb b/padrino-helpers/test/test_render_helpers.rb
index e06bef5ba..7f74d21e8 100644
--- a/padrino-helpers/test/test_render_helpers.rb
+++ b/padrino-helpers/test/test_render_helpers.rb
@@ -7,209 +7,268 @@ def app
end
describe 'for #partial method and object' do
- before { visit '/partial/object' }
+ before { get "/partial/object" }
it 'should render partial html with object' do
- assert_have_selector "h1", :content => "User name is John"
+ assert_response_has_tag "h1", :content => "User name is John"
end
it 'should have no counter index for single item' do
- assert_have_no_selector "p", :content => "My counter is 1", :count => 1
+ assert_response_has_no_tag "p", :content => "My counter is 1", :count => 1
end
it 'should include extra locals information' do
- assert_have_selector 'p', :content => "Extra is bar"
+ assert_response_has_tag 'p', :content => "Extra is bar"
end
end
describe 'for #partial method and collection' do
- before { visit '/partial/collection' }
+ before { get "/partial/collection" }
it 'should render partial html with collection' do
- assert_have_selector "h1", :content => "User name is John"
- assert_have_selector "h1", :content => "User name is Billy"
+ assert_response_has_tag "h1", :content => "User name is John"
+ assert_response_has_tag "h1", :content => "User name is Billy"
end
it 'should include counter which contains item index' do
- assert_have_selector "p", :content => "My counter is 1"
- assert_have_selector "p", :content => "My counter is 2"
+ assert_response_has_tag "p", :content => "My counter is 1"
+ assert_response_has_tag "p", :content => "My counter is 2"
end
it 'should include extra locals information' do
- assert_have_selector 'p', :content => "Extra is bar"
+ assert_response_has_tag 'p', :content => "Extra is bar"
end
end
describe 'for #partial with ext and collection' do
- before { visit '/partial/collection.ext' }
+ before { get "/partial/collection.ext" }
it 'should not fail horribly with `invalid locals key` RuntimeError' do
- assert_have_selector "h1", :content => "User name is John"
+ assert_response_has_tag "h1", :content => "User name is John"
end
end
describe 'for #partial method and locals' do
- before { visit '/partial/locals' }
+ before { get "/partial/locals" }
it 'should render partial html with locals' do
- assert_have_selector "h1", :content => "User name is John"
+ assert_response_has_tag "h1", :content => "User name is John"
end
it 'should have no counter index for single item' do
- assert_have_no_selector "p", :content => "My counter is 1", :count => 1
+ assert_response_has_no_tag "p", :content => "My counter is 1", :count => 1
end
it 'should include extra locals information' do
- assert_have_selector 'p', :content => "Extra is bar"
+ assert_response_has_tag 'p', :content => "Extra is bar"
end
end
describe 'for #partial method taking a path starting with forward slash' do
- before { visit '/partial/foward_slash' }
+ before { get "/partial/foward_slash" }
it 'should render partial without throwing an error' do
- assert_have_selector "h1", :content => "User name is John"
+ assert_response_has_tag "h1", :content => "User name is John"
end
end
describe 'for #partial method with unsafe engine' do
it 'should render partial without escaping it' do
- visit '/partial/unsafe'
- assert_have_selector "h1", :content => "User name is John"
+ get "/partial/unsafe"
+ assert_response_has_tag "h1", :content => "User name is John"
end
it 'should render partial object without escaping it' do
- visit '/partial/unsafe_one'
- assert_have_selector "h1", :content => "User name is Mary"
+ get "/partial/unsafe_one"
+ assert_response_has_tag "h1", :content => "User name is Mary"
end
it 'should render partial collection without escaping it' do
- visit '/partial/unsafe_many'
- assert_have_selector "h1", :content => "User name is John"
- assert_have_selector "h1", :content => "User name is Mary"
+ get "/partial/unsafe_many"
+ assert_response_has_tag "h1", :content => "User name is John"
+ assert_response_has_tag "h1", :content => "User name is Mary"
end
it 'should render unsafe partial without escaping it' do
- visit '/partial/unsafe?block=%3Cevil%3E'
- assert_have_selector "h1", :content => "User name is John"
- assert_have_selector "evil"
+ get "/partial/unsafe?block=%3Cevil%3E"
+ assert_response_has_tag "h1", :content => "User name is John"
+ assert_response_has_tag "evil"
end
it 'should render unsafe partial object without escaping it' do
- visit '/partial/unsafe_one?block=%3Cevil%3E'
- assert_have_selector "h1", :content => "User name is Mary"
- assert_have_selector "evil"
+ get "/partial/unsafe_one?block=%3Cevil%3E"
+ assert_response_has_tag "h1", :content => "User name is Mary"
+ assert_response_has_tag "evil"
end
it 'should render unsafe partial collection without escaping it' do
- visit '/partial/unsafe_many?block=%3Cevil%3E'
- assert_have_selector "h1", :content => "User name is John"
- assert_have_selector "h1", :content => "User name is Mary"
- assert_have_selector "evil"
+ get "/partial/unsafe_many?block=%3Cevil%3E"
+ assert_response_has_tag "h1", :content => "User name is John"
+ assert_response_has_tag "h1", :content => "User name is Mary"
+ assert_response_has_tag "evil"
end
end
describe 'render with block' do
it 'should render slim with block' do
- visit '/render_block_slim'
- assert_have_selector 'h1', :content => 'prefix'
- assert_have_selector 'h3', :content => 'postfix'
- assert_have_selector '.slim-block'
- assert_have_selector 'div', :content => 'go block!'
+ get "/render_block_slim"
+ assert_response_has_tag 'h1', :content => 'prefix'
+ assert_response_has_tag 'h3', :content => 'postfix'
+ assert_response_has_tag '.slim-block'
+ assert_response_has_tag 'div', :content => 'go block!'
end
it 'should render erb with block' do
- visit '/render_block_erb'
- assert_have_selector 'h1', :content => 'prefix'
- assert_have_selector 'h3', :content => 'postfix'
- assert_have_selector '.erb-block'
- assert_have_selector 'div', :content => 'go block!'
+ get "/render_block_erb"
+ assert_response_has_tag 'h1', :content => 'prefix'
+ assert_response_has_tag 'h3', :content => 'postfix'
+ assert_response_has_tag '.erb-block'
+ assert_response_has_tag 'div', :content => 'go block!'
end
it 'should render haml with block' do
- visit '/render_block_haml'
- assert_have_selector 'h1', :content => 'prefix'
- assert_have_selector 'h3', :content => 'postfix'
- assert_have_selector '.haml-block'
- assert_have_selector 'div', :content => 'go block!'
+ get "/render_block_haml"
+ assert_response_has_tag 'h1', :content => 'prefix'
+ assert_response_has_tag 'h3', :content => 'postfix'
+ assert_response_has_tag '.haml-block'
+ assert_response_has_tag 'div', :content => 'go block!'
end
end
describe 'partial with block' do
it 'should show partial slim with block' do
- visit '/partial_block_slim'
- assert_have_selector 'h1', :content => 'prefix'
- assert_have_selector 'h3', :content => 'postfix'
- assert_have_selector '.slim-block'
- assert_have_selector 'div', :content => 'go block!'
- assert_have_selector 'div.deep', :content => 'Done'
+ get "/partial_block_slim"
+ assert_response_has_tag 'h1', :content => 'prefix'
+ assert_response_has_tag 'h3', :content => 'postfix'
+ assert_response_has_tag '.slim-block'
+ assert_response_has_tag 'div', :content => 'go block!'
+ assert_response_has_tag 'div.deep', :content => 'Done'
end
it 'should show partial erb with block' do
- visit '/partial_block_erb'
- assert_have_selector 'h1', :content => 'prefix'
- assert_have_selector 'h3', :content => 'postfix'
- assert_have_selector '.erb-block'
- assert_have_selector 'div', :content => 'go block!'
- assert_have_selector 'div.deep', :content => 'Done'
+ get "/partial_block_erb"
+ assert_response_has_tag 'h1', :content => 'prefix'
+ assert_response_has_tag 'h3', :content => 'postfix'
+ assert_response_has_tag '.erb-block'
+ assert_response_has_tag 'div', :content => 'go block!'
+ assert_response_has_tag 'div.deep', :content => 'Done'
end
it 'should show partial haml with block' do
- visit '/partial_block_haml'
- assert_have_selector 'h1', :content => 'prefix'
- assert_have_selector 'h3', :content => 'postfix'
- assert_have_selector '.haml-block'
- assert_have_selector 'div', :content => 'go block!'
- assert_have_selector 'div.deep', :content => 'Done'
+ get "/partial_block_haml"
+ assert_response_has_tag 'h1', :content => 'prefix'
+ assert_response_has_tag 'h3', :content => 'postfix'
+ assert_response_has_tag '.haml-block'
+ assert_response_has_tag 'div', :content => 'go block!'
+ assert_response_has_tag 'div.deep', :content => 'Done'
end
end
describe 'for #current_engine method' do
it 'should detect correctly current engine for a padrino application' do
- visit '/current_engine'
- assert_have_selector 'p.start', :content => "haml"
- assert_have_selector 'p.haml span', :content => "haml"
- assert_have_selector 'p.erb span', :content => "erb"
- assert_have_selector 'p.slim span', :content => "slim"
- assert_have_selector 'p.end', :content => "haml"
+ get "/current_engine"
+ assert_response_has_tag 'p.start', :content => "haml"
+ assert_response_has_tag 'p.haml span', :content => "haml"
+ assert_response_has_tag 'p.erb span', :content => "erb"
+ assert_response_has_tag 'p.slim span', :content => "slim"
+ assert_response_has_tag 'p.end', :content => "haml"
end
it 'should detect correctly current engine for explicit engine on partials' do
- visit '/explicit_engine'
- assert_have_selector 'p.start', :content => "haml"
- assert_have_selector 'p.haml span', :content => "haml"
- assert_have_selector 'p.erb span', :content => "erb"
- assert_have_selector 'p.slim span', :content => "slim"
- assert_have_selector 'p.end', :content => "haml"
+ get "/explicit_engine"
+ assert_response_has_tag 'p.start', :content => "haml"
+ assert_response_has_tag 'p.haml span', :content => "haml"
+ assert_response_has_tag 'p.erb span', :content => "erb"
+ assert_response_has_tag 'p.slim span', :content => "slim"
+ assert_response_has_tag 'p.end', :content => "haml"
end
it 'should capture slim template once and only once' do
$number_of_captures = 0
- visit '/double_capture_slim'
+ get "/double_capture_slim"
assert_equal 1,$number_of_captures
end
it 'should capture haml template once and only once' do
$number_of_captures = 0
- visit '/double_capture_haml'
+ get "/double_capture_haml"
assert_equal 1,$number_of_captures
end
it 'should capture erb template once and only once' do
$number_of_captures = 0
- visit '/double_capture_erb'
+ get "/double_capture_erb"
assert_equal 1,$number_of_captures
end
it 'should fail on wrong erb usage' do
assert_raises(SyntaxError) do
- visit '/wrong_capture_erb'
+ get "/wrong_capture_erb"
end
end
it 'should ignore wrong haml usage' do
- visit '/wrong_capture_haml'
- assert_have_no_selector 'p', :content => 'this is wrong'
+ get "/wrong_capture_haml"
+ assert_response_has_no_tag 'p', :content => 'this is wrong'
end
it 'should ignore wrong slim usage' do
- visit '/wrong_capture_slim'
- assert_have_no_selector 'p', :content => 'this is wrong'
+ get "/wrong_capture_slim"
+ assert_response_has_no_tag 'p', :content => 'this is wrong'
end
it 'should support weird ruby blocks in erb' do
- visit '/ruby_block_capture_erb'
- assert_have_selector 'b', :content => 'c'
+ get "/ruby_block_capture_erb"
+ assert_response_has_tag 'b', :content => 'c'
end
it 'should support weird ruby blocks in haml' do
- visit '/ruby_block_capture_haml'
- assert_have_selector 'b', :content => 'c'
+ get "/ruby_block_capture_haml"
+ assert_response_has_tag 'b', :content => 'c'
end
it 'should support weird ruby blocks in slim' do
- visit '/ruby_block_capture_slim'
- assert_have_selector 'b', :content => 'c'
+ get "/ruby_block_capture_slim"
+ assert_response_has_tag 'b', :content => 'c'
+ end
+ end
+
+ describe 'standalone partial rendering' do
+ it 'should properly render without Sinatra::Base or Padrino::Application' do
+ class Standalone
+ include Padrino::Helpers::RenderHelpers
+ end
+ locals = { :user => OpenStruct.new(:name => 'Joe') }
+ result = Standalone.new.partial(File.join(File.dirname(__FILE__), 'fixtures/render_app/views/template/user'), :engine => :haml, :locals => locals)
+ assert_equal 'User name is Joe
', result.chomp + end + + it 'should pass class context to renderer' do + class Standalone1 + include Padrino::Helpers::RenderHelpers + def user + OpenStruct.new(:name => 'Jane') + end + end + + result = Standalone1.new.partial(File.join(File.dirname(__FILE__), 'fixtures/render_app/views/template/user.haml')) + assert_equal 'User name is Jane
', result.chomp + end + + it 'should fail on missing template' do + class Standalone2 + include Padrino::Helpers::RenderHelpers + end + assert_raises RuntimeError do + result = Standalone2.new.partial('none') + end + end + + it 'should not override existing render methods' do + class Standalone3 + def render(*) + 'existing' + end + include Padrino::Helpers::RenderHelpers + end + assert_equal 'existing', Standalone3.new.partial('none') + end + + it 'should not add "./" to partial template name' do + class Standalone4 + def render(_, file, *) + file.to_s + end + include Padrino::Helpers::RenderHelpers + end + assert_equal '_none', Standalone4.new.partial('none') + end + end + + describe 'partial in an application with layout' do + it 'should not render with default layout' do + get '/' + assert_response_has_tag 'body', :count => 1 end end end diff --git a/padrino-helpers/test/test_rendering.rb b/padrino-helpers/test/test_rendering.rb index 1094a5f64..3f0b85719 100644 --- a/padrino-helpers/test/test_rendering.rb +++ b/padrino-helpers/test/test_rendering.rb @@ -1,5 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/helper') require 'slim' +require 'liquid' describe "Rendering" do def setup @@ -87,6 +88,26 @@ def teardown assert_equal "js file", body end + it 'should set and restore layout in controllers' do + create_layout :boo, "boo is a <%= yield %>" + create_layout :moo, "moo is a <%= yield %>" + create_view :foo, "liquid file", :format => :liquid + mock_app do + layout :boo + controller :moo do + layout :moo + get('/liquid') { render :foo } + end + controller :boo do + get('/liquid') { render :foo } + end + end + get "/moo/liquid" + assert_equal "moo is a liquid file", body + get "/boo/liquid" + assert_equal "boo is a liquid file", body + end + it 'should use correct layout for each format' do create_layout :application, "this is an <%= yield %>" create_layout :application, "document start <%= yield %> end", :format => :xml @@ -116,6 +137,32 @@ def teardown assert_equal "html file", body end + it 'should find proper templates when content_type is set by string' do + create_layout :error, "layout<%= yield %>" + create_view :e404, "404 file" + + mock_app do + not_found do + content_type 'text/html' + render 'e404', :layout => :error + end + end + get '/missing' + assert_equal 'layout404 file', body + end + + it 'should work with set content type not contained in rack-types' do + create_view "index.md.erb", "Hello" + mock_app do + get("/") { + content_type "text/x-markdown; charset=UTF-8" + render "index.erb", { :layout => nil } + } + end + get "/" + assert_equal "Hello", body + end + it 'should not use html file when DEFAULT_RENDERING_OPTIONS[:strict_format] == true' do create_layout :foo, "html file", :format => :html @@ -537,12 +584,14 @@ def teardown it 'should renders erb with blocks' do mock_app do - def container - @_out_buf << "THIS." - yield - @_out_buf << "SPARTA!" + helpers do + def container + @_out_buf << "THIS." + yield + @_out_buf << "SPARTA!" + end + def is; "IS."; end end - def is; "IS."; end get '/' do render :erb, '<% container do %> <%= is %> <% end %>' end @@ -573,6 +622,23 @@ def is; "IS."; end assert_equal 'this is a span', body end + it 'should render unescaped html on == token (Erubis and Erubi)' do + skip if ENV['ERB_ENGINE'] == 'stdlib' + mock_app do + layout do + "<%= yield %>" + end + + get "/" do + render :erb, '<%== "" %>' + end + end + + get "/" + assert ok? + assert_equal "", body + end + it 'should render haml to a SafeBuffer' do mock_app do layout do @@ -640,7 +706,7 @@ class Bar < Sinatra::Base class Application < Sinatra::Base register Padrino::Rendering get '/' do - render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog' + render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog' end end @app = Application.new @@ -691,4 +757,24 @@ class Application < Sinatra::Base end end end + + describe 'sinatra template helpers' do + it "should respect default_content_type option defined by sinatra" do + mock_app do + get(:index){ builder "xml.foo" } + end + get '/' + assert_equal "application/xml;charset=utf-8", response['Content-Type'] + end + end + + describe 'rendering with helpers that use render' do + %W{erb haml slim}.each do |engine| + it "should work with #{engine}" do + @app = RenderDemo + get "/double_dive_#{engine}" + assert_response_has_tag '.outer .wrapper form .inner .core' + end + end + end end diff --git a/padrino-helpers/test/test_rendering_extensions.rb b/padrino-helpers/test/test_rendering_extensions.rb index 25a3d31be..1012ac494 100644 --- a/padrino-helpers/test/test_rendering_extensions.rb +++ b/padrino-helpers/test/test_rendering_extensions.rb @@ -3,6 +3,8 @@ describe "Rendering Extensions" do describe 'for haml' do it 'should render haml_tag correctly' do + skip unless Padrino::Helpers::OutputHelpers.handlers[:haml].to_s == "Padrino::Helpers::OutputHelpers::HamlHandler" + mock_app do get('/') { render :haml, '-haml_tag :div'} end diff --git a/padrino-helpers/test/test_tag_helpers.rb b/padrino-helpers/test/test_tag_helpers.rb index b92a9204d..9fc439464 100644 --- a/padrino-helpers/test/test_tag_helpers.rb +++ b/padrino-helpers/test/test_tag_helpers.rb @@ -8,27 +8,29 @@ def app describe 'for #tag method' do it 'should support tags with no content no attributes' do - assert_has_tag(:br) { tag(:br) } + assert_html_has_tag(tag(:br), :br) end it 'should support tags with no content with attributes' do actual_html = tag(:br, :style => 'clear:both', :class => 'yellow') - assert_has_tag(:br, :class => 'yellow', :style=>'clear:both') { actual_html } + assert_html_has_tag(actual_html, :br, :class => 'yellow', :style=>'clear:both') end it 'should support selected attribute by using "selected" if true' do actual_html = tag(:option, :selected => true) - assert_has_tag('option', :selected => 'selected') { actual_html } + # fix nokogiri 1.6.8 on jRuby + actual_html = content_tag(:select, actual_html) + assert_html_has_tag(actual_html, 'option', :selected => 'selected') end it 'should support data attributes' do actual_html = tag(:a, :data => { :remote => true, :method => 'post'}) - assert_has_tag(:a, 'data-remote' => 'true', 'data-method' => 'post') { actual_html } + assert_html_has_tag(actual_html, :a, 'data-remote' => 'true', 'data-method' => 'post') end it 'should support nested attributes' do actual_html = tag(:div, :data => {:dojo => {:type => 'dijit.form.TextBox', :props => 'readOnly: true'}}) - assert_has_tag(:div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true') { actual_html } + assert_html_has_tag(actual_html, :div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true') end it 'should support open tags' do @@ -40,92 +42,102 @@ def app actual_html = tag(:br, :class => 'Example", actual_html end + + it 'should allow array as attributes' do + actual_html = tag(:p, :class => [:foo, :bar]) + assert_html_has_tag(actual_html, 'p.foo.bar') + end + + it 'should allow array as nested attributes' do + actual_html = tag(:p, :data => { :foo => [:bar, :baz] }) + assert_html_has_tag(actual_html, 'p', :'data-foo' => 'bar baz') + end end describe 'for #content_tag method' do it 'should support tags with content as parameter' do actual_html = content_tag(:p, "Demo", :class => 'large', :id => 'thing') - assert_has_tag('p.large#thing', :content => "Demo") { actual_html } + assert_html_has_tag(actual_html, 'p.large#thing', :content => "Demo") end it 'should support tags with content as block' do actual_html = content_tag(:p, :class => 'large', :id => 'star') { "Demo" } - assert_has_tag('p.large#star', :content => "Demo") { actual_html } + assert_html_has_tag(actual_html, 'p.large#star', :content => "Demo") end it 'should escape non-html-safe content' do actual_html = content_tag(:p, :class => 'large', :id => 'star') { "<>" } - assert_has_tag('p.large#star') { actual_html } + assert_html_has_tag(actual_html, 'p.large#star') assert_match('<>', actual_html) end it 'should not escape html-safe content' do actual_html = content_tag(:p, :class => 'large', :id => 'star') { "<>" } - assert_has_tag('p.large#star', :content => "<>") { actual_html } + assert_html_has_tag(actual_html, 'p.large#star', :content => "<>") end it 'should convert to a string if the content is not a string' do actual_html = content_tag(:p, 97) - assert_has_tag('p', :content => "97") { actual_html } + assert_html_has_tag(actual_html, 'p', :content => "97") end it 'should support tags with erb' do - visit '/erb/content_tag' - assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1' - assert_have_selector :p, :content => "Test 2" - assert_have_selector :p, :content => "Test 3" - assert_have_selector :p, :content => "Test 4" - assert_have_selector :p, :content => "one" - assert_have_selector :p, :content => "two" - assert_have_no_selector :p, :content => "failed" + get "/erb/content_tag" + assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1' + assert_response_has_tag :p, :content => "Test 2" + assert_response_has_tag :p, :content => "Test 3" + assert_response_has_tag :p, :content => "Test 4" + assert_response_has_tag :p, :content => "one" + assert_response_has_tag :p, :content => "two" + assert_response_has_no_tag :p, :content => "failed" end it 'should support tags with haml' do - visit '/haml/content_tag' - assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1' - assert_have_selector :p, :content => "Test 2" - assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3' - assert_have_selector :p, :content => "Test 4" - assert_have_selector :p, :content => "one" - assert_have_selector :p, :content => "two" - assert_have_no_selector :p, :content => "failed" + get "/haml/content_tag" + assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1' + assert_response_has_tag :p, :content => "Test 2" + assert_response_has_tag :p, :content => "Test 3", :class => 'test', :id => 'test3' + assert_response_has_tag :p, :content => "Test 4" + assert_response_has_tag :p, :content => "one" + assert_response_has_tag :p, :content => "two" + assert_response_has_no_tag :p, :content => "failed" end it 'should support tags with slim' do - visit '/slim/content_tag' - assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1' - assert_have_selector :p, :content => "Test 2" - assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3' - assert_have_selector :p, :content => "Test 4" - assert_have_selector :p, :content => "one" - assert_have_selector :p, :content => "two" - assert_have_no_selector :p, :content => "failed" + get "/slim/content_tag" + assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1' + assert_response_has_tag :p, :content => "Test 2" + assert_response_has_tag :p, :content => "Test 3", :class => 'test', :id => 'test3' + assert_response_has_tag :p, :content => "Test 4" + assert_response_has_tag :p, :content => "one" + assert_response_has_tag :p, :content => "two" + assert_response_has_no_tag :p, :content => "failed" end end describe 'for #input_tag method' do it 'should support field with type' do - assert_has_tag('input[type=text]') { input_tag(:text) } + assert_html_has_tag(input_tag(:text), 'input[type=text]') end it 'should support field with type and options' do actual_html = input_tag(:text, :class => "first", :id => 'texter') - assert_has_tag('input.first#texter[type=text]') { actual_html } + assert_html_has_tag(actual_html, 'input.first#texter[type=text]') end it 'should support checked attribute by using "checked" if true' do actual_html = input_tag(:checkbox, :checked => true) - assert_has_tag('input[type=checkbox]', :checked => 'checked') { actual_html } + assert_html_has_tag(actual_html, 'input[type=checkbox]', :checked => 'checked') end it 'should remove checked attribute if false' do actual_html = input_tag(:checkbox, :checked => false) - assert_has_no_tag('input[type=checkbox][checked=false]') { actual_html } + assert_html_has_no_tag(actual_html, 'input[type=checkbox][checked=false]') end it 'should support disabled attribute by using "disabled" if true' do actual_html = input_tag(:checkbox, :disabled => true) - assert_has_tag('input[type=checkbox]', :disabled => 'disabled') { actual_html } + assert_html_has_tag(actual_html, 'input[type=checkbox]', :disabled => 'disabled') end end end diff --git a/padrino-mailer/README.rdoc b/padrino-mailer/README.rdoc index 50dfbe935..49aa99bc8 100644 --- a/padrino-mailer/README.rdoc +++ b/padrino-mailer/README.rdoc @@ -98,8 +98,8 @@ Once the mailer definition has been completed and the template has been defined, And that will then deliver the email according the configured options. This is all you need to send basic emails. The mailer also supports the attachment of files and various other options. Be sure to check out the -{Padrino Mailer}[http://www.padrinorb.com/guides/padrino-mailer] guide for more details on usage. +{Padrino Mailer}[http://padrinorb.com/guides/features/padrino-mailer/] guide for more details on usage. == Copyright -Copyright (c) 2011-2013 Padrino. See LICENSE for details. +Copyright (c) 2011-2015 Padrino. See LICENSE for details. diff --git a/padrino-mailer/Rakefile b/padrino-mailer/Rakefile index 0ee302aac..da75d43e2 100644 --- a/padrino-mailer/Rakefile +++ b/padrino-mailer/Rakefile @@ -1,5 +1 @@ -# encoding: utf-8 -RAKE_ROOT = __FILE__ - -require 'rubygems' require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') diff --git a/padrino-mailer/lib/padrino-mailer.rb b/padrino-mailer/lib/padrino-mailer.rb index 2643f7606..46ef4d809 100644 --- a/padrino-mailer/lib/padrino-mailer.rb +++ b/padrino-mailer/lib/padrino-mailer.rb @@ -42,7 +42,6 @@ def registered(app) require 'padrino-mailer/mime' # This lazily loads the mail gem, due to its long require time. app.set :_padrino_mailer, proc { - require 'mail' require 'padrino-mailer/ext' app._padrino_mailer = Mail } diff --git a/padrino-mailer/lib/padrino-mailer/base.rb b/padrino-mailer/lib/padrino-mailer/base.rb index f69b55a12..ede32eb73 100644 --- a/padrino-mailer/lib/padrino-mailer/base.rb +++ b/padrino-mailer/lib/padrino-mailer/base.rb @@ -81,9 +81,11 @@ def initialize(app, name, &block) # end # def email(name, &block) - raise "The email '#{name}' is already defined" if self.messages[name].present? + raise "The email '#{name}' is already defined" if self.messages[name] self.messages[name] = Proc.new { |*attrs| message = app.settings._padrino_mailer::Message.new(self.app) + message.mailer_name = mailer_name + message.message_name = name message.defaults = self.defaults if self.defaults.any? message.delivery_method(*delivery_settings) message.instance_exec(*attrs, &block) diff --git a/padrino-mailer/lib/padrino-mailer/ext.rb b/padrino-mailer/lib/padrino-mailer/ext.rb index 23cc97edf..9789aa184 100644 --- a/padrino-mailer/lib/padrino-mailer/ext.rb +++ b/padrino-mailer/lib/padrino-mailer/ext.rb @@ -1,8 +1,12 @@ +require 'mail' + module Mail # @private class Message # @private include Sinatra::Templates include Padrino::Rendering if defined?(Padrino::Rendering) + include Padrino::Helpers::RenderHelpers if defined? Padrino::Helpers::RenderHelpers attr_reader :template_cache + attr_accessor :mailer_name, :message_name def initialize_with_app(*args, &block) @template_cache = Tilt::Cache.new @@ -20,7 +24,8 @@ def initialize_with_app(*args, &block) initialize_without_app(*args, &block) end - alias_method_chain :initialize, :app + alias_method :initialize_without_app, :initialize + alias_method :initialize, :initialize_with_app ## # Setup like in Sinatra/Padrino apps content_type and template lookup. @@ -82,7 +87,7 @@ def add_resolved_part(attributes = {}, &block) instance_variable_set "@#{variable}", self.part(:content_type => content_type, :body => value, :part_block => block) - add_multipart_alternate_header unless self.send(variable).blank? + add_multipart_alternate_header if self.send(variable) else instance_variable_get("@#{variable}") || find_first_mime_type(content_type) end @@ -112,10 +117,13 @@ def part(params = {}, &block) def do_delivery_with_logging logger.debug "Sending email to: #{destinations.join(" ")}" - encoded.to_lf.split("\n").each { |line| logger << (" " + line) } if logger.debug? + encoded.each_line { |line| logger << (" " + line.strip) } if logger.debug? do_delivery_without_logging end - alias_method_chain :do_delivery, :logging if Padrino.respond_to?(:logger) + if Padrino.respond_to?(:logger) + alias_method :do_delivery_without_logging, :do_delivery + alias_method :do_delivery, :do_delivery_with_logging + end ## # Sinatra and Padrino compatibility. @@ -124,6 +132,13 @@ def settings self.class end + ## + # Sinatra almost compatibility. + # + def self.set(name, value) + self.class.instance_eval{ define_method(name) { value } unless method_defined?(:erb) } + end + ## # Sets the message defined template path to the given view path. # @@ -231,28 +246,42 @@ def content_type_with_symbol(value=nil) mime = content_type_without_symbol(value) Padrino::Mailer::Mime.mime_type(mime) end - alias_method_chain :content_type, :symbol + alias_method :content_type_without_symbol, :content_type + alias_method :content_type, :content_type_with_symbol private ## # Defines the render for the mailer utilizing the padrino 'rendering' module # - def render(engine, data=nil, options={}, locals={}, &block) - locals = @_locals if options[:locals].blank? && locals.blank? + def render(engine=nil, data=nil, options={}, locals={}, &block) + locals = @_locals || {} if !options[:locals] && locals.empty? @template_cache.clear if settings.reload_templates? + engine ||= message_name + + if mailer_name && !engine.to_s.index('/') + settings.views += "/#{mailer_name}" + engine = engine.to_s.sub(%r{^#{mailer_name}/}, '') + end + provides.each do |format| part do |p| p.content_type(format) p.send(:render, engine, data, options, locals, &block) - add_multipart_alternate_header if html_part.present? || provides.include?(:html) + add_multipart_alternate_header if html_part || provides.include?(:html) end end self.body = super(engine, data, options, locals, &block) if provides.empty? end + alias_method :original_partial, :partial if instance_methods.include?(:partial) + def partial(template, options={}, &block) + raise "gem 'padrino-helpers' is required to render partials" unless respond_to?(:original_partial) + self.body = original_partial(template, options, &block) + end + ## # Register all special template configurations Padrino has to our fake settings object. # diff --git a/padrino-mailer/lib/padrino-mailer/helpers.rb b/padrino-mailer/lib/padrino-mailer/helpers.rb index 976788765..df238bfd9 100644 --- a/padrino-mailer/lib/padrino-mailer/helpers.rb +++ b/padrino-mailer/lib/padrino-mailer/helpers.rb @@ -106,7 +106,9 @@ def mailer(name, &block) # deliver(:example, :message, "John") # def deliver(mailer_name, message_name, *attributes) - message = registered_mailers[mailer_name].messages[message_name].call(*attributes) + mailer = registered_mailers[mailer_name] or fail "mailer '#{mailer_name}' is not registered" + message = mailer.messages[message_name] or fail "mailer '#{mailer_name}' has no message '#{message_name}'" + message = message.call(*attributes) message.delivery_method(*delivery_settings) message.deliver end @@ -135,7 +137,7 @@ def email(mail_attributes={}, &block) message = _padrino_mailer::Message.new(self) message.delivery_method(*delivery_settings) message.instance_eval(&block) if block_given? - mail_attributes.reverse_merge(mailer_defaults) if respond_to?(:mailer_defaults) + mail_attributes = mailer_defaults.merge(mail_attributes) if respond_to?(:mailer_defaults) mail_attributes.each_pair { |k, v| message.method(k).call(v) } message.deliver end @@ -146,7 +148,10 @@ def email(mail_attributes={}, &block) # def delivery_settings @_delivery_setting ||= begin - raise "You must setup :delivery_method, see api for more details" if RUBY_PLATFORM =~ /win32/ && !respond_to?(:delivery_method) + if Gem.win_platform? && !respond_to?(:delivery_method) + raise "To use mailers on Windows you must set a :delivery_method, see http://padrinorb.com/guides/features/padrino-mailer/#configuration" + end + return [:sendmail, { :location => `which sendmail`.chomp }] unless respond_to?(:delivery_method) return [delivery_method.keys[0], delivery_method.values[0]] if delivery_method.is_a?(Hash) return [delivery_method, {}] if delivery_method.is_a?(Symbol) diff --git a/padrino-mailer/lib/padrino-mailer/mime.rb b/padrino-mailer/lib/padrino-mailer/mime.rb index ec21a6c81..f64e7d6d0 100644 --- a/padrino-mailer/lib/padrino-mailer/mime.rb +++ b/padrino-mailer/lib/padrino-mailer/mime.rb @@ -36,7 +36,7 @@ def self.mime_type(mime, fallback=:plain) # # You can add your own mime types like: # - # Padrino::Mailer::MIME_TYPES.merge!("text/xml" => :xml) + # Padrino::Mailer::Mime::MIME_TYPES.merge!("text/xml" => :xml) # MIME_TYPES = { "text/html" => :html, diff --git a/padrino-mailer/padrino-mailer.gemspec b/padrino-mailer/padrino-mailer.gemspec index 29d9de6e3..cf473ac6f 100644 --- a/padrino-mailer/padrino-mailer.gemspec +++ b/padrino-mailer/padrino-mailer.gemspec @@ -24,5 +24,6 @@ Gem::Specification.new do |s| s.rdoc_options = ["--charset=UTF-8"] s.add_dependency("padrino-core", Padrino.version) - s.add_dependency("mail", "~> 2.5.3") + s.add_dependency("mime-types", "< 3") + s.add_dependency("mail", "~> 2.5") end diff --git a/padrino-mailer/test/fixtures/padrino_app/app.rb b/padrino-mailer/test/fixtures/padrino_app/app.rb index 0b4a78c27..b589506f5 100644 --- a/padrino-mailer/test/fixtures/padrino_app/app.rb +++ b/padrino-mailer/test/fixtures/padrino_app/app.rb @@ -45,6 +45,35 @@ class PadrinoApp < Padrino::Application render 'sample/helper_message' end + message :default_mailer_name do |name| + subject "Welcome Helper!" + to 'jim@fake.com' + from 'noreply@custom.com' + locals :name => name + via :test + render 'default_mailer_name' + end + + message :default_mailer_email_name do |name| + subject "Welcome Helper!" + to 'jim@fake.com' + from 'noreply@custom.com' + locals :name => name + via :test + render + end + + message :external do |name| + subject "Welcome Message!" + to 'john@fake.com' + from 'noreply@custom.com' + locals :name => name + via :test + render 'demo/sample_mail' + end + end + + mailer :nonexistant do end post "/deliver/inline" do @@ -72,6 +101,28 @@ class PadrinoApp < Padrino::Application result ? "mail delivered" : 'mail not delivered' end + post "/deliver/failing_mailer" do + deliver(:nonregistered, :mailer, "hey") + end + + post "/deliver/failing_message" do + deliver(:nonexistant, :message, "hey") + end + + post "/deliver/default_mailer_name" do + result = deliver(:sample, :default_mailer_name, "Jim") + result ? "mail delivered" : 'mail not delivered' + end + + post "/deliver/default_mailer_email_name" do + result = deliver(:sample, :default_mailer_email_name, "Jim") + result ? "mail delivered" : 'mail not delivered' + end + + post "/deliver/external" do + result = deliver(:sample, :external, "Joey") + result ? "mail delivered" : 'mail not delivered' + end end Padrino.mount("PadrinoApp").to("/") diff --git a/padrino-mailer/test/fixtures/padrino_app/views/mailers/sample/default_mailer_email_name.erb b/padrino-mailer/test/fixtures/padrino_app/views/mailers/sample/default_mailer_email_name.erb new file mode 100644 index 000000000..90c4cb3c5 --- /dev/null +++ b/padrino-mailer/test/fixtures/padrino_app/views/mailers/sample/default_mailer_email_name.erb @@ -0,0 +1 @@ +dmen \ No newline at end of file diff --git a/padrino-mailer/test/fixtures/padrino_app/views/mailers/sample/default_mailer_name.erb b/padrino-mailer/test/fixtures/padrino_app/views/mailers/sample/default_mailer_name.erb new file mode 100644 index 000000000..6259343cf --- /dev/null +++ b/padrino-mailer/test/fixtures/padrino_app/views/mailers/sample/default_mailer_name.erb @@ -0,0 +1 @@ +dmn \ No newline at end of file diff --git a/padrino-mailer/test/fixtures/sinatra_app/app.rb b/padrino-mailer/test/fixtures/sinatra_app/app.rb index a8bf98749..969cf6b06 100644 --- a/padrino-mailer/test/fixtures/sinatra_app/app.rb +++ b/padrino-mailer/test/fixtures/sinatra_app/app.rb @@ -1,5 +1,4 @@ require 'sinatra/base' -require 'haml' class SinatraApp < Sinatra::Base register Padrino::Mailer diff --git a/padrino-mailer/test/fixtures/views/mailers/partial/_object.erb b/padrino-mailer/test/fixtures/views/mailers/partial/_object.erb new file mode 100644 index 000000000..ff0094c81 --- /dev/null +++ b/padrino-mailer/test/fixtures/views/mailers/partial/_object.erb @@ -0,0 +1 @@ +Object <%= object %>
diff --git a/padrino-mailer/test/helper.rb b/padrino-mailer/test/helper.rb index bb9f7141f..731f48e65 100644 --- a/padrino-mailer/test/helper.rb +++ b/padrino-mailer/test/helper.rb @@ -1,16 +1,17 @@ ENV['RACK_ENV'] = 'test' PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT -require File.expand_path('../../../load_paths', __FILE__) require 'minitest/autorun' require 'minitest/pride' require 'rack/test' require 'padrino-core' require 'padrino-helpers' -require 'mail' +require 'padrino/rendering' require 'padrino-mailer/ext' require 'padrino-mailer' +require 'ext/rack-test-methods' + class MiniTest::Spec include Rack::Test::Methods @@ -32,30 +33,16 @@ def pop_last_delivery # Asserts that the specified email object was delivered def assert_email_sent(mail_attributes, options={}) mail_message = Mail::TestMailer.deliveries.last - raise "No mail message has been sent!" unless mail_message.present? + raise "No mail message has been sent!" unless mail_message delivery_attributes = mail_attributes - delivery_attributes = { :to => Array(mail_attributes[:to]), :from => Array(mail_attributes[:from]) } - delivery_attributes.each_pair do |k, v| - unless mail_message.method(k).call == v - raise "Mail failure (#{k}): #{mail_message.attributes.inspect} does not match #{delivery_attributes.inspect}" - end + delivery_attributes.update(:to => Array(mail_attributes[:to]), :from => Array(mail_attributes[:from])) + delivery_attributes.each_pair do |key, expected| + next unless mail_message.respond_to?(key) + actual = mail_message.send(key) + actual = actual.to_s.chomp if key == :body + actual = mail_message.content_type_without_symbol.split(';').first if key == :content_type + assert_equal expected, actual, "Mail failure at field '#{key}'" end Mail::TestMailer.deliveries.clear end - - # Asserts that a file matches the pattern - def assert_match_in_file(pattern, file) - assert File.exist?(file), "File '#{file}' does not exist!" - assert_match pattern, File.read(file) - end - - # Delegate other missing methods to response. - def method_missing(name, *args, &block) - if response && response.respond_to?(name) - response.send(name, *args, &block) - else - super(name, *args, &block) - end - end - alias :response :last_response end diff --git a/padrino-mailer/test/test_message.rb b/padrino-mailer/test/test_message.rb index c557d6785..5c824bd0a 100644 --- a/padrino-mailer/test/test_message.rb +++ b/padrino-mailer/test/test_message.rb @@ -152,5 +152,18 @@ message.encoded assert_equal :plain, message.content_type end + + it 'should render partials' do + objects = [1,2,'
\nObject 2
\nObject <evil>
\nObject
", message.body.to_s.chomp + end end end diff --git a/padrino-mailer/test/test_padrino_mailer.rb b/padrino-mailer/test/test_padrino_mailer.rb index d093df30a..057dbbd3e 100644 --- a/padrino-mailer/test/test_padrino_mailer.rb +++ b/padrino-mailer/test/test_padrino_mailer.rb @@ -12,8 +12,7 @@ assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com', :subject => 'Test Email', - :body => 'Test Body', - :delivery_method => @app.delivery_method) + :body => 'Test Body') end it 'should be able to deliver plain text emails' do @@ -21,7 +20,6 @@ assert_equal 'mail delivered', body assert_email_sent(:to => 'john@fake.com', :from => 'noreply@birthday.com', - :delivery_method => @app.delivery_method, :subject => "Happy Birthday!", :body => "Happy Birthday Joey!\nYou are turning 21") end @@ -32,7 +30,6 @@ assert_email_sent(:template => 'mailers/sample/foo_message', :to => 'john@fake.com', :from => 'noreply@custom.com', - :delivery_method => @app.delivery_method, :subject => 'Welcome Message!', :body => 'Hello to Bobby') end @@ -43,9 +40,8 @@ assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com', :content_type => 'text/html', - :delivery_method => @app.delivery_method, :subject => 'Happy anniversary!', - :body => "
Yay Joey & Charlotte!
\nYou have been married 16 years
") + :body => "Yay Joey & Charlotte!
\nYou have been married 16 years
") end it 'should be able to deliver a basic email using app settings' do @@ -53,8 +49,7 @@ :subject => 'Test Email', :body => 'Test Body', :via => :test) assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com', - :subject => 'Test Email', :body => 'Test Body', - :delivery_method => @app.delivery_method) + :subject => 'Test Email', :body => 'Test Body') end end @@ -65,7 +60,7 @@ post '/deliver/inline' assert_equal 'mail delivered', body assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com', - :delivery_method => @app.delivery_method, :subject => 'Test Email', + :subject => 'Test Email', :body => 'Test Body') end @@ -73,7 +68,7 @@ post '/deliver/plain' assert_equal 'mail delivered', body assert_email_sent(:to => 'john@fake.com', :from => 'noreply@birthday.com', - :delivery_method => @app.delivery_method, :subject => "Happy Birthday!", + :subject => "Happy Birthday!", :body => "Happy Birthday Joey!\nYou are turning 21") end @@ -81,7 +76,7 @@ post '/deliver/custom' assert_equal 'mail delivered', body assert_email_sent(:template => 'mailers/sample/foo_message', :to => 'john@fake.com', - :from => 'noreply@custom.com', :delivery_method => @app.delivery_method, + :from => 'noreply@custom.com', :subject => 'Welcome Message!', :body => 'Hello to Bobby') end @@ -89,8 +84,13 @@ post '/deliver/html' assert_equal 'mail delivered', body assert_email_sent(:to => 'julie@fake.com', :from => 'noreply@anniversary.com', - :content_type => 'text/html', :delivery_method => @app.delivery_method, - :subject => 'Happy anniversary!', :body => "Yay Joey & Charlotte!
\nYou have been married 16 years
") + :content_type => 'text/html', + :subject => 'Happy anniversary!', :body => "Yay Joey & Charlotte!
\nYou have been married 16 years
") + end + + it 'should be able to deliver emails with views in custom-named folders' do + post '/deliver/external' + assert_equal 'mail delivered', body end it 'should be able to deliver a basic email using app settings' do @@ -98,8 +98,7 @@ :subject => 'Test Email', :body => 'Test Body', :via => :test) assert_email_sent(:to => 'john@apple.com', :from => 'joe@smith.com', - :subject => 'Test Email', :body => 'Test Body', - :delivery_method => @app.delivery_method) + :subject => 'Test Email', :body => 'Test Body') end it 'should be able to deliver a basic email using Padrino::Helpers' do @@ -107,8 +106,36 @@ post '/deliver/helper' assert_equal 'mail delivered', body assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com', - :content_type => 'text/html', :delivery_method => @app.delivery_method, + :content_type => 'text/html', :subject => 'Welcome Helper!', :body => "jim") end + + it 'should fail with proper message if mailer is not registered' do + error = assert_raises RuntimeError do + post '/deliver/failing_mailer' + end + assert_match /is not registered/, error.message + end + + it 'should fail with proper message if message does not exist' do + error = assert_raises RuntimeError do + post '/deliver/failing_message' + end + assert_match /has no message/, error.message + end + + it 'should be able to render default mailer names' do + post '/deliver/default_mailer_name' + assert_equal 'mail delivered', body + assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com', + :content_type => 'text/plain', :body => "dmn") + end + + it 'should be able to render default mailer email names' do + post '/deliver/default_mailer_email_name' + assert_equal 'mail delivered', body + assert_email_sent(:to => 'jim@fake.com', :from => 'noreply@custom.com', + :content_type => 'text/plain', :body => "dmen") + end end end diff --git a/padrino-mailer/test/test_part.rb b/padrino-mailer/test/test_part.rb index fbea65b09..04fe6d6b3 100644 --- a/padrino-mailer/test/test_part.rb +++ b/padrino-mailer/test/test_part.rb @@ -33,7 +33,6 @@ assert_equal 'other', message.parts[2].body.decoded assert_equal 'This is a foo message in mailers/sample dir', message.html_part.body.decoded.chomp - assert_equal 'plain text', message.text_part.body.decoded end it 'should works with multipart templates' do diff --git a/padrino-performance/Rakefile b/padrino-performance/Rakefile index f33347d26..64fa66b28 100644 --- a/padrino-performance/Rakefile +++ b/padrino-performance/Rakefile @@ -1,5 +1,11 @@ -# coding:utf-8 -RAKE_ROOT = __FILE__ +require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') -require 'rubygems' -require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') \ No newline at end of file +Rake::TestTask.new(:bench) do |test| + test.libs << 'test' + test.test_files = Dir['test/**/bench_*.rb'] +end + +Rake::TestTask.new(:mem) do |test| + test.libs << 'test' + test.test_files = Dir['test/**/mem_*.rb'] +end diff --git a/padrino-performance/lib/padrino-performance/version.rb b/padrino-performance/lib/padrino-performance/version.rb index 5ac4d79a2..d9554963b 100644 --- a/padrino-performance/lib/padrino-performance/version.rb +++ b/padrino-performance/lib/padrino-performance/version.rb @@ -1,7 +1,7 @@ module Padrino module Performance # The version constant for the current version of Padrino. - VERSION = '0.12.2' unless defined?(Padrino::VERSION) + VERSION = '0.13.2' unless defined?(Padrino::VERSION) # # The current Padrino version. diff --git a/padrino-performance/test/bench_core.rb b/padrino-performance/test/bench_core.rb new file mode 100644 index 000000000..ef8bb4136 --- /dev/null +++ b/padrino-performance/test/bench_core.rb @@ -0,0 +1,186 @@ +ENV['RACK_ENV'] = 'test' + +require 'padrino-core' + +require 'minitest/autorun' +require 'minitest/benchmark' +require 'rack/test' + +module MockBenchmark + include Rack::Test::Methods + + module Settings + def bench_range + [20, 80, 320, 1280, 5120] + end + + def run(*) + puts 'Running ' + self.name + super + end + end + + def self.paths + @paths ||= (1..100).map{ rand(36**8).to_s(36) } + end + + def self.included(base) + base.extend Settings + end + + def result_code + '' + end + + def app + @app + end + + module BenchmarkRouting + def bench_calling_404 + assert_performance_linear 0.99 do |n| + n.times do + get "/#{@paths.sample}_not_found" + end + end + assert_equal 404, last_response.status + end + + def bench_calling_one_path + assert_performance_linear 0.99 do |n| + n.times do + get '/foo' + end + end + assert_equal 200, last_response.status + end + + def bench_calling_sample + assert_performance_linear 0.99 do |n| + n.times do + get "/#{@paths.sample}" + end + end + assert_equal 200, last_response.status + end + + def bench_calling_params + assert_performance_linear 0.99 do |n| + n.times do + get "/foo?foo=bar&zoo=#{@paths.sample}" + end + end + assert_equal 200, last_response.status + end + + def bench_sample_and_params + assert_performance_linear 0.99 do |n| + n.times do + get "/#{@paths.sample}?foo=bar&zoo=#{@paths.sample}" + end + end + assert_equal 200, last_response.status + end + end +end + +class Padrino::CoreBenchmark < Minitest::Benchmark + include MockBenchmark + include MockBenchmark::BenchmarkRouting + + def setup + Padrino.clear! + + @app = Sinatra.new Padrino::Application do + get("/foo") { "okey" } + + MockBenchmark.paths.each do |p| + get("/#{p}") { p.to_s } + end + end + + @paths = MockBenchmark.paths + + get '/' + end +end + +class SinatraBenchmark < Minitest::Benchmark + include MockBenchmark + include MockBenchmark::BenchmarkRouting + + def setup + @app = Sinatra.new do + get("/foo") { "okey" } + + MockBenchmark.paths.each do |p| + get("/#{p}") { p.to_s } + end + end + + @paths = MockBenchmark.paths + + get '/' + end +end + +class Padrino::MounterBenchmark < Minitest::Benchmark + include MockBenchmark + + class TestApp < Padrino::Application + get '/' do + 'OK' + end + end + + def setup + Padrino.clear! + + MockBenchmark.paths.each do |p| + Padrino.mount(TestApp).to("/#{p}") + end + + @paths = MockBenchmark.paths + end + + def bench_mounted_sample + request = Rack::MockRequest.new(Padrino.application) + response = nil + assert_performance_linear 0.99 do |n| + n.times do + response = request.get("/#{@paths.sample}") + end + end + assert_equal 200, response.status + end +end + +class Padrino::HugeRouterBenchmark < Minitest::Benchmark + include MockBenchmark + + def setup + @apps = {} + @pathss = {} + @requests = {} + self.class.bench_range.each do |n| + @pathss[n] = paths = (1..n/20).map{ rand(36**8).to_s(36) } + @apps[n] = Sinatra.new Padrino::Application do + paths.each do |p| + get("/#{p}") { p.to_s } + end + end + @requests[n] = Rack::MockRequest.new(@apps[n]) + @requests[n].get('/') + end + end + + def bench_calling_sample + response = nil + assert_performance_linear 0.99 do |n| + n.times do + response = @requests[n].get("/#{@pathss[n].sample}") + end + end + assert_equal 200, response.status + end +end diff --git a/padrino-performance/test/helper.rb b/padrino-performance/test/helper.rb index a5f468582..fcb5443b6 100644 --- a/padrino-performance/test/helper.rb +++ b/padrino-performance/test/helper.rb @@ -1,12 +1,4 @@ -require File.expand_path('../../../load_paths', __FILE__) - require 'minitest/autorun' require 'minitest/pride' -require 'padrino-core' -require 'padrino-performance' -require 'rack' require 'rack/test' - -class MiniTest::Spec - include Rack::Test::Methods -end +require 'padrino-performance' diff --git a/padrino-performance/test/mem_core.rb b/padrino-performance/test/mem_core.rb new file mode 100644 index 000000000..3d1c838f0 --- /dev/null +++ b/padrino-performance/test/mem_core.rb @@ -0,0 +1,66 @@ +ENV['RACK_ENV'] = 'test' + +require 'padrino-core' + +require 'minitest/autorun' +require 'minitest/benchmark' +require 'rack/test' + +module MockBenchmark + include Rack::Test::Methods + + module Settings + def bench_range + [20, 80, 320, 1280, 5120] + end + + def run(*) + puts 'Running ' + self.name + puts `pmap -x #{$$} | tail -1` + super + puts `pmap -x #{$$} | tail -1` + end + end + + def self.included(base) + base.extend Settings + end + + def result_code + '' + end + + def app + @app + end +end + +class Padrino::HugeRouterBenchmark < Minitest::Benchmark + include MockBenchmark + + def setup + @apps = {} + @pathss = {} + @requests = {} + self.class.bench_range.each do |n| + @pathss[n] = paths = (1..n/5).map{ rand(36**8).to_s(36) } + @apps[n] = Sinatra.new Padrino::Application do + paths.each do |p| + get("/#{p}") { p.to_s } + end + end + @requests[n] = Rack::MockRequest.new(@apps[n]) + @requests[n].get('/') + end + end + + def bench_calling_sample + response = nil + assert_performance_linear 0.99 do |n| + n.times do + response = @requests[n].get("/#{@pathss[n].sample}") + end + end + assert_equal 200, response.status + end +end diff --git a/padrino-performance/test/test_os.rb b/padrino-performance/test/test_os.rb index 9ed80de52..01e8ae344 100644 --- a/padrino-performance/test/test_os.rb +++ b/padrino-performance/test/test_os.rb @@ -57,5 +57,4 @@ refute(Padrino::Performance::OS.linux?, 'We a darwin operation system.') end end - end diff --git a/padrino-support/Rakefile b/padrino-support/Rakefile index e747a64e7..da75d43e2 100644 --- a/padrino-support/Rakefile +++ b/padrino-support/Rakefile @@ -1,5 +1 @@ -# coding:utf-8 -RAKE_ROOT = __FILE__ - -require 'rubygems' require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') diff --git a/padrino-support/lib/padrino-support.rb b/padrino-support/lib/padrino-support.rb index 43fc7f5d6..d7f642b61 100644 --- a/padrino-support/lib/padrino-support.rb +++ b/padrino-support/lib/padrino-support.rb @@ -1,21 +1,26 @@ ## -# This file loads certain extensions required by Padrino from ActiveSupport. +# This file loads certain extensions required by Padrino. # -require 'active_support/core_ext/module/aliasing' # alias_method_chain -require 'active_support/core_ext/hash/reverse_merge' # reverse_merge -require 'active_support/core_ext/hash/keys' # symbolize_keys -require 'active_support/core_ext/hash/indifferent_access' # params[:foo] -require 'active_support/core_ext/hash/slice' # slice -require 'active_support/core_ext/array/extract_options' # Array#extract_options! -require 'active_support/core_ext/object/blank' # present? -require 'active_support/core_ext/string/output_safety' # SafeBuffer and html_safe - -require 'padrino-support/core_ext/string/inflections' require 'padrino-support/core_ext/string/colorize' -require 'padrino-support/core_ext/string/undent' # deprecated -require 'padrino-support/core_ext/object_space' require 'padrino-support/file_set' +require 'padrino-support/utils' +if ENV["AS_VERSION"] + # require ActiveSupport features for tests or legacy projects + require 'active_support/core_ext/string/output_safety' # SafeBuffer and html_safe + require 'active_support/core_ext/object/blank' # present? + require 'active_support/core_ext/hash/keys' # symbolize_keys + require 'active_support/core_ext/hash/indifferent_access' # params[:foo] + require 'active_support/core_ext/hash/reverse_merge' # reverse_merge + require 'active_support/core_ext/module/aliasing' # alias_method_chain + require 'active_support/core_ext/array/extract_options' # Array#extract_options! + require 'active_support/core_ext/hash/slice' # slice + begin + require 'active_support/core_ext/object/deep_dup' # AS 4.1 + rescue LoadError + require 'active_support/core_ext/hash/deep_dup' # AS >= 3.1 + end +end ## # Loads our locale configuration files @@ -30,5 +35,5 @@ # In reloader for accessing class_name Foo._orig_klass_name # class Module - alias :_orig_klass_name :to_s + alias :_orig_klass_name :name end diff --git a/padrino-support/lib/padrino-support/core_ext/object_space.rb b/padrino-support/lib/padrino-support/core_ext/object_space.rb deleted file mode 100644 index 04c0c917d..000000000 --- a/padrino-support/lib/padrino-support/core_ext/object_space.rb +++ /dev/null @@ -1,49 +0,0 @@ -module ObjectSpace - class << self - ## - # Returns all the classes in the object space. - # Optionally, a block can be passed, for example the following code - # would return the classes that start with the character "A": - # - # ObjectSpace.classes do |klass| - # if klass.to_s[0] == "A" - # klass - # end - # end - # - def classes(&block) - rs = Set.new - - ObjectSpace.each_object(Class).each do |klass| - if block - if r = block.call(klass) - # add the returned value if the block returns something - rs << r - end - else - rs << klass - end - end - - rs - end - - ## - # Returns a list of existing classes that are not included in "snapshot" - # This method is useful to get the list of new classes that were loaded - # after an event like requiring a file. - # Usage: - # - # snapshot = ObjectSpace.classes - # # require a file - # ObjectSpace.new_classes(snapshot) - # - def new_classes(snapshot) - self.classes do |klass| - if !snapshot.include?(klass) - klass - end - end - end - end -end diff --git a/padrino-support/lib/padrino-support/core_ext/string/colorize.rb b/padrino-support/lib/padrino-support/core_ext/string/colorize.rb index d8739e77b..f347a73ed 100644 --- a/padrino-support/lib/padrino-support/core_ext/string/colorize.rb +++ b/padrino-support/lib/padrino-support/core_ext/string/colorize.rb @@ -1,5 +1,3 @@ -require 'win32console' if RUBY_PLATFORM =~ /(win|m)32/ # ruby color support for win - ## # Add colors # diff --git a/padrino-support/lib/padrino-support/core_ext/string/inflections.rb b/padrino-support/lib/padrino-support/core_ext/string/inflections.rb deleted file mode 100644 index b6af3d54a..000000000 --- a/padrino-support/lib/padrino-support/core_ext/string/inflections.rb +++ /dev/null @@ -1,98 +0,0 @@ -require 'active_support/inflections' # load default inflections -require 'active_support/inflector/methods' # constantize -require 'active_support/inflector/inflections' # pluralize - -## -# This is an adapted version of active_support/core_ext/string/inflections.rb -# to prevent loading several dependencies including I18n gem. -# -# Issue: https://github.com/rails/rails/issues/1526 -# -class String - ## - # Returns the plural form of the word in the string. - # - # "post".pluralize # => "posts" - # "octopus".pluralize # => "octopi" - # "sheep".pluralize # => "sheep" - # "words".pluralize # => "words" - # "the blue mailman".pluralize # => "the blue mailmen" - # "CamelOctopus".pluralize # => "CamelOctopi" - # - def pluralize - ActiveSupport::Inflector.pluralize(self) - end - - ## - # Returns the singular form of the word in the string. - # - # "posts".singularize # => "post" - # "octopi".singularize # => "octopus" - # "sheep".singularize # => "sheep" - # "words".singularize # => "word" - # "the blue mailmen".singularize # => "the blue mailman" - # "CamelOctopi".singularize # => "CamelOctopus" - # - def singularize - ActiveSupport::Inflector.singularize(self) - end - - ## - # +constantize+ tries to find a declared constant with the name specified - # in the string. It raises a NameError when the name is not in CamelCase - # or is not initialized. - # - # "Module".constantize # => Module - # "Class".constantize # => Class - # - def constantize - ActiveSupport::Inflector.constantize(self) - end - - ## - # The reverse of +camelize+. Makes an underscored, lowercase form from the expression in the string. - # - # +underscore+ will also change '::' to '/' to convert namespaces to paths. - # - # "ActiveRecord".underscore # => "active_record" - # "ActiveRecord::Errors".underscore # => active_record/errors - # - def underscore - ActiveSupport::Inflector.underscore(self) - end - - ## - # By default, +camelize+ converts strings to UpperCamelCase. If the argument to camelize - # is set to :lower then camelize produces lowerCamelCase. - # - # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces. - # - # "active_record".camelize # => "ActiveRecord" - # "active_record".camelize(:lower) # => "activeRecord" - # "active_record/errors".camelize # => "ActiveRecord::Errors" - # "active_record/errors".camelize(:lower) # => "activeRecord::Errors" - # - def camelize(first_letter = :upper) - case first_letter - when :upper then ActiveSupport::Inflector.camelize(self, true) - when :lower then ActiveSupport::Inflector.camelize(self, false) - end - end - alias_method :camelcase, :camelize - - ## - # Create a class name from a plural table name like Rails does for table names to models. - # Note that this returns a string and not a class. (To convert to an actual class - # follow +classify+ with +constantize+.) - # - # "egg_and_hams".classify # => "EggAndHam" - # "posts".classify # => "Post" - # - # Singular names are not handled correctly. - # - # "business".classify # => "Busines" - # - def classify - ActiveSupport::Inflector.classify(self) - end -end diff --git a/padrino-support/lib/padrino-support/core_ext/string/undent.rb b/padrino-support/lib/padrino-support/core_ext/string/undent.rb deleted file mode 100644 index bb705a92f..000000000 --- a/padrino-support/lib/padrino-support/core_ext/string/undent.rb +++ /dev/null @@ -1,19 +0,0 @@ -## -# Removes indentation -# -# @example -# help <<-EOS.undent -# Here my help usage -# sample_code -# -# Fix -# EOS -# puts help.red.bold -# -class String - # Strip unnecessary indentation of the front of a string - def undent - warn "##{__method__} is deprecated" - gsub(/^.{#{slice(/^ +/).size}}/, '') - end -end diff --git a/padrino-support/lib/padrino-support/default_inflections.rb b/padrino-support/lib/padrino-support/default_inflections.rb new file mode 100644 index 000000000..65f2b2663 --- /dev/null +++ b/padrino-support/lib/padrino-support/default_inflections.rb @@ -0,0 +1,50 @@ +# frozen-string-literal: true +## +# This module is based on Sequel 5.4.0 +# sequel-5.4.0/lib/sequel/model/default_inflections.rb +# +module Padrino + # Proc that is instance evaled to create the default inflections for both the + # model inflector and the inflector extension. + DEFAULT_INFLECTIONS_PROC = proc do + plural(/$/, 's') + plural(/s$/i, 's') + plural(/(alias|(?:stat|octop|vir|b)us)$/i, '\1es') + plural(/(buffal|tomat)o$/i, '\1oes') + plural(/([ti])um$/i, '\1a') + plural(/sis$/i, 'ses') + plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves') + plural(/(hive)$/i, '\1s') + plural(/([^aeiouy]|qu)y$/i, '\1ies') + plural(/(x|ch|ss|sh)$/i, '\1es') + plural(/(matr|vert|ind)ix|ex$/i, '\1ices') + plural(/([m|l])ouse$/i, '\1ice') + + singular(/s$/i, '') + singular(/([ti])a$/i, '\1um') + singular(/(analy|ba|cri|diagno|parenthe|progno|synop|the)ses$/i, '\1sis') + singular(/([^f])ves$/i, '\1fe') + singular(/([h|t]ive)s$/i, '\1') + singular(/([lr])ves$/i, '\1f') + singular(/([^aeiouy]|qu)ies$/i, '\1y') + singular(/(m)ovies$/i, '\1ovie') + singular(/(x|ch|ss|sh)es$/i, '\1') + singular(/([m|l])ice$/i, '\1ouse') + singular(/buses$/i, 'bus') + singular(/oes$/i, 'o') + singular(/shoes$/i, 'shoe') + singular(/(alias|(?:stat|octop|vir|b)us)es$/i, '\1') + singular(/(vert|ind)ices$/i, '\1ex') + singular(/matrices$/i, 'matrix') + + irregular('person', 'people') + irregular('man', 'men') + irregular('child', 'children') + irregular('sex', 'sexes') + irregular('move', 'moves') + irregular('quiz', 'quizzes') + irregular('testis', 'testes') + + uncountable(%w(equipment information rice money species series fish sheep news)) + end +end diff --git a/padrino-support/lib/padrino-support/file_set.rb b/padrino-support/lib/padrino-support/file_set.rb index c146b0ea6..6111583e8 100644 --- a/padrino-support/lib/padrino-support/file_set.rb +++ b/padrino-support/lib/padrino-support/file_set.rb @@ -8,10 +8,10 @@ module FileSet # Returns the list of files matching the glob pattern # FileSet.glob('padrino-core/application/*.rb', __FILE__) { |file| load file } # - def glob(glob_pattern, file_path=nil, &block) + def glob(glob_pattern, file_path=nil) glob_pattern = File.join(File.dirname(file_path), glob_pattern) if file_path file_list = Dir.glob(glob_pattern).sort - file_list.each { |file| block.call(file) } + file_list.each{ |file| yield(file) } file_list end diff --git a/padrino-support/lib/padrino-support/inflections.rb b/padrino-support/lib/padrino-support/inflections.rb new file mode 100644 index 000000000..14b77939e --- /dev/null +++ b/padrino-support/lib/padrino-support/inflections.rb @@ -0,0 +1,179 @@ +## +# This module is based on Sequel 4.27.0 +# sequel-4.27.0/lib/sequel/model/inflections.rb +# +require 'padrino-support/default_inflections' + +module Padrino + # This module acts as a singleton returned/yielded by Sequel.inflections, + # which is used to override or specify additional inflection rules + # for Sequel. Examples: + # + # Sequel.inflections do |inflect| + # inflect.plural /^(ox)$/i, '\1\2en' + # inflect.singular /^(ox)en/i, '\1' + # + # inflect.irregular 'octopus', 'octopi' + # + # inflect.uncountable "equipment" + # end + # + # New rules are added at the top. So in the example above, the irregular rule for octopus will now be the first of the + # pluralization and singularization rules that is runs. This guarantees that your rules run before any of the rules that may + # already have been loaded. + module Inflections + CAMELIZE_CONVERT_REGEXP = /(^|_)(.)/.freeze + CAMELIZE_MODULE_REGEXP = /\/(.?)/.freeze + DASH = '-'.freeze + DEMODULIZE_CONVERT_REGEXP = /^.*::/.freeze + EMPTY_STRING= ''.freeze + SLASH = '/'.freeze + VALID_CONSTANT_NAME_REGEXP = /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/.freeze + UNDERSCORE = '_'.freeze + UNDERSCORE_CONVERT_REGEXP1 = /([A-Z]+)([A-Z][a-z])/.freeze + UNDERSCORE_CONVERT_REGEXP2 = /([a-z\d])([A-Z])/.freeze + UNDERSCORE_CONVERT_REPLACE = '\1_\2'.freeze + UNDERSCORE_MODULE_REGEXP = /::/.freeze + + @plurals, @singulars, @uncountables = [], [], [] + + class << self + # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for plurization. + attr_reader :plurals + + # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for singularization. + attr_reader :singulars + + # Array of strings for words were the singular form is the same as the plural form + attr_reader :uncountables + end + + # Clears the loaded inflections within a given scope (default is :all). Give the scope as a symbol of the inflection type, + # the options are: :plurals, :singulars, :uncountables + # + # Examples: + # clear :all + # clear :plurals + def self.clear(scope = :all) + case scope + when :all + @plurals, @singulars, @uncountables = [], [], [] + else + instance_variable_set("@#{scope}", []) + end + end + + # Specifies a new irregular that applies to both pluralization and singularization at the same time. This can only be used + # for strings, not regular expressions. You simply pass the irregular in singular and plural form. + # + # Examples: + # irregular 'octopus', 'octopi' + # irregular 'person', 'people' + def self.irregular(singular, plural) + plural(Regexp.new("(#{singular[0,1]})#{singular[1..-1]}$", "i"), '\1' + plural[1..-1]) + singular(Regexp.new("(#{plural[0,1]})#{plural[1..-1]}$", "i"), '\1' + singular[1..-1]) + end + + # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression. + # The replacement should always be a string that may include references to the matched data from the rule. + # + # Example: + # plural(/(x|ch|ss|sh)$/i, '\1es') + def self.plural(rule, replacement) + @plurals.insert(0, [rule, replacement]) + end + + # Specifies a new singularization rule and its replacement. The rule can either be a string or a regular expression. + # The replacement should always be a string that may include references to the matched data from the rule. + # + # Example: + # singular(/([^aeiouy]|qu)ies$/i, '\1y') + def self.singular(rule, replacement) + @singulars.insert(0, [rule, replacement]) + end + + # Add uncountable words that shouldn't be attempted inflected. + # + # Examples: + # uncountable "money" + # uncountable "money", "information" + # uncountable %w( money information rice ) + def self.uncountable(*words) + (@uncountables << words).flatten! + end + + instance_eval(&DEFAULT_INFLECTIONS_PROC) + + extend self + + # Convert the given string to CamelCase. Will also convert '/' to '::' which is useful for converting paths to namespaces. + def camelize(s) + s = s.to_s + return s.camelize if s.respond_to?(:camelize) + s = s.gsub(CAMELIZE_MODULE_REGEXP){|x| "::#{x[-1..-1].upcase unless x == SLASH}"}.gsub(CAMELIZE_CONVERT_REGEXP){|x| x[-1..-1].upcase} + s + end + + # Tries to find a declared constant with the name specified + # in the string. It raises a NameError when the name is not in CamelCase + # or is not initialized. + def constantize(s) + s = s.to_s + return s.constantize if s.respond_to?(:constantize) + raise(NameError, "#{s.inspect} is not a valid constant name!") unless m = VALID_CONSTANT_NAME_REGEXP.match(s) + Object.module_eval("::#{m[1]}", __FILE__, __LINE__) + end + + # Removes the module part from the expression in the string + def demodulize(s) + s = s.to_s + return s.demodulize if s.respond_to?(:demodulize) + s.gsub(DEMODULIZE_CONVERT_REGEXP, EMPTY_STRING) + end + + # Returns the plural form of the word in the string. + def pluralize(s) + s = s.to_s + return s.pluralize if s.respond_to?(:pluralize) + result = s.dup + Inflections.plurals.each{|(rule, replacement)| break if result.gsub!(rule, replacement)} unless Inflections.uncountables.include?(s.downcase) + result + end + + # The reverse of pluralize, returns the singular form of a word in a string. + def singularize(s) + s = s.to_s + return s.singularize if s.respond_to?(:singularize) + result = s.dup + Inflections.singulars.each{|(rule, replacement)| break if result.gsub!(rule, replacement)} unless Inflections.uncountables.include?(s.downcase) + result + end + + # The reverse of camelize. Makes an underscored form from the expression in the string. + # Also changes '::' to '/' to convert namespaces to paths. + def underscore(s) + s = s.to_s + return s.underscore if s.respond_to?(:underscore) + s.gsub(UNDERSCORE_MODULE_REGEXP, SLASH).gsub(UNDERSCORE_CONVERT_REGEXP1, UNDERSCORE_CONVERT_REPLACE). + gsub(UNDERSCORE_CONVERT_REGEXP2, UNDERSCORE_CONVERT_REPLACE).tr(DASH, UNDERSCORE).downcase + end + + ## + # Capitalizes the first word, turns underscores into spaces, and strips a trailing '_id' if present. + # + def humanize(s) + s = s.to_s + return s.humanize if s.respond_to?(:humanize) + s.gsub(/_id$/, '').tr('_', ' ').capitalize + end + + ## + # Create a class name from a plural table name like Rails does for table names to models. + # + def classify(s) + s = s.to_s + return s.classify if s.respond_to?(:classify) + camelize(singularize(s.sub(/.*\./, ''))) + end + end +end diff --git a/padrino-support/lib/padrino-support/locale/de.yml b/padrino-support/lib/padrino-support/locale/de.yml index a7c757be6..2626536e7 100644 --- a/padrino-support/lib/padrino-support/locale/de.yml +++ b/padrino-support/lib/padrino-support/locale/de.yml @@ -4,7 +4,7 @@ de: # Benutze die strftime Parameter für die Formatierung # Wenn keine Formate angegeben werden, wird "default" benutzt. # Du kannst auch weitere Formate hinzufügen, wenn Du möchtest. - default: "&d.&m.%Y" + default: "%d.%m.%Y" short: "%d. %b" long: "%d. %B %Y" only_day: "%e" diff --git a/padrino-support/lib/padrino-support/utils.rb b/padrino-support/lib/padrino-support/utils.rb new file mode 100644 index 000000000..48cb3e1c7 --- /dev/null +++ b/padrino-support/lib/padrino-support/utils.rb @@ -0,0 +1,68 @@ +require 'cgi' + +module Padrino + module Utils + extend self + + ## + # Builds an URI query from a Hash or any Object. + # + # Examples (~ marks here that output is actually escaped by CGI): + # + # Utils.build_uri_query(:a => 1, :b => 2) #=> "a=1&b=2" + # Utils.build_uri_query(:a => [1, 2]) #=> ~"a[]=1&a[]=2" + # Utils.build_uri_query([1, 2], 'namespace') #=> ~"namespace[]=1&namespace[]=2" + # Utils.build_uri_query(:a => { :d => 2 }, :b => 3) #=> ~"a[d]=2&b=3" + # + def build_uri_query(object, namespace = nil) + case object + when Hash + object.map do |key, value| + next if value == {} || value == [] + build_uri_query(value, namespace ? "#{namespace}[#{key}]" : key) + end.compact.join('&') + when Array + fail ArgumentError, 'namespace is missing' unless namespace + (object.empty? ? [''] : object).map do |value| + build_uri_query(value, "#{namespace}[]") + end.join('&') + else + fail ArgumentError, 'namespace is missing' unless namespace + "#{CGI.escape(namespace.to_s)}=#{CGI.escape(object.to_s)}" + end + end + + ## + # Recursively duplicates the passed object. + # + def deep_dup(object) + case object + when Array + object.map{ |value| deep_dup(value) } + when Hash + object.each_with_object(object.dup.clear) do |(key, value), new_hash| + new_hash[deep_dup(key)] = deep_dup(value) + end + when NilClass, FalseClass, TrueClass, Symbol, Numeric, Method + object + else + begin + object.dup + rescue TypeError + object + end + end + end + + ## + # Returns a Hash with keys turned into symbols. + # + def symbolize_keys(hash) + result = hash.class.new + hash.each_key do |key| + result[(key.to_sym rescue key)] = hash[key] + end + result + end + end +end diff --git a/padrino-support/padrino-support.gemspec b/padrino-support/padrino-support.gemspec index 4528ee26a..8435222f8 100644 --- a/padrino-support/padrino-support.gemspec +++ b/padrino-support/padrino-support.gemspec @@ -22,6 +22,4 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"] s.rdoc_options = ["--charset=UTF-8"] - - s.add_dependency("activesupport", ">= 3.1") end diff --git a/padrino-support/test/helper.rb b/padrino-support/test/helper.rb index 025717008..25f5fa5c9 100644 --- a/padrino-support/test/helper.rb +++ b/padrino-support/test/helper.rb @@ -1,7 +1,6 @@ ENV['RACK_ENV'] = 'test' PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT) -require File.expand_path('../../../load_paths', __FILE__) require 'minitest/autorun' require 'minitest/pride' require 'padrino-support' diff --git a/padrino-support/test/test_utils.rb b/padrino-support/test/test_utils.rb new file mode 100644 index 000000000..d02d3bdee --- /dev/null +++ b/padrino-support/test/test_utils.rb @@ -0,0 +1,124 @@ +require File.expand_path(File.dirname(__FILE__) + '/helper') + +class MiniTest::Spec + def assert_query_equal(expected, actual, namespace=nil) + assert_equal expected.split('&').sort, Padrino::Utils.build_uri_query(actual, namespace).split('&').sort + end +end + +describe 'Padrino::Utils.build_uri_query' do + it 'should do simple conversion' do + assert_query_equal 'a=10', :a => 10 + end + + it 'should do cgi escaping' do + assert_query_equal 'a%3Ab=c+d', 'a:b' => 'c d' + end + + it 'should expand nested hashes' do + assert_query_equal 'person%5Blogin%5D=seckar&person%5Bname%5D=Nicholas', + :person => { :login => 'seckar', :name => 'Nicholas' } + end + + it 'should expand deeply nested hashes' do + assert_query_equal 'account%5Bperson%5D%5Bid%5D=20&person%5Bid%5D=10', + { :account => { :person => { :id => 20 } }, :person => {:id => 10} } + end + + it 'should accept arrays' do + assert_query_equal 'person%5Bid%5D%5B%5D=10&person%5Bid%5D%5B%5D=20', + :person => {:id => [10, 20]} + end + + it 'should accept empty arrays' do + assert_query_equal "person%5B%5D=", + [], + 'person' + end + + it 'should expand nested hashes' do + assert_query_equal '', + {} + assert_query_equal 'a=1&b%5Bc%5D=3', + { a: 1, b: { c: 3, d: {} } } + assert_query_equal '', + { a: {b: {c: {}}} } + assert_query_equal 'b%5Bc%5D=false&b%5Be%5D=&b%5Bf%5D=&p=12', + { p: 12, b: { c: false, e: nil, f: '' } } + assert_query_equal 'b%5Bc%5D=3&b%5Bf%5D=', + { b: { c: 3, k: {}, f: '' } } + assert_query_equal 'b=3', + {a: [], b: 3} + end + + it 'should accept namespace for hashes' do + assert_query_equal "user%5Bname%5D=Nakshay&user%5Bnationality%5D=Indian", + { name: 'Nakshay', nationality: 'Indian' }, + 'user' + end +end + +describe 'Padrino::Utils.deep_dup' do + it 'should recursively dup array' do + array = [1, [2, 3]] + dup = Padrino::Utils.deep_dup(array) + dup[1][2] = 4 + assert_equal 2, array[1].size + assert_equal 4, dup[1][2] + end + + it 'should recursively dup hash' do + hash = { :a => { :b => 'b' } } + dup = Padrino::Utils.deep_dup(hash) + dup[:a][:c] = 'c' + refute_includes hash[:a], :c + assert_equal 'c', dup[:a][:c] + end + + it 'should recursively dup array with hash' do + array = [1, { :a => 2, :b => 3 } ] + dup = Padrino::Utils.deep_dup(array) + dup[1][:c] = 4 + refute_includes array[1], :c + assert_equal 4, dup[1][:c] + end + + it 'should recursively dup hash with array' do + hash = { :a => [1, 2] } + dup = Padrino::Utils.deep_dup(hash) + dup[:a][2] = 'c' + assert_equal 2, hash[:a].size + assert_equal 'c', dup[:a][2] + end + + it 'should dup initial hash values' do + zero_hash = Hash.new 0 + hash = { :a => zero_hash } + dup = Padrino::Utils.deep_dup(hash) + assert_equal 0, dup[:a][44] + end + + it 'should properly dup objects' do + object = Object.new + dup = Padrino::Utils.deep_dup(object) + dup.instance_variable_set(:@a, 1) + assert !object.instance_variable_defined?(:@a) + assert dup.instance_variable_defined?(:@a) + end + + it 'should not double the frozen keys' do + hash = { 'a'.freeze => 1 } + dup = Padrino::Utils.deep_dup(hash) + assert_equal 1, dup.keys.length + end +end + +describe 'Padrino::Utils.symbolize_keys' do + it 'should symbolize string keys' do + assert_equal({ :a => 1, :b => 2 }, Padrino::Utils.symbolize_keys('a' => 1, 'b' => 2)) + end + + it 'should not fail on non-symbolizable keys' do + assert_equal({ Object => 1, true => 2 }, Padrino::Utils.symbolize_keys(Object => 1, true => 2)) + end +end diff --git a/padrino/Rakefile b/padrino/Rakefile index 45ceeeb88..14fe0a7aa 100644 --- a/padrino/Rakefile +++ b/padrino/Rakefile @@ -1,32 +1,16 @@ -# coding:utf-8 -RAKE_ROOT = __FILE__ - -require 'rubygems' require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') ########### CUSTOM TASKS ########## -gemspec = ::Gem::Specification.load(File.expand_path(File.dirname(__FILE__) + "/padrino.gemspec")) -subgems = [ - ["padrino-core", "= #{gemspec.version}"], - ["padrino-helpers", "= #{gemspec.version}"], - ["padrino-mailer", "= #{gemspec.version}"], - ["padrino-gen", "= #{gemspec.version}"], - ["padrino-admin", "= #{gemspec.version}"], - ["padrino-cache", "= #{gemspec.version}"], - ["padrino-support", "= #{gemspec.version}"], -] - task :package => "lib/padrino.rb" desc "Create padrino.rb" task "lib/padrino.rb" do - mkdir_p "lib" + FileUtils.mkdir_p "lib" File.open("lib/padrino.rb","w+") do |file| - file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT!" - subgems.each do |pair| - g, _ = pair - file.puts "require '#{g}'" unless g =~ /padrino-gen/ + file.puts "# Automatically generated from 'padrino.gemspec' by `rake lib/padrino.rb`" + PADRINO_SUBGEMS.each_key do |name| + file.puts "require '#{name}'" unless name =~ /padrino-(gen|performance)/ end end -end \ No newline at end of file +end diff --git a/padrino/lib/padrino.rb b/padrino/lib/padrino.rb index ab5458d2b..2fb8496f4 100644 --- a/padrino/lib/padrino.rb +++ b/padrino/lib/padrino.rb @@ -1,7 +1,7 @@ -### AUTOMATICALLY GENERATED. DO NOT EDIT! +# Automatically generated from 'padrino.gemspec' by `rake lib/padrino.rb` require 'padrino-support' require 'padrino-core' -require 'padrino-mailer' require 'padrino-helpers' -require 'padrino-admin' require 'padrino-cache' +require 'padrino-mailer' +require 'padrino-admin' diff --git a/padrino/padrino.gemspec b/padrino/padrino.gemspec index a0920f195..8638748e6 100644 --- a/padrino/padrino.gemspec +++ b/padrino/padrino.gemspec @@ -24,11 +24,13 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.rdoc_options = ["--charset=UTF-8"] - s.add_dependency("padrino-core", Padrino.version) s.add_dependency("padrino-support", Padrino.version) + s.add_dependency("padrino-core", Padrino.version) s.add_dependency("padrino-helpers", Padrino.version) + s.add_dependency("padrino-cache", Padrino.version) s.add_dependency("padrino-mailer", Padrino.version) s.add_dependency("padrino-gen", Padrino.version) - s.add_dependency("padrino-cache", Padrino.version) s.add_dependency("padrino-admin", Padrino.version) + + # add independent padrino gems to 'subgems.rb' end diff --git a/padrino/subgems.rb b/padrino/subgems.rb new file mode 100644 index 000000000..695e2db4e --- /dev/null +++ b/padrino/subgems.rb @@ -0,0 +1,9 @@ +padrino_gemspec = ::Gem::Specification.load(File.expand_path(File.dirname(__FILE__) + "/padrino.gemspec")) +performance_gemspec = ::Gem::Specification.load(File.expand_path(File.dirname(__FILE__) + "/../padrino-performance/padrino-performance.gemspec")) + +PADRINO_SUBGEMS ||= Hash[padrino_gemspec.dependencies.map{ |gem| [gem.name, gem.requirement.to_s] }] + +PADRINO_GEMS ||= PADRINO_SUBGEMS.merge( + 'padrino' => padrino_gemspec.version.to_s, + 'padrino-performance' => performance_gemspec.version.to_s, +) diff --git a/padrino/test/ext/fakeweb-ruby24.rb b/padrino/test/ext/fakeweb-ruby24.rb new file mode 100644 index 000000000..dcc80bc65 --- /dev/null +++ b/padrino/test/ext/fakeweb-ruby24.rb @@ -0,0 +1,5 @@ +# FakeWeb is dead. Ruby 2.4 apparently calls #close even if a socked is already closed. +class FakeWeb::StubSocket + def close + end +end diff --git a/padrino/test/ext/minitest-spec.rb b/padrino/test/ext/minitest-spec.rb new file mode 100644 index 000000000..e55f9acac --- /dev/null +++ b/padrino/test/ext/minitest-spec.rb @@ -0,0 +1,30 @@ +class MiniTest::Spec + # Assert_file_exists('/tmp/app') + def assert_file_exists(file_path) + assert File.file?(file_path), "File at path '#{file_path}' does not exist!" + end + + # Assert_no_file_exists('/tmp/app') + def assert_no_file_exists(file_path) + assert !File.exist?(file_path), "File should not exist at path '#{file_path}' but was found!" + end + + # assert_dir_exists('/tmp/app') + def assert_dir_exists(file_path) + assert File.directory?(file_path), "Folder at path '#{file_path}' does not exist" + end + + # assert_no_dir_exists('/tmp/app') + def assert_no_dir_exists(file_path) + assert !File.exist?(file_path), "Folder should not exist at path '#{file_path}' but was found" + end + + # Asserts that a file matches the pattern + def assert_match_in_file(pattern, file) + File.file?(file) ? assert_match(pattern, File.read(file)) : assert_file_exists(file) + end + + def assert_no_match_in_file(pattern, file) + File.file?(file) ? refute_match(pattern, File.read(file)) : assert_file_exists(file) + end +end diff --git a/padrino/test/ext/rack-test-methods.rb b/padrino/test/ext/rack-test-methods.rb new file mode 100644 index 000000000..b8d3f93e5 --- /dev/null +++ b/padrino/test/ext/rack-test-methods.rb @@ -0,0 +1,10 @@ +module Rack::Test::Methods + # Delegate some methods to the last response + alias_method :response, :last_response + + [:status, :headers, :body, :content_type, :ok?, :forbidden?].each do |method_name| + define_method method_name do + last_response.send(method_name) + end + end +end diff --git a/padrino/test/helper.rb b/padrino/test/helper.rb deleted file mode 100644 index 8c6ffc3b2..000000000 --- a/padrino/test/helper.rb +++ /dev/null @@ -1,6 +0,0 @@ -require File.expand_path('../../../load_paths', __FILE__) -require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda') - -class MiniTest::Spec - # Nothing to see here -end diff --git a/padrino/test/padrino/test-methods.rb b/padrino/test/padrino/test-methods.rb new file mode 100644 index 000000000..f804d8b1f --- /dev/null +++ b/padrino/test/padrino/test-methods.rb @@ -0,0 +1,55 @@ +require 'oga' + +module Padrino + module TestMethods + def assert_html_has_tag(html, tag, attributes={}) + assert html.html_safe?, 'output in not #html_safe?' + assert_has_selector(html, tag, attributes) + end + + def assert_html_has_no_tag(html, tag, attributes={}) + assert html.html_safe?, 'output in not #html_safe?' + assert_has_no_selector(html, tag, attributes) + end + + def assert_response_has_tag(tag, attributes={}) + assert_has_selector(last_response.body, tag, attributes) + end + + def assert_response_has_no_tag(tag, attributes={}) + assert_has_no_selector(last_response.body, tag, attributes) + end + + def assert_has_selector(html, selector, attributes) + count_requirement = attributes.delete(:count) + message = "'#{selector}' with attributes #{attributes} in html\n#{html}" + matched_count = html_matched_tags(html, selector.to_s, attributes) + if count_requirement + assert_equal count_requirement, matched_count, "count of tags #{message}" + else + assert matched_count > 0, "expected a tag #{message}" + end + end + + def assert_has_no_selector(html, selector, attributes) + message = "'#{selector}' with attributes #{attributes} in html\n#{html}" + matched_count = html_matched_tags(html, selector.to_s, attributes) + assert matched_count == 0, "expected no tags #{message}" + end + + private + + def html_matched_tags(html, selector, attributes) + @dom ||= Oga.parse_html(html) + content_requirement = attributes.delete(:content) + attributes.each do |name, value| + selector += %{[#{name}="#{value}"]} + end + tags = @dom.css(selector.to_s.gsub(/\[([^"']*?)=([^'"]*?)\]/, '[\1="\2"]')) + if content_requirement + tags = tags.select{ |tag| (tag.get('content') || tag.text).index(content_requirement) } + end + tags.count + end + end +end diff --git a/padrino/test/test_padrino.rb b/padrino/test/test_padrino.rb index 78e249b24..e631e00aa 100644 --- a/padrino/test/test_padrino.rb +++ b/padrino/test/test_padrino.rb @@ -1,11 +1,12 @@ -require File.expand_path(File.dirname(__FILE__) + '/helper') +require 'minitest/autorun' +require 'minitest/pride' describe "Padrino" do - should "be a metagem that requires subgems" do - assert_nil defined?(Padrino::Mailer) - assert_nil defined?(Padrino::Helpers) + it "should be a metagem that requires subgems" do + refute defined?(Padrino::Mailer) + refute defined?(Padrino::Helpers) require File.expand_path('../../lib/padrino.rb', __FILE__) - assert_not_nil defined?(Padrino::Mailer) - assert_not_nil defined?(Padrino::Helpers) + assert defined?(Padrino::Mailer) + assert defined?(Padrino::Helpers) end end