schematic 0.6.0 → 0.6.1

data/lib/schematic/generator/names.rb

@@ -1,7 +1,7 @@
 module Schematic
   module Generator
     class Names
-      attr_accessor :root
+      attr_accessor :root, :klass
 
       def initialize(klass)
         @klass = klass

data/lib/schematic/generator/xsd.rb

@@ -11,8 +11,8 @@ module Schematic
 
       def options=(hash = {})
         @options = hash
-        @options[:generated_types] ||= []
-        @options[:generated_types] << @klass
+        @options[:generated_singular_types] ||= []
+        @options[:generated_plural_types] ||= []
         @options
       end
 
@@ -35,22 +35,33 @@ module Schematic
       end
 
       def generate(builder, klass, include_collection=true, exclude_from_parent = [])
+        @iteration ||= 0
         @exclude = exclude_from_parent
-
         nested_attributes.each do |nested_attribute|
           next if nested_attribute.klass == klass
           next if nested_attribute.klass == klass.superclass
           @options ||= {}
-          @options[:generated_types] ||= []
+          @options[:generated_singular_types] ||= []
+          @options[:generated_plural_types] ||= []
           exclude = klass.schematic_sandbox.ignored_elements[nested_attribute.name].dup
-          next if @options[:generated_types].include?(nested_attribute.klass)
 
-          nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, nested_attribute.macro == :has_many, @options, exclude)
-          @options[:generated_types] << nested_attribute.klass
+          if nested_attribute.macro == :has_many && !@options[:generated_plural_types].include?(nested_attribute.klass)
+            nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, true, @options, exclude)
+            @options[:generated_plural_types] << nested_attribute.klass
+          elsif !@options[:generated_singular_types].include?(nested_attribute.klass)
+            nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, false, @options, exclude)
+            @options[:generated_singular_types] << nested_attribute.klass
+          end
         end
-
-        generate_complex_type_for_collection(builder) if include_collection
-        generate_complex_type_for_model(builder)
+        if include_collection && !@options[:generated_plural_types].include?(@names.collection_type)
+          generate_complex_type_for_collection(builder)
+          @options[:generated_plural_types] << @names.collection_type
+        end
+        unless @options[:generated_singular_types].include?(@names.type)
+          generate_complex_type_for_model(builder)
+          @options[:generated_singular_types] << @names.type
+        end
+        builder
       end
 
       def generate_complex_type_for_collection(builder)
@@ -120,7 +131,7 @@ module Schematic
       def generate_uniqueness_constraints(builder)
         return unless @klass.respond_to?(:columns)
         @klass.columns.each do |column|
-           Uniqueness.new(@klass, column).generate(builder)
+          Uniqueness.new(@klass, column).generate(builder)
         end
       end
 

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -739,4 +739,43 @@ describe Schematic::Serializers::Xsd do
       xsd.nested_attribute_name(:very_special_children).should == "very-special-children-attributes"
     end
   end
+  context "when the model has a nested attribute with a different class name and foreign key than the has_many association" do
+    with_model :foo do
+      model do
+        has_one :bar, :class_name => "Quz", :foreign_key => "bar_id"
+        has_many :children, :class_name => "Quz", :foreign_key => "children_id"
+        accepts_nested_attributes_for :children
+        accepts_nested_attributes_for :bar
+      end
+    end
+    with_model :quz do
+      table do |t|
+        t.integer :bar_id
+        t.integer :children_id
+        t.string :name
+      end
+    end
+    subject { Foo.to_xsd }
+
+    it "should generate a valid XSD" do
+      test_xml = <<-END
+      <?xml version="1.0" encoding="UTF-8"?>
+      <foos>
+        <foo>
+          <children-attributes>
+            <quz>
+              <name>Joe</name>
+            </quz>
+          </children-attributes>
+        </foo>
+      </foos>
+      END
+
+      subject.should include "Quz"
+      subject.should include "Quzs"
+      validate_xml_against_xsd(test_xml, subject)
+    end
+  end
 end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70329222280980 !ruby/object:Gem::Requirement
+  requirement: &70212766160660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70329222280980
+  version_requirements: *70212766160660
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70329222247240 !ruby/object:Gem::Requirement
+  requirement: &70212766160240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329222247240
+  version_requirements: *70212766160240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70329222245680 !ruby/object:Gem::Requirement
+  requirement: &70212766159700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70329222245680
+  version_requirements: *70212766159700
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &70329222244100 !ruby/object:Gem::Requirement
+  requirement: &70212766159200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70329222244100
+  version_requirements: *70212766159200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70329222243200 !ruby/object:Gem::Requirement
+  requirement: &70212766158820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329222243200
+  version_requirements: *70212766158820
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70329222242300 !ruby/object:Gem::Requirement
+  requirement: &70212766158360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329222242300
+  version_requirements: *70212766158360
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70329222240840 !ruby/object:Gem::Requirement
+  requirement: &70212766157940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329222240840
+  version_requirements: *70212766157940
 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: -3320943580698096283
+      hash: -3449394722461241422
 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: -3320943580698096283
+      hash: -3449394722461241422
 requirements: []
 rubyforge_project: schematic
 rubygems_version: 1.8.10