ananke 1.0.2 → 1.0.3

data/lib/ananke/helpers.rb

@@ -55,24 +55,30 @@ module Ananke
 
   def define_repository_call(mod, method_name)
     inputs = mod.method(method_name).parameters
-    repository_name = mod.name.split('::').last
-    call_def = "def self.call_#{repository_name}_#{method_name}(params)"
+    repository_name = mod.name.split('::').last.downcase
+    call_def = "def self.call_#{repository_name}_#{method_name}(params)\n"
     case inputs.length
       when 0
-        call_def << "#{mod}.send(:#{method_name})"
+        call_def << "  #{mod}.send(:#{method_name})\n"
       when 1
-        call_def << "#{mod}.send(:#{method_name}, params[:key])"
+        call_def << "  param = params[:key] ? params[:key] : params.values.first\n"
+        call_def << "  #{mod}.send(:#{method_name}, param)\n"
       else
         input_array = []
         inputs.each{|i| input_array << "params[:#{i[1]}]"}
-        call_def << "#{mod}.send(:#{method_name}, #{input_array.join(',')})"
+        call_def << "  #{mod}.send(:#{method_name}, #{input_array.join(',')})\n"
     end
     call_def << "end"
     Ananke.send(:eval, call_def)
   end
 
-  def repository_call(mod, method_name, params)
-    repository_name = mod.name.split('::').last
-    Ananke.send("call_#{repository_name}_#{method_name}", params)
+  def repository_call(mod, method_name, params = {})
+    repository_name = mod.name.split('::').last.downcase
+    begin
+      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
+    end
   end
 end

data/lib/ananke/routing.rb

@@ -59,9 +59,7 @@ module Ananke
       out(:error, "Repository for #{path} not found")
       return
     end
-    if @id.empty?
-      out :info, "No Id specified for #{path}"
-    end
+    out :info, "No Id specified for #{path}" if @id.empty?
     key = @id[:key]
     fields = @fields
     link_list = @link_list
@@ -70,18 +68,23 @@ module Ananke
 
     #===========================GET/ID=============================
     build_route mod, :one, :get, "/#{path}/:#{key}" do
-      param_missing!(key) if params[key].nil?
-      obj = mod.one(params[key])
+      new_params = collect_params(params)
+      param_missing!(key) if new_params[key].nil?
 
-      status 200
+      obj, obj_status = repository_call(mod, :one, new_params)
+      error obj_status, obj if obj_status >= 400
+
+      status obj_status
       make_response(path, mod, link_list, link_to_list, obj, key)
     end
 
     #===========================GET================================
     build_route mod, :all, :get, "/#{path}/?" do
-      obj = mod.all
+      
+      obj, obj_status = repository_call(mod, :all)
+      error obj_status, obj if obj_status >= 400
 
-      status 200
+      status obj_status
       make_response(path, mod, link_list, link_to_list, obj, key)
     end
 
@@ -90,8 +93,9 @@ module Ananke
       new_params = collect_params(params)
       status, message = validate(fields, new_params)
       error status, message unless status.nil?
-      
-      obj = repository_call(mod, :add, new_params)
+
+      obj, obj_status = repository_call(mod, :add, new_params)
+      error obj_status, obj if obj_status >= 400
 
       status 201
       make_response(path, mod, link_list, link_to_list, obj, key)
@@ -104,9 +108,10 @@ module Ananke
       status, message = validate(fields, new_params)
       error status, message unless status.nil?
 
-      obj = repository_call(mod, :edit, new_params)
+      obj, obj_status = repository_call(mod, :edit, new_params)
+      error obj_status, obj if obj_status >= 400
       
-      status 200
+      status obj_status
       make_response(path, mod, link_list, link_to_list, obj, key)
     end
 
@@ -116,9 +121,13 @@ module Ananke
 
     #===========================DELETE=============================
     build_route mod, :delete, :delete, "/#{path}/:#{key}" do
-      param_missing!(key) if params[key].nil?
-      mod.delete(params[key]) if !params[key].nil?
-      status 200
+      new_params = collect_params(params)
+      param_missing!(key) if new_params[key].nil?
+      
+      obj, obj_status = repository_call(mod, :delete, new_params)
+      error obj_status, obj if obj_status >= 400
+
+      status obj_status
     end
 
     build_route mod, :delete, :delete, "/#{path}/?" do
@@ -135,10 +144,12 @@ module Ananke
         new_params = collect_params(params)
         param_missing!(:key) if inputs.length == 1 && new_params[:key].nil?
 
-        obj = repository_call(mod, r[:name], new_params)
+        obj, obj_status = repository_call(mod, r[:name], new_params)
+        error obj_status, obj if obj_status >= 400
+        
         obj_list = obj.class == Array ? obj : [obj]
 
-        status 200
+        status obj_status
         make_response(path, mod, link_list, link_to_list, obj_list, key).gsub("\"/#{path}/\"", "\"#{request.path}\"")
       end
     end

data/lib/version.rb

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

data/spec/lib/error_spec.rb

@@ -0,0 +1,48 @@
+require './spec/spec_helper'
+require './lib/ananke'
+
+describe 'Resource Route-For' do
+  include Rack::Test::Methods
+  include Ananke
+
+  def app
+    Sinatra::Base
+  end
+
+  it """
+  should return a code 400 for an error raised in the Repository that has a message that starts with  the method name
+  """ do
+    module Repository
+      module Errors
+        def self.exception400(id)
+          raise 'exception400 - Some Exception'
+        end
+      end
+    end
+    route :errors do
+      route_for :exception400
+    end
+
+    get "/errors/exception400/1"
+    check_status(400)
+    last_response.body.should == 'exception400 - Some Exception'
+  end
+
+  it """
+  should return a code 500 for an error raised in the Repository
+  """ do
+    module Repository
+      module Errors
+        def self.exception500(id)
+          raise 'Some Exception'
+        end
+      end
+    end
+    route :errors do
+      route_for :exception500
+    end
+
+    get "/errors/exception500/1"
+    check_status(500)
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: ananke
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Andries Coetzee
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +02:00
+date: 2011-02-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,25 +100,26 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/ananke.rb
+- lib/version.rb
 - lib/ananke/settings.rb
-- lib/ananke/helpers.rb
 - lib/ananke/linking.rb
-- lib/ananke/serialize.rb
-- lib/ananke/validation.rb
 - lib/ananke/routing.rb
-- lib/version.rb
-- spec/nice_formatter.rb
-- spec/call_chain.rb
+- lib/ananke/validation.rb
+- lib/ananke/helpers.rb
+- lib/ananke/serialize.rb
 - spec/dumping.rb
 - spec/cov_adapter.rb
-- spec/lib/json_spec.rb
 - spec/lib/ananke_spec.rb
-- spec/lib/route_for_spec.rb
-- spec/lib/out_spec.rb
 - spec/lib/validation_spec.rb
-- spec/lib/linked_spec.rb
+- spec/lib/out_spec.rb
+- spec/lib/json_spec.rb
 - spec/lib/link_to_spec.rb
+- spec/lib/route_for_spec.rb
+- spec/lib/error_spec.rb
+- spec/lib/linked_spec.rb
 - spec/spec_helper.rb
+- spec/call_chain.rb
+- spec/nice_formatter.rb
 - Gemfile
 - Rakefile
 - README.rdoc
@@ -129,7 +130,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing ananke-1.0.2
+    Thank you for installing ananke-1.0.3
   
     Please be sure to look at README.rdoc to see what might have changed
     since the last release and how to use this GEM.
@@ -158,17 +159,18 @@ rubyforge_project:
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: ananke-1.0.2
+summary: ananke-1.0.3
 test_files: 
-- spec/nice_formatter.rb
-- spec/call_chain.rb
 - spec/dumping.rb
 - spec/cov_adapter.rb
-- spec/lib/json_spec.rb
 - spec/lib/ananke_spec.rb
-- spec/lib/route_for_spec.rb
-- spec/lib/out_spec.rb
 - spec/lib/validation_spec.rb
-- spec/lib/linked_spec.rb
+- spec/lib/out_spec.rb
+- spec/lib/json_spec.rb
 - spec/lib/link_to_spec.rb
+- spec/lib/route_for_spec.rb
+- spec/lib/error_spec.rb
+- spec/lib/linked_spec.rb
 - spec/spec_helper.rb
+- spec/call_chain.rb
+- spec/nice_formatter.rb