schematic 0.2.3 → 0.3.0

data/lib/schematic/generator/names.rb

@@ -7,7 +7,7 @@ module Schematic
       end
 
       def type
-        @klass.name.demodulize
+        @klass.name.gsub(/::/,'')
       end
 
       def element
@@ -22,6 +22,10 @@ module Schematic
         type.pluralize
       end
 
+      def nested_attribute_name
+        "#{element_collection}-attributes"
+      end
+
     end
   end
 end

data/lib/schematic/generator/xsd.rb

@@ -12,7 +12,7 @@ module Schematic
 
       def options=(hash = {})
         @options = {:generated_types => []}.merge(hash)
-        @options[:generated_types] << @klass unless @options[:generated_types].include?(@klass)
+        @options[:generated_types] << @klass
         @options
       end
 
@@ -38,9 +38,9 @@ module Schematic
         nested_attributes.each do |nested_attribute|
           next if nested_attribute.klass == klass
           next if nested_attribute.klass == klass.superclass
-          next if @options && @options[:generated_types] && @options[:generated_types].include?(klass)
+          next if @options && @options[:generated_types] && @options[:generated_types].include?(nested_attribute.klass)
           nested_attribute.klass.generate_xsd(builder, klass, @options)
-          @options[:generated_types] << klass
+          @options[:generated_types] << nested_attribute.klass
         end
 
         generate_complex_type_for_collection(builder)
@@ -64,7 +64,7 @@ module Schematic
             generate_column_elements(all, additional_methods, ignored_methods)
 
             nested_attributes.each do |nested_attribute|
-              all.xs :element, "name" => "#{nested_attribute.name.to_s.dasherize}-attributes", "type" => nested_attribute.klass.xsd_generator.names.collection_type, "minOccurs" => "0", "maxOccurs" => "1"
+              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"
             end
 
             generate_additional_methods(all, additional_methods)

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -98,7 +98,7 @@ describe Schematic::Serializers::Xsd do
         with_model :parent do
           table {}
           model do
-            has_many :children
+            has_many :children, :class_name => "Namespace::Child"
             accepts_nested_attributes_for :children
           end
         end
@@ -125,29 +125,37 @@ describe Schematic::Serializers::Xsd do
         it "should generate a valid XSD" do
           validate_xsd(subject)
         end
+
+        it "should validate against its own XSD" do
+          child_instance = Namespace::Child.new(:parent_id => 123)
+          xml = [child_instance].to_xml
+          lambda {
+            validate_xml_against_xsd(xml, subject)
+          }.should_not raise_error
+        end
       end
 
       context "when the model has a circular nested attribute reference" do
-        with_model :blog do
+        with_model :plate do
           table {}
           model do
-            has_many :posts
-            accepts_nested_attributes_for :posts
+            has_many :cheeses
+            accepts_nested_attributes_for :cheeses
           end
         end
 
-        with_model :post do
+        with_model :cheese do
           table do |t|
-            t.integer :blog_id
+            t.integer :plate_id
           end
 
           model do
-            belongs_to :blog
-            accepts_nested_attributes_for :blog
+            belongs_to :plate
+            accepts_nested_attributes_for :plate
           end
         end
 
-        subject { Post.to_xsd }
+        subject { Cheese.to_xsd }
 
         it "should generate a valid XSD" do
           validate_xsd(subject)

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Case Commons, LLC