sinatra_resource 0.4.21 → 0.4.22

data/examples/datacatalog/test/helpers/lib/request_helpers.rb

@@ -8,7 +8,7 @@ module RequestHelpers
       Crack::JSON.parse(s)
     end
   end
-  
+
   def assert_properties(correct, parsed_document)
     correct.each do |property|
       assert_include property, parsed_document
@@ -19,7 +19,7 @@ module RequestHelpers
   def self.included(includee)
     includee.extend(ClassMethods)
   end
-  
+
   module ClassMethods
     def doc_properties(correct)
       test "document should only have correct attributes" do
@@ -34,13 +34,13 @@ module RequestHelpers
         end
       end
     end
-    
+
     def invalid_param(s)
       test "should report #{s} as invalid" do
         assert_include s.to_s, parsed_response_body["errors"]["invalid_params"]
       end
     end
-    
+
     def missing_param(s)
       test "should report missing #{s}" do
         assert_include "can't be empty", parsed_response_body["errors"][s.to_s]
@@ -55,7 +55,7 @@ module RequestHelpers
         assert_equal expected, last_response.headers['Location']
       end
     end
-    
+
     def nested_location_header(parent_path, parent_ivar, child_path)
       test "should set Location header correctly" do
         base_uri = Config.environment_config["base_uri"]
@@ -67,8 +67,8 @@ module RequestHelpers
         assert_equal expected, last_response.headers['Location']
       end
     end
-    
+
 
   end
-  
+
 end

data/examples/datacatalog/test/helpers/resource_test_helper.rb

@@ -2,4 +2,4 @@ require File.dirname(__FILE__) + '/test_helper'
 require File.expand_path(File.dirname(__FILE__) + '/../../app')
 
 BAD_API_KEY = "123400005678"
-FAKE_ID = BSON::ObjectID.new.to_s
+FAKE_ID = BSON::ObjectId.new.to_s

data/examples/datacatalog/test/helpers/shared/api_keys.rb

@@ -2,43 +2,43 @@ class ResourceTestCase
 
   shared "return 400 because no params were given" do
     use "return 400 Bad Request"
-    
+
     test "body should say no params were given" do
       assert_include "errors", parsed_response_body
       assert_include "no_params", parsed_response_body["errors"]
     end
   end
 
-  shared "return 400 because params were not empty" do
+  shared "return 400 because invalid params were present" do
     use "return 400 Bad Request"
-    
-    test "body should say params were non-empty" do
+
+    test "body should say invalid params were present" do
       assert_include "errors", parsed_response_body
-      assert_include "non_empty_params", parsed_response_body["errors"]
+      assert_include "invalid_params", parsed_response_body["errors"]
     end
   end
-  
+
   shared "return 401 because the API key is invalid" do
     use "return 401 Unauthorized"
-    
+
     test "body should say the API key is invalid" do
       assert_include "errors", parsed_response_body
       assert_include "invalid_api_key", parsed_response_body["errors"]
     end
   end
-  
+
   shared "return 401 because the API key is missing" do
     use "return 401 Unauthorized"
-    
+
     test "body should say the API key is missing" do
       assert_include "errors", parsed_response_body
       assert_include "missing_api_key", parsed_response_body["errors"]
     end
   end
-  
+
   shared "return 401 because the API key is unauthorized" do
     use "return 401 Unauthorized"
-    
+
     test "body should say the API key is unauthorized" do
       assert_include "errors", parsed_response_body
       assert_include "unauthorized_api_key", parsed_response_body["errors"]

data/examples/datacatalog/test/helpers/shared/common_body_responses.rb

@@ -11,7 +11,7 @@ class ResourceTestCase
       assert_equal [], parsed_response_body
     end
   end
-  
+
   shared "content type header indicates JSON" do
     test "should have JSON content type" do
       assert_equal "application/json", last_response.headers["Content-Type"]

data/examples/datacatalog/test/helpers/shared/model_counts.rb

@@ -1,5 +1,5 @@
 class ResourceTestCase
-  
+
   # == categories
 
   shared "no change in category count" do
@@ -13,7 +13,7 @@ class ResourceTestCase
       assert_equal @category_count - 1, DataCatalog::Category.all.length
     end
   end
-  
+
   shared "one new category" do
     test "should add one category document to database" do
       assert_equal @category_count + 1, DataCatalog::Category.all.length

data/examples/datacatalog/test/helpers/shared/status_codes.rb

@@ -1,5 +1,5 @@
 class ResourceTestCase
-  
+
   shared "return 200 Ok" do
     test "status should be 200 Ok" do
       assert_equal 200, last_response.status
@@ -12,7 +12,7 @@ class ResourceTestCase
     test "status should be 201 Created" do
       assert_equal 201, last_response.status
     end
-    
+
     test "location header should start with http://localhost" do
       assert_include "Location", last_response.headers
       generic_uri = %r{^http://localhost}
@@ -26,7 +26,7 @@ class ResourceTestCase
     test "status should be 204 No Content" do
       assert_equal 204, last_response.status
     end
-    
+
     use "return an empty response body"
     use "content type header not set"
   end
@@ -65,7 +65,7 @@ class ResourceTestCase
 
   shared "return 404 Not Found with empty response body" do
     use "return 404 Not Found"
-    
+
     use "return an empty response body"
   end
 

data/examples/datacatalog/test/helpers/test_cases/resource_test_case.rb

@@ -14,15 +14,15 @@ class ResourceTestCase < Test::Unit::TestCase
       )
     end
   end
-  
+
   after :all do
     @users_by_role.each_pair { |role, user| user.destroy }
   end
-  
+
   def user_for(role)
     @users_by_role[role]
   end
-  
+
   def api_key_for(role)
     key = @users_by_role[role]._api_key
     raise "API key not found" unless key
@@ -32,5 +32,5 @@ class ResourceTestCase < Test::Unit::TestCase
   def valid_params_for(role)
     @valid_params.merge(:api_key => api_key_for(role))
   end
-  
+
 end

data/examples/datacatalog/test/helpers/test_helper.rb

@@ -1,19 +1,13 @@
 require 'rubygems'
 
-require 'test/unit'
-
+require 'crack/json'
+require 'pending'
 require 'rack/test'
 require 'rr'
-
-gem 'crack', '>= 0.1.4'
-require 'crack/json'
-
-gem 'tu-context', '>= 0.5.8'
+require 'test/unit'
+require 'timecop'
 require 'tu-context'
 
-gem 'pending', '>= 0.1.1'
-require 'pending'
-
 base = File.dirname(__FILE__)
 Dir.glob(base + '/lib/*.rb'       ).each { |f| require f }
 Dir.glob(base + '/test_cases/*.rb').each { |f| require f }

data/examples/datacatalog/test/models/categorization_test.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helpers/model_test_helper')
 
 class CategorizationTest < ModelTestCase
-  
+
   include DataCatalog
-  
+
   context "Categorization" do
     before do
       @source = create_source
@@ -13,13 +13,13 @@ class CategorizationTest < ModelTestCase
         :category_id => @category.id
       )
     end
-    
+
     after do
       @source.destroy
       @category.destroy
       @categorization.destroy
     end
-    
+
     test "Categorization#source is correct" do
       assert_equal @source, @categorization.source
     end
@@ -27,11 +27,11 @@ class CategorizationTest < ModelTestCase
     test "Categorization#category is correct" do
       assert_equal @category, @categorization.category
     end
-    
+
     test "Source#categorization is correct" do
       assert_equal [@categorization], @source.categorizations
     end
-    
+
     test "Category#categorization is correct" do
       assert_equal [@categorization], @category.categorizations
     end

data/examples/datacatalog/test/models/category_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helpers/model_test_helper')
 
 class CategoryTest < ModelTestCase
-  
+
   include DataCatalog
 
   before do
@@ -15,33 +15,33 @@ class CategoryTest < ModelTestCase
       before do
         @category = Category.new(@required)
       end
-      
+
       test "should be valid" do
         assert_equal true, @category.valid?
       end
     end
-    
+
     [:name].each do |missing|
       context "missing #{missing}" do
         before do
           @category = Category.new(@required.delete_if { |k, v| k == missing })
         end
-        
+
         missing_key(:category, missing)
       end
     end
   end
-  
+
   context "Category with 0 categorizations" do
     before do
       @category = Category.create(@required)
     end
-    
+
     test "#sources should be empty" do
       assert_equal [], @category.sources
     end
   end
-  
+
   context "Category with 3 categorizations" do
     before do
       @category = Category.create(@required)
@@ -57,7 +57,7 @@ class CategoryTest < ModelTestCase
         )
       end
     end
-  
+
     test "#sources should have 3 categorizations" do
       categorizations = @category.categorizations
       assert_equal 3, categorizations.length

data/examples/datacatalog/test/models/note_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helpers/model_test_helper')
 
 class NoteTest < ModelTestCase
-  
+
   include DataCatalog
 
   context "Note" do
@@ -12,16 +12,16 @@ class NoteTest < ModelTestCase
         :user_id => @user.id
       }
     end
-    
+
     after do
       @user.destroy
     end
-  
+
     context "correct params" do
       before do
         @note = Note.new(@required)
       end
-      
+
       test "should be valid" do
         assert_equal true, @note.valid?
       end
@@ -32,11 +32,11 @@ class NoteTest < ModelTestCase
         before do
           @note = Note.new(@required.delete_if { |k, v| k == missing })
         end
-        
+
         missing_key(:note, missing)
       end
     end
 
   end
-  
+
 end

data/examples/datacatalog/test/models/search_test.rb

@@ -25,20 +25,20 @@ class SearchUnitTest < ModelTestCase
         Search.tokens("The earth has an axial tilt of 23.439 degrees.")
     end
   end
-  
+
   context "tokenize" do
     test "simple" do
       assert_equal %w(aerospace defense systems),
         Search.tokenize(["aerospace defense", "defense systems"])
     end
   end
-  
+
   context "unstop" do
     test "simple" do
       assert_equal %w(big brown fox), Search.unstop(%w(the big brown fox))
     end
   end
-  
+
   context "process" do
     test "simple" do
       assert_equal %w(aerospace defense systems),
@@ -50,5 +50,5 @@ class SearchUnitTest < ModelTestCase
         Search.process(["The earth has an axial tilt of 23.439 degrees."])
     end
   end
-  
+
 end

data/examples/datacatalog/test/models/source_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helpers/model_test_helper')
 
 class SourceTest < ModelTestCase
-  
+
   include DataCatalog
 
   context "Source" do
@@ -11,12 +11,12 @@ class SourceTest < ModelTestCase
         :url   => "http://moneybags.gov/data/2009"
       }
     end
-  
+
     context "correct params" do
       before do
         @source = Source.new(@required)
       end
-      
+
       test "should be valid" do
         assert_equal true, @source.valid?
       end
@@ -27,11 +27,11 @@ class SourceTest < ModelTestCase
         before do
           @source = Source.new(@required.delete_if { |k, v| k == missing })
         end
-        
+
         missing_key(:source, missing)
       end
     end
 
   end
-  
+
 end

data/examples/datacatalog/test/models/user_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../helpers/model_test_helper')
 
 class UserTest < ModelTestCase
-  
+
   include DataCatalog
 
   context "User#new" do
@@ -11,27 +11,27 @@ class UserTest < ModelTestCase
         :role => "basic"
       }
     end
-  
+
     context "correct params" do
       before do
         @user = User.new(@required)
       end
-      
+
       test "should be valid" do
         assert_equal true, @user.valid?
       end
-      
+
       test "should not set api_key" do
         assert_equal nil, @user._api_key
       end
     end
-    
+
     [:name, :role].each do |missing|
       context "missing #{missing}" do
         before do
           @user = User.new(@required.delete_if { |k, v| k == missing })
         end
-        
+
         missing_key(:user, missing)
       end
     end
@@ -41,7 +41,7 @@ class UserTest < ModelTestCase
         @user = User.new(@required.merge(:role => "owner"))
         # owner is not a 'fixed' role, it is a 'relative' role
       end
-    
+
       test "should be invalid" do
         assert_equal false, @user.valid?
       end
@@ -58,20 +58,20 @@ class UserTest < ModelTestCase
         before do
           @user = User.create(@required)
         end
-        
+
         after do
           @user.destroy
         end
-    
+
         test "should be valid" do
           assert_equal true, @user.valid?
         end
-    
+
         test "should set api_key" do
           assert_not_equal nil, @user._api_key
         end
       end
     end
   end
-  
+
 end

data/examples/datacatalog/test/resources/categories/categories_delete_test.rb

@@ -20,7 +20,7 @@ class CategoriesDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@category.id}"
       end
-    
+
       use "return 401 because the API key is missing"
       use "no change in category count"
     end
@@ -29,18 +29,18 @@ class CategoriesDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@category.id}", :api_key => BAD_API_KEY
       end
-      
+
       use "return 401 because the API key is invalid"
       use "no change in category 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 category count"
     end
@@ -51,7 +51,7 @@ class CategoriesDeleteResourceTest < ResourceTestCase
           :api_key => api_key_for(role),
           :key     => "value"
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in category count"
     end
@@ -60,7 +60,7 @@ class CategoriesDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@category.id}", :api_key => api_key_for(role)
       end
-      
+
       use "return 401 because the API key is unauthorized"
       use "no change in category count"
     end
@@ -71,7 +71,7 @@ class CategoriesDeleteResourceTest < 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 category count"
     end
@@ -82,8 +82,8 @@ class CategoriesDeleteResourceTest < 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 category count"
     end
 
@@ -91,15 +91,15 @@ class CategoriesDeleteResourceTest < ResourceTestCase
       before do
         delete "/#{@category.id}", :api_key => api_key_for(role)
       end
-      
+
       use "return 204 No Content"
       use "one less category"
-      
+
       test "callbacks should work" do
         actual = last_response.headers['X-Test-Callbacks']
         assert_equal "before_destroy after_destroy", actual
       end
     end
   end
-  
+
 end

data/examples/datacatalog/test/resources/categories/categories_get_many_test.rb

@@ -14,11 +14,11 @@ class CategoriesGetManyResourceTest < ResourceTestCase
       create_category(:name => "Category #{i}")
     end
   end
-  
+
   after do
     @categories.each { |x| x.destroy } if @categories
   end
-  
+
   CATEGORIES = ["Category 0", "Category 1", "Category 2"].sort
 
   context "get /" do
@@ -26,15 +26,15 @@ class CategoriesGetManyResourceTest < 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
@@ -45,18 +45,18 @@ class CategoriesGetManyResourceTest < ResourceTestCase
         get "/", :api_key => api_key_for(role)
         @members = parsed_response_body['members']
       end
-  
+
       use "return 200 Ok"
-      
+
       test "body should have 3 categories" do
         assert_equal 3, @members.length
       end
-      
+
       test "body should have correct category names" do
         actual = @members.map { |e| e["name"] }
         assert_equal CATEGORIES, actual.sort
       end
-      
+
       test "members should only have correct attributes" do
         correct = %w(name log sources id created_at updated_at)
         @members.each do |member|