ananke 1.0.3 → 1.0.4

data/lib/ananke/helpers.rb

@@ -78,7 +78,8 @@ module Ananke
       return Ananke.send("call_#{repository_name}_#{method_name}", params), 200
     rescue StandardError => error
       raise if !error.message.start_with?(method_name.to_s)
-      return error.message, 400
+      message = error.message.split(method_name.to_s).last.split('-').last.split(':').last.strip
+      return message, 400
     end
   end
 end

data/lib/ananke/routing.rb

@@ -41,7 +41,7 @@ module Ananke
   def make_response(path, mod, link_list, link_to_list, obj, key)
     if obj.class == Array
       result_list = []
-      obj.each{|i| result_list << make_response_item(path, mod, link_list, link_to_list, i, key)}
+      obj.each{|i| result_list << make_response_item(path, mod, link_list, link_to_list, i, key) if i}
 
       dic = result_list.empty? ? {} : {"#{path}_list".to_sym => result_list}
       link_self = build_link_self(path, '') if Ananke.settings[:links]
@@ -73,6 +73,7 @@ module Ananke
 
       obj, obj_status = repository_call(mod, :one, new_params)
       error obj_status, obj if obj_status >= 400
+      not_found if obj && obj.class == Array && obj.empty?
 
       status obj_status
       make_response(path, mod, link_list, link_to_list, obj, key)
@@ -83,6 +84,7 @@ module Ananke
       
       obj, obj_status = repository_call(mod, :all)
       error obj_status, obj if obj_status >= 400
+      not_found if obj && obj.class == Array && obj.empty?
 
       status obj_status
       make_response(path, mod, link_list, link_to_list, obj, key)
@@ -96,6 +98,7 @@ module Ananke
 
       obj, obj_status = repository_call(mod, :add, new_params)
       error obj_status, obj if obj_status >= 400
+      not_found if obj && obj.class == Array && obj.empty?
 
       status 201
       make_response(path, mod, link_list, link_to_list, obj, key)
@@ -110,6 +113,7 @@ module Ananke
 
       obj, obj_status = repository_call(mod, :edit, new_params)
       error obj_status, obj if obj_status >= 400
+      not_found if obj && obj.class == Array && obj.empty?
       
       status obj_status
       make_response(path, mod, link_list, link_to_list, obj, key)
@@ -126,6 +130,7 @@ module Ananke
       
       obj, obj_status = repository_call(mod, :delete, new_params)
       error obj_status, obj if obj_status >= 400
+      not_found if obj && obj.class == Array && obj.empty?
 
       status obj_status
     end
@@ -146,6 +151,7 @@ module Ananke
 
         obj, obj_status = repository_call(mod, r[:name], new_params)
         error obj_status, obj if obj_status >= 400
+        not_found if obj && obj.class == Array && obj.empty?
         
         obj_list = obj.class == Array ? obj : [obj]
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ananke
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/lib/error_spec.rb

@@ -25,7 +25,7 @@ describe 'Resource Route-For' do
 
     get "/errors/exception400/1"
     check_status(400)
-    last_response.body.should == 'exception400 - Some Exception'
+    last_response.body.should == 'Some Exception'
   end
 
   it """
@@ -45,4 +45,29 @@ describe 'Resource Route-For' do
     get "/errors/exception500/1"
     check_status(500)
   end
+
+  it """
+  should return a code 404 for an empty Array object returned
+  """ do
+    module Repository
+      module Errors
+        def self.one(id)
+          []
+        end
+        def self.empty(id)
+          []
+        end
+      end
+    end
+    route :errors do
+      id :id
+      route_for :empty
+    end
+
+    get "/errors/empty/1"
+    check_status(404)
+
+    get "/errors/1"
+    check_status(404)
+  end
 end

data/spec/lib/validation_spec.rb

@@ -70,7 +70,9 @@ describe 'Resource' do
     end
     module Repository
       module Added
-        def self.add(data)end
+        def self.add(data)
+          nil
+        end
       end
     end
     route :added do

metadata

@@ -2,7 +2,7 @@
 name: ananke
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Andries Coetzee
@@ -130,7 +130,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing ananke-1.0.3
+    Thank you for installing ananke-1.0.4
   
     Please be sure to look at README.rdoc to see what might have changed
     since the last release and how to use this GEM.
@@ -159,7 +159,7 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: ananke-1.0.3
+summary: ananke-1.0.4
 test_files: 
 - spec/dumping.rb
 - spec/cov_adapter.rb