schematic 0.3.1 → 0.3.2

data/lib/schematic/generator/xsd.rb

@@ -64,7 +64,11 @@ module Schematic
             generate_column_elements(all, additional_methods, ignored_methods)
 
             nested_attributes.each do |nested_attribute|
-              all.xs :element, "name" => nested_attribute.klass.xsd_generator.names.nested_attribute_name, "type" => nested_attribute.klass.xsd_generator.names.collection_type, "minOccurs" => "0", "maxOccurs" => "1"
+              all.xs :element,
+                "name" => nested_attribute_name(nested_attribute.name),
+                "type" => nested_attribute.klass.xsd_generator.names.collection_type,
+                "minOccurs" => "0",
+                "maxOccurs" => "1"
             end
 
             generate_additional_methods(all, additional_methods)
@@ -128,6 +132,10 @@ module Schematic
         { "xmlns:#{ns}" => Namespaces::PROVIDERS[provider][key] }
       end
 
+      def nested_attribute_name(name)
+        "#{name.to_s.pluralize}-attributes"
+      end
+
     end
   end
 end

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -135,6 +135,34 @@ describe Schematic::Serializers::Xsd do
         end
       end
 
+      context "when the model has a nested attribute on a subclass with a different class name than the association" do
+        with_model :parent do
+          table {}
+          model do
+            has_many :children, :class_name => "SpecialChild"
+            accepts_nested_attributes_for :children
+          end
+        end
+
+        with_model :special_child do
+          table do |t|
+            t.integer :parent_id
+          end
+
+          model do
+            belongs_to :parent
+          end
+        end
+
+        subject { Parent.to_xsd }
+
+        it "should generate a valid XSD" do
+          subject.should include "children-attributes"
+          subject.should_not include "special-children-attributes"
+          validate_xsd(subject)
+        end
+      end
+
       context "when the model has a circular nested attribute reference" do
         with_model :plate do
           table {}
@@ -343,4 +371,14 @@ describe Schematic::Serializers::Xsd do
 
   end
 
+  describe "#nested_attribute_name" do
+    let(:xsd) {Schematic::Generator::Xsd.new(Object)}
+    it "turns 'child' into 'children-attributes'" do
+      xsd.nested_attribute_name('child').should == "children-attributes"
+    end
+
+    it "turns 'children' into 'children-attributes'" do
+      xsd.nested_attribute_name('children').should == "children-attributes"
+    end
+  end
 end

metadata

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