spectifly 0.0.5 → 0.0.6

data/lib/spectifly/version.rb

@@ -1,3 +1,3 @@
 module Spectifly
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/spectifly/xsd/association.rb

@@ -7,11 +7,17 @@ module Spectifly
 
       def to_xsd(builder = nil)
         builder ||= ::Builder::XmlMarkup.new(:indent => 2)
-        attributes['type'] = "#{Spectifly::Support.lower_camelize(type)}Type"
-        attributes['minOccurs'] = '0' unless required? && relationship != 'belongs_to'
+        if relationship == 'belongs_to'
+          attributes['name'] = "#{name}Id"
+          attributes['type'] = "xs:string"
+        else
+          attributes['name'] = name
+          attributes['type'] = "#{Spectifly::Support.lower_camelize(type)}Type"
+          attributes['minOccurs'] = '0' unless required?
+        end
         attributes['maxOccurs'] = 'unbounded' if multiple?
         block = embedded_block
-        builder.xs :element, { :name => name }.merge(attributes), &block
+        builder.xs :element, attributes, &block
       end
 
       def embedded_block
@@ -28,4 +34,4 @@ module Spectifly
       end
     end
   end
-end
+end

data/lib/spectifly/xsd/builder.rb

@@ -24,6 +24,13 @@ module Spectifly
         end
       end
 
+      def types
+        [
+          fields.map(&:type) +
+          associations.select { |a| a.relationship != 'belongs_to' }.map(&:type)
+        ].flatten.compact.uniq
+      end
+
       def build(xml = nil)
         xml ||= ::Builder::XmlMarkup.new(:indent => 2)
         xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
@@ -34,10 +41,12 @@ module Spectifly
           unless utilized_extended_types.empty?
             xml.xs :include, 'schemaLocation' => "extended.xsd"
           end
-          xml.xs :element, :name => Spectifly::Support.camelize(root), :type => root_type
+          xml.xs :element,
+            :name => Spectifly::Support.camelize(root),
+            :type => root_type
           build_type(xml)
         end
       end
     end
   end
-end
+end

data/spec/expectations/individual.xsd

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:include schemaLocation="group.xsd"/>
   <xs:include schemaLocation="extended.xsd"/>
   <xs:element name="Individual" type="individualType"/>
   <xs:complexType name="individualType">
@@ -37,7 +36,7 @@
           <xs:documentation>Whether or not this individual is pickled</xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="Party" type="groupType" minOccurs="0">
+      <xs:element name="PartyId" type="xs:string">
         <xs:annotation>
           <xs:documentation>Which funtime party this individual happy with is</xs:documentation>
         </xs:annotation>

data/spec/expectations/presented/positionless_individual.xsd

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:include schemaLocation="group.xsd"/>
   <xs:include schemaLocation="extended.xsd"/>
   <xs:element name="Individual" type="individualType"/>
   <xs:complexType name="individualType">
@@ -25,7 +24,7 @@
           <xs:documentation>Whether or not this individual is pickled</xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="Party" type="groupType" minOccurs="0">
+      <xs:element name="PartyId" type="xs:string">
         <xs:annotation>
           <xs:documentation>Which funtime party this individual happy with is</xs:documentation>
         </xs:annotation>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectifly
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -207,12 +207,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2137149722934303799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2137149722934303799
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -248,4 +254,3 @@ test_files:
 - spec/spectifly/xsd/field_spec.rb
 - spec/spectifly/xsd/types_spec.rb
 - spec/support/path_helper.rb
-has_rdoc: