Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bump to Rails 3.2!

  • Loading branch information...
commit d398c3d03cb025e43a913e8c339eeb3c56dc6e8f 1 parent a8c3d28
Nick Quaranto qrush authored
Showing with 45 additions and 1,052 deletions.
  1. +6 −2 Gemfile
  2. +38 −40 Gemfile.lock
  3. +1 −1  app/controllers/application_controller.rb
  4. BIN  vendor/cache/actionmailer-3.1.4.gem
  5. BIN  vendor/cache/actionmailer-3.2.2.gem
  6. BIN  vendor/cache/actionpack-3.1.4.gem
  7. BIN  vendor/cache/actionpack-3.2.2.gem
  8. BIN  vendor/cache/activemodel-3.1.4.gem
  9. BIN  vendor/cache/activemodel-3.2.2.gem
  10. BIN  vendor/cache/activerecord-3.1.4.gem
  11. BIN  vendor/cache/activerecord-3.2.2.gem
  12. BIN  vendor/cache/activeresource-3.1.4.gem
  13. BIN  vendor/cache/activeresource-3.2.2.gem
  14. BIN  vendor/cache/activesupport-3.1.4.gem
  15. BIN  vendor/cache/activesupport-3.2.2.gem
  16. BIN  vendor/cache/arel-2.2.3.gem
  17. BIN  vendor/cache/arel-3.0.2.gem
  18. BIN  vendor/cache/dynamic_form-1.1.4.gem
  19. BIN  vendor/cache/journey-1.0.3.gem
  20. BIN  vendor/cache/mail-2.3.3.gem
  21. BIN  vendor/cache/mail-2.4.4.gem
  22. BIN  vendor/cache/rack-1.3.6.gem
  23. BIN  vendor/cache/rack-1.4.1.gem
  24. BIN  vendor/cache/rack-mount-0.8.3.gem
  25. BIN  vendor/cache/{rails-3.1.4.gem → rails-3.2.2.gem}
  26. BIN  vendor/cache/railties-3.1.4.gem
  27. BIN  vendor/cache/railties-3.2.2.gem
  28. BIN  vendor/cache/silent-postgres-0.1.1.gem
  29. BIN  vendor/cache/sprockets-2.0.3.gem
  30. BIN  vendor/cache/sprockets-2.1.2.gem
  31. 0  vendor/plugins/.gitkeep
  32. +0 −20 vendor/plugins/dynamic_form/MIT-LICENSE
  33. +0 −13 vendor/plugins/dynamic_form/README
  34. +0 −10 vendor/plugins/dynamic_form/Rakefile
  35. +0 −5 vendor/plugins/dynamic_form/init.rb
  36. +0 −300 vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb
  37. +0 −8 vendor/plugins/dynamic_form/lib/action_view/locale/en.yml
  38. +0 −42 vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb
  39. +0 −370 vendor/plugins/dynamic_form/test/dynamic_form_test.rb
  40. +0 −9 vendor/plugins/dynamic_form/test/test_helper.rb
  41. +0 −20 vendor/plugins/heroku_asset_cacher/MIT-LICENSE
  42. +0 −48 vendor/plugins/heroku_asset_cacher/README.rdoc
  43. +0 −23 vendor/plugins/heroku_asset_cacher/Rakefile
  44. +0 −2  vendor/plugins/heroku_asset_cacher/init.rb
  45. +0 −17 vendor/plugins/heroku_asset_cacher/lib/actionpack_overrides.rb
  46. +0 −51 vendor/plugins/heroku_asset_cacher/lib/heroku_asset_cacher.rb
  47. +0 −12 vendor/plugins/heroku_asset_cacher/tasks/heroku_asset_cacher_tasks.rake
  48. +0 −49 vendor/plugins/heroku_asset_cacher/test/heroku_asset_cacher_test.rb
  49. +0 −9 vendor/plugins/heroku_asset_cacher/test/test_helper.rb
  50. +0 −1  vendor/plugins/heroku_asset_cacher/uninstall.rb
