schematic 0.5.2 → 0.5.3

data/lib/schematic/generator/sandbox.rb

@@ -27,9 +27,9 @@ module Schematic
         output
       end
 
-      def generate_xsd(builder, klass, options)
+      def generate_xsd(builder, klass, include_collection, options)
         xsd_generator.options = options
-        xsd_generator.generate(builder, klass)
+        xsd_generator.generate(builder, klass, include_collection)
       end
 
       def ignore(*fields)

data/lib/schematic/generator/xsd.rb

@@ -34,18 +34,18 @@ module Schematic
         end
       end
 
-      def generate(builder, klass)
+      def generate(builder, klass, include_collection=true)
         nested_attributes.each do |nested_attribute|
           next if nested_attribute.klass == klass
           next if nested_attribute.klass == klass.superclass
           @options ||= {}
           @options[:generated_types] ||= []
           next if @options[:generated_types].include?(nested_attribute.klass)
-          nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, @options)
+          nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, nested_attribute.macro == :has_many, @options)
           @options[:generated_types] << nested_attribute.klass
         end
 
-        generate_complex_type_for_collection(builder)
+        generate_complex_type_for_collection(builder) if include_collection
         generate_complex_type_for_model(builder)
       end
 

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -229,6 +229,7 @@ describe Schematic::Serializers::Xsd do
         it "should generate a valid XSD" do
           subject.should include "engine-attributes"
           subject.should_not include "engines-attributes"
+          subject.should_not include "Engines"
           validate_xsd(subject)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2165083140 !ruby/object:Gem::Requirement
+  requirement: &2160906360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165083140
+  version_requirements: *2160906360
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2165081880 !ruby/object:Gem::Requirement
+  requirement: &2160898860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165081880
+  version_requirements: *2160898860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2165080860 !ruby/object:Gem::Requirement
+  requirement: &2160897360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2165080860
+  version_requirements: *2160897360
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2165079840 !ruby/object:Gem::Requirement
+  requirement: &2160896060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165079840
+  version_requirements: *2160896060
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2165078840 !ruby/object:Gem::Requirement
+  requirement: &2160893960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165078840
+  version_requirements: *2160893960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165077900 !ruby/object:Gem::Requirement
+  requirement: &2160893000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165077900
+  version_requirements: *2160893000
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2165076920 !ruby/object:Gem::Requirement
+  requirement: &2160891200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165076920
+  version_requirements: *2160891200
 description: Automatic XSD generation from ActiveRecord models
 email:
 - casecommons-dev@googlegroups.com
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4493981086317892751
+      hash: -4035158889682443836
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4493981086317892751
+      hash: -4035158889682443836
 requirements: []
 rubyforge_project: schematic
 rubygems_version: 1.8.10