schematic 0.3.7 → 0.3.8

data/README.rdoc

@@ -23,6 +23,14 @@ Then run:
 
   Post.to_xsd => (a bunch of xml)
 
+Validations will automatically add restrictions to the XSD for fields. If a validation has a conditional 
+if or unless option it will be skipped. However if you wish to force the inclusion of the validation in 
+the XSD you can set: { :xsd => { :include => true } } in the options e.g.
+
+  class Post < ActiveRecord::Base
+    validates :category, :inclusion => { :in => ["foo", "bar"], :xsd => { :include => true } }, :if => lambda { ... }
+  end
+
 You can include additional elements by defining a ".xsd_methods" on your class:
 
   class Post < ActiveRecord::Base

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

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

@@ -10,18 +10,22 @@ describe Schematic::Generator::Restrictions::Enumeration do
           t.string "title"
           t.string "should_be_skipped"
           t.string "should_also_be_skipped"
+          t.string "and_also_be_skipped"
           t.boolean "active"
           t.string "options"
           t.integer "force_enumeration"
+          t.integer "skip_enumeration"
         end
 
         model do
           validates :title, :inclusion => { :in => ["a", "b", "c"] }
           validates :should_be_skipped, :inclusion => ["a", "b", "c"], :if => lambda { false }
           validates :should_also_be_skipped, :inclusion => ["a", "b", "c"], :unless => lambda { false }
+          validates :and_also_be_skipped, :inclusion => ["a", "b", "c"], :if => lambda { true}, :unless => lambda { false }
           validates :active, :inclusion => { :in => [true, false] }
           validates :options, :inclusion => { :in => lambda { |f| ["some valid attribute"] } }
           validates :force_enumeration, :inclusion => { :in => [1, 2], :xsd => { :include => true} }, :if => lambda { false }
+          validates :skip_enumeration, :inclusion => { :in => [1, 2], :xsd => { :include => false} }, :if => lambda { true }
         end
       end
 
@@ -31,7 +35,14 @@ describe Schematic::Generator::Restrictions::Enumeration do
         lambda {
           validate_xml_against_xsd(xml, subject)
         }.should raise_error
-        valid_instance = EnumerationModel.new(:title => "a", :should_be_skipped => "a", :should_also_be_skipped => "a", :active => true, :options => "some valid attribute", :force_enumeration => 2)
+        valid_instance = EnumerationModel.new(:title => "a",
+                                              :should_be_skipped => "a",
+                                              :should_also_be_skipped => "a",
+                                              :and_also_be_skipped => "a",
+                                              :active => true,
+                                              :options => "some valid attribute",
+                                              :force_enumeration => 2,
+                                              :skip_enumeration => 2)
         xml = [valid_instance].to_xml
         lambda {
           validate_xml_against_xsd(xml, subject)
@@ -68,6 +79,14 @@ describe Schematic::Generator::Restrictions::Enumeration do
                   </xs:simpleContent>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="and-also-be-skipped" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="String">
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
               <xs:element name="active" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                   <xs:simpleContent>
@@ -94,6 +113,14 @@ describe Schematic::Generator::Restrictions::Enumeration do
                   </xs:simpleContent>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="skip-enumeration" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="Integer">
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
           XML
         end
 

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1535622649516995802
+      hash: 3119055094098631503
       segments: 
       - 0
       version: "0"
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1535622649516995802
+      hash: 3119055094098631503
       segments: 
       - 0
       version: "0"