schematic 0.5.1 → 0.5.2

data/lib/schematic/generator/xsd.rb

@@ -67,11 +67,20 @@ module Schematic
             generate_column_elements(all, additional_methods, ignored_methods, required_methods)
 
             nested_attributes.each do |nested_attribute|
-              all.xs :element,
-                "name" => nested_attribute_name(nested_attribute.name),
-                "type" => nested_attribute.klass.schematic_sandbox.xsd_generator.names.collection_type,
-                "minOccurs" => "0",
-                "maxOccurs" => "1"
+              case nested_attribute.macro
+              when :has_many
+                all.xs :element,
+                  "name" => nested_attribute_name(nested_attribute.name),
+                  "type" => nested_attribute.klass.schematic_sandbox.xsd_generator.names.collection_type,
+                  "minOccurs" => "0",
+                  "maxOccurs" => "1"
+              when :has_one
+                all.xs :element,
+                  "name" => nested_attribute_name(nested_attribute.name, {:pluralized => false}),
+                  "type" => nested_attribute.klass.schematic_sandbox.xsd_generator.names.type,
+                  "minOccurs" => "0",
+                  "maxOccurs" => "1"
+              end
             end
 
             generate_additional_methods(all, additional_methods)
@@ -155,8 +164,12 @@ module Schematic
         { "xmlns:#{ns}" => Namespaces::PROVIDERS[provider][key] }
       end
 
-      def nested_attribute_name(name)
-        "#{name.to_s.gsub("_", "-").pluralize}-attributes"
+      def nested_attribute_name(name, options={})
+        pluralized = options.delete(:pluralized)
+        pluralized = true if pluralized.nil?
+        name = name.to_s.gsub("_", "-")
+        name = name.pluralize if pluralized
+        "#{name}-attributes"
       end
 
     end

data/lib/schematic/version.rb

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

data/spec/schematic_serializers_xsd_spec.rb

@@ -177,7 +177,7 @@ 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
+      context "when the model has a nested attribute on a subclass with a different class name than the has_many association" do
         with_model :parent2 do
           table {}
           model do
@@ -205,6 +205,34 @@ describe Schematic::Serializers::Xsd do
         end
       end
 
+      context "when the model has a nested attribute for a has_one association" do
+        with_model :car do
+          table {}
+          model do
+            has_one :engine
+            accepts_nested_attributes_for :engine
+          end
+        end
+
+        with_model :engine do
+          table do |t|
+            t.integer :car_id
+          end
+
+          model do
+            belongs_to :car
+          end
+        end
+
+        subject { Car.to_xsd }
+
+        it "should generate a valid XSD" do
+          subject.should include "engine-attributes"
+          subject.should_not include "engines-attributes"
+          validate_xsd(subject)
+        end
+      end
+
       context "when the model has a circular nested attribute reference" do
         with_model :plate do
           table {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164310000 !ruby/object:Gem::Requirement
+  requirement: &2165083140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164310000
+  version_requirements: *2165083140
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2164309120 !ruby/object:Gem::Requirement
+  requirement: &2165081880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164309120
+  version_requirements: *2165081880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2164308120 !ruby/object:Gem::Requirement
+  requirement: &2165080860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2164308120
+  version_requirements: *2165080860
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2164307420 !ruby/object:Gem::Requirement
+  requirement: &2165079840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164307420
+  version_requirements: *2165079840
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2164304880 !ruby/object:Gem::Requirement
+  requirement: &2165078840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164304880
+  version_requirements: *2165078840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164303960 !ruby/object:Gem::Requirement
+  requirement: &2165077900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164303960
+  version_requirements: *2165077900
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2164288000 !ruby/object:Gem::Requirement
+  requirement: &2165076920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164288000
+  version_requirements: *2165076920
 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: -1652545114662954696
+      hash: 4493981086317892751
 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: -1652545114662954696
+      hash: 4493981086317892751
 requirements: []
 rubyforge_project: schematic
 rubygems_version: 1.8.10