sinatra_resource 0.4.21 → 0.4.22

data/examples/datacatalog/test/resources/sources_usages/sources_usages_put_test.rb

@@ -5,7 +5,7 @@ class SourcesUsagesPutResourceTest < ResourceTestCase
   include DataCatalog
 
   def app; Sources end
-  
+
   before do
     @source = create_source
     @source.usages << new_usage
@@ -35,117 +35,117 @@ class SourcesUsagesPutResourceTest < ResourceTestCase
       before do
         put "/#{@source.id}/usages/#{@usage_id}"
       end
-    
+
       use "return 401 because the API key is missing"
       use "usage unchanged"
     end
-  
+
     context "incorrect API key" do
       before do
         put "/#{@source.id}/usages/#{@usage_id}", :api_key => BAD_API_KEY
       end
-      
+
       use "return 401 because the API key is invalid"
       use "usage unchanged"
     end
   end
-  
+
   %w(basic).each do |role|
     context "#{role} : put /:fake_id/usages/:fake_id" do
       before do
         put "/#{FAKE_ID}/usages/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-    
+
       use "return 404 Not Found with empty response body"
       use "usage unchanged"
     end
-    
+
     context "#{role} : put /:fake_id/usages/:id" do
       before do
         put "/#{FAKE_ID}/usages/#{@usage_id}", :api_key => api_key_for(role)
       end
-    
+
       use "return 404 Not Found with empty response body"
       use "usage unchanged"
     end
-    
+
     context "#{role} : put /:id/usages/:fake_id" do
       before do
         put "/#{@source.id}/usages/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-    
+
       use "return 401 because the API key is unauthorized"
       use "usage unchanged"
     end
-  
+
     context "#{role} : put /:id/usages/:not_related_id" do
       before do
         put "/#{@source.id}/usages/#{@other_usage_id}",
           :api_key => api_key_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "usage unchanged"
     end
-  
+
     context "#{role} : put /:id/usages/:id" do
       before do
         put "/#{@source.id}/usages/#{@usage_id}", :api_key => api_key_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "usage unchanged"
     end
   end
-  
+
   %w(curator admin).each do |role|
     context "#{role} : put /:fake_id/usages/:fake_id" do
       before do
         put "/#{FAKE_ID}/usages/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-    
+
       use "return 404 Not Found with empty response body"
       use "usage unchanged"
     end
-    
+
     context "#{role} : put /:fake_id/usages/:id" do
       before do
         put "/#{FAKE_ID}/usages/#{@usage_id}", :api_key => api_key_for(role)
       end
-    
+
       use "return 404 Not Found with empty response body"
       use "usage unchanged"
     end
-    
+
     context "#{role} : put /:id/usages/:fake_id" do
       before do
         put "/#{@source.id}/usages/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-    
+
       use "return 404 Not Found with empty response body"
       use "usage unchanged"
     end
-  
+
     context "#{role} : put /:id/usages/:not_related_id" do
       before do
         put "/#{@source.id}/usages/#{@other_usage_id}",
           :api_key => api_key_for(role)
       end
-      
+
       use "return 404 Not Found with empty response body"
       use "usage unchanged"
     end
-  
+
     context "#{role} : put /:id/usages/:id with no params" do
       before do
         put "/#{@source.id}/usages/#{@usage_id}", 
           :api_key => api_key_for(role)
       end
-  
+
       use "return 400 because no params were given"
       use "usage unchanged"
     end
-  
+
     # TODO: As of 2009-10-29, MongoMapper does not support validations on
     # EmbeddedDocuments.
     #
@@ -155,7 +155,7 @@ class SourcesUsagesPutResourceTest < ResourceTestCase
     #       put "/#{@source.id}/usages/#{@usage_id}",
     #         valid_params_for(role).delete_if { |k, v| k == missing }
     #     end
-    #   
+    # 
     #     use "return 200 Ok"
     #     doc_properties %w(title url description id)
     # 
@@ -168,7 +168,7 @@ class SourcesUsagesPutResourceTest < ResourceTestCase
     #     end
     #   end
     # end
-    
+
     # TODO: As of 2009-10-29, MongoMapper does not support validations on
     # EmbeddedDocuments.
     #
@@ -178,20 +178,20 @@ class SourcesUsagesPutResourceTest < ResourceTestCase
     #       put "/#{@source.id}/usages/#{@usage_id}",
     #         valid_params_for(role).merge(erase => "")
     #     end
-    #   
+    # 
     #     use "return 400 Bad Request"
     #     use "usage unchanged"
     #     missing_param erase
     #   end
     # end
-  
+
     [:junk].each do |invalid|
       context "#{role} : put /:id/usages/:id with #{invalid}" do
         before do
           put "/#{@source.id}/usages/#{@usage_id}",
             valid_params_for(role).merge(invalid => 9)
         end
