[myexperiment-hackers] [2974] trunk/lib/rest.rb: find_entity_name_from_object changed to support versions

[noreply]

Revision

2974

Author

dgc

Date

2012-03-20 16:55:21 +0000 (Tue, 20 Mar 2012)

Log Message

find_entity_name_from_object changed to support versions

Modified Paths

• trunk/lib/rest.rb

Diff

Modified: trunk/lib/rest.rb (2973 => 2974)

--- trunk/lib/rest.rb	2012-03-20 13:10:01 UTC (rev 2973)
+++ trunk/lib/rest.rb	2012-03-20 16:55:21 UTC (rev 2974)
@@ -327,6 +327,7 @@
 end
 
 def find_entity_name_from_object(ob)
+  ob = ob.versioned_resource if ob.respond_to?(:version)
   OBJECT_CLASS_TO_ENTITY_NAME[ob.class.name.underscore]
 end
 
@@ -340,6 +341,8 @@
   resource = rest_resource_uri(ob)
   version  = ob.current_version.to_s if ob.respond_to?('versions')
 
+  version = ob.version.to_s if ob.respond_to?(:versioned_resource)
+
   entity['uri'     ] = uri      if uri && query["show-uri"] != "no"
   entity['resource'] = resource if resource && query["show-resource"] != "no"
   entity['version' ] = version  if version && query["show-version"] != "no"