8 Gemfile
View
@@ -1,9 +1,10 @@
source 'https://rubygems.org'
-gem 'rails', '~> 3.1.0'
+gem 'rails', '~> 3.2.2'
gem 'airbrake'
gem 'clearance', '~> 0.13.2'
+gem 'dynamic_form'
gem 'excon'
gem 'fog'
gem 'gchartrb', :require => 'google_chart'
@@ -25,6 +26,10 @@ gem 'will_paginate'
gem 'xml-simple'
gem 'yajl-ruby', :require => 'yajl'
+# enable if on heroku, make sure to toss this into an initializer:
+# Rails.application.config.middleware.use HerokuAssetCacher
+#gem 'heroku_asset_cacher', :git => "git@github.com/qrush/heroku_asset_cacher"
+
group :development do
gem 'capistrano-ext'
gem 'rails-erd'
@@ -33,7 +38,6 @@ group :development do
end
group :development, :test do
- gem 'silent-postgres'
gem 'guard'
gem 'guard-cucumber'
gem 'guard-bundler'
78 Gemfile.lock
View
@@ -1,39 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.1.4)
- actionpack (= 3.1.4)
- mail (~> 2.3.0)
- actionpack (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
+ actionmailer (3.2.2)
+ actionpack (= 3.2.2)
+ mail (~> 2.4.0)
+ actionpack (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.6)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.4)
- activesupport (= 3.1.4)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- arel (~> 2.2.3)
+ activerecord (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- activesupport (3.1.4)
+ activeresource (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ activesupport (3.2.2)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.7)
airbrake (3.0.9)
activesupport
builder
- arel (2.2.3)
+ arel (3.0.2)
builder (3.0.0)
capistrano (2.11.2)
highline
@@ -77,6 +76,7 @@ GEM
diesel (0.1.5)
railties
diff-lcs (1.1.3)
+ dynamic_form (1.1.4)
erubis (2.7.0)
excon (0.13.0)
factory_girl (2.6.4)
@@ -112,13 +112,14 @@ GEM
highline (1.6.11)
hike (1.2.1)
i18n (0.6.0)
+ journey (1.0.3)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.5)
launchy (2.1.0)
addressable (~> 2.2.6)
- mail (2.3.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -145,34 +146,32 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.7.1)
slop (>= 2.4.4, < 3)
- rack (1.3.6)
+ rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-maintenance (0.3.0)
rack (>= 1.0)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.4)
- actionmailer (= 3.1.4)
- actionpack (= 3.1.4)
- activerecord (= 3.1.4)
- activeresource (= 3.1.4)
- activesupport (= 3.1.4)
+ rails (3.2.2)
+ actionmailer (= 3.2.2)
+ actionpack (= 3.2.2)
+ activerecord (= 3.2.2)
+ activeresource (= 3.2.2)
+ activesupport (= 3.2.2)
bundler (~> 1.0)
- railties (= 3.1.4)
+ railties (= 3.2.2)
rails-erd (0.4.5)
activerecord (~> 3.0)
activesupport (~> 3.0)
ruby-graphviz (~> 0.9.18)
- railties (3.1.4)
- actionpack (= 3.1.4)
- activesupport (= 3.1.4)
+ railties (3.2.2)
+ actionpack (= 3.2.2)
+ activesupport (= 3.2.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -198,13 +197,12 @@ GEM
shoulda-matchers (~> 1.0.0)
shoulda-context (1.0.0)
shoulda-matchers (1.0.0)
- silent-postgres (0.1.1)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
slop (2.4.4)
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -240,6 +238,7 @@ DEPENDENCIES
database_cleaner
delayed_job (~> 3.0.0.pre)
delayed_job_active_record
+ dynamic_form
excon
factory_girl_rails (~> 1.7.0)
fog
@@ -263,7 +262,7 @@ DEPENDENCIES
rack
rack-maintenance
rack-test
- rails (~> 3.1.0)
+ rails (~> 3.2.2)
rails-erd
rdoc
redis
@@ -271,7 +270,6 @@ DEPENDENCIES
rr
rvm
shoulda
- silent-postgres
sinatra
timecop
validates_formatting_of (>= 0.3.0)
2  app/controllers/application_controller.rb
View
@@ -31,7 +31,7 @@ def find_rubygem
if @rubygem.blank?
respond_to do |format|
format.html do
- render :file => "public/404.html", :status => :not_found, :layout => false
+ render :file => "public/404", :status => :not_found, :layout => false, :formats => [:html]
end
format.json do
render :text => "This rubygem could not be found.", :status => :not_found
BIN  vendor/cache/actionmailer-3.1.4.gem
View
Binary file not shown
BIN  vendor/cache/actionmailer-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/actionpack-3.1.4.gem
View
Binary file not shown
BIN  vendor/cache/actionpack-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/activemodel-3.1.4.gem
View
Binary file not shown
BIN  vendor/cache/activemodel-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/activerecord-3.1.4.gem
View
Binary file not shown
BIN  vendor/cache/activerecord-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/activeresource-3.1.4.gem
View
Binary file not shown
BIN  vendor/cache/activeresource-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/activesupport-3.1.4.gem
View
Binary file not shown
BIN  vendor/cache/activesupport-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/arel-2.2.3.gem
View
Binary file not shown
BIN  vendor/cache/arel-3.0.2.gem
View
Binary file not shown
BIN  vendor/cache/dynamic_form-1.1.4.gem
View
Binary file not shown
BIN  vendor/cache/journey-1.0.3.gem
View
Binary file not shown
BIN  vendor/cache/mail-2.3.3.gem
View
Binary file not shown
BIN  vendor/cache/mail-2.4.4.gem
View
Binary file not shown
BIN  vendor/cache/rack-1.3.6.gem
View
Binary file not shown
BIN  vendor/cache/rack-1.4.1.gem
View
Binary file not shown
BIN  vendor/cache/rack-mount-0.8.3.gem
View
Binary file not shown
BIN  vendor/cache/rails-3.1.4.gem → vendor/cache/rails-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/railties-3.1.4.gem
View
Binary file not shown
BIN  vendor/cache/railties-3.2.2.gem
View
Binary file not shown
BIN  vendor/cache/silent-postgres-0.1.1.gem
View
Binary file not shown
BIN  vendor/cache/sprockets-2.0.3.gem
View
Binary file not shown
BIN  vendor/cache/sprockets-2.1.2.gem
View
Binary file not shown
0  vendor/plugins/.gitkeep
View
No changes.
20 vendor/plugins/dynamic_form/MIT-LICENSE
View
@@ -1,20 +0,0 @@
-Copyright (c) 2010 David Heinemeier Hansson
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13 vendor/plugins/dynamic_form/README
View
@@ -1,13 +0,0 @@
-DynamicForm
-===========
-
-DynamicForm holds a few helpers method to help you deal with your models, they are:
-
-* input(record, method, options = {})
-* form(record, options = {})
-* error_message_on(object, method, options={})
-* error_messages_for(record, options={})
-
-It also adds f.error_messages and f.error_messages_on to your form builders.
-
-Copyright (c) 2010 David Heinemeier Hansson, released under the MIT license
10 vendor/plugins/dynamic_form/Rakefile
View
@@ -1,10 +0,0 @@
-require 'rake/testtask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the active_model_helper plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'test'
- t.pattern = 'test/**/*_test.rb'
-end
5 vendor/plugins/dynamic_form/init.rb
View
@@ -1,5 +0,0 @@
-require 'action_view/helpers/dynamic_form'
-
-class ActionView::Base
- include DynamicForm
-end
300 vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb
View
@@ -1,300 +0,0 @@
-require 'action_view/helpers'
-require 'active_support/i18n'
-require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/object/blank'
-
-module ActionView
- module Helpers
- # The Active Record Helper makes it easier to create forms for records kept in instance variables. The most far-reaching is the +form+
- # method that creates a complete form for all the basic content types of the record (not associations or aggregations, though). This
- # is a great way of making the record quickly available for editing, but likely to prove lackluster for a complicated real-world form.
- # In that case, it's better to use the +input+ method and the specialized +form+ methods in link:classes/ActionView/Helpers/FormHelper.html
- module DynamicForm
- # Returns a default input tag for the type of object returned by the method. For example, if <tt>@post</tt>
- # has an attribute +title+ mapped to a +VARCHAR+ column that holds "Hello World":
- #
- # input("post", "title")
- # # => <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
- def input(record_name, method, options = {})
- InstanceTag.new(record_name, method, self).to_tag(options)
- end
-
- # Returns an entire form with all needed input tags for a specified Active Record object. For example, if <tt>@post</tt>
- # has attributes named +title+ of type +VARCHAR+ and +body+ of type +TEXT+ then
- #
- # form("post")
- #
- # would yield a form like the following (modulus formatting):
- #
- # <form action='/posts/create' method='post'>
- # <p>
- # <label for="post_title">Title</label><br />
- # <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
- # </p>
- # <p>
- # <label for="post_body">Body</label><br />
- # <textarea cols="40" id="post_body" name="post[body]" rows="20"></textarea>
- # </p>
- # <input name="commit" type="submit" value="Create" />
- # </form>
- #
- # It's possible to specialize the form builder by using a different action name and by supplying another
- # block renderer. For example, if <tt>@entry</tt> has an attribute +message+ of type +VARCHAR+ then
- #
- # form("entry",
- # :action => "sign",
- # :input_block => Proc.new { |record, column|
- # "#{column.human_name}: #{input(record, column.name)}<br />"
- # })
- #
- # would yield a form like the following (modulus formatting):
- #
- # <form action="/entries/sign" method="post">
- # Message:
- # <input id="entry_message" name="entry[message]" size="30" type="text" /><br />
- # <input name="commit" type="submit" value="Sign" />
- # </form>
- #
- # It's also possible to add additional content to the form by giving it a block, such as:
- #
- # form("entry", :action => "sign") do |form|
- # form << content_tag("b", "Department")
- # form << collection_select("department", "id", @departments, "id", "name")
- # end
- #
- # The following options are available:
- #
- # * <tt>:action</tt> - The action used when submitting the form (default: +create+ if a new record, otherwise +update+).
- # * <tt>:input_block</tt> - Specialize the output using a different block, see above.
- # * <tt>:method</tt> - The method used when submitting the form (default: +post+).
- # * <tt>:multipart</tt> - Whether to change the enctype of the form to "multipart/form-data", used when uploading a file (default: +false+).
- # * <tt>:submit_value</tt> - The text of the submit button (default: "Create" if a new record, otherwise "Update").
- def form(record_name, options = {})
- record = instance_variable_get("@#{record_name}")
- record = convert_to_model(record)
-
- options = options.symbolize_keys
- options[:action] ||= record.persisted? ? "update" : "create"
- action = url_for(:action => options[:action], :id => record)
-
- submit_value = options[:submit_value] || options[:action].gsub(/[^\w]/, '').capitalize
-
- contents = form_tag({:action => action}, :method =>(options[:method] || 'post'), :enctype => options[:multipart] ? 'multipart/form-data': nil)
- contents.safe_concat hidden_field(record_name, :id) if record.persisted?
- contents.safe_concat all_input_tags(record, record_name, options)
- yield contents if block_given?
- contents.safe_concat submit_tag(submit_value)
- contents.safe_concat('</form>')
- end
-
- # Returns a string containing the error message attached to the +method+ on the +object+ if one exists.
- # This error message is wrapped in a <tt>DIV</tt> tag by default or with <tt>:html_tag</tt> if specified,
- # which can be extended to include a <tt>:prepend_text</tt> and/or <tt>:append_text</tt> (to properly explain
- # the error), and a <tt>:css_class</tt> to style it accordingly. +object+ should either be the name of an
- # instance variable or the actual object. The method can be passed in either as a string or a symbol.
- # As an example, let's say you have a model <tt>@post</tt> that has an error message on the +title+ attribute:
- #
- # <%= error_message_on "post", "title" %>
- # # => <div class="formError">can't be empty</div>
- #
- # <%= error_message_on @post, :title %>
- # # => <div class="formError">can't be empty</div>
- #
- # <%= error_message_on "post", "title",
- # :prepend_text => "Title simply ",
- # :append_text => " (or it won't work).",
- # :html_tag => "span",
- # :css_class => "inputError" %>
- # # => <span class="inputError">Title simply can't be empty (or it won't work).</span>
- def error_message_on(object, method, *args)
- options = args.extract_options!
- unless args.empty?
- ActiveSupport::Deprecation.warn('error_message_on takes an option hash instead of separate ' +
- 'prepend_text, append_text, html_tag, and css_class arguments', caller)
-
- options[:prepend_text] = args[0] || ''
- options[:append_text] = args[1] || ''
- options[:html_tag] = args[2] || 'div'
- options[:css_class] = args[3] || 'formError'
- end
- options.reverse_merge!(:prepend_text => '', :append_text => '', :html_tag => 'div', :css_class => 'formError')
-
- object = convert_to_model(object)
-
- if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
- (errors = obj.errors[method]).presence
- content_tag(options[:html_tag],
- (options[:prepend_text].html_safe << errors.first).safe_concat(options[:append_text]),
- :class => options[:css_class]
- )
- else
- ''
- end
- end
-
- # Returns a string with a <tt>DIV</tt> containing all of the error messages for the objects located as instance variables by the names
- # given. If more than one object is specified, the errors for the objects are displayed in the order that the object names are
- # provided.
- #
- # This <tt>DIV</tt> can be tailored by the following options:
- #
- # * <tt>:header_tag</tt> - Used for the header of the error div (default: "h2").
- # * <tt>:id</tt> - The id of the error div (default: "errorExplanation").
- # * <tt>:class</tt> - The class of the error div (default: "errorExplanation").
- # * <tt>:object</tt> - The object (or array of objects) for which to display errors,
- # if you need to escape the instance variable convention.
- # * <tt>:object_name</tt> - The object name to use in the header, or any text that you prefer.
- # If <tt>:object_name</tt> is not set, the name of the first object will be used.
- # * <tt>:header_message</tt> - The message in the header of the error div. Pass +nil+
- # or an empty string to avoid the header message altogether. (Default: "X errors
- # prohibited this object from being saved").
- # * <tt>:message</tt> - The explanation message after the header message and before
- # the error list. Pass +nil+ or an empty string to avoid the explanation message
- # altogether. (Default: "There were problems with the following fields:").
- #
- # To specify the display for one object, you simply provide its name as a parameter.
- # For example, for the <tt>@user</tt> model:
- #
- # error_messages_for 'user'
- #
- # You can also supply an object:
- #
- # error_messages_for @user
- #
- # This will use the last part of the model name in the presentation. For instance, if
- # this is a MyKlass::User object, this will use "user" as the name in the String. This
- # is taken from MyKlass::User.model_name.human, which can be overridden.
- #
- # To specify more than one object, you simply list them; optionally, you can add an extra <tt>:object_name</tt> parameter, which
- # will be the name used in the header message:
- #
- # error_messages_for 'user_common', 'user', :object_name => 'user'
- #
- # You can also use a number of objects, which will have the same naming semantics
- # as a single object.
- #
- # error_messages_for @user, @post
- #
- # If the objects cannot be located as instance variables, you can add an extra <tt>:object</tt> parameter which gives the actual
- # object (or array of objects to use):
- #
- # error_messages_for 'user', :object => @question.user
- #
- # NOTE: This is a pre-packaged presentation of the errors with embedded strings and a certain HTML structure. If what
- # you need is significantly different from the default presentation, it makes plenty of sense to access the <tt>object.errors</tt>
- # instance yourself and set it up. View the source of this method to see how easy it is.
- def error_messages_for(*params)
- options = params.extract_options!.symbolize_keys
-
- objects = Array.wrap(options.delete(:object) || params).map do |object|
- object = instance_variable_get("@#{object}") unless object.respond_to?(:to_model)
- object = convert_to_model(object)
-
- if object.class.respond_to?(:model_name)
- options[:object_name] ||= object.class.model_name.human.downcase
- end
-
- object
- end
-
- objects.compact!
- count = objects.inject(0) {|sum, object| sum + object.errors.count }
-
- unless count.zero?
- html = {}
- [:id, :class].each do |key|
- if options.include?(key)
- value = options[key]
- html[key] = value unless value.blank?
- else
- html[key] = 'errorExplanation'
- end
- end
- options[:object_name] ||= params.first
-
- I18n.with_options :locale => options[:locale], :scope => [:errors, :template] do |locale|
- header_message = if options.include?(:header_message)
- options[:header_message]
- else
- locale.t :header, :count => count, :model => options[:object_name].to_s.gsub('_', ' ')
- end
-
- message = options.include?(:message) ? options[:message] : locale.t(:body)
-
- error_messages = objects.sum do |object|
- object.errors.full_messages.map do |msg|
- content_tag(:li, msg)
- end
- end.join.html_safe
-
- contents = ''
- contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
- contents << content_tag(:p, message) unless message.blank?
- contents << content_tag(:ul, error_messages)
-
- content_tag(:div, contents.html_safe, html)
- end
- else
- ''
- end
- end
-
- private
-
- def all_input_tags(record, record_name, options)
- input_block = options[:input_block] || default_input_block
- record.class.content_columns.collect{ |column| input_block.call(record_name, column) }.join("\n")
- end
-
- def default_input_block
- Proc.new { |record, column| %(<p><label for="#{record}_#{column.name}">#{column.human_name}</label><br />#{input(record, column.name)}</p>) }
- end
-
- module InstanceTagMethods
- def to_tag(options = {})
- case column_type
- when :string
- field_type = @method_name.include?("password") ? "password" : "text"
- to_input_field_tag(field_type, options)
- when :text
- to_text_area_tag(options)
- when :integer, :float, :decimal
- to_input_field_tag("text", options)
- when :date
- to_date_select_tag(options)
- when :datetime, :timestamp
- to_datetime_select_tag(options)
- when :time
- to_time_select_tag(options)
- when :boolean
- to_boolean_select_tag(options)
- end
- end
-
- def column_type
- object.send(:column_for_attribute, @method_name).type
- end
- end
-
- module FormBuilderMethods
- def error_message_on(method, *args)
- @template.error_message_on(@object || @object_name, method, *args)
- end
-
- def error_messages(options = {})
- @template.error_messages_for(@object_name, objectify_options(options))
- end
- end
- end
-
- class InstanceTag
- include DynamicForm::InstanceTagMethods
- end
-
- class FormBuilder
- include DynamicForm::FormBuilderMethods
- end
- end
-end
-
-I18n.load_path << File.expand_path("../../locale/en.yml", __FILE__)
8 vendor/plugins/dynamic_form/lib/action_view/locale/en.yml
View
@@ -1,8 +0,0 @@
-en:
- errors:
- template:
- header:
- one: "1 error prohibited this %{model} from being saved"
- other: "%{count} errors prohibited this %{model} from being saved"
- # The variable :count is also available
- body: "There were problems with the following fields:"
42 vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb
View
@@ -1,42 +0,0 @@
-require 'test_helper'
-
-class DynamicFormI18nTest < Test::Unit::TestCase
- include ActionView::Context
- include ActionView::Helpers::DynamicForm
-
- attr_reader :request
-
- def setup
- @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
- @object.stubs :to_model => @object
- @object.stubs :class => stub(:model_name => stub(:human => ""))
-
- @object_name = 'book_seller'
- @object_name_without_underscore = 'book seller'
-
- stubs(:content_tag).returns 'content_tag'
-
- I18n.stubs(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns "1 error prohibited this from being saved"
- I18n.stubs(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:'
- end
-
- def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
- I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').never
- error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en')
- end
-
- def test_error_messages_for_given_no_header_option_it_translates_header_message
- I18n.expects(:t).with(:'header', :locale => 'en', :scope => [:errors, :template], :count => 1, :model => '').returns 'header message'
- error_messages_for(:object => @object, :locale => 'en')
- end
-
- def test_error_messages_for_given_a_message_option_it_does_not_translate_message
- I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).never
- error_messages_for(:object => @object, :message => 'message', :locale => 'en')
- end
-
- def test_error_messages_for_given_no_message_option_it_translates_message
- I18n.expects(:t).with(:'body', :locale => 'en', :scope => [:errors, :template]).returns 'There were problems with the following fields:'
- error_messages_for(:object => @object, :locale => 'en')
- end
-end
370 vendor/plugins/dynamic_form/test/dynamic_form_test.rb
View
@@ -1,370 +0,0 @@
-require 'test_helper'
-require 'action_view/template/handlers/erb'
-
-class DynamicFormTest < ActionView::TestCase
- tests ActionView::Helpers::DynamicForm
-
- def form_for(*)
- @output_buffer = super
- end
-
- silence_warnings do
- class Post < Struct.new(:title, :author_name, :body, :secret, :written_on)
- extend ActiveModel::Naming
- include ActiveModel::Conversion
- end
-
- class User < Struct.new(:email)
- extend ActiveModel::Naming
- include ActiveModel::Conversion
- end
-
- class Column < Struct.new(:type, :name, :human_name)
- extend ActiveModel::Naming
- include ActiveModel::Conversion
- end
- end
-
- class DirtyPost
- class Errors
- def empty?
- false
- end
-
- def count
- 1
- end
-
- def full_messages
- ["Author name can't be <em>empty</em>"]
- end
-
- def [](field)
- ["can't be <em>empty</em>"]
- end
- end
-
- def errors
- Errors.new
- end
- end
-
- def setup_post
- @post = Post.new
- def @post.errors
- Class.new {
- def [](field)
- case field.to_s
- when "author_name"
- ["can't be empty"]
- when "body"
- ['foo']
- else
- []
- end
- end
- def empty?() false end
- def count() 1 end
- def full_messages() [ "Author name can't be empty" ] end
- }.new
- end
-
- def @post.persisted?() false end
- def @post.to_param() nil end
-
- def @post.column_for_attribute(attr_name)
- Post.content_columns.select { |column| column.name == attr_name }.first
- end
-
- silence_warnings do
- def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
- end
-
- @post.title = "Hello World"
- @post.author_name = ""
- @post.body = "Back to the hill and over it again!"
- @post.secret = 1
- @post.written_on = Date.new(2004, 6, 15)
- end
-
- def setup_user
- @user = User.new
- def @user.errors
- Class.new {
- def [](field) field == "email" ? ['nonempty'] : [] end
- def empty?() false end
- def count() 1 end
- def full_messages() [ "User email can't be empty" ] end
- }.new
- end
-
- def @user.new_record?() true end
- def @user.to_param() nil end
-
- def @user.column_for_attribute(attr_name)
- User.content_columns.select { |column| column.name == attr_name }.first
- end
-
- silence_warnings do
- def User.content_columns() [ Column.new(:string, "email", "Email") ] end
- end
-
- @user.email = ""
- end
-
- def protect_against_forgery?
- @protect_against_forgery ? true : false
- end
- attr_accessor :request_forgery_protection_token, :form_authenticity_token
-
- def setup
- super
- setup_post
- setup_user
-
- @response = ActionController::TestResponse.new
- end
-
- def url_for(options)
- options = options.symbolize_keys
- [options[:action], options[:id].to_param].compact.join('/')
- end
-
- def test_generic_input_tag
- assert_dom_equal(
- %(<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />), input("post", "title")
- )
- end
-
- def test_text_area_with_errors
- assert_dom_equal(
- %(<div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div>),
- text_area("post", "body")
- )
- end
-
- def test_text_field_with_errors
- assert_dom_equal(
- %(<div class="fieldWithErrors"><input id="post_author_name" name="post[author_name]" size="30" type="text" value="" /></div>),
- text_field("post", "author_name")
- )
- end
-
- def test_field_error_proc
- old_proc = ActionView::Base.field_error_proc
- ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
- %(<div class=\"fieldWithErrors\">#{html_tag} <span class="error">#{[instance.error_message].join(', ')}</span></div>).html_safe
- end
-
- assert_dom_equal(
- %(<div class="fieldWithErrors"><input id="post_author_name" name="post[author_name]" size="30" type="text" value="" /> <span class="error">can't be empty</span></div>),
- text_field("post", "author_name")
- )
- ensure
- ActionView::Base.field_error_proc = old_proc if old_proc
- end
-
- def test_form_with_string
- assert_dom_equal(
- %(<form action="create" method="post"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
- form("post")
- )
-
- silence_warnings do
- class << @post
- def persisted?() true end
- def to_param() id end
- def id() 1 end
- end
- end
-
- assert_dom_equal(
- %(<form action="update/1" method="post"><input id="post_id" name="post[id]" type="hidden" value="1" /><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Update" /></form>),
- form("post")
- )
- end
-
- def test_form_with_protect_against_forgery
- @protect_against_forgery = true
- @request_forgery_protection_token = 'authenticity_token'
- @form_authenticity_token = '123'
- assert_dom_equal(
- %(<form action="create" method="post"><div style='margin:0;padding:0;display:inline'><input type='hidden' name='authenticity_token' value='123' /></div><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
- form("post")
- )
- end
-
- def test_form_with_method_option
- assert_dom_equal(
- %(<form action="create" method="get"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
- form("post", :method=>'get')
- )
- end
-
- def test_form_with_action_option
- output_buffer << form("post", :action => "sign")
- assert_select "form[action=sign]" do |form|
- assert_select "input[type=submit][value=Sign]"
- end
- end
-
- def test_form_with_date
- silence_warnings do
- def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
- end
-
- assert_dom_equal(
- %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select id="post_written_on_1i" name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select id="post_written_on_2i" name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select id="post_written_on_3i" name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
- form("post")
- )
- end
-
- def test_form_with_datetime
- silence_warnings do
- def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
- end
- @post.written_on = Time.gm(2004, 6, 15, 16, 30)
-
- assert_dom_equal(
- %(<form action="create" method="post"><p><label for="post_written_on">Written on</label><br /><select id="post_written_on_1i" name="post[written_on(1i)]">\n<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n</select>\n<select id="post_written_on_2i" name="post[written_on(2i)]">\n<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select id="post_written_on_3i" name="post[written_on(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n &mdash; <select id="post_written_on_4i" name="post[written_on(4i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select id="post_written_on_5i" name="post[written_on(5i)]">\n<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30" selected="selected">30</option>\n<option value="31">31</option>\n<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n</select>\n</p><input name="commit" type="submit" value="Create" /></form>),
- form("post")
- )
- end
-
- def test_error_for_block
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post")
- assert_equal %(<div class="errorDeathByClass" id="errorDeathById"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => "errorDeathById", :header_tag => "h1")
- assert_equal %(<div id="errorDeathById"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => nil, :id => "errorDeathById", :header_tag => "h1")
- assert_equal %(<div class="errorDeathByClass"><h1>1 error prohibited this post from being saved</h1><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :class => "errorDeathByClass", :id => nil, :header_tag => "h1")
- end
-
- def test_error_messages_for_escapes_html
- @dirty_post = DirtyPost.new
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this dirty post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be &lt;em&gt;empty&lt;/em&gt;</li></ul></div>), error_messages_for("dirty_post")
- end
-
- def test_error_messages_for_handles_nil
- assert_equal "", error_messages_for("notthere")
- end
-
- def test_error_message_on_escapes_html
- @dirty_post = DirtyPost.new
- assert_dom_equal "<div class=\"formError\">can't be &lt;em&gt;empty&lt;/em&gt;</div>", error_message_on(:dirty_post, :author_name)
- end
-
- def test_error_message_on_handles_nil
- assert_equal "", error_message_on("notthere", "notthere")
- end
-
- def test_error_message_on
- assert_dom_equal "<div class=\"formError\">can't be empty</div>", error_message_on(:post, :author_name)
- end
-
- def test_error_message_on_no_instance_variable
- other_post = @post
- assert_dom_equal "<div class=\"formError\">can't be empty</div>", error_message_on(other_post, :author_name)
- end
-
- def test_error_message_on_with_options_hash
- assert_dom_equal "<div class=\"differentError\">beforecan't be emptyafter</div>", error_message_on(:post, :author_name, :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after')
- end
-
- def test_error_message_on_with_tag_option_in_options_hash
- assert_dom_equal "<span class=\"differentError\">beforecan't be emptyafter</span>", error_message_on(:post, :author_name, :html_tag => "span", :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after')
- end
-
- def test_error_message_on_handles_empty_errors
- assert_equal "", error_message_on(@post, :tag)
- end
-
- def test_error_messages_for_many_objects
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li><li>User email can't be empty</li></ul></div>), error_messages_for("post", "user")
-
- # reverse the order, error order changes and so does the title
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for("user", "post")
-
- # add the default to put post back in the title
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for("user", "post", :object_name => "post")
-
- # symbols work as well
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => :post)
-
- # any default works too
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this monkey from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => "monkey")
-
- # should space object name
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this chunky bacon from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :object_name => "chunky_bacon")
-
- # hide header and explanation messages with nil or empty string
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :header_message => nil, :message => "")
-
- # override header and explanation messages
- header_message = "Yikes! Some errors"
- message = "Please fix the following fields and resubmit:"
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>#{header_message}</h2><p>#{message}</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for(:user, :post, :header_message => header_message, :message => message)
- end
-
- def test_error_messages_for_non_instance_variable
- actual_user = @user
- actual_post = @post
- @user = nil
- @post = nil
-
- #explicitly set object
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>), error_messages_for("post", :object => actual_post)
-
- #multiple objects
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>), error_messages_for("user", "post", :object => [actual_user, actual_post])
-
- #nil object
- assert_equal '', error_messages_for('user', :object => nil)
- end
-
- def test_error_messages_for_model_objects
- error = error_messages_for(@post)
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>),
- error
-
- error = error_messages_for(@user, @post)
- assert_dom_equal %(<div class="errorExplanation" id="errorExplanation"><h2>2 errors prohibited this user from being saved</h2><p>There were problems with the following fields:</p><ul><li>User email can't be empty</li><li>Author name can't be empty</li></ul></div>),
- error
- end
-
- def test_form_with_string_multipart
- assert_dom_equal(
- %(<form action="create" enctype="multipart/form-data" method="post"><p><label for="post_title">Title</label><br /><input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /></p>\n<p><label for="post_body">Body</label><br /><div class="fieldWithErrors"><textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea></div></p><input name="commit" type="submit" value="Create" /></form>),
- form("post", :multipart => true)
- )
- end
-
- def test_default_form_builder_with_dynamic_form_helpers
- form_for(@post, :as => :post, :url => {}) do |f|
- concat f.error_message_on('author_name')
- concat f.error_messages
- end
-
- expected = %(<form class="post_new" method="post" action="" id="post_new">) +
- %(<div class="formError">can't be empty</div>) +
- %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
- %(</form>)
-
- assert_dom_equal expected, output_buffer
- end
-
- def test_default_form_builder_no_instance_variable
- post = @post
- @post = nil
-
- form_for(post, :as => :post, :url => {}) do |f|
- concat f.error_message_on('author_name')
- concat f.error_messages
- end
-
- expected = %(<form class="post_new" method="post" action="" id="post_new">) +
- %(<div class="formError">can't be empty</div>) +
- %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
- %(</form>)
-
- assert_dom_equal expected, output_buffer
- end
-end
9 vendor/plugins/dynamic_form/test/test_helper.rb
View
@@ -1,9 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'active_support'
-require 'active_support/core_ext'
-require 'action_view'
-require 'action_controller'
-require 'action_controller/test_case'
-require 'active_model'
-require 'action_view/helpers/dynamic_form'
20 vendor/plugins/heroku_asset_cacher/MIT-LICENSE
View
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Mauricio Gomes
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
48 vendor/plugins/heroku_asset_cacher/README.rdoc
View
@@ -1,48 +0,0 @@
-= Heroku Asset Cacher
-
-This plugin will override the caching options of Rails helpers: javascript_include_tag and stylesheet_link_tag. It will
-instruct them to place their cached assets into the Rails /tmp directory, the only writeable directory in Heroku. It then adds
-some Rack middleware to route requests for those files to the /tmp directory.
-
-== Install
-
- script/plugin install http://github.com/mgomes/heroku_asset_cacher.git
-
-== Usage
-
-This plugin will only override the requests for all.js and all.css. So please use the convention of naming your cached JS and CSS assets: all.js and all.css, respectively. (these are the default naming conventions).
-Here is an example:
-
- javascript_include_tag :all, :cache => true
- stylesheet_link_tag :all, :cache => true
-
-Or you can specify individual files to cache, as such:
-
- javascript_include_tag 'jquery', 'jquery.tooltip', :cache => true
- stylesheet_link_tag 'main_design', 'secondary_design', :cache => true
-
-Files that are not included in the all.js or all.css bundle will still be served from their original directories.
-
-== Clearing the cached assets
-
-You can run the following rake task on Heroku to regenerate your cached assets:
-
- rake asset_cache:clear
-
-== Testing
-
-To run the test suite:
-
- rake test
-
-To try out Heroku Asset Cacher in development, you can set the following option in environment.rb:
-
- ActionController::Base.perform_caching = true
-
-== Previous Art
-
-This plugin is based off of the work by Matthew Savage in his {Heroku Asset Packager}[http://github.com/amasses/heroku_asset_packager] plugin.
-
-== Author
-
-Copyright (c) 2010 Mauricio Gomes, released under the MIT license
23 vendor/plugins/heroku_asset_cacher/Rakefile
View
@@ -1,23 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the heroku_asset_cacher plugin.'
-Rake::TestTask.new(:test) do |t|
- t.libs << 'lib'
- t.libs << 'test'
- t.pattern = 'test/**/*_test.rb'
- t.verbose = true
-end
-
-desc 'Generate documentation for the heroku_asset_cacher plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
- rdoc.rdoc_dir = 'rdoc'
- rdoc.title = 'HerokuAssetCacher'
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.rdoc_files.include('README')
- rdoc.rdoc_files.include('lib/**/*.rb')
-end
2  vendor/plugins/heroku_asset_cacher/init.rb
View
@@ -1,2 +0,0 @@
-require 'actionpack_overrides'
-ActionController::Dispatcher.middleware.use HerokuAssetCacher
17 vendor/plugins/heroku_asset_cacher/lib/actionpack_overrides.rb
View
@@ -1,17 +0,0 @@
-module ActionView
- module Helpers
- module AssetTagHelper
- private
- def write_asset_file_contents(joined_asset_path, asset_paths)
- joined_asset_path = File.join($asset_cache_base_path, joined_asset_path.split(File::SEPARATOR).last)
- FileUtils.mkdir_p(File.dirname(joined_asset_path))
- File.atomic_write(joined_asset_path) { |cache| cache.write(join_asset_file_contents(asset_paths)) }
-
- # Set mtime to the latest of the combined files to allow for
- # consistent ETag without a shared filesystem.
- mt = asset_paths.map { |p| File.mtime(asset_file_path(p)) }.max
- File.utime(mt, mt, joined_asset_path)
- end
- end
- end
-end
51 vendor/plugins/heroku_asset_cacher/lib/heroku_asset_cacher.rb
View
@@ -1,51 +0,0 @@
-class HerokuAssetCacher
- def initialize_asset_packager
- $asset_cache_base_path = heroku_file_location
- end
-
- def initialize(app)
- @app = app
- initialize_asset_packager if ActionController::Base.perform_caching
- end
-
- def call(env)
- @env = env
- if ActionController::Base.perform_caching
- return render_css if env['REQUEST_PATH'] =~ /\/stylesheets\/all.css/i
- return render_js if env['REQUEST_PATH'] =~ /\/javascripts\/all.js/i
- end
-
- @app.call(env)
- end
-
- def render_js
- file = "#{heroku_file_location}/all.js"
- [
- 200,
- {
- 'Cache-Control' => 'public, max-age=86400',
- 'Content-Length' => File.size(file).to_s,
- 'Content-Type' => 'text/javascript'
- },
- File.read(file)
- ]
- end
-
- def render_css
- file = "#{heroku_file_location}/all.css"
- [
- 200,
- {
- 'Cache-Control' => 'public, max-age=86400',
- 'Content-Length' => File.size(file).to_s,
- 'Content-Type' => 'text/css'
- },
- File.read(file)
- ]
- end
-
- def heroku_file_location
- "#{RAILS_ROOT}/tmp/asset_cache"
- end
-
-end
12 vendor/plugins/heroku_asset_cacher/tasks/heroku_asset_cacher_tasks.rake
View
@@ -1,12 +0,0 @@
-namespace :asset_cache do
- desc 'Clear the cached asset files (Run in production)'
- task :clear do
- asset_cache_path = File.join(File.dirname(__FILE__), "..", "..", "..", "..", "tmp", "asset_cache")
- if File.directory?(asset_cache_path)
- Dir.entries(asset_cache_path).each do |file|
- next if file == "." || file == ".."
- File.delete(File.join(asset_cache_path, file))
- end
- end
- end
-end
49 vendor/plugins/heroku_asset_cacher/test/heroku_asset_cacher_test.rb
View
@@ -1,49 +0,0 @@
-require 'test_helper'
-require 'mocha'
-
-class HerokuAssetPackagerTest < Test::Unit::TestCase
- def test_all_css_call
- env = {"REQUEST_PATH" => "/stylesheets/all.css"}
-
- app = mock()
- hac = HerokuAssetCacher.new(app)
-
- assert !$asset_cache_base_path.nil?
- hac.expects(:render_css)
-
- hac.call(env)
- end
-
- def test_all_js_call
- env = {"REQUEST_PATH" => "/javascripts/all.js"}
-
- app = mock()
- hac = HerokuAssetCacher.new(app)
-
- assert_equal false, $asset_cache_base_path.nil?
- hac.expects(:render_js)
-
- hac.call(env)
- end
-
- def test_regular_js_call
- env = {"REQUEST_PATH" => "/javascripts/test.js"}
-
- app = mock()
- app.expects(:call).with(env)
- hac = HerokuAssetCacher.new(app)
-
- hac.call(env)
- end
-
- def test_regular_css_call
- env = {"REQUEST_PATH" => "/stylesheets/test.css"}
-
- app = mock()
- app.expects(:call).with(env)
- hac = HerokuAssetCacher.new(app)
-
- hac.call(env)
- end
-
-end
9 vendor/plugins/heroku_asset_cacher/test/test_helper.rb
View
@@ -1,9 +0,0 @@
-require 'test/unit'
-require 'rubygems'
-require 'action_controller'
-require 'active_support'
-require 'active_support/test_case'
-Dir["lib/*.rb"].each {|r| require r}
-
-ActionController::Base.perform_caching = "true"
-RAILS_ROOT = "/"
1  vendor/plugins/heroku_asset_cacher/uninstall.rb
View
@@ -1 +0,0 @@
-# Uninstall hook code here
Please sign in to comment.
Something went wrong with that request. Please try again.