Fixed format for regular expressions

kennon · Aug 10, 2010 · 43f3114 · 43f3114
1 parent b9ad3c0
commit 43f3114
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/client_side_validations/adapters/orm_base.rb b/lib/client_side_validations/adapters/orm_base.rb
@@ -73,7 +73,7 @@ def get_validation_options(validation)
         options.delete(:maximum) if options.has_key?(:minimum)
         options.delete_if { |k, v| deleteable_keys.include?(k) }
         if options[:with].kind_of?(Regexp)
-          options[:with] = options[:with].inspect.to_s.sub("\\A","^").sub("\\Z","$").sub(%r{/i?$}, "/")
+          options[:with] = options[:with].inspect.to_s.sub("\\A","^").sub("\\Z","$").sub(%r{^/},"").sub(%r{/i?$}, "")
         end
         if options[:only_integer] == false
           options.delete(:only_integer)

diff --git a/spec/shared_examples/active_model_examples.rb b/spec/shared_examples/active_model_examples.rb
@@ -12,7 +12,7 @@
     it "should support validates_format_of of" do
       Klass.class_eval { validates_format_of :string, :with => /\A\d\Z/i }
       instance      = Klass.new
-      expected_hash = { "format" => { "message" => "is invalid", "with" => "/^\\d$/" } }
+      expected_hash = { "format" => { "message" => "is invalid", "with" => "^\\d$" } }
       result_hash   = ClientSideValidations::ORM::ValidateOptions.new(instance).validations_for(:string)
       result_hash.should == expected_hash
     end
@@ -23,8 +23,8 @@
         validates_format_of :string_2, :with => /\d/
       end
       instance        = Klass.new
-      expected_hash_1 = { "format" => { "message" => "is invalid", "with" => "/^\\d$/" } }
-      expected_hash_2 = { "format" => { "message" => "is invalid", "with" => "/\\d/" } }
+      expected_hash_1 = { "format" => { "message" => "is invalid", "with" => "^\\d$" } }
+      expected_hash_2 = { "format" => { "message" => "is invalid", "with" => "\\d" } }
       result_hash_1   = ClientSideValidations::ORM::ValidateOptions.new(instance).validations_for(:string)
       result_hash_2   = ClientSideValidations::ORM::ValidateOptions.new(instance).validations_for(:string_2)
       result_hash_1.should == expected_hash_1

diff --git a/spec/shared_examples/validate_options_examples/format_examples.rb b/spec/shared_examples/validate_options_examples/format_examples.rb
@@ -9,7 +9,7 @@
     end
 
     it 'should translate the rule' do
-      @result['rules']['string']['format'].should == /\w/.inspect
+      @result['rules']['string']['format'].should == %{\\w}
       @result['rules']['string']['required'].should be_true
     end
 
@@ -29,7 +29,7 @@
     end
 
     it 'should translate the rule' do
-      @result['rules']['string']['format'].should == /\w/.inspect
+      @result['rules']['string']['format'].should == %{\\w}
       @result['rules']['string']['required'].should be_true
     end
 
@@ -49,7 +49,7 @@
     end
 
     it 'should translate the rule' do
-      @result['rules']['string']['format'].should == /\w/.inspect
+      @result['rules']['string']['format'].should == %{\\w}
       @result['rules']['string']['required'].should be_nil
     end