schematic 0.3.6 → 0.3.7

data/README.rdoc

@@ -4,7 +4,7 @@
 
 == DESCRIPTION
 
-Automatic XSD generation for your ActiveRecord models 
+Automatic XSD generation for your ActiveRecord models
 
 == INSTALL
 
@@ -39,6 +39,42 @@ You can exclude elements by defining a ".xsd_ignore_methods" on your class:
     end
   end
 
+You can define your own custom restrictions by inheriting from the Restrictions Base class:
+
+  class MyCustomRestriction < Schematic::Generator::Restrictions::Base
+    def generate(builder)
+      for_validator ActiveModel::BlockValidator do |validator|
+        builder.xs(:enumeration, "value" => "foo")
+        builder.xs(:enumeration, "value" => "bar")
+      end
+    end
+  end
+
+You can have a custom pattern restriction from a custom validater:
+
+  class MyValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      ...
+    end
+
+    def xsd_pattern_restrictions
+      [/foo/, /bar/]
+    end
+  end
+
+You can have a custom enumeration restriction from a custom validater:
+
+  class MyValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      ...
+    end
+
+    def xsd_field_enumeration_restrictions
+      ["foo", "bar"]
+    end
+  end
+
+
 == REQUIREMENTS
 
 * ActiveRecord 3.x

data/lib/schematic/generator/column_validator.rb

@@ -11,7 +11,9 @@ module Schematic
       def for_validator(validator_klass)
         validators_for_column.each do |column_validation|
           next unless column_validation.is_a? validator_klass
-          next unless column_validation.options[:if].nil? || column_validation.options[:unless].nil?
+          has_conditional_proc = !column_validation.options[:if].nil? || !column_validation.options[:unless].nil?
+          force_inclusion = column_validation.options[:xsd] && column_validation.options[:xsd][:include]
+          next if has_conditional_proc && !force_inclusion
           yield(column_validation)
           return
         end

data/lib/schematic/version.rb

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

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

@@ -8,14 +8,20 @@ describe Schematic::Generator::Restrictions::Enumeration do
       with_model :enumeration_model do
         table :id => false do |t|
           t.string "title"
+          t.string "should_be_skipped"
+          t.string "should_also_be_skipped"
           t.boolean "active"
           t.string "options"
+          t.integer "force_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 :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 }
         end
       end
 
@@ -25,7 +31,7 @@ describe Schematic::Generator::Restrictions::Enumeration do
         lambda {
           validate_xml_against_xsd(xml, subject)
         }.should raise_error
-        valid_instance = EnumerationModel.new(:title => "a", :active => true, :options => "some valid attribute")
+        valid_instance = EnumerationModel.new(:title => "a", :should_be_skipped => "a", :should_also_be_skipped => "a", :active => true, :options => "some valid attribute", :force_enumeration => 2)
         xml = [valid_instance].to_xml
         lambda {
           validate_xml_against_xsd(xml, subject)
@@ -46,6 +52,22 @@ describe Schematic::Generator::Restrictions::Enumeration do
                   </xs:simpleContent>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="should-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="should-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>
@@ -62,6 +84,16 @@ describe Schematic::Generator::Restrictions::Enumeration do
                   </xs:simpleContent>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="force-enumeration" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="Integer">
+                      <xs:enumeration value="1"/>
+                      <xs:enumeration value="2"/>
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
           XML
         end
 

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

@@ -165,7 +165,6 @@ describe Schematic::Generator::Restrictions::Length do
                 <xs:complexType>
                   <xs:simpleContent>
                     <xs:restriction base="String">
-                      <xs:maxLength value="100"/>
                     </xs:restriction>
                   </xs:simpleContent>
                 </xs:complexType>

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -04:00
-default_executable: 
+date: 2011-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -142,7 +141,6 @@ files:
 - spec/support/extensions/active_model/validations/inclusion.rb
 - spec/xsd/XMLSchema.xsd
 - spec/xsd/xml.xsd
-has_rdoc: true
 homepage: https://github.com/Casecommons/schematic
 licenses: []
 
@@ -156,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -515081018085257419
+      hash: -1535622649516995802
       segments: 
       - 0
       version: "0"
@@ -165,14 +163,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -515081018085257419
+      hash: -1535622649516995802
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: schematic
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Automatic XSD generation from ActiveRecord models