ruby_odata 0.0.6 → 0.0.7

data/CHANGELOG.rdoc

@@ -23,10 +23,16 @@
   
 === 0.0.5
 * Bug Fixes
-	* Works with Ruby 1.9.1
-	* Works with ActiveSupport 3.0.0.beta4
-	
+  * Works with Ruby 1.9.1
+  * Works with ActiveSupport 3.0.0.beta4
+  
 === 0.0.6
 * New Features
-	* Ability to batch saves (Adds, Updates, Deletes); this will help save on network chatter
-	
+  * Ability to batch saves (Adds, Updates, Deletes); this will help save on network chatter
+
+=== 0.0.7
+* New Features
+  * Complex Types are now supported
+  * Support for Edm.Int16, Edm.Int32, Edm.Int64
+  * Support for Edm.Decimal
+  * Support for Edm.DateTime

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/features/complex_types.feature

@@ -0,0 +1,52 @@
+Feature: Complex types
+  In order to fully support OData services
+  As a user of ruby_odata
+  I want to be able to manage objects with complex types
+
+Background:
+  Given an ODataService exists with uri: "http://localhost:8888/SampleService/Entities.svc"
+  And blueprints exist for the service
+
+Scenario: The proxy must generate classes for complex types if they exist
+  Then a class named "AuditFields" should exist
+
+Scenario: Complex properties on an entity must be the correct type
+  Given I call "AddToProducts" on the service with a new "Product" object
+  And I save changes		
+  And I call "Products" on the service with args: "1"
+  When I run the query
+  Then the result should have a method: "AuditFields"
+  And the method "AuditFields" on the result should be of type "AuditFields"
+
+Scenario: Complex properties on an entity must be filled
+  Given I call "AddToProducts" on the service with a new "Product" object
+  And I save changes
+  And I call "Products" on the service with args: "1"
+  When I run the query
+  Then the result should have a method: "AuditFields"
+  When I call "CreateDate" for "AuditFields" on the result 
+  Then the operation should not be null 
+
+# TODO: This scenario should have the AuditFields.CreatedBy field set in the Given
+# instead it is set by the blueprint  
+Scenario: Complex properties should be able to be added
+  Given I call "AddToProducts" on the service with a new "Product" object
+  And I save changes
+  And I call "Products" on the service with args: "1"
+  When I run the query
+  Then the method "CreatedBy" on the result's method "AuditFields" should equal: "Cucumber"
+  
+Scenario: Complex propertis should be able to be updated
+  Given I call "AddToProducts" on the service with a new "Product" object
+  And I save changes
+  And I call "Products" on the service with args: "1"
+  When I run the query
+  When I set "CreatedBy" on the result's method "AuditFields" to "This Test"
+  And I call "update_object" on the service with the last query result
+  And I save changes
+  Then the save result should equal: "true"
+  When I call "Products" on the service with args: "1"
+  And I run the query
+  Then the method "CreatedBy" on the result's method "AuditFields" should equal: "This Test"
+
+

data/features/service.feature

@@ -5,7 +5,7 @@ Feature: Service Should Generate a Proxy
 
 Background:
   Given an ODataService exists with uri: "http://localhost:8888/SampleService/Entities.svc"
-	And blueprints exist for the service
+  And blueprints exist for the service
 
 Scenario: Service should respond to valid collections
   Then I should be able to call "Categories" on the service
@@ -18,14 +18,14 @@ Scenario: Service should respond to accessing a single entity by ID
 
 Scenario: Access an entity by ID should return the entity type
   Given I call "AddToCategories" on the service with a new "Category" object with Name: "Test Category"
-	And I save changes
+  And I save changes
   And I call "Categories" on the service with args: "1"
   When I run the query
   Then the result should be of type "Category"
 
 Scenario: Entity should have the correct accessors
   Given I call "AddToCategories" on the service with a new "Category" object with Name: "Test Category"
-	And I save changes
+  And I save changes
   And I call "Categories" on the service with args: "1"
   When I run the query
   Then the result should have a method: "Id"
@@ -33,7 +33,7 @@ Scenario: Entity should have the correct accessors
   
 Scenario: Entity should fill values
   Given I call "AddToCategories" on the service with a new "Category" object with Name: "Test Category"
-	And I save changes
+  And I save changes
   And I call "Categories" on the service with args: "1"
   When I run the query
   Then the method "Id" on the result should equal: "1"
@@ -41,7 +41,7 @@ Scenario: Entity should fill values
 
 Scenario: Navigation Properties should be included in results	
   Given I call "AddToProducts" on the service with a new "Product" object
-	And I save changes		
+  And I save changes		
   And I call "Products" on the service with args: "1"
   When I run the query
   Then the result should have a method: "Category"

data/features/step_definitions/service_steps.rb

@@ -39,7 +39,7 @@ Then /^the result should have a method: "([^\"]*)"$/ do |method|
 end
 
 Then /^the method "([^\"]*)" on the result should equal: "([^\"]*)"$/ do |method, value|
-  @service_result.send(method.to_sym).should == value
+  @service_result.send(method.to_sym).to_s.should == value
 end
 
 Then /^the method "([^\"]*)" on the result should be nil$/ do |method|
@@ -47,7 +47,7 @@ Then /^the method "([^\"]*)" on the result should be nil$/ do |method|
 end
 
 When /^I set "([^\"]*)" on the result to "([^\"]*)"$/ do |property_name, value|
-	@service_result.send("#{property_name}=", value)
+  @service_result.send("#{property_name}=", value)
 end
 
 Given /^I expand the query to include "([^\"]*)"$/ do |expands|
@@ -67,7 +67,7 @@ When /^I skip (\d+)$/ do |skip|
 end
 
 When /^I ask for the top (\d+)$/ do |top|
-	@service_query.top(top)
+  @service_query.top(top)
 end
 
 Then /^the method "([^\"]*)" on the result should be of type "([^\"]*)"$/ do |method, type|
@@ -79,18 +79,17 @@ Given /^I call "([^\"]*)" on the service with a new "([^\"]*)" object(?: with (.
   fields_hash = {}
   
   if !fields.nil?
-  	fields.split(', ').each do |field|
-  	if field =~ /^(?:(\w+): "(.*)")$/
-  		key = $1
-  		val = $2
-  		if val =~ /^@@LastSave$/
-  			val = @saved_result
-  		end
-  		
-  		fields_hash.merge!({ key => val })
-		else
-		end
-  	end	
+    fields.split(', ').each do |field|
+      if field =~ /^(?:(\w+): "(.*)")$/
+        key = $1
+        val = $2
+        if val =~ /^@@LastSave$/
+          val = @saved_result
+        end
+        
+        fields_hash.merge!({ key => val })
+      end
+    end	
   end
   
   obj = object.constantize.send(:make, fields_hash)
@@ -102,7 +101,7 @@ When /^I save changes$/ do
 end
 
 Then /^the save result should be of type "([^\"]*)"$/ do |type|
-	@saved_result.class.to_s.should == type
+  @saved_result.class.to_s.should == type
 end
 
 When /^I call "([^\"]*)" on the service with the last save result$/ do |method|
@@ -119,33 +118,42 @@ end
 
 Then /^the method "([^\"]*)" on the save result should equal: "([^\"]*)"$/ do |method, value|
   result = @saved_result.send(method.to_sym)
-	result.should == value
+  result.should == value
 end
 
 When /^blueprints exist for the service$/ do
-	require File.expand_path(File.dirname(__FILE__) + "../../../test/blueprints")
+  require File.expand_path(File.dirname(__FILE__) + "../../../test/blueprints")
 end
 
 Given /^I call "([^\"]*)" on the service with a new "([^\"]*)" object it should throw an exception with message "([^\"]*)"$/ do |method, object, msg|
-	obj = object.constantize.send :make
+  obj = object.constantize.send :make
   lambda { @service.send(method.to_sym, obj) }.should raise_error(msg)
 end
 
 Then /^no "([^\"]*)" should exist$/ do |collection|
-	@service.send(collection)
-	results = @service.execute
-	results.should == []
+  @service.send(collection)
+  results = @service.execute
+  results.should == []
 end
 
- Given /^the following (.*) exist:$/ do |plural_factory, table|
-   # table is a Cucumber::Ast::Table
- 	factory = plural_factory.singularize
- 	table.hashes.map do |hash|
- 		obj = factory.constantize.send(:make, hash)
-   	@service.send("AddTo#{plural_factory}", obj)
-   	@service.save_changes
- 	end
- end
+Given /^the following (.*) exist:$/ do |plural_factory, table|
+  # table is a Cucumber::Ast::Table
+  factory = plural_factory.singularize
+  table.hashes.map do |hash|
+    obj = factory.constantize.send(:make, hash)
+    @service.send("AddTo#{plural_factory}", obj)
+    @service.save_changes
+  end
+end
+
+Given /^(\d+) (.*) exist$/ do |num, plural_factory|
+  factory = plural_factory.singularize
+  num.to_i.times do 
+    obj = factory.constantize.send(:make)
+    @service.send("AddTo#{plural_factory}", obj)
+  end
+  @service.save_changes # Batch save
+end
 
 Then /^the result should be:$/ do |table|
   # table is a Cucumber::Ast::Table
@@ -156,16 +164,16 @@ Then /^the result should be:$/ do |table|
   results = []
   
   @service_result.each do |result|
-  	obj_hash = Hash.new
-  	fields.each do |field|
-  		obj_hash[field] = result.send(field)
-		end
-		results << obj_hash
-	end
-	
-	result_table = Cucumber::Ast::Table.new(results)
-	
-	table.diff!(result_table) 	
+    obj_hash = Hash.new
+    fields.each do |field|
+      obj_hash[field] = result.send(field)
+    end
+    results << obj_hash
+  end
+  
+  result_table = Cucumber::Ast::Table.new(results)
+  
+  table.diff!(result_table) 	
 end
 
 Then /^the save result should be:$/ do |table|
@@ -177,19 +185,60 @@ Then /^the save result should be:$/ do |table|
   results = []
   
   @saved_result.each do |result|
-  	obj_hash = Hash.new
-  	fields.each do |field|
-  		obj_hash[field] = result.send(field)
-		end
-		results << obj_hash
-	end
-	
-	result_table = Cucumber::Ast::Table.new(results)
-	
-	table.diff!(result_table) 	
+    obj_hash = Hash.new
+    fields.each do |field|
+      obj_hash[field] = result.send(field)
+    end
+    results << obj_hash
+  end
+  
+  result_table = Cucumber::Ast::Table.new(results)
+  
+  table.diff!(result_table) 	
 end
 
+Then /^a class named "([^\"]*)" should exist$/ do |klass_name|
+  (Object.const_defined? klass_name).should == true
+end
+
+# Operations against a method on the service result
+When /^I call "([^\"]*)" for "([^\"]*)" on the result$/ do |method2, method1|
+  r1 = @service_result.send(method1)
+  @operation_result = r1.send(method2)
+end
+
+Then /^the operation should not be null$/ do
+  @operation_result.nil?.should == false
+end
+
+
 Then /^the method "([^\"]*)" on the result's method "([^\"]*)" should equal: "([^\"]*)"$/ do |method, result_method, value|
   obj = @service_result.send(result_method.to_sym)
-  obj.send(method.to_sym).should == value
+  obj.send(method.to_sym).to_s.should == value
+end
+
+When /^I set "([^\"]*)" on the result's method "([^\"]*)" to "([^\"]*)"$/ do |property_name, result_method, value|
+  @service_result.send(result_method).send("#{property_name}=", value)
 end
+
+# Type tests
+Then /^the "([^\"]*)" method should return a (.*)/ do |method_name, type|
+	methods = method_name.split '.'
+	if methods.length == 1
+		@service_result.send(method_name).class.to_s.should == type
+	else
+		@service_result.send(methods[0]).send(methods[1]).class.to_s.should == type
+	end
+
+end
+Then /^I store the last query result for comparison$/ do
+  @stored_query_result = @service_result
+end
+Then /^the new query result's time "([^\"]*)" should equal the saved query result$/ do |method_name|
+	methods = method_name.split '.'
+	if methods.length == 1
+		@service_result.send(method_name).xmlschema(3).should == @stored_query_result.send(method_name).xmlschema(3)
+	else
+		@service_result.send(methods[0]).send(methods[1]).xmlschema(3).should == @stored_query_result.send(methods[0]).send(methods[1]).xmlschema(3)
+	end
+end

data/features/type_conversion.feature

@@ -0,0 +1,45 @@
+Feature: Type conversion
+  In order to accurately perform operations
+  As a user of the API 
+  I want types returned to be accurately represented
+
+Background:
+  Given an ODataService exists with uri: "http://localhost:8888/SampleService/Entities.svc"
+  And blueprints exist for the service
+
+Scenario: Integers should be Fixnums
+  Given I call "AddToProducts" on the service with a new "Product" object
+	And I save changes
+  When I call "Products" on the service
+  And I run the query
+  Then the "Id" method should return a Fixnum 
+  
+Scenario: Decimals should be BigDecimals
+	Given I call "AddToProducts" on the service with a new "Product" object
+  And I save changes
+	When I call "Products" on the service
+  And I run the query
+  Then the "Price" method should return a BigDecimal
+
+Scenario: DateTimes should be Times
+	Given I call "AddToProducts" on the service with a new "Product" object
+  And I save changes
+	When I call "Products" on the service
+  And I run the query
+	Then the "AuditFields.CreateDate" method should return a Time
+ 
+Scenario: Verify that DateTimes don't change if not modified on an update
+	Given I call "AddToProducts" on the service with a new "Product" object with Name: "Test Product"
+	When I save changes
+	And I call "Products" on the service with args: "1"
+  And I run the query
+  Then I store the last query result for comparison
+  When I set "Name" on the result to "Changed Test Product"
+  Then the method "Name" on the result should equal: "Changed Test Product"
+  And I call "update_object" on the service with the last query result
+  And I save changes
+  Then the save result should equal: "true"
+  When I call "Products" on the service with args: "1"
+  And I run the query
+  Then the new query result's time "AuditFields.CreateDate" should equal the saved query result
+

data/lib/ruby_odata.rb

@@ -9,6 +9,8 @@ require 'cgi'
 require 'open-uri'
 require 'rest_client'
 require 'nokogiri'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 require lib + '/ruby_odata/query_builder'
 require lib + '/ruby_odata/class_builder'

data/lib/ruby_odata/class_builder.rb

@@ -64,10 +64,26 @@ module OData
 					vars.delete(meta)
 				end
 
+				# Convert a BigDecimal to a string for serialization (to match Edm.Decimal)
+				decimals = vars.find_all { |o| o[1].class == BigDecimal } || []
+				decimals.each do |d|
+					vars[d[0]] = d[1].to_s
+				end
+
+				# Convert Time to an RFC3339 string for serialization
+				times = vars.find_all { |o| o[1].class == Time } || []
+				times.each do |t|
+          sdate = t[1].xmlschema(3)
+          # Remove the ending Z (indicating UTC).
+          # If the Z is there when saving, the time is converted to local time on the server
+          sdate.chop! if sdate.match(/Z$/)
+					vars[t[0]] = sdate
+				end
+
 				vars
 			end
-			
-			
+
+
 			# Add the methods that were passed in
 			@methods.each do |method_name|
 				klass.send :define_method, method_name do
@@ -78,7 +94,7 @@ module OData
 				end
 			end
 		end
-		
+
 		def add_nav_props(klass)
 			@nav_props.each do |method_name|
 				klass.send :define_method, method_name do
@@ -86,8 +102,8 @@ module OData
 				end
 				klass.send :define_method, "#{method_name}=" do |value|
 					instance_variable_set("@#{method_name}", value)
-				end				
+				end
 			end
 		end
 	end
-end # module OData
+end # module OData

data/lib/ruby_odata/service.rb

@@ -109,12 +109,15 @@ class Service
 		end
 	end
 	
-	private 
+	private
+	# Retrieves collections from the main service page
 	def get_collections
 		doc = Nokogiri::XML(open(@uri))
 		collections = doc.xpath("//app:collection", "app" => "http://www.w3.org/2007/app")
 		collections.collect { |c| c["href"] }
-	end	
+	end
+
+	# Build the classes required by the metadata
 	def build_classes
 		@classes = Hash.new
 		doc = Nokogiri::XML(open("#{@uri}/$metadata"))
@@ -122,6 +125,15 @@ class Service
 		# Get the edm namespace
 		edm_ns = doc.xpath("edmx:Edmx/edmx:DataServices/*", "edmx" => "http://schemas.microsoft.com/ado/2007/06/edmx").first.namespaces['xmlns'].to_s
 
+		# Build complex types first, these will be used for entities
+		complex_types = doc.xpath("//edm:ComplexType", "edm" => edm_ns) || []
+		complex_types.each do |c|
+			name = c['Name']
+			props = c.xpath(".//edm:Property", "edm" => edm_ns)
+			methods = props.collect { |p| p['Name'] } # Standard Properties
+			@classes[name] = ClassBuilder.new(name, methods, []).build unless @classes.keys.include?(name)
+		end
+
 		entity_types = doc.xpath("//edm:EntityType", "edm" => edm_ns)
 		entity_types.each do |e|
 			name = e['Name']
@@ -132,6 +144,8 @@ class Service
 			@classes[name] = ClassBuilder.new(name, methods, nav_props).build unless @classes.keys.include?(name)
 		end
 	end
+
+	# Helper to loop through a result and create an instance for each entity in the results
 	def build_classes_from_result(result)
 		doc = Nokogiri::XML(result)
 		entries = doc.xpath("//atom:entry[not(ancestor::atom:entry)]", "atom" => "http://www.w3.org/2005/Atom")
@@ -143,6 +157,8 @@ class Service
 		end
 		return results
 	end
+
+	# Converts an XML Entry into a class
 	def entry_to_class(entry)
 		# Retrieve the class name from the fully qualified name (the last string after the last dot)
 		klass_name = entry.xpath("./atom:category/@term", "atom" => "http://www.w3.org/2005/Atom").to_s.split('.')[-1]
@@ -159,8 +175,7 @@ class Service
 		# Fill properties
 		for prop in properties
 			prop_name = prop.name
-			# puts "#{prop_name} - #{prop.content}"
-			klass.send "#{prop_name}=", prop.content 
+			klass.send "#{prop_name}=", parse_value(prop)
 		end
 		
 		inline_links = entry.xpath("./atom:link[m:inline]", { "m" => "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata", "atom" => "http://www.w3.org/2005/Atom" })
@@ -188,6 +203,7 @@ class Service
 		
 		return klass
 	end
+
 	def build_query_uri
 		"#{@uri}#{@query.query}"
 	end
@@ -215,6 +231,11 @@ class Service
 			return (delete_result.code == 204) 
 		end		
 	end
+
+	# Batch Saves
+	def generate_guid
+		rand(36**12).to_s(36).insert(4, "-").insert(9, "-")
+	end
 	def batch_save(operations)	
 		batch_num = generate_guid
 		changeset_num = generate_guid
@@ -245,7 +266,6 @@ class Service
 		
 		return body
 	end
-	
 	def build_batch_operation(operation, changeset_num)
 		accept_headers = "Accept-Charset: utf-8\n"
 		accept_headers << "Content-Type: application/json;charset=utf-8\n" unless operation.kind == "Delete"
@@ -278,10 +298,52 @@ class Service
 			
 		return content
 	end
-	
-	def generate_guid
-		rand(36**12).to_s(36).insert(4, "-").insert(9, "-")
+
+	# Complex Types
+	def complex_type_to_class(complex_type_xml)
+		klass_name = complex_type_xml.attr('type').split('.')[-1]
+		klass = @classes[klass_name].new
+
+		# Fill in the properties
+		properties = complex_type_xml.xpath(".//*")
+		properties.each do |prop|
+			klass.send "#{prop.name}=", parse_value(prop)
+		end
+
+		return klass
 	end
+
+	# Field Converters
+	def parse_value(property_xml)
+		property_type = property_xml.attr('type')
+
+		# Handle a nil property type, this is a string
+		return property_xml.content if property_type.nil?
+
+		# Handle complex types
+		return complex_type_to_class(property_xml) if !property_type.match(/^Edm/)
+
+		# Handle integers
+		return property_xml.content.to_i if property_type.match(/^Edm.Int/)
+
+		# Handle decimals
+		return property_xml.content.to_d if property_type.match(/Edm.Decimal/)
+
+		# Handle DateTimes
+		# return Time.parse(property_xml.content) if property_type.match(/Edm.DateTime/)
+		if property_type.match(/Edm.DateTime/)
+			sdate = property_xml.content
+
+			# Assume this is UTC if no timezone is specified
+			sdate = sdate + "Z" unless sdate.match(/Z|([+|-]\d{2}:\d{2})$/)
+
+			return Time.parse(sdate)
+		end
+
+		# If we can't parse the value, just return the element's content
+		property_xml.content
+	end
+
 end
 
 end # module OData

data/ruby_odata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_odata}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Damien White"]
-  s.date = %q{2010-06-17}
+  s.date = %q{2010-07-04}
   s.description = %q{An OData Client Library for Ruby.  Use this to interact with OData services}
   s.email = %q{damien.white@visoftinc.com}
   s.extra_rdoc_files = [
@@ -26,12 +26,14 @@ Gem::Specification.new do |s|
      "VERSION",
      "config/cucumber.yml",
      "features/batch_request.feature",
+     "features/complex_types.feature",
      "features/query_builder.feature",
      "features/service.feature",
      "features/service_manage.feature",
      "features/step_definitions/service_steps.rb",
      "features/support/env.rb",
      "features/support/hooks.rb",
+     "features/type_conversion.feature",
      "lib/ruby_odata.rb",
      "lib/ruby_odata/class_builder.rb",
      "lib/ruby_odata/operation.rb",
@@ -40,9 +42,11 @@ Gem::Specification.new do |s|
      "ruby_odata.gemspec",
      "test/Cassini x64.bat",
      "test/Cassini x86.bat",
+     "test/SampleService/App_Code/AuditFields.cs",
      "test/SampleService/App_Code/Entities.cs",
      "test/SampleService/App_Code/Model.Designer.cs",
      "test/SampleService/App_Code/Model.edmx",
+     "test/SampleService/App_Code/ModelContainerExtended.cs",
      "test/SampleService/App_Data/_TestDB.mdf",
      "test/SampleService/App_Data/_TestDB_Log.ldf",
      "test/SampleService/Entities.svc",

data/test/SampleService/App_Code/AuditFields.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Model
+{
+	public partial class AuditFields
+	{
+		public AuditFields()
+		{
+			CreateDate = DateTime.UtcNow;
+			ModifiedDate = DateTime.UtcNow;
+		}
+	}
+}

data/test/SampleService/App_Code/Model.Designer.cs

@@ -252,13 +252,15 @@ namespace Model
         /// <param name="name">Initial value of the Name property.</param>
         /// <param name="description">Initial value of the Description property.</param>
         /// <param name="price">Initial value of the Price property.</param>
-        public static Product CreateProduct(global::System.Int32 id, global::System.String name, global::System.String description, global::System.Decimal price)
+        /// <param name="auditFields">Initial value of the AuditFields property.</param>
+        public static Product CreateProduct(global::System.Int32 id, global::System.String name, global::System.String description, global::System.Decimal price, AuditFields auditFields)
         {
             Product product = new Product();
             product.Id = id;
             product.Name = name;
             product.Description = description;
             product.Price = price;
+            product.AuditFields = StructuralObject.VerifyComplexObjectIsNotNull(auditFields, "AuditFields");
             return product;
         }
 
@@ -364,6 +366,40 @@ namespace Model
         partial void OnPriceChanging(global::System.Decimal value);
         partial void OnPriceChanged();
 
+        #endregion
+        #region Complex Properties
+    
+        /// <summary>
+        /// No Metadata Documentation available.
+        /// </summary>
+        [EdmComplexPropertyAttribute()]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [XmlElement(IsNullable=true)]
+        [SoapElement(IsNullable=true)]
+        [DataMemberAttribute()]
+        public AuditFields AuditFields
+        {
+            get
+            {
+                _AuditFields = GetValidValue(_AuditFields, "AuditFields", false, _AuditFieldsInitialized);
+                _AuditFieldsInitialized = true;
+                return _AuditFields;
+            }
+            set
+            {
+                OnAuditFieldsChanging(value);
+                ReportPropertyChanging("AuditFields");
+                _AuditFields = SetValidValue(_AuditFields, value, "AuditFields");
+                _AuditFieldsInitialized = true;
+                ReportPropertyChanged("AuditFields");
+                OnAuditFieldsChanged();
+            }
+        }
+        private AuditFields _AuditFields;
+        private bool _AuditFieldsInitialized;
+        partial void OnAuditFieldsChanging(AuditFields value);
+        partial void OnAuditFieldsChanged();
+
         #endregion
     
         #region Navigation Properties
@@ -410,5 +446,109 @@ namespace Model
     }
 
     #endregion
+    #region ComplexTypes
+    
+    /// <summary>
+    /// No Metadata Documentation available.
+    /// </summary>
+    [EdmComplexTypeAttribute(NamespaceName="Model", Name="AuditFields")]
+    [DataContractAttribute(IsReference=true)]
+    [Serializable()]
+    public partial class AuditFields : ComplexObject
+    {
+        #region Factory Method
+    
+        /// <summary>
+        /// Create a new AuditFields object.
+        /// </summary>
+        /// <param name="createDate">Initial value of the CreateDate property.</param>
+        /// <param name="modifiedDate">Initial value of the ModifiedDate property.</param>
+        public static AuditFields CreateAuditFields(global::System.DateTime createDate, global::System.DateTime modifiedDate)
+        {
+            AuditFields auditFields = new AuditFields();
+            auditFields.CreateDate = createDate;
+            auditFields.ModifiedDate = modifiedDate;
+            return auditFields;
+        }
+
+        #endregion
+        #region Primitive Properties
+    
+        /// <summary>
+        /// No Metadata Documentation available.
+        /// </summary>
+        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
+        [DataMemberAttribute()]
+        public global::System.DateTime CreateDate
+        {
+            get
+            {
+                return _CreateDate;
+            }
+            set
+            {
+                OnCreateDateChanging(value);
+                ReportPropertyChanging("CreateDate");
+                _CreateDate = StructuralObject.SetValidValue(value);
+                ReportPropertyChanged("CreateDate");
+                OnCreateDateChanged();
+            }
+        }
+        private global::System.DateTime _CreateDate;
+        partial void OnCreateDateChanging(global::System.DateTime value);
+        partial void OnCreateDateChanged();
+    
+        /// <summary>
+        /// No Metadata Documentation available.
+        /// </summary>
+        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
+        [DataMemberAttribute()]
+        public global::System.DateTime ModifiedDate
+        {
+            get
+            {
+                return _ModifiedDate;
+            }
+            set
+            {
+                OnModifiedDateChanging(value);
+                ReportPropertyChanging("ModifiedDate");
+                _ModifiedDate = StructuralObject.SetValidValue(value);
+                ReportPropertyChanged("ModifiedDate");
+                OnModifiedDateChanged();
+            }
+        }
+        private global::System.DateTime _ModifiedDate;
+        partial void OnModifiedDateChanging(global::System.DateTime value);
+        partial void OnModifiedDateChanged();
+    
+        /// <summary>
+        /// No Metadata Documentation available.
+        /// </summary>
+        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)]
+        [DataMemberAttribute()]
+        public global::System.String CreatedBy
+        {
+            get
+            {
+                return _CreatedBy;
+            }
+            set
+            {
+                OnCreatedByChanging(value);
+                ReportPropertyChanging("CreatedBy");
+                _CreatedBy = StructuralObject.SetValidValue(value, true);
+                ReportPropertyChanged("CreatedBy");
+                OnCreatedByChanged();
+            }
+        }
+        private global::System.String _CreatedBy;
+        partial void OnCreatedByChanging(global::System.String value);
+        partial void OnCreatedByChanged();
+
+        #endregion
+    }
+
+    #endregion
     
 }

data/test/SampleService/App_Code/Model.edmx

@@ -29,6 +29,9 @@
           <Property Name="Description" Type="nvarchar(max)" Nullable="false" />
           <Property Name="Price" Type="money" Nullable="false" />
           <Property Name="Category_Id" Type="int" Nullable="false" />
+          <Property Name="CreateDate" Type="datetime" Nullable="false" />
+          <Property Name="ModifiedDate" Type="datetime" Nullable="false" />
+          <Property Name="CreatedBy" Type="nvarchar" MaxLength="50" />
         </EntityType>
         <Association Name="FK_CategoryProduct">
           <End Role="Categories" Type="Model.Store.Categories" Multiplicity="1" />
@@ -63,6 +66,7 @@
           <Property Type="String" Name="Description" Nullable="false" />
           <Property Type="Decimal" Name="Price" Nullable="false" />
           <NavigationProperty Name="Category" Relationship="Model.CategoryProduct" FromRole="Product" ToRole="Category" />
+          <Property Name="AuditFields" Type="Model.AuditFields" Nullable="false" />
         </EntityType>
         <EntityType Name="Category">
           <Key>
@@ -76,6 +80,11 @@
           <End Type="Model.Category" Role="Category" Multiplicity="1" />
           <End Type="Model.Product" Role="Product" Multiplicity="*" />
         </Association>
+        <ComplexType Name="AuditFields">
+          <Property Type="DateTime" Name="CreateDate" Nullable="false" />
+          <Property Type="DateTime" Name="ModifiedDate" Nullable="false" />
+          <Property Type="String" Name="CreatedBy" Nullable="true" />
+        </ComplexType>
       </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -85,10 +94,15 @@
     <EntitySetMapping Name="Products">
       <EntityTypeMapping TypeName="IsTypeOf(Model.Product)">
         <MappingFragment StoreEntitySet="Products">
-          <ScalarProperty Name="Id" ColumnName="Id" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
           <ScalarProperty Name="Name" ColumnName="Name" />
           <ScalarProperty Name="Description" ColumnName="Description" />
           <ScalarProperty Name="Price" ColumnName="Price" />
+                <ComplexProperty Name="AuditFields">
+                  <ScalarProperty Name="CreatedBy" ColumnName="CreatedBy" />
+                  <ScalarProperty Name="ModifiedDate" ColumnName="ModifiedDate" />
+                  <ScalarProperty Name="CreateDate" ColumnName="CreateDate" />
+                </ComplexProperty>
         </MappingFragment>
       </EntityTypeMapping>
     </EntitySetMapping>
@@ -128,7 +142,7 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram Name="Model" >
-        <EntityTypeShape EntityType="Model.Product" Width="1.5" PointX="8" PointY="1.75" Height="1.787985026041667" />
+        <EntityTypeShape EntityType="Model.Product" Width="1.5" PointX="8" PointY="1.75" Height="2.172587890625" />
         <EntityTypeShape EntityType="Model.Category" Width="1.5" PointX="5.25" PointY="1.875" Height="1.59568359375" />
         <AssociationConnector Association="Model.CategoryProduct">
           <ConnectorPoint PointX="6.75" PointY="2.672841796875" />

data/test/SampleService/App_Code/ModelContainerExtended.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Data;
+using System.Data.Objects;
+using System.Linq;
+
+namespace Model
+{
+    /// <summary>
+    /// Extensions to the default container
+    /// </summary>
+    public partial class ModelContainer
+    {
+        partial void OnContextCreated()
+        {
+            SavingChanges += ContainerSavingChanges;
+        }
+
+        private static void ContainerSavingChanges(object sender, EventArgs e)
+        {
+            var updatedEntites = ((ObjectContext) sender).ObjectStateManager.GetObjectStateEntries(EntityState.Modified);
+            foreach (var ose in updatedEntites)
+            {
+                var type = ose.Entity.GetType();
+                if (type.GetProperties().Any(p => typeof(AuditFields).IsAssignableFrom(p.PropertyType)))
+                {
+                    dynamic entity = ose.Entity;
+                    entity.AuditFields.ModifiedDate = DateTime.UtcNow;
+                }
+            }
+        }
+    }
+}

data/test/SampleService/web.config

@@ -5,7 +5,7 @@
   -->
 <configuration>
   <system.web>
-    <compilation debug="false" targetFramework="4.0">
+    <compilation debug="true" targetFramework="4.0">
       <assemblies>
         <add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
         <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />

data/test/blueprints.rb

@@ -9,8 +9,13 @@ Product.blueprint do
 	Description		"Test Widget"
 	Price					{ Sham.price }
 	Category			{ Category.make }
+	AuditFields   { AuditFields.make }
 end
 
 Category.blueprint do
 	Name					{ Sham.category_name }
+end
+
+AuditFields.blueprint do
+  CreatedBy     "Cucumber"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_odata
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Damien White
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -04:00
+date: 2010-07-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,12 +85,14 @@ files:
 - VERSION
 - config/cucumber.yml
 - features/batch_request.feature
+- features/complex_types.feature
 - features/query_builder.feature
 - features/service.feature
 - features/service_manage.feature
 - features/step_definitions/service_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
+- features/type_conversion.feature
 - lib/ruby_odata.rb
 - lib/ruby_odata/class_builder.rb
 - lib/ruby_odata/operation.rb
@@ -99,9 +101,11 @@ files:
 - ruby_odata.gemspec
 - test/Cassini x64.bat
 - test/Cassini x86.bat
+- test/SampleService/App_Code/AuditFields.cs
 - test/SampleService/App_Code/Entities.cs
 - test/SampleService/App_Code/Model.Designer.cs
 - test/SampleService/App_Code/Model.edmx
+- test/SampleService/App_Code/ModelContainerExtended.cs
 - test/SampleService/App_Data/_TestDB.mdf
 - test/SampleService/App_Data/_TestDB_Log.ldf
 - test/SampleService/Entities.svc