muck-users 0.1.7 → 0.1.8
Sign up to get free protection for your applications and to get access to all the features.
- data/README.rdoc +24 -5
- data/Rakefile +8 -8
- data/VERSION +1 -1
- data/app/controllers/muck/password_resets_controller.rb +1 -1
- data/app/models/{muck_user_mailer.rb → user_mailer.rb} +6 -6
- data/app/views/password_resets/edit.html.erb +2 -2
- data/app/views/user_mailer/activation_confirmation.text.html.erb +7 -0
- data/app/views/{muck_user_mailer/activation_confirmation.html.erb → user_mailer/activation_confirmation.text.plain.erb} +0 -0
- data/app/views/user_mailer/activation_instructions.text.html.erb +7 -0
- data/app/views/{muck_user_mailer/activation_instructions.html.erb → user_mailer/activation_instructions.text.plain.erb} +0 -0
- data/app/views/user_mailer/password_not_active_instructions.text.html.erb +10 -0
- data/app/views/{muck_user_mailer/password_not_active_instructions.html.erb → user_mailer/password_not_active_instructions.text.plain.erb} +0 -0
- data/app/views/user_mailer/password_reset_instructions.text.html.erb +10 -0
- data/app/views/{muck_user_mailer/password_reset_instructions.html.erb → user_mailer/password_reset_instructions.text.plain.erb} +0 -0
- data/app/views/user_mailer/username_request.text.html.erb +5 -0
- data/app/views/{muck_user_mailer/username_request.html.erb → user_mailer/username_request.text.plain.erb} +0 -0
- data/app/views/user_mailer/welcome_notification.text.html.erb +5 -0
- data/app/views/{muck_user_mailer/welcome_notification.html.erb → user_mailer/welcome_notification.text.plain.erb} +1 -1
- data/config/muck_users_routes.rb +3 -2
- data/lib/active_record/acts/muck_user.rb +6 -6
- data/muck-users.gemspec +32 -98
- data/pkg/muck-users-0.1.7.gem +0 -0
- data/rdoc/classes/ActiveRecord/Acts/MuckUser/InstanceMethods.html +6 -6
- data/rdoc/created.rid +1 -1
- data/rdoc/files/README_rdoc.html +12 -1
- data/test/rails_root/app/controllers/application_controller.rb +14 -5
- data/test/rails_root/config/environment.rb +3 -1
- data/test/rails_root/test/functional/activations_controller_test.rb +1 -1
- data/test/rails_root/test/functional/admin/users_controller_test.rb +10 -2
- data/test/rails_root/test/functional/password_resets_controller_test.rb +7 -7
- data/test/rails_root/test/functional/users_controller_test.rb +6 -6
- data/test/rails_root/test/unit/{muck_user_mailer_test.rb → user_mailer_test.rb} +12 -12
- data/test/rails_root/vendor/plugins/validation_reflection/CHANGELOG +24 -0
- data/test/rails_root/vendor/plugins/validation_reflection/LICENSE +20 -0
- data/test/rails_root/vendor/plugins/validation_reflection/README +64 -0
- data/test/rails_root/vendor/plugins/validation_reflection/Rakefile +22 -0
- data/test/rails_root/vendor/plugins/validation_reflection/about.yml +7 -0
- data/test/rails_root/vendor/plugins/validation_reflection/init.rb +8 -0
- data/test/rails_root/vendor/plugins/validation_reflection/lib/boiler_plate/validation_reflection.rb +129 -0
- data/test/rails_root/vendor/plugins/validation_reflection/test/test_helper.rb +36 -0
- data/test/rails_root/vendor/plugins/validation_reflection/test/validation_reflection_test.rb +126 -0
- metadata +31 -11
@@ -37,8 +37,16 @@ class Admin::Muck::UsersControllerTest < ActionController::TestCase
|
|
37
37
|
get :search
|
38
38
|
end
|
39
39
|
should_respond_with :success
|
40
|
-
should_render_template :
|
40
|
+
should_render_template :index
|
41
41
|
end
|
42
|
+
|
43
|
+
context "GET ajax search" do
|
44
|
+
setup do
|
45
|
+
get :ajax_search
|
46
|
+
end
|
47
|
+
should_respond_with :success
|
48
|
+
should_render_template :table
|
49
|
+
end
|
42
50
|
|
43
51
|
context 'on DELETE to :destroy' do
|
44
52
|
setup do
|
@@ -50,4 +58,4 @@ class Admin::Muck::UsersControllerTest < ActionController::TestCase
|
|
50
58
|
|
51
59
|
end
|
52
60
|
|
53
|
-
end
|
61
|
+
end
|
@@ -4,10 +4,10 @@ class Muck::PasswordResetsControllerTest < ActionController::TestCase
|
|
4
4
|
|
5
5
|
tests Muck::PasswordResetsController
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
7
|
+
context "user sessions controller" do
|
8
|
+
setup do
|
9
|
+
@user = Factory(:user)
|
10
|
+
end
|
11
11
|
context "get new" do
|
12
12
|
setup do
|
13
13
|
get :new
|
@@ -17,7 +17,7 @@ class Muck::PasswordResetsControllerTest < ActionController::TestCase
|
|
17
17
|
end
|
18
18
|
context "find user using email and send email message" do
|
19
19
|
setup do
|
20
|
-
post :create, :email => @user.email
|
20
|
+
post :create, :reset_password => { :email => @user.email }
|
21
21
|
end
|
22
22
|
should "send password reset instructions" do
|
23
23
|
assert_sent_email do |email|
|
@@ -28,7 +28,7 @@ class Muck::PasswordResetsControllerTest < ActionController::TestCase
|
|
28
28
|
end
|
29
29
|
context "bad email - fail to reset password" do
|
30
30
|
setup do
|
31
|
-
post :create, :email => 'quentin@bad_email_example.com'
|
31
|
+
post :create, :reset_password => { :email => 'quentin@bad_email_example.com' }
|
32
32
|
end
|
33
33
|
should_respond_with :success
|
34
34
|
should_render_template :new
|
@@ -57,4 +57,4 @@ class Muck::PasswordResetsControllerTest < ActionController::TestCase
|
|
57
57
|
should_render_template :edit
|
58
58
|
end
|
59
59
|
end
|
60
|
-
end
|
60
|
+
end
|
@@ -4,6 +4,8 @@ class Muck::UsersControllerTest < ActionController::TestCase
|
|
4
4
|
|
5
5
|
tests Muck::UsersController
|
6
6
|
|
7
|
+
should_require_login :welcome => :get, :edit => :get, :login_url => '/login'
|
8
|
+
|
7
9
|
context "configuration tests" do
|
8
10
|
teardown do
|
9
11
|
GlobalConfig.automatically_activate = false
|
@@ -129,20 +131,19 @@ class Muck::UsersControllerTest < ActionController::TestCase
|
|
129
131
|
|
130
132
|
context "on GET to :welcome" do
|
131
133
|
setup do
|
132
|
-
@user = Factory(:user)
|
133
134
|
get :welcome, :id => @user.to_param
|
134
135
|
end
|
135
136
|
should_respond_with :success
|
136
137
|
should_render_template :welcome
|
137
138
|
end
|
138
|
-
|
139
|
+
|
139
140
|
context "on GET to new (signup) while logged in" do
|
140
141
|
setup do
|
141
142
|
get :new
|
142
143
|
end
|
143
144
|
should_redirect_to("the logged in user's main user page") { user_url(@user) }
|
144
145
|
end
|
145
|
-
|
146
|
+
|
146
147
|
context "on GET to show" do
|
147
148
|
setup do
|
148
149
|
get :show
|
@@ -172,10 +173,9 @@ class Muck::UsersControllerTest < ActionController::TestCase
|
|
172
173
|
|
173
174
|
context "on PUT to :update" do
|
174
175
|
setup do
|
175
|
-
@user = Factory(:user)
|
176
176
|
put_update_user(@user)
|
177
177
|
end
|
178
|
-
should_redirect_to("user path") { user_path(
|
178
|
+
should_redirect_to("user path") { user_path(@user) }
|
179
179
|
end
|
180
180
|
|
181
181
|
end
|
@@ -252,4 +252,4 @@ class Muck::UsersControllerTest < ActionController::TestCase
|
|
252
252
|
:terms_of_service => true }.merge(options)
|
253
253
|
end
|
254
254
|
|
255
|
-
end
|
255
|
+
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
require File.dirname(__FILE__) + '/../test_helper'
|
2
|
-
require '
|
2
|
+
require 'user_mailer'
|
3
3
|
|
4
|
-
class
|
4
|
+
class UserMailerTest < ActiveSupport::TestCase
|
5
5
|
|
6
6
|
context "deliver emails" do
|
7
7
|
|
@@ -15,49 +15,49 @@ class MuckUserMailerTest < ActiveSupport::TestCase
|
|
15
15
|
|
16
16
|
should "send activation confirmation email" do
|
17
17
|
user = Factory(:user)
|
18
|
-
response =
|
18
|
+
response = UserMailer.deliver_activation_confirmation(user)
|
19
19
|
assert !ActionMailer::Base.deliveries.empty?, "No email was sent"
|
20
20
|
assert_match "#{user.login}", response.body, "User login was not found in the email"
|
21
21
|
email = ActionMailer::Base.deliveries.last
|
22
22
|
assert_equal email.to, [user.email]
|
23
|
-
assert_equal email.from,
|
23
|
+
assert_equal email.from, GlobalConfig.from_email
|
24
24
|
end
|
25
25
|
|
26
26
|
should "send activation instructions email" do
|
27
27
|
user = Factory(:user)
|
28
|
-
response =
|
28
|
+
response = UserMailer.deliver_activation_instructions(user)
|
29
29
|
assert !ActionMailer::Base.deliveries.empty?, "No email was sent"
|
30
30
|
assert_match "#{user.login}", response.body, "User login was not found in the email"
|
31
31
|
email = ActionMailer::Base.deliveries.last
|
32
32
|
assert_equal email.to, [user.email]
|
33
|
-
assert_equal email.from,
|
33
|
+
assert_equal email.from, GlobalConfig.from_email
|
34
34
|
end
|
35
35
|
|
36
36
|
should "send password reset account not active instructions email" do
|
37
37
|
user = Factory(:user)
|
38
|
-
response =
|
38
|
+
response = UserMailer.deliver_password_not_active_instructions(user)
|
39
39
|
assert !ActionMailer::Base.deliveries.empty?, "No email was sent"
|
40
40
|
email = ActionMailer::Base.deliveries.last
|
41
41
|
assert_equal email.to, [user.email]
|
42
|
-
assert_equal email.from,
|
42
|
+
assert_equal email.from, GlobalConfig.from_email
|
43
43
|
end
|
44
44
|
|
45
45
|
should "send password reset instructions email" do
|
46
46
|
user = Factory(:user)
|
47
|
-
response =
|
47
|
+
response = UserMailer.deliver_password_reset_instructions(user)
|
48
48
|
assert !ActionMailer::Base.deliveries.empty?, "No email was sent"
|
49
49
|
email = ActionMailer::Base.deliveries.last
|
50
50
|
assert_equal email.to, [user.email]
|
51
|
-
assert_equal email.from,
|
51
|
+
assert_equal email.from, GlobalConfig.from_email
|
52
52
|
end
|
53
53
|
|
54
54
|
should "send welcome email" do
|
55
55
|
user = Factory(:user)
|
56
|
-
response =
|
56
|
+
response = UserMailer.deliver_welcome_notification(user)
|
57
57
|
assert !ActionMailer::Base.deliveries.empty?, "No email was sent"
|
58
58
|
email = ActionMailer::Base.deliveries.last
|
59
59
|
assert_equal email.to, [user.email]
|
60
|
-
assert_equal email.from,
|
60
|
+
assert_equal email.from, GlobalConfig.from_email
|
61
61
|
end
|
62
62
|
|
63
63
|
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
|
2
|
+
== 0.3.1, 2008-01-03
|
3
|
+
* require 'ostruct'; thanks to Georg Friedrich.
|
4
|
+
|
5
|
+
== 0.3, 2008-01-01
|
6
|
+
* Added configurability in config/plugins/validation_reflection.rb
|
7
|
+
|
8
|
+
== 0.2.1, 2006-12-28
|
9
|
+
* Moved lib files into subfolder boiler_plate.
|
10
|
+
|
11
|
+
== 0.2, 2006-08-06
|
12
|
+
?
|
13
|
+
|
14
|
+
= Deprecation Notice
|
15
|
+
|
16
|
+
Version 0.1 had supplied three methods
|
17
|
+
|
18
|
+
- validates_presence_of_mandatory_content_columns
|
19
|
+
- validates_lengths_of_string_attributes
|
20
|
+
- validates_all_associated
|
21
|
+
|
22
|
+
These have been removed. Please use the Enforce Schema Rules plugin instead
|
23
|
+
|
24
|
+
http://enforce-schema-rules.googlecode.com/svn/trunk/enforce_schema_rules/
|
@@ -0,0 +1,20 @@
|
|
1
|
+
Copyright (c) 2006 Michael Schuerig
|
2
|
+
|
3
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
4
|
+
a copy of this software and associated documentation files (the
|
5
|
+
"Software"), to deal in the Software without restriction, including
|
6
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
7
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
8
|
+
permit persons to whom the Software is furnished to do so, subject to
|
9
|
+
the following conditions:
|
10
|
+
|
11
|
+
The above copyright notice and this permission notice shall be
|
12
|
+
included in all copies or substantial portions of the Software.
|
13
|
+
|
14
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
15
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
16
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
17
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
18
|
+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
19
|
+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
20
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
@@ -0,0 +1,64 @@
|
|
1
|
+
Validation Reflection
|
2
|
+
=====================
|
3
|
+
|
4
|
+
Version 0.3.1, 2008-01-03
|
5
|
+
|
6
|
+
This plugin adds reflective access to validations
|
7
|
+
|
8
|
+
- ModelClass.reflect_on_all_validations
|
9
|
+
- ModelClass.reflect_on_validations_for(:property)
|
10
|
+
|
11
|
+
Both of these methods return arrays containing instances of
|
12
|
+
ActiveRecord::Reflection::MacroReflection. For example
|
13
|
+
|
14
|
+
class Person < ActiveRecord::Base
|
15
|
+
validates_presence_of :name
|
16
|
+
validates_numericality_of :size, :only_integer => true
|
17
|
+
end
|
18
|
+
|
19
|
+
refl = Person.reflect_on_validations_for(:name)
|
20
|
+
refl[0].macro
|
21
|
+
# => :validates_presence_of
|
22
|
+
|
23
|
+
refl = Person.reflect_on_validations_for(:size)
|
24
|
+
refl[0].macro
|
25
|
+
# => :validates_numericality_of
|
26
|
+
refl[0].options
|
27
|
+
# => { :only_integer => true }
|
28
|
+
|
29
|
+
|
30
|
+
== Customization
|
31
|
+
|
32
|
+
Usually, all the standard Rails validations are reflected.
|
33
|
+
You can change this -- add or remove validations -- in an
|
34
|
+
application-specific configuration file,
|
35
|
+
|
36
|
+
config/plugins/validation_reflection.rb
|
37
|
+
|
38
|
+
In that file change config.reflected_validations to suit your
|
39
|
+
needs. Say, you have a custom validation for email addresses,
|
40
|
+
validates_as_email, then you could add it like this
|
41
|
+
|
42
|
+
config.reflected_validations << :validates_as_email
|
43
|
+
|
44
|
+
If validates_as_email is implemented in terms of other validation
|
45
|
+
methods, these validations are added to the reflection metadata,
|
46
|
+
too. As that may not be what you want, you can disable reflection
|
47
|
+
for these subordinate validations
|
48
|
+
|
49
|
+
config.reflected_validations << {
|
50
|
+
:method => :validates_as_email,
|
51
|
+
:ignore_subvalidations => true
|
52
|
+
}
|
53
|
+
|
54
|
+
You have to make sure that all reflected validations are defined
|
55
|
+
before this plugin is loaded. To this end, you may have to
|
56
|
+
explicitly set the load order of plugins somewhere in the environment
|
57
|
+
configuration using
|
58
|
+
|
59
|
+
config.plugins = [...]
|
60
|
+
|
61
|
+
|
62
|
+
|
63
|
+
|
64
|
+
Copyright (c) 2006-2008, Michael Schuerig, michael@schuerig.de
|
@@ -0,0 +1,22 @@
|
|
1
|
+
require 'rake'
|
2
|
+
require 'rake/testtask'
|
3
|
+
require 'rake/rdoctask'
|
4
|
+
|
5
|
+
desc 'Default: run unit tests.'
|
6
|
+
task :default => :test
|
7
|
+
|
8
|
+
desc 'Test the validation_reflection plugin.'
|
9
|
+
Rake::TestTask.new(:test) do |t|
|
10
|
+
t.libs << 'lib'
|
11
|
+
t.pattern = 'test/**/*_test.rb'
|
12
|
+
t.verbose = true
|
13
|
+
end
|
14
|
+
|
15
|
+
desc 'Generate documentation for the validation_reflection plugin.'
|
16
|
+
Rake::RDocTask.new(:rdoc) do |rdoc|
|
17
|
+
rdoc.rdoc_dir = 'rdoc'
|
18
|
+
rdoc.title = 'ValidationReflection'
|
19
|
+
rdoc.options << '--line-numbers' << '--inline-source'
|
20
|
+
rdoc.rdoc_files.include('README')
|
21
|
+
rdoc.rdoc_files.include('lib/**/*.rb')
|
22
|
+
end
|
@@ -0,0 +1,8 @@
|
|
1
|
+
|
2
|
+
require 'boiler_plate/validation_reflection'
|
3
|
+
|
4
|
+
ActiveRecord::Base.class_eval do
|
5
|
+
include BoilerPlate::ActiveRecordExtensions::ValidationReflection
|
6
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.load_config
|
7
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.install(self)
|
8
|
+
end
|
data/test/rails_root/vendor/plugins/validation_reflection/lib/boiler_plate/validation_reflection.rb
ADDED
@@ -0,0 +1,129 @@
|
|
1
|
+
#--
|
2
|
+
# Copyright (c) 2006-2008, Michael Schuerig, michael@schuerig.de
|
3
|
+
#
|
4
|
+
# Permission is hereby granted, free of charge, to any person obtaining
|
5
|
+
# a copy of this software and associated documentation files (the
|
6
|
+
# "Software"), to deal in the Software without restriction, including
|
7
|
+
# without limitation the rights to use, copy, modify, merge, publish,
|
8
|
+
# distribute, sublicense, and/or sell copies of the Software, and to
|
9
|
+
# permit persons to whom the Software is furnished to do so, subject to
|
10
|
+
# the following conditions:
|
11
|
+
#
|
12
|
+
# The above copyright notice and this permission notice shall be
|
13
|
+
# included in all copies or substantial portions of the Software.
|
14
|
+
#
|
15
|
+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
16
|
+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
17
|
+
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
18
|
+
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
19
|
+
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
20
|
+
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
21
|
+
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
22
|
+
#++
|
23
|
+
|
24
|
+
|
25
|
+
require 'active_record/reflection'
|
26
|
+
require 'ostruct'
|
27
|
+
|
28
|
+
# Based on code by Sebastian Kanthak
|
29
|
+
# See http://dev.rubyonrails.org/ticket/861
|
30
|
+
module BoilerPlate # :nodoc:
|
31
|
+
module ActiveRecordExtensions # :nodoc:
|
32
|
+
module ValidationReflection # :nodoc:
|
33
|
+
CONFIG_PATH = File.join(RAILS_ROOT, 'config', 'plugins', 'validation_reflection.rb')
|
34
|
+
|
35
|
+
mattr_accessor :reflected_validations
|
36
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.reflected_validations = %w(
|
37
|
+
validates_acceptance_of
|
38
|
+
validates_associated
|
39
|
+
validates_confirmation_of
|
40
|
+
validates_exclusion_of
|
41
|
+
validates_format_of
|
42
|
+
validates_inclusion_of
|
43
|
+
validates_length_of
|
44
|
+
validates_numericality_of
|
45
|
+
validates_presence_of
|
46
|
+
validates_uniqueness_of
|
47
|
+
)
|
48
|
+
|
49
|
+
mattr_accessor :in_ignored_subvalidation
|
50
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation = false
|
51
|
+
|
52
|
+
def self.included(base)
|
53
|
+
return if base.kind_of?(BoilerPlate::ActiveRecordExtensions::ValidationReflection::ClassMethods)
|
54
|
+
base.extend(ClassMethods)
|
55
|
+
end
|
56
|
+
|
57
|
+
def self.load_config
|
58
|
+
if File.file?(CONFIG_PATH)
|
59
|
+
config = OpenStruct.new
|
60
|
+
config.reflected_validations = reflected_validations
|
61
|
+
silence_warnings do
|
62
|
+
eval(IO.read(CONFIG_PATH), binding, CONFIG_PATH)
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
def self.install(base)
|
68
|
+
reflected_validations.freeze
|
69
|
+
reflected_validations.each do |validation_type|
|
70
|
+
next if base.respond_to?("#{validation_type}_with_reflection")
|
71
|
+
ignore_subvalidations = false
|
72
|
+
if validation_type.kind_of?(Hash)
|
73
|
+
ignore_subvalidations = validation_type[:ignore_subvalidations]
|
74
|
+
validation_type = validation_type[:method]
|
75
|
+
end
|
76
|
+
base.class_eval <<-"end_eval"
|
77
|
+
class << self
|
78
|
+
def #{validation_type}_with_reflection(*attr_names)
|
79
|
+
ignoring_subvalidations(#{ignore_subvalidations}) do
|
80
|
+
#{validation_type}_without_reflection(*attr_names)
|
81
|
+
remember_validation_metadata(:#{validation_type}, *attr_names)
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
85
|
+
alias_method_chain :#{validation_type}, :reflection
|
86
|
+
end
|
87
|
+
end_eval
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
module ClassMethods
|
92
|
+
|
93
|
+
# Returns an array of MacroReflection objects for all validations in the class
|
94
|
+
def reflect_on_all_validations
|
95
|
+
read_inheritable_attribute(:validations) || []
|
96
|
+
end
|
97
|
+
|
98
|
+
# Returns an array of MacroReflection objects for all validations defined for the field +attr_name+.
|
99
|
+
def reflect_on_validations_for(attr_name)
|
100
|
+
attr_name = attr_name.to_sym
|
101
|
+
reflect_on_all_validations.select do |reflection|
|
102
|
+
reflection.name == attr_name
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
private
|
107
|
+
|
108
|
+
def remember_validation_metadata(validation_type, *attr_names)
|
109
|
+
configuration = attr_names.last.is_a?(Hash) ? attr_names.pop : {}
|
110
|
+
attr_names.each do |attr_name|
|
111
|
+
write_inheritable_array :validations,
|
112
|
+
[ ActiveRecord::Reflection::MacroReflection.new(validation_type, attr_name.to_sym, configuration, self) ]
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
116
|
+
def ignoring_subvalidations(ignore)
|
117
|
+
save_ignore = BoilerPlate::ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation
|
118
|
+
unless BoilerPlate::ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation
|
119
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation = ignore
|
120
|
+
yield
|
121
|
+
end
|
122
|
+
ensure
|
123
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.in_ignored_subvalidation = save_ignore
|
124
|
+
end
|
125
|
+
end
|
126
|
+
|
127
|
+
end
|
128
|
+
end
|
129
|
+
end
|
@@ -0,0 +1,36 @@
|
|
1
|
+
|
2
|
+
ENV["RAILS_ENV"] = "test"
|
3
|
+
RAILS_ROOT = File.join(File.dirname(__FILE__), '../../../..')
|
4
|
+
|
5
|
+
$:.unshift File.join(File.dirname(__FILE__), '../lib')
|
6
|
+
$:.unshift File.join(RAILS_ROOT, 'lib')
|
7
|
+
$:.unshift File.join(RAILS_ROOT, 'vendor/rails/activerecord/lib')
|
8
|
+
$:.unshift File.join(RAILS_ROOT, 'vendor/rails/actionpack/lib')
|
9
|
+
$:.unshift File.join(RAILS_ROOT, 'vendor/rails/activesupport/lib')
|
10
|
+
|
11
|
+
|
12
|
+
require 'test/unit'
|
13
|
+
require 'logger'
|
14
|
+
require 'active_support'
|
15
|
+
require 'active_record'
|
16
|
+
require 'action_controller'
|
17
|
+
require 'action_controller/assertions'
|
18
|
+
require 'html/document'
|
19
|
+
|
20
|
+
require 'ruby-debug'
|
21
|
+
|
22
|
+
RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
|
23
|
+
### TODO why is this necessary?
|
24
|
+
ActionController::Base.logger = RAILS_DEFAULT_LOGGER
|
25
|
+
ActiveRecord::Base.logger = RAILS_DEFAULT_LOGGER
|
26
|
+
ActiveRecord::Base.colorize_logging = false
|
27
|
+
|
28
|
+
|
29
|
+
def with_log_level(level)
|
30
|
+
old_level = RAILS_DEFAULT_LOGGER.level
|
31
|
+
RAILS_DEFAULT_LOGGER.level = level
|
32
|
+
yield
|
33
|
+
ensure
|
34
|
+
RAILS_DEFAULT_LOGGER.level = old_level
|
35
|
+
end
|
36
|
+
|
@@ -0,0 +1,126 @@
|
|
1
|
+
|
2
|
+
$:.unshift File.join(File.dirname(__FILE__))
|
3
|
+
$:.unshift File.join(File.dirname(__FILE__), '/../lib')
|
4
|
+
|
5
|
+
require 'test_helper'
|
6
|
+
|
7
|
+
ActiveRecord::Base.class_eval do
|
8
|
+
def self.validates_something_weird(*cols)
|
9
|
+
cols.each do |col|
|
10
|
+
validates_format_of col, :with => /weird/
|
11
|
+
end
|
12
|
+
end
|
13
|
+
def self.validates_something_selfcontained(*cols)
|
14
|
+
cols.each do |col|
|
15
|
+
validates_format_of col, :with => /blablabla/
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
require 'boiler_plate/validation_reflection'
|
21
|
+
|
22
|
+
ActiveRecord::Base.class_eval do
|
23
|
+
include BoilerPlate::ActiveRecordExtensions::ValidationReflection
|
24
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.reflected_validations << :validates_something_weird
|
25
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.reflected_validations << {
|
26
|
+
:method => :validates_something_selfcontained,
|
27
|
+
:ignore_subvalidations => true
|
28
|
+
}
|
29
|
+
BoilerPlate::ActiveRecordExtensions::ValidationReflection.install(self)
|
30
|
+
end
|
31
|
+
|
32
|
+
|
33
|
+
class ValidationReflectionTest < Test::Unit::TestCase
|
34
|
+
|
35
|
+
class Dummy < ActiveRecord::Base
|
36
|
+
class << self
|
37
|
+
|
38
|
+
def create_fake_column(name, null = true, limit = nil)
|
39
|
+
sql_type = limit ? "varchar (#{limit})" : nil
|
40
|
+
col = ActiveRecord::ConnectionAdapters::Column.new(name, nil, sql_type, null)
|
41
|
+
col
|
42
|
+
end
|
43
|
+
|
44
|
+
def columns
|
45
|
+
[
|
46
|
+
create_fake_column('col0'),
|
47
|
+
create_fake_column('col1'),
|
48
|
+
create_fake_column('col2', false, 100),
|
49
|
+
create_fake_column('col3'),
|
50
|
+
create_fake_column('col4'),
|
51
|
+
create_fake_column('col5'),
|
52
|
+
create_fake_column('col6'),
|
53
|
+
create_fake_column('col7')
|
54
|
+
]
|
55
|
+
end
|
56
|
+
end
|
57
|
+
|
58
|
+
has_one :nothing
|
59
|
+
|
60
|
+
validates_presence_of :col1
|
61
|
+
validates_length_of :col2, :maximum => 100
|
62
|
+
validates_format_of :col3, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
|
63
|
+
validates_numericality_of :col4, :only_integer => true
|
64
|
+
validates_numericality_of :col5, :less_than => 5
|
65
|
+
validates_something_weird :col6
|
66
|
+
validates_something_selfcontained :col7
|
67
|
+
end
|
68
|
+
|
69
|
+
|
70
|
+
def test_sanity
|
71
|
+
assert_equal [], Dummy.reflect_on_validations_for(:col0)
|
72
|
+
end
|
73
|
+
|
74
|
+
def test_validates_presence_of_is_reflected
|
75
|
+
refls = Dummy.reflect_on_validations_for(:col1)
|
76
|
+
assert refls.all? { |r| r.name.to_s == 'col1' }
|
77
|
+
assert refls.find { |r| r.macro == :validates_presence_of }
|
78
|
+
end
|
79
|
+
|
80
|
+
def test_string_limit_is_reflected
|
81
|
+
refls = Dummy.reflect_on_validations_for(:col2)
|
82
|
+
assert refls.any? { |r| r.macro == :validates_length_of && r.options[:maximum] == 100 }
|
83
|
+
end
|
84
|
+
|
85
|
+
def test_format_is_reflected
|
86
|
+
refls = Dummy.reflect_on_validations_for(:col3)
|
87
|
+
assert refls.any? { |r| r.macro == :validates_format_of && r.options[:with] == /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
|
88
|
+
end
|
89
|
+
|
90
|
+
def test_numeric_integer_is_reflected
|
91
|
+
refls = Dummy.reflect_on_validations_for(:col4)
|
92
|
+
assert refls.any? { |r| r.macro == :validates_numericality_of && r.options[:only_integer] }
|
93
|
+
end
|
94
|
+
|
95
|
+
def test_numeric_is_reflected
|
96
|
+
refls = Dummy.reflect_on_validations_for(:col5)
|
97
|
+
assert refls.any? { |r| r.macro == :validates_numericality_of }
|
98
|
+
end
|
99
|
+
|
100
|
+
def test_validation_options_are_reflected
|
101
|
+
refls = Dummy.reflect_on_validations_for(:col5)
|
102
|
+
refl = refls[0]
|
103
|
+
assert_equal 5, refl.options[:less_than]
|
104
|
+
end
|
105
|
+
|
106
|
+
def test_custom_validations_are_reflected
|
107
|
+
refls = Dummy.reflect_on_validations_for(:col6)
|
108
|
+
assert refls.any? { |r| r.macro == :validates_something_weird }
|
109
|
+
assert refls.any? { |r| r.macro == :validates_format_of }
|
110
|
+
end
|
111
|
+
|
112
|
+
def test_custom_validations_with_options_are_reflected
|
113
|
+
refls = Dummy.reflect_on_validations_for(:col7)
|
114
|
+
assert refls.any? { |r| r.macro == :validates_something_selfcontained }
|
115
|
+
end
|
116
|
+
|
117
|
+
def test_subvalidations_are_reflected
|
118
|
+
refls = Dummy.reflect_on_validations_for(:col6)
|
119
|
+
assert_equal 2, refls.size
|
120
|
+
end
|
121
|
+
|
122
|
+
def test_ignored_subvalidations_are_not_reflected
|
123
|
+
refls = Dummy.reflect_on_validations_for(:col7)
|
124
|
+
assert_equal 1, refls.size
|
125
|
+
end
|
126
|
+
end
|