kylefang/rmq
1
0
Fork 0
mirror of https://github.com/zhigang1992/rmq.git synced 2026-01-12 17:52:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

taking options and ignoring them for now

Browse Source
This commit is contained in:
Gant
2014-07-31 09:03:00 -05:00
parent 33ec1a9a6a
commit 9ab2544fa7
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
motion/ruby_motion_query/validation.rb
View File

@@ -58,8 +58,8 @@ module RubyMotionQuery
raise "RMQ validation error: :#{rule} is not one of the supported validation methods." unless @rule
end
def valid?(data)
@rule.call data
def valid?(data, options={})
@rule.call(data, options)
end
class << self
@@ -79,15 +79,15 @@ module RubyMotionQuery
@@validation_methods = {
:email => lambda { |value| Validation.regex_match?(value, EMAIL)},
:url => lambda { |value| Validation.regex_match?(value, URL)},
:dateiso => lambda { |value| Validation.regex_match?(value, DATEISO)},
:number => lambda { |value| Validation.regex_match?(value, NUMBER)},
:digits => lambda { |value| Validation.regex_match?(value, DIGITS)},
:ipv4 => lambda { |value| Validation.regex_match?(value, IPV4)},
:time => lambda { |value| Validation.regex_match?(value, TIME)},
:uszip => lambda { |value| Validation.regex_match?(value, USZIP)},
:usphone => lambda { |value| Validation.regex_match?(value, USPHONE)}
:email => lambda { |value, opts| Validation.regex_match?(value, EMAIL)},
:url => lambda { |value, opts| Validation.regex_match?(value, URL)},
:dateiso => lambda { |value, opts| Validation.regex_match?(value, DATEISO)},
:number => lambda { |value, opts| Validation.regex_match?(value, NUMBER)},
:digits => lambda { |value, opts| Validation.regex_match?(value, DIGITS)},
:ipv4 => lambda { |value, opts| Validation.regex_match?(value, IPV4)},
:time => lambda { |value, opts| Validation.regex_match?(value, TIME)},
:uszip => lambda { |value, opts| Validation.regex_match?(value, USZIP)},
:usphone => lambda { |value, opts| Validation.regex_match?(value, USPHONE)}
}
# Add tags
@@ -99,13 +99,10 @@ module RubyMotionQuery
# rmq.validation.valid?('2014-03-02'), :dateiso)
#
# @return [Boolean]
def valid?(value, *rule_or_rules)
def valid?(value, rule, options={})
#shortcircuit if debugging
return true if RubyMotionQuery::RMQ.debugging?
rule_or_rules.each do |rule|
return false unless Validation.new(rule).valid?(value)
end
true
Validation.new(rule).valid?(value, options)
end
def regex_match?(value, regex)

2
spec/validation.rb
View File

@@ -77,7 +77,7 @@ describe 'validation' do
@rmq.validation.valid?('test', :madeupthing)
end
should.not.raise(RuntimeError) do
@rmq.validation.valid?('test', :email, :url)
@rmq.validation.valid?('test', :email)
@rmq.validation.valid?('test@test.com', :email)
end
end