myexperiment-hackers
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myexperiment-hackers] [3438] trunk: removed spurious colons

From: noreply
Subject: [myexperiment-hackers] [3438] trunk: removed spurious colons
Date: Fri, 22 Feb 2013 19:22:43 +0000 (UTC)
Revision
3438
Author
dgc
Date
2013-02-22 19:22:43 +0000 (Fri, 22 Feb 2013)

Log Message

removed spurious colons

Modified Paths

Diff

Modified: trunk/app/helpers/application_helper.rb (3437 => 3438)


--- trunk/app/helpers/application_helper.rb	2013-02-22 19:20:29 UTC (rev 3437)
+++ trunk/app/helpers/application_helper.rb	2013-02-22 19:22:43 UTC (rev 3438)
@@ -1526,7 +1526,7 @@
 
   def callback_url(item)
     item_url = nil
-    if session && session[:callback]:
+    if session && session[:callback]
       case session[:callback][:format]
       when 'uri'
         item_url = rest_resource_uri(item)

Modified: trunk/lib/pivoting.rb (3437 => 3438)


--- trunk/lib/pivoting.rb	2013-02-22 19:20:29 UTC (rev 3437)
+++ trunk/lib/pivoting.rb	2013-02-22 19:22:43 UTC (rev 3438)
@@ -78,15 +78,15 @@
     end
 
     case state | token
-      when STATE_INITIAL         | TOKEN_WORD   : state = STATE_EXPECT_OPEN     ; data << { :name => tokens[0], :expr => [] }
-      when STATE_EXPECT_OPEN     | TOKEN_OPEN   : state = STATE_EXPECT_STR
-      when STATE_EXPECT_STR      | TOKEN_STRING : state = STATE_EXPECT_EXPR_END ; data.last[:expr] << tokens[0]
-      when STATE_EXPECT_EXPR_END | TOKEN_AND    : state = STATE_EXPECT_STR      ; data.last[:expr] << :and
-      when STATE_EXPECT_EXPR_END | TOKEN_OR     : state = STATE_EXPECT_STR      ; data.last[:expr] << :or
-      when STATE_EXPECT_EXPR_END | TOKEN_CLOSE  : state = STATE_EXPECT_END
-      when STATE_EXPECT_END      | TOKEN_AND    : state = STATE_INITIAL         ; data << :and
-      when STATE_EXPECT_END      | TOKEN_OR     : state = STATE_INITIAL         ; data << :or
-      when STATE_EXPECT_END      | TOKEN_EOS    : state = STATE_COMPLETE
+      when STATE_INITIAL         | TOKEN_WORD   ; state = STATE_EXPECT_OPEN     ; data << { :name => tokens[0], :expr => [] }
+      when STATE_EXPECT_OPEN     | TOKEN_OPEN   ; state = STATE_EXPECT_STR
+      when STATE_EXPECT_STR      | TOKEN_STRING ; state = STATE_EXPECT_EXPR_END ; data.last[:expr] << tokens[0]
+      when STATE_EXPECT_EXPR_END | TOKEN_AND    ; state = STATE_EXPECT_STR      ; data.last[:expr] << :and
+      when STATE_EXPECT_EXPR_END | TOKEN_OR     ; state = STATE_EXPECT_STR      ; data.last[:expr] << :or
+      when STATE_EXPECT_EXPR_END | TOKEN_CLOSE  ; state = STATE_EXPECT_END
+      when STATE_EXPECT_END      | TOKEN_AND    ; state = STATE_INITIAL         ; data << :and
+      when STATE_EXPECT_END      | TOKEN_OR     ; state = STATE_INITIAL         ; data << :or
+      when STATE_EXPECT_END      | TOKEN_EOS    ; state = STATE_COMPLETE
 
       else raise "Error parsing query _expression_"
     end

Modified: trunk/lib/rest.rb (3437 => 3438)


--- trunk/lib/rest.rb	2013-02-22 19:20:29 UTC (rev 3437)
+++ trunk/lib/rest.rb	2013-02-22 19:22:43 UTC (rev 3438)
@@ -75,13 +75,13 @@
   message = "Unknown Error"
 
   case code
-    when 200: message = "OK"
-    when 307: message = "Temporary Redirect"
-    when 400: message = "Bad Request"
-    when 401: message = "Unauthorized"
-    when 403: message = "Forbidden"
-    when 404: message = "Not Found"
-    when 500: message = "Internal Server Error"
+    when 200; message = "OK"
+    when 307; message = "Temporary Redirect"
+    when 400; message = "Bad Request"
+    when 401; message = "Unauthorized"
+    when 403; message = "Forbidden"
+    when 404; message = "Not Found"
+    when 500; message = "Internal Server Error"
   end
 
   if (code >= 300) && (code < 400)
