schematic 0.0.7 → 0.0.8

data/lib/schematic/serializers/xsd.rb

@@ -9,7 +9,7 @@ module Schematic
 
       def to_xsd(options = {})
         output = ""
-        builder = Builder::XmlMarkup.new(:target => output)
+        builder = Builder::XmlMarkup.new(:target => output, :indent => 2)
         builder.instruct!
         builder.xs :schema, "xmlns:xs" => "http://www.w3.org/2001/XMLSchema" do |schema|
           schema.xs :element, "name" => xsd_element_collection_name, "type" => xsd_type_collection_name
@@ -112,19 +112,20 @@ module Schematic
         additional_methods.each do |method_name, values|
           method_xsd_name = method_name.to_s.dasherize
           if values.present?
-            max_occurrences = values.is_a?(Hash) ? {} : {"maxOccurs" => "1"}
-            builder.xs :element, {"name" => method_xsd_name, "minOccurs" => "0"}.merge(max_occurrences) do |element|
+            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|
-                  if values.is_a?(Array)
+                if values.is_a?(Array)
+                  complex_type.xs :sequence do |nested_sequence|
                     values.each do |value|
-                      nested_all.xs :element, "name" => value.to_s.dasherize, "minOccurs" => "0"
+                      nested_sequence.xs :element, "name" => value.to_s.dasherize, "minOccurs" => "0", "maxOccurs" => "unbounded"
                     end
-                  elsif values.is_a?(Hash)
+                  end
+                elsif values.is_a?(Hash)
+                  complex_type.xs :all do |nested_all|
                     generate_xsd_additional_methods(nested_all, values)
-                  else
-                    raise "Additional methods must be a hash of hashes or hash of arrays"
                   end
+                else
+                  raise "Additional methods must be a hash of hashes or hash of arrays"
                 end
                 complex_type.xs :attribute, "name" => "type", "type" => "xs:string", "fixed" => "array", "use" => "optional"
               end

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -160,24 +160,24 @@ describe Schematic::Serializers::Xsd do
     end
 
     context "for an empty model with no attributes or validations" do
-      subject { EmptyModel.to_xsd }
+      subject { sanitize_xml(EmptyModel.to_xsd) }
 
       it "should return an xsd for an array of the model" do
         xsd = <<-XML
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="empty-models" type="EmptyModels"/>
-  <xs:complexType name="EmptyModels">
-    <xs:sequence>
-      <xs:element name="empty-model" type="EmptyModel" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="type" type="xs:string" fixed="array"/>
-  </xs:complexType>
-  <xs:complexType name="EmptyModel">
-    <xs:all>
-    </xs:all>
-  </xs:complexType>
-</xs:schema>
+          <?xml version="1.0" encoding="UTF-8"?>
+          <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+            <xs:element name="empty-models" type="EmptyModels"/>
+            <xs:complexType name="EmptyModels">
+              <xs:sequence>
+                <xs:element name="empty-model" type="EmptyModel" minOccurs="0" maxOccurs="unbounded"/>
+              </xs:sequence>
+              <xs:attribute name="type" type="xs:string" fixed="array"/>
+            </xs:complexType>
+            <xs:complexType name="EmptyModel">
+              <xs:all>
+              </xs:all>
+            </xs:complexType>
+          </xs:schema>
         XML
         subject.should == sanitize_xml(xsd)
       end
@@ -186,7 +186,7 @@ describe Schematic::Serializers::Xsd do
 
     context "for a model with attributes" do
 
-      subject { SomeModel.to_xsd }
+      subject { sanitize_xml(SomeModel.to_xsd) }
 
       context "for a any attribute" do
         with_model :some_model do
@@ -210,7 +210,7 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          subject.should == sanitize_xml(xsd)
+          subject.should == xsd
         end
 
       end
@@ -236,14 +236,14 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          SomeModel.to_xsd(:methods => {:foo_bar => nil}).should == sanitize_xml(xsd)
+          sanitize_xml(SomeModel.to_xsd(:methods => {:foo_bar => nil})).should == xsd
         end
       end
 
     end
 
     context "with a model with validations" do
-      subject { SomeModel.to_xsd }
+      subject { sanitize_xml(SomeModel.to_xsd) }
 
       context "presence of validation" do
 
