spectifly 0.0.7 → 0.0.8

data/lib/spectifly/base/association.rb

@@ -11,8 +11,8 @@ module Spectifly
       end
 
       def multiple?
-        ['has_many', 'has_many_and_belongs_to'].include? relationship
+        ['has_many', 'has_many_and_belongs_to', 'belongs_to_many'].include? relationship
       end
     end
   end
-end
+end

data/lib/spectifly/version.rb

@@ -1,3 +1,3 @@
 module Spectifly
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/spectifly/xsd/association.rb

@@ -7,7 +7,7 @@ module Spectifly
 
       def to_xsd(builder = nil)
         builder ||= ::Builder::XmlMarkup.new(:indent => 2)
-        if relationship == 'belongs_to'
+        if relationship =~ /^belongs_to(_many)?/
           attributes['name'] = "#{name}Id"
           attributes['type'] = "xs:string"
         else

data/lib/spectifly/xsd/builder.rb

@@ -27,7 +27,7 @@ module Spectifly
       def types
         [
           fields.map(&:type) +
-          associations.select { |a| a.relationship != 'belongs_to' }.map(&:type)
+          associations.select { |a| a.relationship !~ /belongs_to(_many)?/ }.map(&:type)
         ].flatten.compact.uniq
       end
 

data/spec/expectations/individual.json

@@ -1,10 +1,10 @@
 {
   "individual": {
     "belongs_to": {
-      "party": {
+      "political_party": {
         "type": "group",
         "required": true,
-        "description": "Which funtime party this individual happy with is"
+        "description": "Less funtime party that aligns with this individual's ideals"
       },
       "stupid_club": {
         "type": "group",
@@ -12,6 +12,13 @@
         "description": "Which stupid club this individual was manipulated into joining"
       }
     },
+    "belongs_to_many": {
+      "parties": {
+        "type": "group",
+        "required": false,
+        "description": "Which funtime party/parties this individual happy with is"
+      }
+    },
     "name": {
       "type": "string",
       "multiple": false,
@@ -59,4 +66,4 @@
       "description": "Whether or not this individual is pickled"
     }
   }
-}
+}

data/spec/expectations/individual.xsd

@@ -36,9 +36,9 @@
           <xs:documentation>Whether or not this individual is pickled</xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="PartyId" type="xs:string">
+      <xs:element name="PoliticalPartyId" type="xs:string">
         <xs:annotation>
-          <xs:documentation>Which funtime party this individual happy with is</xs:documentation>
+          <xs:documentation>Less funtime party that aligns with this individual's ideals</xs:documentation>
         </xs:annotation>
       </xs:element>
       <xs:element name="StupidClubId" type="xs:string" minOccurs="0">
@@ -46,6 +46,11 @@
           <xs:documentation>Which stupid club this individual was manipulated into joining</xs:documentation>
         </xs:annotation>
       </xs:element>
+      <xs:element name="PartiesId" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+        <xs:annotation>
+          <xs:documentation>Which funtime party/parties this individual happy with is</xs:documentation>
+        </xs:annotation>
+      </xs:element>
     </xs:sequence>
   </xs:complexType>
 </xs:schema>

data/spec/expectations/presented/positionless_individual.json

@@ -1,17 +1,19 @@
 {
   "individual": {
     "belongs_to": {
-      "party": {
-        "type": "group",
-        "required": true,
-        "description": "Which funtime party this individual happy with is"
-      },
       "stupid_club": {
         "type": "group",
         "required": false,
         "description": "Which stupid club this individual was manipulated into joining"
       }
     },
+    "belongs_to_many": {
+      "parties": {
+        "type": "group",
+        "required": false,
+        "description": "Which funtime party/parties this individual happy with is"
+      }
+    },
     "name": {
       "type": "string",
       "multiple": false,
@@ -46,4 +48,4 @@
       "description": "Whether or not this individual is pickled"
     }
   }
-}
+}

data/spec/expectations/presented/positionless_individual.xsd

@@ -24,14 +24,14 @@
           <xs:documentation>Whether or not this individual is pickled</xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="PartyId" type="xs:string">
+      <xs:element name="StupidClubId" type="xs:string" minOccurs="0">
         <xs:annotation>
-          <xs:documentation>Which funtime party this individual happy with is</xs:documentation>
+          <xs:documentation>Which stupid club this individual was manipulated into joining</xs:documentation>
         </xs:annotation>
       </xs:element>
-      <xs:element name="StupidClubId" type="xs:string" minOccurs="0">
+      <xs:element name="PartiesId" type="xs:string" minOccurs="0" maxOccurs="unbounded">
         <xs:annotation>
-          <xs:documentation>Which stupid club this individual was manipulated into joining</xs:documentation>
+          <xs:documentation>Which funtime party/parties this individual happy with is</xs:documentation>
         </xs:annotation>
       </xs:element>
     </xs:sequence>

data/spec/fixtures/individual.entity

@@ -28,10 +28,15 @@ Individual:
 
   Related Entities:
     Belongs To:
-      Party*:
-        Description: Which funtime party this individual happy with is
+      Political Party*:
+        Description: Less funtime party that aligns with this individual's ideals
         Type: Group
 
       Stupid Club:
         Description: Which stupid club this individual was manipulated into joining
-        Type: Group
+        Type: Group
+
+    Belongs To Many:
+      Parties:
+        Description: Which funtime party/parties this individual happy with is
+        Type: Group

data/spec/fixtures/presenters/positionless_individual/individual.entity

@@ -9,5 +9,6 @@ Individual:
     Pickled?:
   Related Entities:
     Belongs To:
-      Party*:
       Stupid Club:
+    Belongs To Many:
+      Parties:

data/spec/spectifly/json/builder_spec.rb

@@ -7,7 +7,7 @@ describe Spectifly::Json::Builder do
       entity = Spectifly::Entity.parse(fixture_path('individual'))
       json_path = expectation_path('individual', 'json')
       hash = described_class.new(entity).build
-      JSON.pretty_generate(hash).should == File.read(json_path)
+      JSON.pretty_generate(hash).strip.should == File.read(json_path).strip
     end
 
     it 'works with containing relationships' do
@@ -26,7 +26,7 @@ describe Spectifly::Json::Builder do
       builder = described_class.new(entity)
       builder.present_as(presenter_entity).should == builder
       hash = builder.build
-      JSON.pretty_generate(hash).should == File.read(json_path)
+      JSON.pretty_generate(hash).strip.should == File.read(json_path).strip
     end
 
     it 'works with overriding relationships' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectifly
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-09-27 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: 4342167303691961125
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4342167303691961125
 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: