schematic 0.3.3 → 0.3.4

data/lib/schematic/generator/xsd.rb

@@ -88,6 +88,21 @@ module Schematic
         end
       end
 
+      def generate_sequence_value_restrictions(builder, value)
+        enumeration_method = "xsd_#{value}_enumeration_restrictions".to_sym
+        builder.xs :complexType do |complex_type|
+          complex_type.xs :simpleContent do |simple_content|
+            simple_content.xs :restriction, "base" => "String" do |restriction|
+              if @klass.respond_to? enumeration_method
+                @klass.send(enumeration_method).each do |enumeration|
+                  restriction.xs :enumeration, "value" => enumeration
+                end
+              end
+            end
+          end
+        end
+      end
+
       def generate_additional_methods(builder, additional_methods)
         additional_methods.each do |method_name, values|
           method_xsd_name = method_name.to_s.dasherize
@@ -98,7 +113,9 @@ module Schematic
                   complex_type.xs :sequence do |nested_sequence|
                     if values.present?
                       values.each do |value|
-                        nested_sequence.xs :element, "name" => value.to_s.dasherize, "minOccurs" => "0", "maxOccurs" => "unbounded"
+                        nested_sequence.xs :element, "name" => value.to_s.dasherize, "minOccurs" => "0", "maxOccurs" => "unbounded" do |sequence_element|
+                          generate_sequence_value_restrictions(sequence_element, value)
+                        end
                       end
                     else
                       nested_sequence.xs :any, "processContents" => "skip", "minOccurs" => "0", "maxOccurs" => "unbounded"

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/schematic/serializers/xsd_xsd_methods_spec.rb

@@ -114,8 +114,24 @@ describe Schematic::Serializers::Xsd do
         table {}
 
         model do
+          def foo=(value)
+            @foo = value
+          end
+
+          def foo
+            @foo
+          end
+
+          def self.xsd_foo_enumeration_restrictions
+            ["1", "2", "3"]
+          end
+
           def self.xsd_methods
-            {:foo => [:bar]}
+            {:foo => [:foo]}
+          end
+
+          def to_xml(options = {})
+            super({:methods => [:foo]}.merge(options))
           end
         end
       end
@@ -134,7 +150,17 @@ describe Schematic::Serializers::Xsd do
             <xs:element name="foo" minOccurs="0" maxOccurs="1">
               <xs:complexType>
                 <xs:sequence>
-                  <xs:element name="bar" minOccurs="0" maxOccurs="unbounded"/>
+                  <xs:element name="foo" minOccurs="0" maxOccurs="unbounded">
+                    <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>
                 </xs:sequence>
                 <xs:attribute name="type" type="xs:string" fixed="array" use="optional"/>
               </xs:complexType>
@@ -143,6 +169,20 @@ describe Schematic::Serializers::Xsd do
         end
         sanitize_xml(SomeModel.to_xsd).should eq(xsd)
       end
+
+      it "should validate against its own XSD" do
+        invalid_instance = SomeModel.new(:foo => ["a", "b"])
+        xml = [invalid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, SomeModel.to_xsd)
+        }.should raise_error
+
+        instance = SomeModel.new(:foo => ["1", "2"])
+        xml = [instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, SomeModel.to_xsd)
+        }.should_not raise_error
+      end
     end
 
     context "given nested methods" do

data/spec/schematic_serializers_xsd_spec.rb

@@ -58,7 +58,7 @@ describe Schematic::Serializers::Xsd do
                                    :some_datetime => DateTime.new,
                                    :some_boolean => true,
                                    :some_float => 1.5,
-                                   :method_is_also_columns => [{:some => "somevalues"}],
+                                   :method_is_also_columns => ["somevalues"],
                                    :additional_method_array => {"somevalue" => "somekey"},
                                    :some_integer => 2)
           xml = [instance].to_xml

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -04:00
+date: 2011-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency