odata 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a27c048ec4706996d0eccc9aff655a5c60be94
-  data.tar.gz: de691ae9f3cb75ab544642f9826521cfc3bb09e5
+  metadata.gz: 0168d51fbc598d14a4ad183bf905476b1c7e0c33
+  data.tar.gz: 2b1678db31c28a5bd4122753d43153f9d83ac6a7
 SHA512:
-  metadata.gz: cdaae668ecb311bbb45f7abd54b116c9576d6c158c86968379405890aafad70bd14b0deda585c8f7e0cdbe9cb50e258d2590ccec2e3f78561ea851e58cc7a096
-  data.tar.gz: 84222c7cf63702ccc0f6073962a3ce3317cfb32507560dc49ada9c6ac6fb676cf66061a264fba8fa72849638448739d03c2a47bccdd684097499e1cf473a3cc2
+  metadata.gz: 315c0846a3e364a234fa63595618d89e8a6d340d0046440c815ba9153ec7db419136443027203ae6d307ba82883d089af0fcb02379c1c33010b53f21979f3251
+  data.tar.gz: 53b3c627ab42f413d264c23aa8dfea0f64e559e87c0cd747ceba9e786de2c0f537836c6fdf528d27bcc6fd1cdfa32c4746350c681a22daed1664f3dfcfa63cd6

data/lib/odata.rb

@@ -11,6 +11,7 @@ require 'typhoeus'
 require 'odata/version'
 require 'odata/property'
 require 'odata/properties'
+require 'odata/complex_type'
 require 'odata/entity'
 require 'odata/entity_set'
 require 'odata/query/criteria'

data/lib/odata/complex_type.rb

@@ -0,0 +1,67 @@
+module OData
+  # ComplexTypes are used in OData to either encapsulate richer data types for
+  # use as Entity properties. ComplexTypes are composed of properties the same
+  # way that Entities are and, so, the interface for working with the various
+  # properties of a ComplexType mimics that of Entities.
+  class ComplexType
+    # The name of the ComplexType
+    attr_reader :name
+
+    # Creates a new ComplexType based on the supplied options.
+    # @param options [Hash]
+    # @return [self]
+    def initialize(options = {})
+      validate_options(options)
+
+      @name = options[:name].to_s
+      @service = options[:service]
+
+      collect_properties
+    end
+
+    # Returns the namespace this ComplexType belongs to.
+    # @return [String]
+    def namespace
+      @namespace ||= service.namespace
+    end
+
+    # Returns a list of this ComplexType's property names.
+    # @return [Array<String>]
+    def property_names
+      @property_names ||= properties.collect {|name, property| name}
+    end
+
+    # Returns the value of the requested property.
+    # @param property_name [to_s]
+    # @return [*]
+    def [](property_name)
+      properties[property_name.to_s].value
+    end
+
+    # Sets the value of the named property.
+    # @param property_name [to_s]
+    # @param value [*]
+    # @return [*]
+    def []=(property_name, value)
+      properties[property_name.to_s].value = value
+    end
+
+    private
+
+    def service
+      @service
+    end
+
+    def properties
+      @properties
+    end
+
+    def validate_options(options)
+
+    end
+
+    def collect_properties
+      @properties = service.properties_for_complex_type(name)
+    end
+  end
+end

data/lib/odata/entity.rb

@@ -30,22 +30,22 @@ module OData
     # @param property_name [to_s]
     # @return [*]
     def [](property_name)
-      begin
-       properties[property_name.to_s].value
-      rescue NoMethodError
-        raise ArgumentError, "Unknown property: #{property_name}"
+      if properties[property_name.to_s].is_a?(::OData::ComplexType)
+        properties[property_name.to_s]
+      else
+        properties[property_name.to_s].value
       end
+    rescue NoMethodError
+      raise ArgumentError, "Unknown property: #{property_name}"
     end
 
     # Set property value
     # @param property_name [to_s]
     # @param value [*]
     def []=(property_name, value)
-      begin
-        properties[property_name.to_s].value = value
-      rescue NoMethodError
-        raise ArgumentError, "Unknown property: #{property_name}"
-      end
+      properties[property_name.to_s].value = value
+    rescue NoMethodError
+      raise ArgumentError, "Unknown property: #{property_name}"
     end
 
     # Create Entity with provided properties and options.
@@ -55,7 +55,7 @@ module OData
     def self.with_properties(new_properties = {}, options = {})
       entity = OData::Entity.new(options)
       entity.instance_eval do
-        service.properties_for(name).each do |name, instance|
+        service.properties_for_entity(name).each do |name, instance|
           set_property(name, instance)
         end
 
@@ -118,10 +118,20 @@ module OData
 
     private
 
-    def get_property_class(property_name)
+    def instantiate_property(property_name, value)
       value_type = service.get_property_type(name, property_name)
-      klass_name = value_type.gsub(/^Edm\./, '')
-      ::OData::Properties.const_get(klass_name)
+      if value_type =~ /^#{namespace}\./
+        type_name = value_type.gsub(/^#{namespace}\./, '')
+        property = ::OData::ComplexType.new(name: type_name, service: service)
+        value.element_children.each do |node|
+          property[node.name] = node.content
+        end
+        property
+      else
+        klass_name = value_type.gsub(/^Edm\./, '')
+        value = value.content unless value.nil?
+        ::OData::Properties.const_get(klass_name).new(property_name, value)
+      end
     end
 
     def properties
@@ -144,9 +154,9 @@ module OData
               property_xml.attributes['null'].value == 'true'
             value = nil
           else
-            value = property_xml.content
+            value = property_xml
           end
-          property = get_property_class(property_name).new(property_name, value)
+          property = instantiate_property(property_name, value)
           set_property(property_name, property)
         end
       end
@@ -154,9 +164,10 @@ module OData
 
     def self.process_feed_property(entity, xml_doc, property_name)
       entity.instance_eval do
-        property_value = xml_doc.xpath("//#{property_name}").first.content
+        property_value = xml_doc.xpath("//#{property_name}").first
         property_name = service.send("get_#{property_name}_property_name", name)
-        property = get_property_class(property_name).new(property_name, property_value)
+        return if property_name.nil?
+        property = instantiate_property(property_name, property_value)
         set_property(property_name, property)
       end
     end

data/lib/odata/properties.rb

@@ -11,4 +11,5 @@ require 'odata/properties/float'
 require 'odata/properties/guid'
 require 'odata/properties/integer'
 require 'odata/properties/string'
-require 'odata/properties/time'
+require 'odata/properties/time'
+require 'odata/properties/geography_point'

data/lib/odata/properties/geography_point.rb

@@ -0,0 +1,6 @@
+module OData
+  module Properties
+    class GeographyPoint < OData::Property
+    end
+  end
+end

data/lib/odata/service.rb

@@ -142,6 +142,8 @@ module OData
     # @return [String] the name of the property used as the entity summary
     def get_summary_property_name(entity_name)
       metadata.xpath("//EntityType[@Name='#{entity_name}']/Property[@FC_TargetPath='SyndicationSummary']").first.attributes['Name'].value
+    rescue NoMethodError
+      nil
     end
 
     # Get the primary key for the supplied Entity.
@@ -154,20 +156,32 @@ module OData
 
     # Get the list of properties and their various options for the supplied
     # Entity name.
-    #
     # @param entity_name [to_s]
     # @return [Hash]
-    def properties_for(entity_name)
+    # @api private
+    def properties_for_entity(entity_name)
       type_definition = metadata.xpath("//EntityType[@Name='#{entity_name}']").first
       raise ArgumentError, "Unknown EntityType: #{entity_name}" if type_definition.nil?
       properties_to_return = {}
       type_definition.xpath('./Property').each do |property_xml|
-        property_name = property_xml.attributes['Name'].value
-        value_type = property_xml.attributes['Type'].value
-        property_options = {}
-        property_options[:allows_nil] = false if property_xml.attributes['Nullable'] == 'false'
-        klass_name = value_type.gsub(/^Edm\./, '')
-        properties_to_return[property_name] = get_property_class(klass_name).new(property_name, nil, property_options)
+        property_name, property = process_property_from_xml(property_xml)
+        properties_to_return[property_name] = property
+      end
+      properties_to_return
+    end
+
+    # Get list of properties and their various options for the supplied
+    # ComplexType name.
+    # @param type_name [to_s]
+    # @return [Hash]
+    # @api private
+    def properties_for_complex_type(type_name)
+      type_definition = metadata.xpath("//ComplexType[@Name='#{type_name}']").first
+      raise ArgumentError, "Unknown ComplexType: #{type_name}" if type_definition.nil?
+      properties_to_return = {}
+      type_definition.xpath('./Property').each do |property_xml|
+        property_name, property = process_property_from_xml(property_xml)
+        properties_to_return[property_name] = property
       end
       properties_to_return
     end
@@ -197,5 +211,15 @@ module OData
         ::Nokogiri::XML(response.body).remove_namespaces!
       }.call
     end
+
+    def process_property_from_xml(property_xml)
+      property_name = property_xml.attributes['Name'].value
+      value_type = property_xml.attributes['Type'].value
+      property_options = {}
+      property_options[:allows_nil] = false if property_xml.attributes['Nullable'] == 'false'
+      klass_name = value_type.gsub(/^Edm\./, '')
+      property = get_property_class(klass_name).new(property_name, nil, property_options)
+      return [property_name, property]
+    end
   end
 end

data/lib/odata/version.rb

@@ -1,3 +1,3 @@
 module OData
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/fixtures/sample_service/supplier_0.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xml:base="http://services.odata.org/OData/OData.svc/" xmlns="http://www.w3.org/2005/Atom"
+       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
+       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
+       xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;0&quot;">
+  <id>http://services.odata.org/OData/OData.svc/Suppliers(0)</id>
+  <category term="ODataDemo.Supplier" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
+  <link rel="edit" title="Supplier" href="Suppliers(0)"/>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Products"
+        type="application/atom+xml;type=feed" title="Products" href="Suppliers(0)/Products"/>
+  <title type="text">Exotic Liquids</title>
+  <updated>2014-09-15T04:34:42Z</updated>
+  <author>
+    <name/>
+  </author>
+  <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/Products" type="application/xml"
+        title="Products" href="Suppliers(0)/$links/Products"/>
+  <content type="application/xml">
+    <m:properties>
+      <d:ID m:type="Edm.Int32">0</d:ID>
+      <d:Name>Exotic Liquids</d:Name>
+      <d:Address m:type="ODataDemo.Address">
+        <d:Street>NE 228th</d:Street>
+        <d:City>Sammamish</d:City>
+        <d:State>WA</d:State>
+        <d:ZipCode>98074</d:ZipCode>
+        <d:Country>USA</d:Country>
+      </d:Address>
+      <d:Location m:type="Edm.GeographyPoint">
+        <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+          <gml:pos>47.6316604614258 -122.03547668457</gml:pos>
+        </gml:Point>
+      </d:Location>
+      <d:Concurrency m:type="Edm.Int32">0</d:Concurrency>
+    </m:properties>
+  </content>
+</entry>

data/spec/fixtures/vcr_cassettes/complex_type_specs.yml

@@ -0,0 +1,164 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://services.odata.org/OData/OData.svc/$metadata
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '10034'
+      Content-Type:
+      - application/xml;charset=utf-8
+      Server:
+      - Microsoft-IIS/8.0
+      X-Content-Type-Options:
+      - nosniff
+      DataServiceVersion:
+      - 3.0;
+      X-AspNet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+      Access-Control-Allow-Headers:
+      - Accept, Origin, Content-Type, MaxDataServiceVersion
+      Access-Control-Expose-Headers:
+      - DataServiceVersion
+      Set-Cookie:
+      - ARRAffinity=9df27d486a924e1ae61bad0640ee28788b5a0f49ab9983f64ad6636df0c674a5;Path=/;Domain=services.odata.org
+      Date:
+      - Wed, 23 Jul 2014 17:40:38 GMT
+    body:
+      encoding: UTF-8
+      string: <?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx"><edmx:DataServices
+        m:DataServiceVersion="3.0" m:MaxDataServiceVersion="3.0" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"><Schema
+        Namespace="ODataDemo" xmlns="http://schemas.microsoft.com/ado/2009/11/edm"><EntityType
+        Name="Product"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Int32"
+        Nullable="false" /><Property Name="Name" Type="Edm.String" m:FC_TargetPath="SyndicationTitle"
+        m:FC_ContentKind="text" m:FC_KeepInContent="false" /><Property Name="Description"
+        Type="Edm.String" m:FC_TargetPath="SyndicationSummary" m:FC_ContentKind="text"
+        m:FC_KeepInContent="false" /><Property Name="ReleaseDate" Type="Edm.DateTime"
+        Nullable="false" /><Property Name="DiscontinuedDate" Type="Edm.DateTime" /><Property
+        Name="Rating" Type="Edm.Int16" Nullable="false" /><Property Name="Price" Type="Edm.Double"
+        Nullable="false" /><NavigationProperty Name="Categories" Relationship="ODataDemo.Product_Categories_Category_Products"
+        ToRole="Category_Products" FromRole="Product_Categories" /><NavigationProperty
+        Name="Supplier" Relationship="ODataDemo.Product_Supplier_Supplier_Products"
+        ToRole="Supplier_Products" FromRole="Product_Supplier" /><NavigationProperty
+        Name="ProductDetail" Relationship="ODataDemo.Product_ProductDetail_ProductDetail_Product"
+        ToRole="ProductDetail_Product" FromRole="Product_ProductDetail" /></EntityType><EntityType
+        Name="FeaturedProduct" BaseType="ODataDemo.Product"><NavigationProperty Name="Advertisement"
+        Relationship="ODataDemo.FeaturedProduct_Advertisement_Advertisement_FeaturedProduct"
+        ToRole="Advertisement_FeaturedProduct" FromRole="FeaturedProduct_Advertisement"
+        /></EntityType><EntityType Name="ProductDetail"><Key><PropertyRef Name="ProductID"
+        /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property
+        Name="Details" Type="Edm.String" /><NavigationProperty Name="Product" Relationship="ODataDemo.Product_ProductDetail_ProductDetail_Product"
+        ToRole="Product_ProductDetail" FromRole="ProductDetail_Product" /></EntityType><EntityType
+        Name="Category" OpenType="true"><Key><PropertyRef Name="ID" /></Key><Property
+        Name="ID" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String"
+        m:FC_TargetPath="SyndicationTitle" m:FC_ContentKind="text" m:FC_KeepInContent="true"
+        /><NavigationProperty Name="Products" Relationship="ODataDemo.Product_Categories_Category_Products"
+        ToRole="Product_Categories" FromRole="Category_Products" /></EntityType><EntityType
+        Name="Supplier"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Int32"
+        Nullable="false" /><Property Name="Name" Type="Edm.String" m:FC_TargetPath="SyndicationTitle"
+        m:FC_ContentKind="text" m:FC_KeepInContent="true" /><Property Name="Address"
+        Type="ODataDemo.Address" /><Property Name="Location" Type="Edm.GeographyPoint"
+        SRID="Variable" /><Property Name="Concurrency" Type="Edm.Int32" ConcurrencyMode="Fixed"
+        Nullable="false" /><NavigationProperty Name="Products" Relationship="ODataDemo.Product_Supplier_Supplier_Products"
+        ToRole="Product_Supplier" FromRole="Supplier_Products" /></EntityType><ComplexType
+        Name="Address"><Property Name="Street" Type="Edm.String" /><Property Name="City"
+        Type="Edm.String" /><Property Name="State" Type="Edm.String" /><Property Name="ZipCode"
+        Type="Edm.String" /><Property Name="Country" Type="Edm.String" /></ComplexType><EntityType
+        Name="Person"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Int32"
+        Nullable="false" /><Property Name="Name" Type="Edm.String" /><NavigationProperty
+        Name="PersonDetail" Relationship="ODataDemo.Person_PersonDetail_PersonDetail_Person"
+        ToRole="PersonDetail_Person" FromRole="Person_PersonDetail" /></EntityType><EntityType
+        Name="Customer" BaseType="ODataDemo.Person"><Property Name="TotalExpense"
+        Type="Edm.Decimal" Nullable="false" /></EntityType><EntityType Name="Employee"
+        BaseType="ODataDemo.Person"><Property Name="EmployeeID" Type="Edm.Int64" Nullable="false"
+        /><Property Name="HireDate" Type="Edm.DateTime" Nullable="false" /><Property
+        Name="Salary" Type="Edm.Single" Nullable="false" /></EntityType><EntityType
+        Name="PersonDetail"><Key><PropertyRef Name="PersonID" /></Key><Property Name="PersonID"
+        Type="Edm.Int32" Nullable="false" /><Property Name="Age" Type="Edm.Byte" Nullable="false"
+        /><Property Name="Gender" Type="Edm.Boolean" Nullable="false" /><Property
+        Name="Phone" Type="Edm.String" /><Property Name="Address" Type="ODataDemo.Address"
+        /><Property Name="Photo" Type="Edm.Stream" Nullable="false" /><NavigationProperty
+        Name="Person" Relationship="ODataDemo.Person_PersonDetail_PersonDetail_Person"
+        ToRole="Person_PersonDetail" FromRole="PersonDetail_Person" /></EntityType><EntityType
+        Name="Advertisement" m:HasStream="true"><Key><PropertyRef Name="ID" /></Key><Property
+        Name="ID" Type="Edm.Guid" Nullable="false" /><Property Name="Name" Type="Edm.String"
+        /><Property Name="AirDate" Type="Edm.DateTime" Nullable="false" /><NavigationProperty
+        Name="FeaturedProduct" Relationship="ODataDemo.FeaturedProduct_Advertisement_Advertisement_FeaturedProduct"
+        ToRole="FeaturedProduct_Advertisement" FromRole="Advertisement_FeaturedProduct"
+        /></EntityType><Association Name="Product_Categories_Category_Products"><End
+        Type="ODataDemo.Category" Role="Category_Products" Multiplicity="*" /><End
+        Type="ODataDemo.Product" Role="Product_Categories" Multiplicity="*" /></Association><Association
+        Name="Product_Supplier_Supplier_Products"><End Type="ODataDemo.Supplier" Role="Supplier_Products"
+        Multiplicity="0..1" /><End Type="ODataDemo.Product" Role="Product_Supplier"
+        Multiplicity="*" /></Association><Association Name="Product_ProductDetail_ProductDetail_Product"><End
+        Type="ODataDemo.ProductDetail" Role="ProductDetail_Product" Multiplicity="0..1"
+        /><End Type="ODataDemo.Product" Role="Product_ProductDetail" Multiplicity="0..1"
+        /></Association><Association Name="FeaturedProduct_Advertisement_Advertisement_FeaturedProduct"><End
+        Type="ODataDemo.Advertisement" Role="Advertisement_FeaturedProduct" Multiplicity="0..1"
+        /><End Type="ODataDemo.FeaturedProduct" Role="FeaturedProduct_Advertisement"
+        Multiplicity="0..1" /></Association><Association Name="Person_PersonDetail_PersonDetail_Person"><End
+        Type="ODataDemo.PersonDetail" Role="PersonDetail_Person" Multiplicity="0..1"
+        /><End Type="ODataDemo.Person" Role="Person_PersonDetail" Multiplicity="0..1"
+        /></Association><EntityContainer Name="DemoService" m:IsDefaultEntityContainer="true"><EntitySet
+        Name="Products" EntityType="ODataDemo.Product" /><EntitySet Name="ProductDetails"
+        EntityType="ODataDemo.ProductDetail" /><EntitySet Name="Categories" EntityType="ODataDemo.Category"
+        /><EntitySet Name="Suppliers" EntityType="ODataDemo.Supplier" /><EntitySet
+        Name="Persons" EntityType="ODataDemo.Person" /><EntitySet Name="PersonDetails"
+        EntityType="ODataDemo.PersonDetail" /><EntitySet Name="Advertisements" EntityType="ODataDemo.Advertisement"
+        /><FunctionImport Name="GetProductsByRating" ReturnType="Collection(ODataDemo.Product)"
+        EntitySet="Products" m:HttpMethod="GET"><Parameter Name="rating" Type="Edm.Int16"
+        Nullable="false" /></FunctionImport><AssociationSet Name="Products_Advertisement_Advertisements"
+        Association="ODataDemo.FeaturedProduct_Advertisement_Advertisement_FeaturedProduct"><End
+        Role="FeaturedProduct_Advertisement" EntitySet="Products" /><End Role="Advertisement_FeaturedProduct"
+        EntitySet="Advertisements" /></AssociationSet><AssociationSet Name="Products_Categories_Categories"
+        Association="ODataDemo.Product_Categories_Category_Products"><End Role="Product_Categories"
+        EntitySet="Products" /><End Role="Category_Products" EntitySet="Categories"
+        /></AssociationSet><AssociationSet Name="Products_Supplier_Suppliers" Association="ODataDemo.Product_Supplier_Supplier_Products"><End
+        Role="Product_Supplier" EntitySet="Products" /><End Role="Supplier_Products"
+        EntitySet="Suppliers" /></AssociationSet><AssociationSet Name="Products_ProductDetail_ProductDetails"
+        Association="ODataDemo.Product_ProductDetail_ProductDetail_Product"><End Role="Product_ProductDetail"
+        EntitySet="Products" /><End Role="ProductDetail_Product" EntitySet="ProductDetails"
+        /></AssociationSet><AssociationSet Name="Persons_PersonDetail_PersonDetails"
+        Association="ODataDemo.Person_PersonDetail_PersonDetail_Person"><End Role="Person_PersonDetail"
+        EntitySet="Persons" /><End Role="PersonDetail_Person" EntitySet="PersonDetails"
+        /></AssociationSet></EntityContainer><Annotations Target="ODataDemo.DemoService"><ValueAnnotation
+        Term="Org.OData.Display.V1.Description" String="This is a sample OData service
+        with vocabularies" /></Annotations><Annotations Target="ODataDemo.Product"><ValueAnnotation
+        Term="Org.OData.Display.V1.Description" String="All Products available in
+        the online store" /></Annotations><Annotations Target="ODataDemo.Product/Name"><ValueAnnotation
+        Term="Org.OData.Display.V1.DisplayName" String="Product Name" /></Annotations><Annotations
+        Target="ODataDemo.DemoService/Suppliers"><ValueAnnotation Term="Org.OData.Publication.V1.PublisherName"
+        String="Microsoft Corp." /><ValueAnnotation Term="Org.OData.Publication.V1.PublisherId"
+        String="MSFT" /><ValueAnnotation Term="Org.OData.Publication.V1.Keywords"
+        String="Inventory, Supplier, Advertisers, Sales, Finance" /><ValueAnnotation
+        Term="Org.OData.Publication.V1.AttributionUrl" String="http://www.odata.org/"
+        /><ValueAnnotation Term="Org.OData.Publication.V1.AttributionDescription"
+        String="All rights reserved" /><ValueAnnotation Term="Org.OData.Publication.V1.DocumentationUrl
+        " String="http://www.odata.org/" /><ValueAnnotation Term="Org.OData.Publication.V1.TermsOfUseUrl"
+        String="All rights reserved" /><ValueAnnotation Term="Org.OData.Publication.V1.PrivacyPolicyUrl"
+        String="http://www.odata.org/" /><ValueAnnotation Term="Org.OData.Publication.V1.LastModified"
+        String="4/2/2013" /><ValueAnnotation Term="Org.OData.Publication.V1.ImageUrl
+        " String="http://www.odata.org/" /></Annotations></Schema></edmx:DataServices></edmx:Edmx>
+    http_version: '1.1'
+    adapter_metadata:
+      effective_url: http://services.odata.org/OData/OData.svc/$metadata
+  recorded_at: Wed, 23 Jul 2014 17:40:40 GMT
+recorded_with: VCR 2.9.2

data/spec/odata/complex_type_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe OData::ComplexType, vcr: {cassette_name: 'complex_type_specs'} do
+  before(:example) do
+    OData::Service.open('http://services.odata.org/OData/OData.svc', name: 'ODataDemo')
+  end
+
+  let(:subject) { OData::ComplexType.new(name: 'Address', service: service) }
+  let(:service) { OData::ServiceRegistry['ODataDemo'] }
+
+  it { expect(subject).to respond_to(:name) }
+  it { expect(subject).to respond_to(:namespace) }
+  it { expect(subject).to respond_to(:property_names) }
+  it { expect(subject).to respond_to(:[]) }
+  it { expect(subject).to respond_to(:[]=) }
+
+  describe 'is properly parsed from service metadata' do
+    it { expect(subject.name).to eq('Address') }
+    it { expect(subject.namespace).to eq('ODataDemo') }
+    it { expect(subject.property_names).to eq(%w{Street City State ZipCode Country}) }
+
+    it { expect(subject['Street']).to be_nil }
+    it { expect(subject['City']).to be_nil }
+    it { expect(subject['State']).to be_nil }
+    it { expect(subject['ZipCode']).to be_nil }
+    it { expect(subject['Country']).to be_nil }
+
+    it { subject['Street'] = 'Test'; expect(subject['Street']).to eq('Test') }
+    it { subject['City'] = 'Test'; expect(subject['City']).to eq('Test') }
+    it { subject['State'] = 'Test'; expect(subject['State']).to eq('Test') }
+    it { subject['ZipCode'] = 'Test'; expect(subject['ZipCode']).to eq('Test') }
+    it { subject['Country'] = 'Test'; expect(subject['Country']).to eq('Test') }
+  end
+end

data/spec/odata/entity_spec.rb

@@ -45,5 +45,27 @@ describe OData::Entity, vcr: {cassette_name: 'entity_specs'} do
 
     it { expect {subject['NonExistant']}.to raise_error(ArgumentError) }
     it { expect {subject['NonExistant'] = 5}.to raise_error(ArgumentError) }
+
+    context 'with a complex type property' do
+      let(:options) { {
+          type:         'ODataDemo.Supplier',
+          namespace:    'ODataDemo',
+          service_name: 'ODataDemo'
+      } }
+
+      let(:subject) { OData::Entity.from_xml(supplier_xml, options) }
+      let(:supplier_xml) {
+        document = ::Nokogiri::XML(File.open('spec/fixtures/sample_service/supplier_0.xml'))
+        document.remove_namespaces!
+        document.xpath('//entry').first
+      }
+
+      it { expect(subject.name).to eq('Supplier') }
+      it { expect(subject.type).to eq('ODataDemo.Supplier') }
+
+      it { expect(subject['Address']).to be_a(OData::ComplexType) }
+      it { expect(subject['Address']['Street']).to eq('NE 228th') }
+      it { expect(subject['Address']['City']).to eq('Sammamish') }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,6 +153,7 @@ files:
 - README.md
 - Rakefile
 - lib/odata.rb