@@ -1008,14 +1008,14 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a workflow") unless Authorization.check('create', Workflow, opts[:user], nil)
       if opts[:query]['id']
         ob, error = obtain_rest_resource('Workflow', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
       else
         ob = Workflow.new(:contributor => opts[:user])
       end
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Workflow', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -1185,14 +1185,14 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a file") unless Authorization.check('create', Blob, opts[:user], nil)
       if opts[:query]['id']
         ob, error = obtain_rest_resource('Blob', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
       else
         ob = Blob.new(:contributor => opts[:user])
       end
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Blob', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -1325,7 +1325,7 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a pack") unless Authorization.check('create', Pack, opts[:user], nil)
       if id = opts[:query]['id']
         ob = Pack.find_by_id(id)
@@ -1343,7 +1343,7 @@
         ob = Pack.new(:contributor => opts[:user])
       end
 
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Pack', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -1412,7 +1412,7 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
 
       return rest_response(401, :reason => "Not authorised to create an external pack item") unless Authorization.check('create', PackRemoteEntry, opts[:user], pack)
       return rest_response(400, :reason => "Pack not found") if pack.nil?
@@ -1425,7 +1425,7 @@
           :alternate_uri => alternate_uri,
           :comment       => comment)
 
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
 
       ob, error = obtain_rest_resource('PackRemoteEntry', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
 
@@ -1487,7 +1487,7 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
 
       return rest_response(401, :reason => "Not authorised to create an internal pack item") unless Authorization.check('create', PackContributableEntry, opts[:user], pack)
       return rest_response(400, :reason => "Pack not found") if pack.nil?
@@ -1498,7 +1498,7 @@
           :comment       => comment,
           :contributable_version => version)
 
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
 
       ob, error = obtain_rest_resource('PackContributableEntry', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
 
@@ -1606,9 +1606,9 @@
     if bits.length == 4
 
       case bits[1]
-        when 'workflows': model = Workflow
-        when 'files': model = Blob
-        when 'packs': model = Pack
+        when 'workflows'; model = Workflow
+        when 'files'; model = Blob
+        when 'packs'; model = Pack
         else return rest_response(400, :reason => "Unknown category '#{bits[1]}'")
       end
 
@@ -1788,8 +1788,8 @@
 def whoami_redirect(opts)
   if opts[:user].class == User
     case opts[:format]
-      when "xml": rest_response(307, :location => rest_access_uri(opts[:user]))
-      when "rdf": rest_response(307, :location => formatted_user_url(:id => opts[:user].id, :format => 'rdf'))
+      when "xml"; rest_response(307, :location => rest_access_uri(opts[:user]))
+      when "rdf"; rest_response(307, :location => formatted_user_url(:id => opts[:user].id, :format => 'rdf'))
     end
   else
     rest_response(401, :reason => "Not logged in")
@@ -1928,11 +1928,11 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a comment") unless Authorization.check('create', Comment, opts[:user], subject)
 
       ob = Comment.new(:user => opts[:user])
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Comment', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -2055,11 +2055,11 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a favourite") unless Authorization.check('create', Bookmark, opts[:user], target)
 
       ob = Bookmark.new(:user => opts[:user])
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Bookmark', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -2112,11 +2112,11 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a rating") unless Authorization.check('create', Rating, opts[:user], subject)
 
       ob = Rating.new(:user => opts[:user])
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Rating', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -2172,11 +2172,11 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a tagging") unless Authorization.check('create', Tagging, opts[:user], subject)
 
       ob = Tagging.new(:user => opts[:user])
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Tagging', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -2219,10 +2219,10 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create an ontology") unless Authorization.check('create', Ontology, opts[:user], nil)
       ob = Ontology.new(:user => opts[:user])
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Ontology', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -2289,10 +2289,10 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a predicate") unless Authorization.check('create', Predicate, opts[:user], ontology)
       ob = Predicate.new
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Predicate', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"
@@ -2351,10 +2351,10 @@
   # Obtain object
 
   case action
-    when 'create':
+    when 'create';
       return rest_response(401, :reason => "Not authorised to create a relationship") unless Authorization.check('create', Relationship, opts[:user], context)
       ob = Relationship.new(:user => opts[:user])
-    when 'view', 'edit', 'destroy':
+    when 'view', 'edit', 'destroy';
       ob, error = obtain_rest_resource('Relationship', opts[:query]['id'], opts[:query]['version'], opts[:user], action)
     else
       raise "Invalid action '#{action}'"

Modified: trunk/vendor/plugins/oauth/lib/oauth/request_proxy/base.rb (3437 => 3438)


--- trunk/vendor/plugins/oauth/lib/oauth/request_proxy/base.rb	2013-02-22 19:20:29 UTC (rev 3437)
+++ trunk/vendor/plugins/oauth/lib/oauth/request_proxy/base.rb	2013-02-22 19:22:43 UTC (rev 3438)
@@ -37,7 +37,7 @@
 
     def signature_method
       case parameters['oauth_signature_method']
-      when Array: parameters['oauth_signature_method'].first
+      when Array; parameters['oauth_signature_method'].first
       else
         parameters['oauth_signature_method']
       end

Modified: trunk/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb (3437 => 3438)


--- trunk/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb	2013-02-22 19:20:29 UTC (rev 3437)
+++ trunk/vendor/plugins/open_id_authentication/lib/open_id_authentication.rb	2013-02-22 19:22:43 UTC (rev 3438)
@@ -122,8 +122,8 @@
     
     def open_id_store
       case store
-      when :db  : OpenIdAuthentication::DbStore.new
-      when :file: OpenID::FilesystemStore.new(OPEN_ID_AUTHENTICATION_DIR)
+      when :db  ; OpenIdAuthentication::DbStore.new
+      when :file; OpenID::FilesystemStore.new(OPEN_ID_AUTHENTICATION_DIR)
       else
         raise "Unknown store: #{store}"
       end
@@ -155,4 +155,4 @@
         end
       end.new
     end
-end
\ No newline at end of file
+end
reply via email to
[Prev in Thread] Current Thread [Next in Thread]