myexperiment-rest 0.3.2 → 0.3.3

data/CHANGES

@@ -1,9 +1,12 @@
 = Changes log for the MyExperiment via REST Gem
 
+== Version 0.3.3
+* Fixed bug when acquiring information from versions other than the newest
+
+
 == Version 0.3.2
 * Updated to libxml-ruby 2.2.2
 
-
 == Version 0.3.1
 * Renamed xml_uri to content_uri
 * added simple session cookie authentication

data/README

@@ -1,7 +1,7 @@
 = MyExperiment Interaction via REST
 
 Authors::     Konstantinos Karasavvas
-Gem Version:: 0.3.2
+Gem Version:: 0.3.3
 Contact::     mailto:kostas.karasavvas@nbic.nl
 Licence::     MIT (See LICENCE or http://www.opensource.org/licenses/mit-license)
 Copyright::   (c) 2010 Netherlands Bioinformatics Centre, The Netherlands

data/Rakefile

@@ -7,7 +7,7 @@ require 'rdoc/task'
 
 spec = Gem::Specification.new do |s|
   s.name = 'myexperiment-rest'
-  s.version = '0.3.2'
+  s.version = '0.3.3'
   s.extra_rdoc_files = ['README', 'LICENSE', 'CHANGES']
   s.summary = 'This is a simple library to access data on myExperiment via its REST API.'
   s.description = 'This is a simple library to access data on myExperiment via its REST API. Currently supports a subset of the workflow information available.'

data/doc/rdoc/CHANGES.html

@@ -92,6 +92,11 @@
     
 <h1>Changes log for the MyExperiment via REST Gem</h1>
 
+<h2>Version 0.3.3</h2>
+<ul><li>
+<p>Fixed bug when acquiring information from versions other than the newest</p>
+</li></ul>
+
 <h2>Version 0.3.2</h2>
 <ul><li>
 <p>Updated to libxml-ruby 2.2.2</p>

data/doc/rdoc/MyExperimentREST.html

@@ -206,22 +206,24 @@ currently are <tt>WORKFLOW_URL</tt>“+ and <tt>USER_URL</tt>.</p>
   <span class="ruby-keyword">case</span> <span class="ruby-identifier">resource_url</span>
 
   <span class="ruby-keyword">when</span> <span class="ruby-constant">Urls</span><span class="ruby-operator">::</span><span class="ruby-constant">WORKFLOW_URL</span>
+    <span class="ruby-identifier">rest_params</span> = { <span class="ruby-value">:params</span> =<span class="ruby-operator">&gt;</span> {<span class="ruby-string">'id'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{params[:id]}&quot;</span>,
+                                <span class="ruby-string">'elements'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-string">'title,description,content-uri,components,uploader'</span>}
+                  }
+
+    <span class="ruby-comment"># if version is not empty use that one -- otherwise it returns the current version</span>
+    <span class="ruby-keyword">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-value">:version</span>] <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-identifier">params</span>[<span class="ruby-value">:version</span>].<span class="ruby-identifier">empty?</span> 
+      <span class="ruby-identifier">rest_params</span>[<span class="ruby-value">:params</span>][<span class="ruby-string">'version'</span>] = <span class="ruby-node">&quot;#{params[:version]}&quot;</span>
+    <span class="ruby-keyword">end</span>
+
+    <span class="ruby-comment"># if session cookie is not empty it uses simple cookie auth (not secure -- used for demos)</span>
+    <span class="ruby-keyword">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-value">:session_cookie</span>]
+      <span class="ruby-identifier">rest_params</span>[<span class="ruby-value">:cookies</span>] = <span class="ruby-identifier">params</span>[<span class="ruby-value">:session_cookie</span>]
+    <span class="ruby-keyword">end</span>
+
+
+    <span class="ruby-comment"># Get workflow resource information</span>
     <span class="ruby-keyword">begin</span>
-      <span class="ruby-comment"># Get workflow resource information -- if version is empty it returns the current version</span>
-      <span class="ruby-keyword">if</span> <span class="ruby-identifier">params</span>[<span class="ruby-value">:session_cookie</span>].<span class="ruby-identifier">empty?</span>
-        <span class="ruby-identifier">response</span> = <span class="ruby-constant">RestClient</span>.<span class="ruby-identifier">get</span>(<span class="ruby-node">&quot;#{Urls::MYEXPERIMENT_URL}/#{Urls::WORKFLOW_URL}&quot;</span>,
-                                         {<span class="ruby-value">:params</span> =<span class="ruby-operator">&gt;</span> {<span class="ruby-string">'id'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{params[:id]}&quot;</span>,
-                                                      <span class="ruby-string">'version'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{params[:version]}&quot;</span>,
-                                                      <span class="ruby-string">'elements'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-string">'title,description,content-uri,components,uploader'</span>} } )
-        <span class="ruby-identifier">response</span>      
-      <span class="ruby-keyword">else</span>    <span class="ruby-comment"># TODO: reduce repetition.. if else only for the cookie key-value pair!!</span>
-        <span class="ruby-identifier">response</span> = <span class="ruby-constant">RestClient</span>.<span class="ruby-identifier">get</span>(<span class="ruby-node">&quot;#{Urls::MYEXPERIMENT_URL}/#{Urls::WORKFLOW_URL}&quot;</span>, 
-                                         {<span class="ruby-value">:params</span> =<span class="ruby-operator">&gt;</span> {<span class="ruby-string">'id'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{params[:id]}&quot;</span>,
-                                                      <span class="ruby-string">'version'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{params[:version]}&quot;</span>,
-                                                      <span class="ruby-string">'elements'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-string">'title,description,content-uri,components,uploader'</span>},
-                                          <span class="ruby-value">:cookies</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">params</span>[<span class="ruby-value">:session_cookie</span>] } )
-        <span class="ruby-identifier">response</span>
-      <span class="ruby-keyword">end</span>
+      <span class="ruby-identifier">response</span> = <span class="ruby-constant">RestClient</span>.<span class="ruby-identifier">get</span>(<span class="ruby-node">&quot;#{Urls::MYEXPERIMENT_URL}/#{Urls::WORKFLOW_URL}&quot;</span>, <span class="ruby-identifier">rest_params</span>)
     <span class="ruby-keyword">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
       <span class="ruby-identifier">raise</span> <span class="ruby-string">&quot;REST call to acquire workflow resource failed!\n&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">e</span>
     <span class="ruby-keyword">end</span>

data/doc/rdoc/README.html

@@ -96,7 +96,7 @@
 <p>Konstantinos Karasavvas</p>
 </td></tr><tr><td class="rdoc-term"><p>Gem Version</p></td>
 <td>
-<p>0.3.2</p>
+<p>0.3.3</p>
 </td></tr><tr><td class="rdoc-term"><p>Contact</p></td>
 <td>
 <p><a href="mailto:kostas.karasavvas@nbic.nl">kostas.karasavvas@nbic.nl</a></p>

data/doc/rdoc/created.rid

@@ -1,9 +1,9 @@
-Mon, 16 Jan 2012 11:48:00 +0100
+Mon, 13 Feb 2012 16:25:51 +0100
 LICENSE	Tue, 26 Jul 2011 16:45:34 +0200
 lib/myexperiment-rest/constants.rb	Thu, 29 Sep 2011 16:33:55 +0200
-README	Mon, 16 Jan 2012 11:47:36 +0100
+README	Tue, 07 Feb 2012 15:53:26 +0100
 lib/myexperiment-rest/user.rb	Wed, 28 Sep 2011 12:11:32 +0200
-lib/myexperiment-rest.rb	Tue, 04 Oct 2011 15:07:41 +0200
-CHANGES	Mon, 16 Jan 2012 11:47:22 +0100
+lib/myexperiment-rest.rb	Mon, 13 Feb 2012 16:25:36 +0100
+CHANGES	Mon, 13 Feb 2012 16:14:27 +0100
 lib/myexperiment-rest/authentication.rb	Mon, 03 Oct 2011 12:20:41 +0200
-lib/myexperiment-rest/workflow.rb	Mon, 03 Oct 2011 12:44:03 +0200
+lib/myexperiment-rest/workflow.rb	Tue, 07 Feb 2012 16:23:39 +0100

data/doc/rdoc/index.html

@@ -29,7 +29,7 @@
 <p>Konstantinos Karasavvas</p>
 </td></tr><tr><td class="rdoc-term"><p>Gem Version</p></td>
 <td>
-<p>0.3.2</p>
+<p>0.3.3</p>
 </td></tr><tr><td class="rdoc-term"><p>Contact</p></td>
 <td>
 <p><a href="mailto:kostas.karasavvas@nbic.nl">kostas.karasavvas@nbic.nl</a></p>

data/doc/rdoc/lib/myexperiment-rest/workflow_rb.html

@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Mon Oct 03 12:44:03 +0200 2011</dd>
+      <dd class="modified-date">Tue Feb 07 16:23:39 +0100 2012</dd>
 
       
       <dt class="requires">Requires</dt>

data/doc/rdoc/lib/myexperiment-rest_rb.html

@@ -24,7 +24,7 @@
   <div id="metadata">
     <dl>
       <dt class="modified-date">Last Modified</dt>
-      <dd class="modified-date">Tue Oct 04 15:07:41 +0200 2011</dd>
+      <dd class="modified-date">Mon Feb 13 16:25:36 +0100 2012</dd>
 
       
       <dt class="requires">Requires</dt>

data/lib/myexperiment-rest.rb

@@ -16,22 +16,24 @@ module MyExperimentREST
     case resource_url
 
     when Urls::WORKFLOW_URL
+      rest_params = { :params => {'id' => "#{params[:id]}",
+                                  'elements' => 'title,description,content-uri,components,uploader'}
+                    }
+
+      # if version is not empty use that one -- otherwise it returns the current version
+      if params[:version] && !params[:version].empty? 
+        rest_params[:params]['version'] = "#{params[:version]}"
+      end
+
+      # if session cookie is not empty it uses simple cookie auth (not secure -- used for demos)
+      if params[:session_cookie]
+        rest_params[:cookies] = params[:session_cookie]
+      end
+
+
+      # Get workflow resource information
       begin
-        # Get workflow resource information -- if version is empty it returns the current version
-        if params[:session_cookie].empty?
-          response = RestClient.get("#{Urls::MYEXPERIMENT_URL}/#{Urls::WORKFLOW_URL}",
-                                           {:params => {'id' => "#{params[:id]}",
-                                                        'version' => "#{params[:version]}",
-                                                        'elements' => 'title,description,content-uri,components,uploader'} } )
-          response      
-        else    # TODO: reduce repetition.. if else only for the cookie key-value pair!!
-          response = RestClient.get("#{Urls::MYEXPERIMENT_URL}/#{Urls::WORKFLOW_URL}", 
-                                           {:params => {'id' => "#{params[:id]}",
-                                                        'version' => "#{params[:version]}",
-                                                        'elements' => 'title,description,content-uri,components,uploader'},
-                                            :cookies => params[:session_cookie] } )
-          response
-        end
+        response = RestClient.get("#{Urls::MYEXPERIMENT_URL}/#{Urls::WORKFLOW_URL}", rest_params)
       rescue Exception => e
         raise "REST call to acquire workflow resource failed!\n" + e
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: myexperiment-rest
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Konstantinos Karasavvas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 Z
+date: 2012-02-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client