sinatra_resource 0.4.21 → 0.4.22

data/examples/datacatalog/test/resources/notes/notes_post_test.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../helpers/resource_test_helper')
 
 class NotesPostResourceTest < ResourceTestCase
-  
+
   include DataCatalog
 
   def app; Notes end
-  
+
   before do
     @note_count = Note.all.length
     @user = create_user
@@ -14,7 +14,7 @@ class NotesPostResourceTest < ResourceTestCase
       :user_id => @user.id
     }
   end
-  
+
   after do
     @user.destroy
   end
@@ -24,7 +24,7 @@ class NotesPostResourceTest < ResourceTestCase
       before do
         post "/", @valid_params
       end
-    
+
       use "return 401 because the API key is missing"
       use "no change in note count"
     end
@@ -33,7 +33,7 @@ class NotesPostResourceTest < 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 note count"
     end
@@ -45,39 +45,39 @@ class NotesPostResourceTest < ResourceTestCase
         before do
           post "/", valid_params_for(role).delete_if { |k, v| k == missing }
         end
-  
+
         use "return 400 Bad Request"
         use "no change in note 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(invalid => 9)
         end
-  
+
         use "return 400 Bad Request"
         use "no change in note count"
         invalid_param invalid
       end
     end
-  
+
     context "#{role} : post / with valid params" do
       before do
         post "/", valid_params_for(role)
       end
-  
+
       after do
         Note.find_by_id(parsed_response_body["id"]).destroy
       end
-  
+
       use "return 201 Created"
       location_header "notes"
       use "one new note"
       doc_properties %w(text user_id id created_at updated_at)
-  
+
       test "should set all fields in database" do
         note = Note.find_by_id(parsed_response_body["id"])
         raise "Cannot find note" unless note

data/examples/datacatalog/test/resources/sources/sources_delete_test.rb

@@ -14,13 +14,13 @@ class SourcesDeleteResourceTest < ResourceTestCase
   after do
     @source.destroy
   end
-  
+
   context "delete /:id" do
     context "anonymous" do
       before do
         delete "/#{@source.id}"
       end
-    
+
       use "return 401 because the API key is missing"
       use "no change in source count"
     end
@@ -29,18 +29,18 @@ class SourcesDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@source.id}", :api_key => BAD_API_KEY
       end
-      
+
       use "return 401 because the API key is invalid"
       use "no change in source count"
     end
   end
-  
+
   %w(basic).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 source count"
     end
@@ -51,7 +51,7 @@ class SourcesDeleteResourceTest < ResourceTestCase
           :api_key => api_key_for(role),
           :key     => "value"
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in source count"
     end
@@ -60,7 +60,7 @@ class SourcesDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@source.id}", :api_key => api_key_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in source count"
     end
@@ -71,7 +71,7 @@ class SourcesDeleteResourceTest < ResourceTestCase
       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 source count"
     end
@@ -82,8 +82,8 @@ class SourcesDeleteResourceTest < ResourceTestCase
           :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 source count"
     end
 
@@ -91,10 +91,10 @@ class SourcesDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@source.id}", :api_key => api_key_for(role)
       end
-      
+
       use "return 204 No Content"
       use "one less source"
     end
   end
-  
+
 end

data/examples/datacatalog/test/resources/sources/sources_get_many_search_test.rb

@@ -45,48 +45,48 @@ class SourcesGetManySearchResourceTest < ResourceTestCase
   after do
     @sources.each { |x| x.destroy } if @sources
   end
-  
+
   context "search=arrest" do
     before do
       @search_params = { :search => "arrest" }
     end
-  
+
     context "get /" do
       context "anonymous" do
         before do
           get "/", @search_params
         end
-    
+
         use "return 401 because the API key is missing"
       end
-    
+
       context "incorrect API key" do
         before do
           get "/", @search_params.merge(:api_key => BAD_API_KEY)
         end
-    
+
         use "return 401 because the API key is invalid"
       end
     end
-  
+
     %w(basic curator admin).each do |role|
       context "#{role} : get /" do
         before do
           get "/", @search_params.merge(:api_key => api_key_for(role))
           @members = parsed_response_body['members']
         end
-  
+
         use "return 200 Ok"
-  
+
         test "body should have 1 source" do
           assert_equal 1, @members.length
         end
-        
+
         test "body should have correct source" do
           assert_equal %{2007 Crime in the United States},
             @members[0]['title']
         end
-        
+
         test "members should only have correct attributes" do
           correct = %w(title url categories id created_at updated_at)
           @members.each do |member|
@@ -96,21 +96,21 @@ class SourcesGetManySearchResourceTest < ResourceTestCase
       end
     end
   end
-  
+
   context "search=quotations" do
     before do
       @search_params = { :search => "quotations" }
     end
-  
+
     %w(basic).each do |role|
       context "#{role} : get /" do
         before do
           get "/", @search_params.merge(:api_key => api_key_for(role))
           @members = parsed_response_body['members']
         end
-  
+
         use "return 200 Ok"
-        
+
         test "body should have correct sources" do
           titles = @members.map { |x| x['title'] }
           assert_equal 2, titles.length
@@ -125,16 +125,16 @@ class SourcesGetManySearchResourceTest < ResourceTestCase
     before do
       @search_params = { :search => "flight delays" }
     end
-  
+
     %w(basic).each do |role|
       context "#{role} : get /" do
         before do
           get "/", @search_params.merge(:api_key => api_key_for(role))
           @members = parsed_response_body['members']
         end
-  
+
         use "return 200 Ok"
-        
+
         test "body should have correct sources" do
           titles = @members.map { |x| x['title'] }
           assert_equal 1, titles.length
@@ -148,16 +148,16 @@ class SourcesGetManySearchResourceTest < ResourceTestCase
     before do
       @search_params = { :search => "" }
     end
-  
+
     %w(basic).each do |role|
       context "#{role} : get /" do
         before do
           get "/", @search_params.merge(:api_key => api_key_for(role))
           @members = parsed_response_body['members']
         end
-  
+
         use "return 200 Ok"
-        
+
         test "body should have no sources" do
           titles = @members.map { |x| x['title'] }
           assert_equal 0, titles.length

data/examples/datacatalog/test/resources/sources/sources_get_many_test.rb

@@ -13,25 +13,25 @@ class SourcesGetManyResourceTest < ResourceTestCase
     end
     @source_titles = ["Source 0", "Source 1", "Source 2"].sort
   end
-  
+
   after do
     @sources.each { |x| x.destroy } if @sources
   end
-  
+
   context "get /" do
     context "anonymous" do
       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
@@ -42,13 +42,13 @@ class SourcesGetManyResourceTest < ResourceTestCase
         get "/", :api_key => api_key_for(role)
         @members = parsed_response_body['members']
       end
-  
+
       use "return 200 Ok"
-      
+
       test "body should have 3 sources" do
         assert_equal 3, @members.length
       end
-      
+
       test "body should have correct source titles" do
         actual = @members.map { |e| e["title"] }
         assert_equal @source_titles, actual.sort

data/examples/datacatalog/test/resources/sources/sources_get_one_test.rb

@@ -5,13 +5,15 @@ class SourcesGetOneResourceTest < ResourceTestCase
   include DataCatalog
 
   def app; Sources end
-  
+
   before do
+    Timecop.freeze(Time.local(2010, 7, 4, 15, 0, 0))
     @source = create_source
   end
 
   after do
     @source.destroy
+    Timecop.return
   end
 
   context "get /:id" do
@@ -19,7 +21,7 @@ class SourcesGetOneResourceTest < ResourceTestCase
       before do
         get "/#{@source.id}"
       end
-    
+
       use "return 401 because the API key is missing"
     end
 
@@ -27,7 +29,7 @@ class SourcesGetOneResourceTest < ResourceTestCase
       before do
         get "/#{@source.id}", :api_key => BAD_API_KEY
       end
-  
+
       use "return 401 because the API key is invalid"
     end
   end
@@ -37,7 +39,7 @@ class SourcesGetOneResourceTest < ResourceTestCase
       before do
         get "/#{FAKE_ID}", :api_key => api_key_for(role)
       end
-    
+
       use "return 404 Not Found with empty response body"
     end
 
@@ -50,15 +52,15 @@ class SourcesGetOneResourceTest < ResourceTestCase
         )
         get "/#{@source.id}", :api_key => api_key_for(role)
       end
-    
+
       after do
         @category.destroy
         @categorization.destroy
       end
-    
+
       use "return 200 Ok"
       doc_properties %w(title url categories id created_at updated_at)
-    
+
       test "body should have correct categories" do
         expected = [
           {
@@ -69,13 +71,19 @@ class SourcesGetOneResourceTest < ResourceTestCase
         ]
         assert_equal expected, parsed_response_body["categories"]
       end
+
+      test "correct timestamp format" do
+        parsed = parsed_response_body
+        assert_equal Time.local(2010, 7, 4, 15, 0, 0), parsed['created_at']
+        assert_equal Time.local(2010, 7, 4, 15, 0, 0), parsed['updated_at']
+      end
     end
-    
+
     context "#{role} : get /:id?show=all" do
       before do
         get "/#{@source.id}?show=all", :api_key => api_key_for(role)
       end
-    
+
       use "return 200 Ok"
       doc_properties %w(title url raw categories id created_at updated_at)
     end

data/examples/datacatalog/test/resources/sources/sources_post_test.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../helpers/resource_test_helper')
 
 class SourcesPostResourceTest < ResourceTestCase
-  
+
   include DataCatalog
 
   def app; Sources end
-  
+
   before do
     @source_count = Source.all.length
     @valid_params = {
@@ -20,7 +20,7 @@ class SourcesPostResourceTest < ResourceTestCase
       before do
         post "/", @valid_params
       end
-    
+
       use "return 401 because the API key is missing"
       use "no change in source count"
     end
@@ -29,7 +29,7 @@ class SourcesPostResourceTest < 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 source count"
     end
@@ -52,7 +52,7 @@ class SourcesPostResourceTest < ResourceTestCase
         before do
           post "/", valid_params_for(role).merge(invalid => 9)
         end
-  
+
         use "return 401 because the API key is unauthorized"
         use "no change in source count"
       end
@@ -62,12 +62,12 @@ class SourcesPostResourceTest < ResourceTestCase
       before do
         post "/", valid_params_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in source count"
     end
   end
-  
+
   %w(curator).each do |role|
     [:title, :url].each do |missing|
       context "#{role} : post / but missing #{missing}" do
@@ -86,13 +86,13 @@ class SourcesPostResourceTest < ResourceTestCase
         before do
           post "/", valid_params_for(role).merge(invalid => 9)
         end
-  
+
         use "return 400 Bad Request"
         use "no change in source count"
         invalid_param invalid
       end
     end
-  
+
     context "#{role} : post / with valid params" do
       before do
         post "/", valid_params_for(role)
@@ -101,7 +101,7 @@ class SourcesPostResourceTest < ResourceTestCase
       after do
         Source.find_by_id(parsed_response_body["id"]).destroy
       end
-  
+
       use "return 201 Created"
       location_header "sources"
       use "one new source"
@@ -137,13 +137,13 @@ class SourcesPostResourceTest < ResourceTestCase
           post "/", valid_params_for(role).
             merge(@extra_admin_params).merge(invalid => 9)
         end
-  
+
         use "return 400 Bad Request"
         use "no change in source count"
         invalid_param invalid
       end
     end
-  
+
     context "#{role} : post / with valid params" do
       before do
         post "/", valid_params_for(role).merge(@extra_admin_params)
@@ -152,7 +152,7 @@ class SourcesPostResourceTest < ResourceTestCase
       after do
         Source.find_by_id(parsed_response_body["id"]).destroy
       end
-  
+
       use "return 201 Created"
       location_header "sources"
       use "one new source"