@@ -273,7 +273,7 @@ describe Schematic::Serializers::Xsd do
               XML
             end
 
-            subject.should == sanitize_xml(xsd)
+            subject.should == xsd
           end
         end
 
@@ -303,7 +303,7 @@ describe Schematic::Serializers::Xsd do
               XML
             end
 
-            subject.should == sanitize_xml(xsd)
+            subject.should == xsd
           end
         end
 
@@ -333,7 +333,7 @@ describe Schematic::Serializers::Xsd do
               XML
             end
 
-            subject.should == sanitize_xml(xsd)
+            subject.should == xsd
           end
         end
       end
@@ -376,7 +376,7 @@ describe Schematic::Serializers::Xsd do
           XML
         end
 
-        SomeModel.to_xsd.should == sanitize_xml(xsd)
+        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
       end
     end
 
@@ -386,7 +386,7 @@ describe Schematic::Serializers::Xsd do
 
         model do
           def self.xsd_methods
-            {:foo => [:bar, :baz]}
+            {:foo => [:bar]}
           end
         end
       end
@@ -394,28 +394,26 @@ describe Schematic::Serializers::Xsd do
       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>
+            <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:sequence>
+                  <xs:element name="bar" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+                <xs:attribute name="type" type="xs:string" fixed="array" use="optional"/>
+              </xs:complexType>
+            </xs:element>
           XML
         end
-
-        SomeModel.to_xsd.should == sanitize_xml(xsd)
+        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
       end
     end
 
@@ -442,10 +440,10 @@ describe Schematic::Serializers::Xsd do
             </xs:simpleContent>
           </xs:complexType>
         </xs:element>
-        <xs:element name="foo" minOccurs="0">
+        <xs:element name="foo" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:all>
-              <xs:element name="bar" minOccurs="0">
+              <xs:element name="bar" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                   <xs:all>
                     <xs:element name="baz" minOccurs="0" maxOccurs="1"/>
@@ -460,7 +458,7 @@ describe Schematic::Serializers::Xsd do
           XML
         end
 
-        SomeModel.to_xsd.should == sanitize_xml(xsd)
+        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
       end
     end
   end
@@ -483,7 +481,7 @@ describe Schematic::Serializers::Xsd do
       xsd = generate_xsd_for_model(SomeModel) do
       end
 
-      SomeModel.to_xsd.should == sanitize_xml(xsd)
+      sanitize_xml(SomeModel.to_xsd).should eq(xsd)
     end
   end
 
@@ -546,26 +544,27 @@ describe Schematic::Serializers::Xsd do
   end
 
   def sanitize_xml(xml)
-    xml.split("\n").map(&:strip).join("")
+    xml.split("\n").reject(&:blank?).map(&:strip).join("\n")
   end
 
   def generate_xsd_for_model(model)
-    <<-XML
-    <?xml version="1.0" encoding="UTF-8"?>
-    <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:element name="#{model.xsd_element_collection_name}" type="#{model.xsd_type_collection_name}"/>
-    <xs:complexType name="#{model.xsd_type_collection_name}">
+    output = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="#{model.xsd_element_collection_name}" type="#{model.xsd_type_collection_name}"/>
+  <xs:complexType name="#{model.xsd_type_collection_name}">
     <xs:sequence>
-    <xs:element name="#{model.xsd_element_name}" type="#{model.xsd_type_name}" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="#{model.xsd_element_name}" type="#{model.xsd_type_name}" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
     <xs:attribute name="type" type="xs:string" fixed="array"/>
-    </xs:complexType>
-    <xs:complexType name="#{model.xsd_type_name}">
+  </xs:complexType>
+  <xs:complexType name="#{model.xsd_type_name}">
     <xs:all>
-    #{yield}
+      #{yield}
     </xs:all>
-    </xs:complexType>
-    </xs:schema>
+  </xs:complexType>
+</xs:schema>
     XML
+    sanitize_xml(output)
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -04:00
-default_executable: 
+date: 2011-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -103,7 +102,6 @@ files:
 - spec/spec_helper.rb
 - spec/xsd/XMLSchema.xsd
 - spec/xsd/xml.xsd
-has_rdoc: true
 homepage: https://github.com/Casecommons/schematic
 licenses: []
 
@@ -127,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: schematic
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Automatic XSD generation from ActiveRecord models