schematic 0.1.2 → 0.1.3

data/lib/schematic/generator/restrictions/pattern.rb

@@ -9,7 +9,12 @@ module Schematic
 
         def generate(builder)
           for_validator ActiveModel::Validations::FormatValidator do |validator|
-            builder.xs(:pattern, "value" => validator.options[:with].source) if validator.options[:with]
+            if pattern = validator.options[:with]
+              value = pattern.source
+              value.gsub!(/^(?:\^|\\A|\\a)?/, '')
+              value.gsub!(/(?:\$|\\Z|\\z)?$/, '')
+              builder.xs(:pattern, "value" => value)
+            end
           end
         end
       end

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/schematic/generator/restrictions/pattern_spec.rb

@@ -45,6 +45,32 @@ describe Schematic::Generator::Restrictions::Enumeration do
         subject.should == xsd
       end
     end
+
+    context "with a model with a complex format" do
+      subject { sanitize_xml(PatternModel.to_xsd) }
+      with_model :pattern_model do
+        table :id => false do |t|
+          t.string "email"
+        end
+
+        model do
+          validates :email, :format => { :with => /\A([\w\.%\+\-`']+)@([\w\-]+\.)+([\w]{2,})\Z/ }
+        end
+      end
+
+      it "should validate against it's own XSD" do
+        invalid_instance = PatternModel.new(:email => "@blah")
+        xml = [invalid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, subject)
+        }.should raise_error
+        valid_instance = PatternModel.new(:email => "foo@bar.com")
+        xml = [valid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, subject)
+        }.should_not raise_error
+      end
+    end
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Case Commons, LLC