schematic 0.1.6 → 0.1.7

data/.gitignore

@@ -1,3 +1,4 @@
+.pairs
 *.gem
 *~
 .DS_Store

data/lib/schematic/generator/xsd.rb

@@ -91,7 +91,9 @@ module Schematic
               end
             end
           else
-            builder.xs :element, "name" => method_xsd_name, "minOccurs" => "0", "maxOccurs" => "1"
+            column_klass = Struct.new(:name, :type)
+            column = column_klass.new(method_name.to_s, :string)
+            Column.new(@klass, column, {}, @klass.xsd_ignore_methods).generate(builder)
           end
         end
       end

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/schematic/serializers/xsd_xsd_methods_spec.rb

@@ -24,12 +24,89 @@ describe Schematic::Serializers::Xsd do
             </xs:simpleContent>
           </xs:complexType>
         </xs:element>
-        <xs:element name="foo-bar" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="foo-bar" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:restriction base="String">
+              </xs:restriction>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+          XML
+        end
+
+        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+      end
+    end
+
+    context "given a method with validations" do
+      with_model :some_model do
+        table {}
+
+        model do
+          validates :foo_bar, :inclusion => { :in => [1,2,3] }
+
+          def foo_bar=(value)
+            @foo_bar = value
+          end
+
+          def foo_bar
+            @foo_bar
+          end
+
+          def to_xml(options = {})
+            super({:methods => [:foo_bar]}.merge(options))
+          end
+
+          def self.xsd_methods
+            {:foo_bar => nil}
+          end
+        end
+      end
+
+
+      it "should generate validation restrictions for the method if there are any" do
+        xsd = generate_xsd_for_model(SomeModel) do
+          <<-XML
+        <xs:element name="id" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:restriction base="Integer">
+              </xs:restriction>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="foo-bar" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:restriction base="String">
+                <xs:enumeration value="1"/>
+                <xs:enumeration value="2"/>
+                <xs:enumeration value="3"/>
+              </xs:restriction>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
           XML
         end
 
         sanitize_xml(SomeModel.to_xsd).should eq(xsd)
       end
+
+      it "should validate against the xsd" do
+        xsd = SomeModel.to_xsd
+
+        invalid_instance = SomeModel.new(:foo_bar => "d")
+        xml = [invalid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, xsd)
+        }.should raise_error
+        valid_instance = SomeModel.new(:foo_bar => 1)
+        xml = [valid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, xsd)
+        }.should_not raise_error
+      end
     end
 
     context "given a an array of methods" do
@@ -96,7 +173,14 @@ describe Schematic::Serializers::Xsd do
               <xs:element name="bar" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                   <xs:all>
-                    <xs:element name="baz" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="baz" minOccurs="0" maxOccurs="1">
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:restriction base="String">
+                          </xs:restriction>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
                   </xs:all>
                   <xs:attribute name="type" type="xs:string" fixed="array" use="optional"/>
                 </xs:complexType>

data/spec/schematic_serializers_xsd_spec.rb

@@ -266,7 +266,14 @@ describe Schematic::Serializers::Xsd do
                   </xs:simpleContent>
                 </xs:complexType>
               </xs:element>
-              <xs:element name="foo-bar" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="foo-bar" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="String">
+                    </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.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 Z
+date: 2011-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord