schematic 0.0.5 → 0.0.6

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2-p136@schematic
+rvm 1.9.2-p136@schematic --create

data/lib/schematic/serializers/xsd.rb

@@ -115,8 +115,14 @@ module Schematic
             builder.xs :element, "name" => method_xsd_name, "minOccurs" => "0", "maxOccurs" => "1" do |element|
               element.xs :complexType do |complex_type|
                 complex_type.xs :all do |nested_all|
-                  values.each do |value|
-                    nested_all.xs :element, "name" => value.to_s.dasherize, "minOccurs" => "0"
+                  if values.is_a?(Array)
+                    values.each do |value|
+                      nested_all.xs :element, "name" => value.to_s.dasherize, "minOccurs" => "0"
+                    end
+                  elsif values.is_a?(Hash)
+                    generate_xsd_additional_methods(nested_all, values)
+                  else
+                    raise "Additional methods must be a hash of hashes or hash of arrays"
                   end
                 end
                 complex_type.xs :attribute, "name" => "type", "type" => "xs:string", "fixed" => "array", "use" => "optional"

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -55,6 +55,12 @@ describe Schematic::Serializers::Xsd do
             validates :some_string, :presence => true
             validates :some_date, :presence => true, :allow_blank => true
             validates :some_datetime, :presence => true, :allow_blank => false
+
+            class << self
+              def xsd_methods
+                {:foo => { :bar => { :baz => nil } } }
+              end
+            end
           end
 
         end
@@ -347,19 +353,20 @@ describe Schematic::Serializers::Xsd do
   end
 
   describe ".xsd_methods" do
-    with_model :some_model do
-      table {}
+    context "given a method" do
+      with_model :some_model do
+        table {}
 
-      model do
-        def self.xsd_methods
-          {:foo_bar => nil}
+        model do
+          def self.xsd_methods
+            {:foo_bar => nil}
+          end
         end
       end
-    end
 
-    it "should include the additional method" do
-      xsd = generate_xsd_for_model(SomeModel) do
-        <<-XML
+      it "should include the additional method" do
+        xsd = generate_xsd_for_model(SomeModel) do
+          <<-XML
         <xs:element name="id" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:simpleContent>
@@ -370,10 +377,95 @@ describe Schematic::Serializers::Xsd do
           </xs:complexType>
         </xs:element>
         <xs:element name="foo-bar" minOccurs="0" maxOccurs="1"/>
-        XML
+          XML
+        end
+
+        SomeModel.to_xsd.should == sanitize_xml(xsd)
       end
+    end
 
-      SomeModel.to_xsd.should == sanitize_xml(xsd)
+    context "given a an array of methods" do
+      with_model :some_model do
+        table {}
+
+        model do
+          def self.xsd_methods
+            {:foo => [:bar, :baz]}
+          end
+        end
+      end
+
+      it "should include the additional methods" do
+        xsd = generate_xsd_for_model(SomeModel) do
+          <<-XML
+        <xs:element name="id" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:integer">
+                <xs:attribute name="type" type="xs:string" use="optional"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="foo" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:all>
+              <xs:element name="bar" minOccurs="0"/>
+              <xs:element name="baz" minOccurs="0"/>
+            </xs:all>
+            <xs:attribute name="type" type="xs:string" fixed="array" use="optional"/>
+          </xs:complexType>
+        </xs:element>
+          XML
+        end
+
+        SomeModel.to_xsd.should == sanitize_xml(xsd)
+      end
+    end
+
+    context "given nested methods" do
+      with_model :some_model do
+        table {}
+
+        model do
+          def self.xsd_methods
+            { :foo => { :bar => {:baz => nil } } }
+          end
+        end
+      end
+
+      it "should nested the additional methods" do
+        xsd = generate_xsd_for_model(SomeModel) do
+          <<-XML
+        <xs:element name="id" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:integer">
+                <xs:attribute name="type" type="xs:string" use="optional"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="foo" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:all>
+              <xs:element name="bar" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:all>
+                    <xs:element name="baz" minOccurs="0" maxOccurs="1"/>
+                  </xs:all>
+                  <xs:attribute name="type" type="xs:string" fixed="array" use="optional"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:all>
+            <xs:attribute name="type" type="xs:string" fixed="array" use="optional"/>
+          </xs:complexType>
+        </xs:element>
+          XML
+        end
+
+        SomeModel.to_xsd.should == sanitize_xml(xsd)
+      end
     end
   end
 

metadata

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