kotovalexarian-likes-github
/
thoughtbot--shoulda-matchers
mirror of https://github.com/thoughtbot/shoulda-matchers.git
1
0
Fork 0
Code Releases Activity

Small refactoring in NumericTypeMatcher

This commit is contained in:
Elliot Winkler 2015-12-27 00:38:48 -05:00
parent 8bc8083d77
commit fc010175c7
2 changed files with 13 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/shoulda/matchers/active_model/disallow_value_matcher.rb
View File

@ -11,6 +11,7 @@ module Shoulda
:_after_setting_value,
:attribute_to_set,
:description,
:expects_strict?,
:model,
:last_value_set,
:simple_description,

59
lib/shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher.rb
View File

@ -8,44 +8,21 @@ module Shoulda
class NumericTypeMatcher
extend Forwardable
def_delegators :disallow_value_matcher, :matches?, :failure_message,
:failure_message_when_negated
def_delegators(
:disallow_value_matcher,
:expects_custom_validation_message?,
:expects_strict?,
:failure_message,
:failure_message_when_negated,
:matches?,
:on,
:strict,
:with_message,
)
def initialize(numeric_type_matcher, attribute, options = {})
def initialize(numeric_type_matcher, attribute)
@numeric_type_matcher = numeric_type_matcher
@attribute = attribute
@options = options
@message = nil
@context = nil
@expects_strict = false
@expects_custom_validation_message = false
end
def with_message(message)
if message
@expects_custom_validation_message = true
@message = message
end
self
end
def expects_custom_validation_message?
@expects_custom_validation_message
end
def strict
@expects_strict = true
self
end
def expects_strict?
@expects_strict
end
def on(context)
@context = context
self
end
def allowed_type_name
@ -79,18 +56,6 @@ module Shoulda
DisallowValueMatcher.new(disallowed_value).tap do |matcher|
matcher.for(attribute)
wrap_disallow_value_matcher(matcher)
if @message
matcher.with_message(@message)
end
if expects_strict?
matcher.strict
end
if @context
matcher.on(@context)
end
end
end
end