+- lib/odata/complex_type.rb
 - lib/odata/entity.rb
 - lib/odata/entity_set.rb
 - lib/odata/properties.rb
@@ -162,6 +163,7 @@ files:
 - lib/odata/properties/date_time_offset.rb
 - lib/odata/properties/decimal.rb
 - lib/odata/properties/float.rb
+- lib/odata/properties/geography_point.rb
 - lib/odata/properties/guid.rb
 - lib/odata/properties/integer.rb
 - lib/odata/properties/number.rb
@@ -187,6 +189,8 @@ files:
 - spec/fixtures/sample_service/products_skip0_top5.xml
 - spec/fixtures/sample_service/products_skip10_top5.xml
 - spec/fixtures/sample_service/products_skip5_top5.xml
+- spec/fixtures/sample_service/supplier_0.xml
+- spec/fixtures/vcr_cassettes/complex_type_specs.yml
 - spec/fixtures/vcr_cassettes/entity_set_specs.yml
 - spec/fixtures/vcr_cassettes/entity_set_specs/bad_entry.yml
 - spec/fixtures/vcr_cassettes/entity_set_specs/existing_entry.yml
@@ -196,6 +200,7 @@ files:
 - spec/fixtures/vcr_cassettes/query_specs.yml
 - spec/fixtures/vcr_cassettes/service_registry_specs.yml
 - spec/fixtures/vcr_cassettes/service_specs.yml
+- spec/odata/complex_type_spec.rb
 - spec/odata/entity_set_spec.rb
 - spec/odata/entity_spec.rb
 - spec/odata/properties/binary_spec.rb
@@ -251,6 +256,8 @@ test_files:
 - spec/fixtures/sample_service/products_skip0_top5.xml
 - spec/fixtures/sample_service/products_skip10_top5.xml
 - spec/fixtures/sample_service/products_skip5_top5.xml
+- spec/fixtures/sample_service/supplier_0.xml
+- spec/fixtures/vcr_cassettes/complex_type_specs.yml
 - spec/fixtures/vcr_cassettes/entity_set_specs.yml
 - spec/fixtures/vcr_cassettes/entity_set_specs/bad_entry.yml
 - spec/fixtures/vcr_cassettes/entity_set_specs/existing_entry.yml
@@ -260,6 +267,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/query_specs.yml
 - spec/fixtures/vcr_cassettes/service_registry_specs.yml
 - spec/fixtures/vcr_cassettes/service_specs.yml
+- spec/odata/complex_type_spec.rb
 - spec/odata/entity_set_spec.rb
 - spec/odata/entity_spec.rb
 - spec/odata/properties/binary_spec.rb