schematic 0.1.4 → 0.1.5

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

@@ -4,9 +4,10 @@ module Schematic
       class Custom < Base
         def generate(builder)
           validators_for_column.each do |validator|
-            if validator.respond_to?(:xsd_restriction)
-              restriction = validator.xsd_restriction
-              builder.xs(:pattern, "value" => restriction.is_a?(Regexp) ? restriction.source : restriction)
+            if validator.respond_to?(:xsd_pattern_restrictions)
+              validator.xsd_pattern_restrictions.each do |restriction|
+                builder.xs(:pattern, "value" => restriction.is_a?(Regexp) ? restriction.source : restriction)
+              end
               return
             end
           end

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

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

@@ -6,11 +6,11 @@ describe Schematic::Generator::Restrictions::Enumeration do
       before do
         class CrazyTownValidator < ActiveModel::EachValidator
           def validate_each(record, attribute, value)
-            record.errors.add(attribute, "must be crazy") unless value.match /.*crazy.*/
+            record.errors.add(attribute, "must be crazy") unless value.match /.*crazy.*|\w/
           end
 
-          def xsd_restriction
-            /.*crazy.*/
+          def xsd_pattern_restrictions
+            [/\w/, /.*crazy.*/]
           end
         end
       end
@@ -27,7 +27,12 @@ describe Schematic::Generator::Restrictions::Enumeration do
       end
 
       it "should validate against it's own XSD" do
-        invalid_instance = CustomModel.new(:title => "happy")
+        invalid_instance = CustomModel.new(:title => "happy today")
+        xml = [invalid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, subject)
+        }.should raise_error
+        invalid_instance = CustomModel.new(:title => "happytoday")
         xml = [invalid_instance].to_xml
         lambda {
           validate_xml_against_xsd(xml, subject)
@@ -46,6 +51,7 @@ describe Schematic::Generator::Restrictions::Enumeration do
                 <xs:complexType>
                   <xs:simpleContent>
                     <xs:restriction base="String">
+                      <xs:pattern value="\\w"/>
                       <xs:pattern value=".*crazy.*"/>
                     </xs:restriction>
                   </xs:simpleContent>

metadata

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