[myexperiment-hackers] [2288] trunk/lib: added versioning support to POST/PUT/DELETE workflow.xml

[noreply]

Revision

2288

Author

dgc

Date

2009-10-26 11:36:27 -0400 (Mon, 26 Oct 2009)

Log Message

added versioning support to POST/PUT/DELETE workflow.xml

Modified Paths

• trunk/lib/explicit_versioning.rb
• trunk/lib/rest.rb

Diff

Modified: trunk/lib/explicit_versioning.rb (2287 => 2288)

--- trunk/lib/explicit_versioning.rb	2009-10-16 00:07:42 UTC (rev 2287)
+++ trunk/lib/explicit_versioning.rb	2009-10-26 15:36:27 UTC (rev 2288)
@@ -49,11 +49,15 @@
             def self.reloadable? ; false ; end
           end
           
+          versioned_resource = self.to_s.demodulize.underscore.to_sym
+
           versioned_class.set_table_name versioned_table_name
-          versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym, 
+          versioned_class.belongs_to versioned_resource, 
             :class_name  => "::#{self.to_s}", 
             :foreign_key => versioned_foreign_key
-          
+
+          versioned_class.class_eval("alias_method :versioned_resource, :#{versioned_resource}")
+
           if block_given?
             versioned_class.class_eval(&extension)
           end

Modified: trunk/lib/rest.rb (2287 => 2288)

--- trunk/lib/rest.rb	2009-10-16 00:07:42 UTC (rev 2287)
+++ trunk/lib/rest.rb	2009-10-26 15:36:27 UTC (rev 2288)
@@ -748,7 +748,7 @@
   resource
 end
 
-def obtain_rest_resource(type, id, user, permission = nil)
+def obtain_rest_resource(type, id, version, user, permission = nil)
 
   resource = eval(type).find_by_id(id)
 
@@ -757,6 +757,13 @@
     return nil
   end
 
+  resource = resource.find_version(version) if version
+
+  if resource.nil?
+    rest_response(404)
+    return nil
+  end
+
   if permission
     if !Authorization.is_authorized?(permission, nil, resource, user)
       rest_response(401)
@@ -838,7 +845,7 @@
       return rest_response(401) unless Authorization.is_authorized_for_type?('create', 'Workflow', user, nil)
       ob = Workflow.new(:contributor => user)
     when 'read', 'update', 'destroy':
-      ob = obtain_rest_resource('Workflow', query['id'], user, action)
+      ob = obtain_rest_resource('Workflow', query['id'], query['version'], user, action)
     else
       raise "Invalid action '#{action}'"
   end
@@ -847,19 +854,22 @@
 
   if action == "destroy"
 
+    return rest_response(400, :reason => "Cannot delete individual versions") if query['version']
+      
     ob.destroy
 
   else
 
     data = ""
 
-    title        = parse_element(data, :text,   '/workflow/title')
-    description  = parse_element(data, :text,   '/workflow/description')
-    license_type = parse_element(data, :text,   '/workflow/license-type')
-    type         = parse_element(data, :text,   '/workflow/type')
-    content_type = parse_element(data, :text,   '/workflow/content-type')
-    content      = parse_element(data, :binary, '/workflow/content')
-    preview      = parse_element(data, :binary, '/workflow/preview')
+    title            = parse_element(data, :text,   '/workflow/title')
+    description      = parse_element(data, :text,   '/workflow/description')
+    license_type     = parse_element(data, :text,   '/workflow/license-type')
+    type             = parse_element(data, :text,   '/workflow/type')
+    content_type     = parse_element(data, :text,   '/workflow/content-type')
+    content          = parse_element(data, :binary, '/workflow/content')
+    preview          = parse_element(data, :binary, '/workflow/preview')
+    revision_comment = parse_element(data, :text,   '/workflow/revision-comment')
 
     permissions  = data.find_first('/workflow/permissions')
 
@@ -867,16 +877,8 @@
 
     ob.title        = title        if title
     ob.body         = description  if description
-    #ob.license_id   = License.find_by_unique_name(license_type) if license_type
+    ob.license      = License.find_by_unique_name(license_type) if license_type
 
-    if license_type
-      ob.license = License.find_by_unique_name(license_type)
-      if ob.license.nil?
-        ob.errors.add("License type")
-        return rest_response(400, :object => ob)
-      end
-    end
-   
     # handle workflow type
 
     if type
@@ -924,16 +926,29 @@
       image.close
     end
 
-    if not ob.save
-      return rest_response(400, :object => ob)
+    success = if content
+      ob.save_as_new_version(revision_comment)
+    else
+      ob.save
     end
 
-    if ob.contribution.policy.nil?
-      ob.contribution.policy = create_default_policy(user)
-      ob.contribution.save
+    return rest_response(400, :object => ob) unless success
+
+    # Elements to update if we're not dealing with a workflow version
+
+    if query['version'].nil?
+
+      if ob.contribution.policy.nil?
+        ob.contribution.policy = create_default_policy(user)
+        ob.contribution.save
+      end
+
+      update_permissions(ob, permissions)
     end
+  end
 
-    update_permissions(ob, permissions)
+  if query['version']
+    ob = ob.versioned_resource
   end
 
   rest_get_request(ob, "workflow", user,
@@ -963,7 +978,7 @@
       return rest_response(401) unless Authorization.is_authorized_for_type?('create', 'Blob', user, nil)
       ob = Blob.new(:contributor => user)
     when 'read', 'update', 'destroy':
-      ob = obtain_rest_resource('Blob', query['id'], user, action)
+      ob = obtain_rest_resource('Blob', query['id'], query['version'], user, action)
     else
       raise "Invalid action '#{action}'"
   end
@@ -1346,7 +1361,7 @@
 
       ob = Comment.new(:user => user)
     when 'read', 'update', 'destroy':
-      ob = obtain_rest_resource('Comment', query['id'], user, action)
+      ob = obtain_rest_resource('Comment', query['id'], query['version'], user, action)
     else
       raise "Invalid action '#{action}'"
   end
@@ -1402,7 +1417,7 @@
 
       ob = Bookmark.new(:user => user)
     when 'read', 'update', 'destroy':
-      ob = obtain_rest_resource('Bookmark', query['id'], user, action)
+      ob = obtain_rest_resource('Bookmark', query['id'], query['version'], user, action)
     else
       raise "Invalid action '#{action}'"
   end