sinatra_resource 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/examples/datacatalog/resources/categories.rb

@@ -37,7 +37,7 @@ module DataCatalog
       category.log += " after_create"
     end
 
-    callback :before_update do |action|
+    callback :before_update do |action, category|
       action.params["log"] = "before_update"
     end
     
@@ -45,7 +45,7 @@ module DataCatalog
       category.log += " after_update"
     end
 
-    callback :before_destroy do |action|
+    callback :before_destroy do |action, category|
       action.headers 'X-Test-Callbacks' => 'before_destroy'
     end
     

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

@@ -39,6 +39,15 @@ class CategoriesPutResourceTest < ResourceTestCase
   end
 
   %w(basic).each do |role|
+    context "#{role} : put /:id with no params" do
+      before do
+        put "/#{@category.id}", :api_key => api_key_for(role)
+      end
+
+      use "return 401 because the API key is unauthorized"
+      use "category unchanged"
+    end
+
     [:created_at, :updated_at, :sources, :junk].each do |invalid|
       context "#{role} : put /:id but with #{invalid}" do
         before do
@@ -61,11 +70,11 @@ class CategoriesPutResourceTest < ResourceTestCase
       end
     end
 
-    context "#{role} : put /:id with no params" do
+    context "#{role} : put /:fake_id with valid params" do
       before do
-        put "/#{@category.id}", :api_key => api_key_for(role)
+        put "/#{FAKE_ID}", valid_params_for(role)
       end
-
+      
       use "return 401 because the API key is unauthorized"
       use "category unchanged"
     end
@@ -81,6 +90,25 @@ class CategoriesPutResourceTest < ResourceTestCase
   end
   
   %w(curator admin).each do |role|
+    context "#{role} : put /:fake_id with no params" do
+      before do
+        put "/#{FAKE_ID}", :api_key => api_key_for(role)
+      end
+
+      use "return 400 because no params were given"
+      # (The 400 'takes precedence' over the 404.)
+      use "category unchanged"
+    end
+
+    context "#{role} : put /:id with no params" do
+      before do
+        put "/#{@category.id}", :api_key => api_key_for(role)
+      end
+
+      use "return 400 because no params were given"
+      use "category unchanged"
+    end
+
     [:created_at, :updated_at, :sources, :junk].each do |invalid|
       context "#{role} : put /:id but with #{invalid}" do
         before do
@@ -93,6 +121,18 @@ class CategoriesPutResourceTest < ResourceTestCase
       end
     end
 
+    [:name].each do |erase|
+      context "#{role} : put /:fake_id but blanking out #{erase}" do
+        before do
+          put "/#{FAKE_ID}", valid_params_for(role).merge(erase => "")
+        end
+      
+        use "return 404 Not Found with empty response body"
+        # (The 404 'takes precedence' over the 400.)
+        use "category unchanged"
+      end
+    end  
+
     [:name].each do |erase|
       context "#{role} : put /:id but blanking out #{erase}" do
         before do
@@ -105,12 +145,12 @@ class CategoriesPutResourceTest < ResourceTestCase
       end
     end
 
-    context "#{role} : put /:id with no params" do
+    context "#{role} : put /:fake_id with valid params" do
       before do
-        put "/#{@category.id}", :api_key => api_key_for(role)
+        put "/#{FAKE_ID}", valid_params_for(role)
       end
-
-      use "return 400 because no params were given"
+      
+      use "return 404 Not Found with empty response body"
       use "category unchanged"
     end
 

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

@@ -73,6 +73,15 @@ class SourcesPutResourceTest < ResourceTestCase
         use "source unchanged"
       end
     end
+
+    context "#{role} : put /:fake_id with valid params" do
+      before do
+        put "/#{FAKE_ID}", valid_params_for(role)
+      end
+      
+      use "return 401 because the API key is unauthorized"
+      use "source unchanged"
+    end
   
     context "#{role} : put /:id with valid params" do
       before do
@@ -97,6 +106,18 @@ class SourcesPutResourceTest < ResourceTestCase
       end
     end
 
+    [:title, :url].each do |erase|
+      context "#{role} : put /:fake_id but blanking out #{erase}" do
+        before do
+          put "/#{FAKE_ID}", valid_params_for(role).merge(erase => "")
+        end
+      
+        use "return 404 Not Found with empty response body"
+        # (The 404 'takes precedence' over the 400.)
+        use "source unchanged"
+      end
+    end  
+
     [:title, :url].each do |erase|
       context "#{role} : put /:id but blanking out #{erase}" do
         before do
@@ -128,6 +149,15 @@ class SourcesPutResourceTest < ResourceTestCase
       end
     end
 
+    context "#{role} : put /:fake_id with valid params" do
+      before do
+        put "/#{FAKE_ID}", valid_params_for(role)
+      end
+      
+      use "return 404 Not Found with empty response body"
+      use "source unchanged"
+    end
+
     context "#{role} : put /:id with valid params" do
       before do
         put "/#{@source.id}", valid_params_for(role)
@@ -146,6 +176,25 @@ class SourcesPutResourceTest < ResourceTestCase
   end
   
   %w(admin).each do |role|
+    context "#{role} : put /:fake_id with no params" do
+      before do
+        put "/#{FAKE_ID}", :api_key => api_key_for(role)
+      end
+
+      use "return 400 because no params were given"
+      # (The 400 'takes precedence' over the 404.)
+      use "source unchanged"
+    end
+
+    context "#{role} : put /:id with no params" do
+      before do
+        put "/#{@source.id}", :api_key => api_key_for(role)
+      end
+
+      use "return 400 because no params were given"
+      use "source unchanged"
+    end
+
     [:created_at, :updated_at, :categories, :junk].each do |invalid|
       context "#{role} : put /:id but with #{invalid}" do
         before do
@@ -159,6 +208,19 @@ class SourcesPutResourceTest < ResourceTestCase
       end
     end
 
+    [:title, :url].each do |erase|
+      context "#{role} : put /:fake_id but blanking out #{erase}" do
+        before do
+          put "/#{FAKE_ID}", valid_params_for(role).
+            merge(@extra_admin_params).merge(erase => "")
+        end
+      
+        use "return 404 Not Found with empty response body"
+        # (The 404 'takes precedence' over the 400.)
+        use "source unchanged"
+      end
+    end
+
     [:title, :url].each do |erase|
       context "#{role} : put /:id but blanking out #{erase}" do
         before do
@@ -172,15 +234,6 @@ class SourcesPutResourceTest < ResourceTestCase
       end
     end  
 
-    context "#{role} : put /:id with no params" do
-      before do
-        put "/#{@source.id}", :api_key => api_key_for(role)
-      end
-
-      use "return 400 because no params were given"
-      use "source unchanged"
-    end
-
     [:title, :url].each do |missing|
       context "#{role} : put /:id without #{missing}" do
         before do
@@ -201,6 +254,15 @@ class SourcesPutResourceTest < ResourceTestCase
       end
     end
 
+    context "#{role} : put /:fake_id with valid params" do
+      before do
+        put "/#{FAKE_ID}", valid_params_for(role).merge(@extra_admin_params)
+      end
+      
+      use "return 404 Not Found with empty response body"
+      use "source unchanged"
+    end
+
     context "#{role} : put /:id with valid params" do
       before do
         put "/#{@source.id}", valid_params_for(role).merge(@extra_admin_params)

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

@@ -77,6 +77,15 @@ class UsersPutResourceTest < ResourceTestCase
       end
     end
 
+    context "#{role} : put /:fake_id with valid params" do
+      before do
+        put "/#{FAKE_ID}", valid_params_for(role)
+      end
+    
+      use "return 401 because the API key is unauthorized"
+      use "user unchanged"
+    end
+
     context "#{role} : put /:id with valid params" do
       before do
         put "/#{@user.id}", valid_params_for(role)
@@ -88,6 +97,25 @@ class UsersPutResourceTest < ResourceTestCase
   end
 
   %w(admin).each do |role|
+    context "#{role} : put /:fake_id with no params" do
+      before do
+        put "/#{FAKE_ID}", :api_key => api_key_for(role)
+      end
+
+      use "return 400 because no params were given"
+      # (The 400 'takes precedence' over the 404.)
+      use "user unchanged"
+    end
+
+    context "#{role} : put /:id with no params" do
+      before do
+        put "/#{@user.id}", :api_key => api_key_for(role)
+      end
+
+      use "return 400 because no params were given"
+      use "user unchanged"
+    end
+
     [:created_at, :updated_at, :junk].each do |invalid|
       context "#{role} : put /:id but with #{invalid}" do
         before do
@@ -114,13 +142,16 @@ class UsersPutResourceTest < ResourceTestCase
       end
     end
 
-    context "#{role} : put /:id with no params" do
-      before do
-        put "/#{@user.id}", :api_key => api_key_for(role)
+    [:name, :role].each do |missing|
+      context "#{role} : put /:fake_id without #{missing}" do
+        before do
+          put "/#{FAKE_ID}", valid_params_for(role).
+            merge(@extra_admin_params).delete_if { |k, v| k == missing }
+        end
+      
+        use "return 404 Not Found with empty response body"
+        use "user unchanged"
       end
-
-      use "return 400 because no params were given"
-      use "user unchanged"
     end
 
     [:name, :role].each do |missing|
@@ -143,6 +174,15 @@ class UsersPutResourceTest < ResourceTestCase
       end
     end
 
+    context "#{role} : put /:fake_id with valid params" do
+      before do
+        put "/#{FAKE_ID}", valid_params_for(role).merge(@extra_admin_params)
+      end
+    
+      use "return 404 Not Found with empty response body"
+      use "user unchanged"
+    end
+
     context "#{role} : put /:id with valid params" do
       before do
         put "/#{@user.id}", valid_params_for(role).merge(@extra_admin_params)

data/lib/builder/action_definitions.rb

@@ -43,7 +43,7 @@ module SinatraResource
           check_related?(parent_document, association, id)
         end
         check_params(:update, role, resource_config, leaf)
-        do_callback(:before_update, resource_config, nil)
+        do_callback(:before_update, resource_config, find_document!(model, id))
         document = update_document!(model, id)
         do_callback(:after_update, resource_config, document)
         document
@@ -55,7 +55,7 @@ module SinatraResource
           check_related?(parent_document, association, id)
         end
         check_params(:delete, role, resource_config, leaf)
-        do_callback(:before_destroy, resource_config, nil)
+        do_callback(:before_destroy, resource_config, find_document!(model, id))
         document = delete_document!(model, id)
         do_callback(:after_destroy, resource_config, document)
         document

data/sinatra_resource.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_resource
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - David James