-  
+
         use "return 400 Bad Request"
         use "usage unchanged"
         invalid_param invalid
@@ -202,10 +202,10 @@ class SourcesUsagesPutResourceTest < ResourceTestCase
       before do
         put "/#{@source.id}/usages/#{@usage_id}", valid_params_for(role)
       end
-      
+
       use "return 200 Ok"
       doc_properties %w(title url description id)
-          
+
       test "should change correct fields in database" do
         source = Source.find_by_id(@source.id)
         # TODO: use reload instead
@@ -218,5 +218,5 @@ class SourcesUsagesPutResourceTest < ResourceTestCase
       end
     end
   end
-  
+
 end

data/examples/datacatalog/test/resources/users/users_delete_test.rb

@@ -14,13 +14,13 @@ class UsersDeleteResourceTest < ResourceTestCase
   after do
     @user.destroy
   end
-  
+
   context "delete /:id" do
     context "anonymous" do
       before do
         delete "/#{@user.id}"
       end
-    
+
       use "return 401 because the API key is missing"
       use "no change in user count"
     end
@@ -29,38 +29,38 @@ class UsersDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@user.id}", :api_key => BAD_API_KEY
       end
-      
+
       use "return 401 because the API key is invalid"
       use "no change in user count"
     end
   end
-  
+
   %w(basic curator).each do |role|
     context "#{role} : delete /:fake_id" do
       before do
         delete "/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in user count"
     end
-  
+
     context "#{role} : delete /:id" do
       before do
         delete "/#{@user.id}",
           :api_key => api_key_for(role),
           :key     => "value"
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in user count"
     end
-      
+
     context "#{role} : delete /:id" do
       before do
         delete "/#{@user.id}", :api_key => api_key_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in user count"
     end
@@ -73,50 +73,50 @@ class UsersDeleteResourceTest < ResourceTestCase
           :api_key => @user._api_key,
           :key     => "value"
       end
-      
-      use "return 400 because params were not empty"
+
+      use "return 400 because invalid params were present"
       use "no change in user count"
     end
-  
+
     context "delete /:id" do
       before do
         delete "/#{@user.id}", :api_key => @user._api_key
       end
-      
+
       use "return 204 No Content"
       use "one less user"
     end
   end
-  
+
   %(admin).each do |role|
     context "#{role} : delete /:fake_id" do
       before do
         delete "/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-      
+
       use "return 404 Not Found with empty response body"
       use "no change in user count"
     end
-  
+
     context "#{role} : delete /:id" do
       before do
         delete "/#{@user.id}",
           :api_key => api_key_for(role),
           :key     => "value"
       end
-      
-      use "return 400 because params were not empty"
+
+      use "return 400 because invalid params were present"
       use "no change in user count"
     end
-  
+
     context "#{role} : delete /:id" do
       before do
         delete "/#{@user.id}", :api_key => api_key_for(role)
       end
-      
+
       use "return 204 No Content"
       use "one less user"
     end
   end
-  
+
 end

data/examples/datacatalog/test/resources/users/users_get_many_test.rb

@@ -17,11 +17,11 @@ class UsersGetManyResourceTest < ResourceTestCase
       )
     end
   end
-  
+
   after do
     @users.each { |x| x.destroy } if @users
   end
-  
+
   NAMES = [
     "admin User",
     "basic User",
@@ -30,7 +30,7 @@ class UsersGetManyResourceTest < ResourceTestCase
     "User 1",
     "User 2"
   ].sort
-  
+
   EMAILS = %w(
     admin-user@inter.net
     basic-user@inter.net
@@ -45,32 +45,32 @@ class UsersGetManyResourceTest < ResourceTestCase
       before do
         get "/"
       end
-    
+
       use "return 401 because the API key is missing"
     end
-  
+
     context "incorrect API key" do
       before do
         get "/", :api_key => BAD_API_KEY
       end
-  
+
       use "return 401 because the API key is invalid"
     end
   end
-  
+
   %w(basic curator).each do |role|
     context "#{role} : get /" do
       before do
         get "/", :api_key => api_key_for(role)
         @members = parsed_response_body['members']
       end
-  
+
       use "return 200 Ok"
-      
+
       test "body should have 6 users" do
         assert_equal 6, @members.length
       end
-      
+
       test "body should have correct names" do
         actual = @members.map { |e| e["name"] }
         assert_equal NAMES, actual.sort
@@ -88,25 +88,25 @@ class UsersGetManyResourceTest < ResourceTestCase
       end
     end
   end
-  
+
   %w(admin).each do |role|
     context "#{role} : get /" do
       before do
         get "/", :api_key => api_key_for(role)
         @members = parsed_response_body['members']
       end
-  
+
       use "return 200 Ok"
-      
+
       test "body should have 6 users" do
         assert_equal 6, @members.length
       end
-      
+
       test "body should have correct names" do
         actual = @members.map { |e| e["name"] }
         assert_equal NAMES, actual.sort
       end
-  
+
       test "body should have correct emails" do
         actual = @members.map { |e| e["email"] }
         assert_equal EMAILS, actual.sort
@@ -120,5 +120,5 @@ class UsersGetManyResourceTest < ResourceTestCase
       end
     end
   end
-  
+
 end

data/examples/datacatalog/test/resources/users/users_get_one_test.rb

@@ -5,7 +5,7 @@ class UsersGetOneResourceTest < ResourceTestCase
   include DataCatalog
 
   def app; Users end
-  
+
   before do
     @user = create_user
   end
@@ -19,7 +19,7 @@ class UsersGetOneResourceTest < ResourceTestCase
       before do
         get "/#{@user.id}"
       end
-    
+
       use "return 401 because the API key is missing"
     end
 
@@ -27,7 +27,7 @@ class UsersGetOneResourceTest < ResourceTestCase
       before do
         get "/#{@user.id}", :api_key => BAD_API_KEY
       end
-  
+
       use "return 401 because the API key is invalid"
     end
   end
@@ -37,7 +37,7 @@ class UsersGetOneResourceTest < ResourceTestCase
       before do
         get "/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-    
+
       use "return 404 Not Found with empty response body"
     end
   end
@@ -47,7 +47,7 @@ class UsersGetOneResourceTest < ResourceTestCase
       before do
         get "/#{@user.id}", :api_key => api_key_for(role)
       end
-  
+
       use "return 200 Ok"
       doc_properties %w(name id created_at updated_at)
     end
@@ -57,18 +57,18 @@ class UsersGetOneResourceTest < ResourceTestCase
     before do
       get "/#{@user.id}", :api_key => @user._api_key
     end
-  
+
     use "return 200 Ok"
     doc_properties %w(name email role _api_key token
       id created_at updated_at)
   end
-  
+
   %w(admin).each do |role|
     context "#{role} : get /:id" do
       before do
         get "/#{@user.id}", :api_key => api_key_for(role)
       end
-  
+
       use "return 200 Ok"
       doc_properties %w(name email role _api_key token
         id created_at updated_at)

data/examples/datacatalog/test/resources/users/users_post_test.rb

@@ -5,7 +5,7 @@ class UsersPostResourceTest < ResourceTestCase
   include DataCatalog
 
   def app; Users end
-  
+
   before do
     @user_count = User.all.length
     @valid_params = {
@@ -23,7 +23,7 @@ class UsersPostResourceTest < ResourceTestCase
       before do
         post "/", @valid_params
       end
-    
+
       use "return 401 because the API key is missing"
       use "no change in user count"
     end
@@ -32,7 +32,7 @@ class UsersPostResourceTest < ResourceTestCase
       before do
         post "/", @valid_params.merge(:api_key => BAD_API_KEY)
       end
-  
+
       use "return 401 because the API key is invalid"
       use "no change in user count"
     end
@@ -44,28 +44,28 @@ class UsersPostResourceTest < ResourceTestCase
         before do
           post "/", valid_params_for(role).delete_if { |k, v| k == missing }
         end
-  
+
         use "return 401 because the API key is unauthorized"
         use "no change in user count"
       end
     end
-  
+
     [:role, :_api_key, :id, :created_at, :updated_at, :junk].each do |invalid|
       context "#{role} : post / but with #{invalid}" do
         before do
           post "/", valid_params_for(role).merge(invalid => 9)
         end
-  
+
         use "return 401 because the API key is unauthorized"
         use "no change in user count"
       end
     end
-  
+
     context "#{role} : post / with valid params" do
       before do
         post "/", valid_params_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in user count"
     end
@@ -78,26 +78,26 @@ class UsersPostResourceTest < ResourceTestCase
           post "/", valid_params_for(role).
             merge(@extra_admin_params).delete_if { |k, v| k == missing }
         end
-        
+
         use "return 400 Bad Request"
         use "no change in user count"
         missing_param missing
       end
     end
-  
+
     [:id, :created_at, :updated_at, :junk].each do |invalid|
       context "#{role} : post / but with #{invalid}" do
         before do
           post "/", valid_params_for(role).
             merge(@extra_admin_params).merge(invalid => 9)
         end
-  
+
         use "return 400 Bad Request"
         use "no change in user count"
         invalid_param invalid
       end
     end
-  
+
     context "#{role} : post / with valid params" do
       before do
         post "/", valid_params_for(role).merge(@extra_admin_params)
@@ -106,7 +106,7 @@ class UsersPostResourceTest < ResourceTestCase
       after do
         User.find_by_id(parsed_response_body["id"]).destroy
       end
-  
+
       use "return 201 Created"
       location_header "users"
       use "one new user"