angus 0.0.6 → 0.0.7

data/lib/angus/base.rb

@@ -9,6 +9,7 @@ require_relative 'responses'
 require_relative 'renders/base'
 require_relative 'marshallings/base'
 require_relative 'base_actions'
+require_relative 'proxy_actions'
 require_relative 'definition_reader'
 
 require 'angus/sdoc'
@@ -16,16 +17,20 @@ require 'angus/sdoc'
 module Angus
   class Base < RequestHandler
     include BaseActions
+    include ProxyActions
 
     FIRST_VERSION = '0.1'
 
-    PRODUCTION_ENV    = :production
-    DEVELOPMENT_ENV   = :development
-    TEST_ENV          = :test
-    DEFAULT_ENV       = DEVELOPMENT_ENV
+    PRODUCTION_ENV        = :production
+    DEVELOPMENT_ENV       = :development
+    TEST_ENV              = :test
+    DEFAULT_ENV           = DEVELOPMENT_ENV
+    DEFAULT_DOC_LANGUAGE  = :en
 
     attr_reader :definitions
 
+    attr_accessor :default_doc_language
+
     def initialize
       super
 
@@ -35,9 +40,16 @@ module Angus
       @configured             = false
       @definitions            = nil
       @logger                 = Logger.new(STDOUT)
+      @default_doc_language   = DEFAULT_DOC_LANGUAGE
 
       configure!
 
+      after_configure
+    end
+
+    def after_configure
+      super
+
       register_base_routes
       register_resources_routes
     end
@@ -113,7 +125,6 @@ module Angus
           response = Response.new
 
           resource = resource_definition.resource_class.new(request, params)
-          response['Content-Type'] = 'application/json'
 
           op_response = resource.send(operation.code_name)
           op_response = {} unless op_response.is_a?(Hash)

data/lib/angus/base_actions.rb

@@ -27,7 +27,9 @@ module Angus
         if params[:format] == 'json'
           render(response, Angus::SDoc::JsonFormatter.format_service(@definitions), format: :json)
         else
-          render(response, Angus::SDoc::HtmlFormatter.format_service(@definitions), format: :html)
+          language = params[:lang] || self.default_doc_language
+          render(response, Angus::SDoc::HtmlFormatter.format_service(@definitions, language),
+                 format: :html)
         end
       end
     end

data/lib/angus/definition_reader.rb

@@ -3,8 +3,8 @@ module Angus
 
     attr_reader :definitions
 
-    def initialize
-      @definitions = SDoc::DefinitionsReader.service_definition('definitions')
+    def initialize(definitions = nil)
+      @definitions = definitions || SDoc::DefinitionsReader.service_definition('definitions')
     end
 
     def message_definition(key, level)

data/lib/angus/generator.rb

@@ -13,7 +13,7 @@ module Angus
     NEW_APP_DIRECTORIES = %W(#{DEFINITIONS_DIR} #{RESOURCES_DIR} #{SERVICES_DIR})
 
     NEW_APP_FILES = %w(
-      Gemfile
+      Gemfile.erb
       config.ru.erb
       services/service.rb.erb
       definitions/messages.yml

data/lib/angus/generator/templates/{Gemfile → Gemfile.erb}

@@ -2,4 +2,4 @@ source 'http://rubygems.org'
 
 gem 'rake'
 
-gem 'angus',  '~> 0.0'
+gem 'angus', '<%= Angus::VERSION %>'

data/lib/angus/generator/templates/config.ru.erb

@@ -7,4 +7,4 @@ Bundler.setup
 require 'angus'
 require 'services/<%= app_name %>'
 
-run <%= classify(name) %>.build
+run <%= classify(name) %>.new

data/lib/angus/marshallings/base.rb

@@ -1,2 +1,2 @@
 require_relative 'marshalling'
-require_relative 'unmarshalling'
+require_relative 'exceptions'

data/lib/angus/marshallings/exceptions.rb

@@ -0,0 +1,17 @@
+module Angus
+  module Marshalling
+
+    class InvalidGetterError < StandardError
+
+      def initialize(getter, bc_first_line = nil)
+        @getter = getter
+        @bc_first_line = bc_first_line
+      end
+
+      def message
+        "The requested getter (#@getter) does not exist. #@bc_first_line"
+      end
+    end
+
+  end
+end

data/lib/angus/marshallings/marshalling.rb

@@ -4,26 +4,6 @@ require 'date'
 module Angus
   module Marshalling
 
-    # Marshal an object
-    #
-    # This method is intended for scalar objects and arrays of scalar objects.
-    #
-    # For more complex objects:
-    # @see Angus::Marshalling.marshal_object
-    #
-    # @param object The object to be marshalled
-    # @return [Array] An object suitable for be converted easily to JSON notation
-    #
-    # If {object} is an array, this method returns an array with all the elements marshalled
-    # Else returns a marshalled representation of the object.
-    def self.marshal(object)
-      if object.is_a?(Array)
-        object.map { |element| marshal(element) }
-      else
-        marshal_scalar(object)
-      end
-    end
-
     # Marshal a complex object.
     #
     # @param object The object to be marshalled
@@ -36,8 +16,11 @@ module Angus
           key = getter.keys[0]
           value = get_value(object, key)
 
-          #TODO Consider adding ActiveRecord::Relation support
-          #ex: "if value.is_a?(Array) || value.is_a?(ActiveRecord::Relation)"
+          #HACK to support ActiveRecord::Relation
+          if defined?(ActiveRecord::Relation) && value.is_a?(ActiveRecord::Relation)
+            value = value.to_a
+          end
+
           if value.is_a?(Array)
             result[key] = value.map { |object| marshal_object(object, getter.values[0]) }
           else
@@ -57,8 +40,8 @@ module Angus
     #
     # @param [Object] object The object to get the value from
     # @param [Symbol, String] getter to request from the object
-    # @raise [InvalidGetterError] when getter is not present
-    # in the object
+    # @raise [InvalidGetterError] when getter is not present in the object
+    #
     # @return [Object] the requested value
     def self.get_value(object, getter)
       if object.is_a?(Hash)
@@ -72,8 +55,9 @@ module Angus
     #
     # @param [Object] object The object to get the value from
     # @param [Symbol, String] method the method to invoke in the object
-    # @raise [InvalidGetterError] when the object does not responds
-    # to method as public.
+    #
+    # @raise [InvalidGetterError] when the object does not responds to method as public.
+    #
     # @return [Object] the requested value
     def self.get_value_from_object(object, method)
       value = object.public_send method.to_sym
@@ -85,9 +69,8 @@ module Angus
       else
         value
       end
-    # TODO ver si tirar una exception especifica o que hacer?
-    #rescue NoMethodError => error
-    #  raise InvalidGetterError.new(method, error.backtrace.first)
+    rescue NoMethodError => error
+      raise Marshalling::InvalidGetterError.new(method, error.backtrace.first)
     end
 
     # Gets a value from a hash for a given key.
@@ -106,8 +89,7 @@ module Angus
       elsif hash.has_key?(key.to_s)
         hash[key.to_s]
       else
-        #raise InvalidGetterError.new(key)
-        raise NoMethodError.new(key.to_s)
+        raise Marshalling::InvalidGetterError.new(key)
       end
     end
 

data/lib/angus/middleware/exception_handler.rb

@@ -8,9 +8,9 @@ module Angus
     class ExceptionHandler
       include Angus::StatusCodes
 
-      def initialize(app)
+      def initialize(app, definitions = nil)
         @app = app
-        @definition_reader = Angus::DefinitionReader.new
+        @definition_reader = Angus::DefinitionReader.new(definitions)
       end
 
       def call(env)
@@ -29,7 +29,6 @@ module Angus
 
       private
 
-
       # Builds a service error response
       def build_error_response(error)
         error_messages = messages_from_error(error)
@@ -37,7 +36,6 @@ module Angus
         JsonRender.convert(:status => :error, :messages => error_messages)
       end
 
-
       # Returns an array of messages errors to be sent in an operation response
       #
       # If {error} respond_to? :errors then the method returns one error message
@@ -59,16 +57,15 @@ module Angus
             messages << {:level => level, :key => key, :dsc => description}
           end
         elsif error.respond_to?(:error_key)
-          messages << {:level => level, :key => error.error_key,
-                       :dsc => error_message(error)}
+          messages << { :level => level, :key => error.error_key,
+                        :dsc => error_message(error) }
         else
-          messages << {:level => level, :key => error.class.name, :dsc => error.message}
+          messages << { :level => level, :key => error.class.name, :dsc => error.message }
         end
 
         messages
       end
 
-
       # Returns the message for an error.
       #
       # It first tries to get the message from text attribute of the error definition
@@ -103,7 +100,8 @@ module Angus
 
       # Returns a suitable HTTP status code for the given error
       #
-      # If error param responds to #errors, then #{HTTP_STATUS_CODE_CONFLICT} will be returned.
+      # If error param responds to #errors, then #{StatusCodes::HTTP_STATUS_CODE_CONFLICT} will
+      # be returned.
       #
       # If error param responds to #error_key, then the status_code associated
       #  with the message will be returned.

data/lib/angus/proxy_actions.rb

@@ -0,0 +1,75 @@
+module Angus
+  module ProxyActions
+
+    def after_configure
+      register_proxy_actions
+      register_proxy_routes
+    end
+
+    def register_proxy_routes
+      @definitions.proxy_operations.each do |proxy_operation|
+        register_proxy_route(proxy_operation)
+      end
+    end
+
+    def register_proxy_actions
+      router.on(:get, File.join(doc_path, '/proxy/:service')) do |env, params|
+        require 'picasso-remote'
+        response = Response.new
+
+        service = params[:service]
+
+        remote_definition = Picasso::Remote::ServiceDirectory.service_definition(service)
+
+        render(response, Picasso::SDoc::JsonFormatter.format_service(remote_definition),
+               format: :json)
+      end
+    end
+
+    def register_proxy_route(proxy_operation)
+      require 'picasso-remote'
+
+      remote_api_uri = Picasso::Remote::ServiceDirectory.api_url(proxy_operation.service_name)
+
+      proxy_client = get_proxy_client(remote_api_uri)
+
+      op_path = "#{api_path}#{proxy_operation.path}"
+
+      router.on(proxy_operation.http_method.to_sym, op_path) do |env, params|
+        request = Rack::Request.new(env)
+        request.body.rewind
+        raw_body = request.body.read
+
+        proxy_path =  env['PATH_INFO'].gsub(api_path, '')
+
+        status, headers, body = proxy_client.make_request(
+          proxy_operation.http_method,
+          proxy_path,
+          env['QUERY_STRING'],
+          {},
+          raw_body
+        )
+
+        Response.new(body, status, headers)
+      end
+    end
+
+    def self.remote_operation(service_code_name, operation_code_name)
+      remote_service = Picasso::Remote::ServiceDirectory.service_definition(service_code_name)
+      remote_service.operation_definition(operation_code_name)
+    end
+
+    def get_proxy_client(url)
+      proxy_clients[url] ||= build_proxy_client(url)
+    end
+
+    def build_proxy_client(url)
+      Angus::Remote::ProxyClient.new(url)
+    end
+
+    def proxy_clients
+      @proxy_clients ||= {}
+    end
+
+  end
+end

data/lib/angus/renders/html_render.rb

@@ -1,7 +1,7 @@
 module HtmlRender
 
   def self.render(response, html)
-    response['Content-Type'] = 'text/html'
+    response['Content-Type'] = 'text/html;charset=utf-8'
 
     response.write(html)
   end

data/lib/angus/request_handler.rb

@@ -31,10 +31,16 @@ module Angus
 
     def to_app
       inner_app = lambda { |env| self.dup.call!(env) }
-      @middleware.reverse.inject(inner_app) do |app, middleware|
+      @app ||= @middleware.reverse.inject(inner_app) do |app, middleware|
         klass, args, block = middleware
 
-        klass.new(app, *args, &block)
+        # HACK to improve performance for now, in reality Middleware::ExceptionHandler should get
+        # the doc from a know place or the documentation should be available to all middleware.
+        if klass == Middleware::ExceptionHandler
+          klass.new(app, @definitions)
+        else
+          klass.new(app, *args, &block)
+        end
       end
     end
 
@@ -54,7 +60,7 @@ module Angus
       response.finish
     end
 
-    # TODO ver multiples formatos en el futuro
+    # TODO add more formats in the future.
     def render(response, content, options = {})
       format = options[:format] || DEFAULT_RENDER
       case(format)
@@ -96,4 +102,4 @@ module Angus
     end
 
   end
-end
+end

data/lib/angus/resource_definition.rb

@@ -50,10 +50,9 @@ module Angus
           result
         else
           field_name = response_representation.name
-          field_type = response_representation.type || response_representation.elements_type
+          field_type_name = response_representation.type || response_representation.elements_type
 
-          # TODO fix this
-          representation = representation_by_name(field_type)
+          representation = representation_by_name(field_type_name)
 
           if representation.nil?
             field_name.to_sym

data/lib/angus/response.rb

@@ -2,7 +2,7 @@ module Angus
   class Response < Rack::Response
     def initialize(*)
       super
-      headers['Content-Type'] ||= 'text/html'
+      headers['Content-Type'] ||= 'application/json'
     end
 
     def body=(value)
@@ -18,8 +18,8 @@ module Angus
       result = body
 
       if drop_content_info?
-        headers.delete "Content-Length"
-        headers.delete "Content-Type"
+        headers.delete('Content-Length')
+        headers.delete'Content-Type'
       end
 
       if drop_body?

data/lib/angus/responses.rb

@@ -6,27 +6,6 @@ module Angus
   module Responses
     include Angus::StatusCodes
 
-    # Returns the error definition.
-    #
-    # If the error does not responds to error_key nil will be returned, see EvolutionError.
-    #
-    # @param [#error_key] error An error object
-    #
-    # @return [Hash]
-    def get_error_definition(error)
-      error_key = error.class.name
-
-      get_message_definition(error_key, Angus::SDoc::Definitions::Message::ERROR_LEVEL)
-    end
-
-    def get_message_definition(key, level)
-      message = @definitions.messages.find { |name, definition|
-        name == key.to_s && definition.level.downcase == level.downcase
-      }
-
-      message.last if message
-    end
-
     # Builds a service success response
     #
     # @param [Hash<Symbol, Object>] messages Elements to be sent in the response
@@ -45,44 +24,6 @@ module Angus
       json(elements)
     end
 
-    # Builds a ResponseMessage object
-    #
-    # @param [#to_s] key Message key
-    # @param [#to_s] level Message level
-    # @param [*Object] params Objects to be used when formatting the message description
-    #
-    # @raise [NameError] when there's no message for the given key and level
-    #
-    # @return [ResponseMessage]
-    def build_message(key, level, *params)
-      message_definition = get_message_definition(key, level)
-
-      unless message_definition
-        raise NameError.new("Could not found message with key: #{key}, level: #{level}")
-      end
-
-      description = if message_definition.text
-                      message_definition.text % params
-                    else
-                      message_definition.description
-                    end
-
-      Angus::SDoc::Definitions::Message
-
-      message = Angus::SDoc::Definitions::Message.new
-      message.key = key
-      message.level = level
-      message.description = description
-
-      message
-    end
-
-    # Builds a service success response
-    def build_warning_response(error)
-      error_messages = messages_from_error(error, :warning)
-      build_response(:success, *error_messages)
-    end
-
     # Builds a success response with the received data
     #
     # @param [Hash] data the hash to be returned in the response
@@ -96,21 +37,6 @@ module Angus
       build_success_response(marshalled_data, messages)
     end
 
-    # Builds a success response with no elements
-    #
-    # The response would include the following:
-    #  - status
-    #  - messages
-    #
-    # @param [Array<ResponseMessage>, Array<Symbol>] messages Message to be included in the response
-    #
-    # @return [String] JSON response
-    def build_no_data_response(messages = [])
-      messages = build_messages(Angus::SDoc::Definitions::Message::INFO_LEVEL, messages)
-
-      build_success_response({}, messages)
-    end
-
     # Builds a list of messages with the following level
     #
     # ResponseMessage objects contained in messages param won't be modified, this method
@@ -124,72 +50,46 @@ module Angus
     # @return [Array<ResponseMessage>]
     def build_messages(level, messages)
       (messages || []).map do |message|
-        if message.kind_of?(Angus::SDoc::Definitions::Message)
-          message
-        else
-          build_message(message, level)
-        end
+        build_message(message, level)
       end
     end
 
-    # Sets the content_type to json and serialize +element+ as json
-    def json(element)
-      #content_type :json
-      JSON(element, :ascii_only => true)
-    end
-
-    private
-    # Returns an array of messages errors to be sent in an operation response
-    #
-    # If {error} respond_to? :errors then the method returns one error message
-    #   for each one.
+    # Builds a ResponseMessage object
     #
-    # Each message returned is a hash with:
-    #  - level
-    #  - key
-    #  - description
+    # @param [#to_s] key Message key
+    # @param [#to_s] level Message level
+    # @param [*Object] params Objects to be used when formatting the message description
     #
-    # @param [Exception] error The error to be returned
+    # @raise [NameError] when there's no message for the given key and level
     #
-    # @return [Array] an array of messages
-    def messages_from_error(error, level = :error)
-      messages = []
-
-      if error.respond_to?(:errors)
-        error.errors.each do |key, description|
-          messages << {:level => level, :key => key, :dsc => description}
-        end
-      elsif error.respond_to?(:error_key)
-        messages << {:level => level, :key => error.error_key,
-                     :dsc => error_message(error)}
-      else
-        messages << {:level => level, :key => error.class.name, :dsc => error.message}
+    # @return [ResponseMessage]
+    def build_message(key, level, *params)
+      message_definition = get_message_definition(key, level)
+
+      unless message_definition
+        raise NameError.new("Could not found message with key: #{key}, level: #{level}")
       end
 
-      messages
+      description = if message_definition.text
+                      message_definition.text % params
+                    else
+                      message_definition.description
+                    end
+
+      { :level => level, :key => key, :dsc => description }
     end
 
-    # Returns the message for an error.
-    #
-    # It first tries to get the message from text attribute of the error definition
-    #   if no definition is found or if the text attribute is blank it the returns the error
-    #   message attribute.
-    #
-    # @param [Exception] error The error to get the message for.
-    #
-    # @return [String] the error message.
-    def error_message(error)
-      error_definition = get_error_definition(error)
-
-      if error_definition && !error_definition.text.blank?
-        error_definition.text
-      else
-        error.message
-      end
+    def get_message_definition(key, level)
+      message = @definitions.messages.find { |name, definition|
+        name == key.to_s && definition.level.downcase == level.downcase
+      }
+
+      message.last if message
     end
 
-    def build_response(status, *messages)
-      json(:status => status, :messages => messages)
+    # Serializes +element+ as json
+    def json(element)
+      JSON(element, :ascii_only => true)
     end
 
   end

data/lib/angus/status_codes.rb

@@ -2,14 +2,14 @@ module Angus
   module StatusCodes
 
     # TODO remove HTTP_STATUS from all constants
-    HTTP_STATUS_CODE_OK = 200
+    HTTP_STATUS_CODE_OK                     = 200
 
-    HTTP_STATUS_CODE_FORBIDDEN = 403
-    HTTP_STATUS_CODE_NOT_FOUND = 404
-    HTTP_STATUS_CODE_CONFLICT = 409
-    HTTP_STATUS_CODE_UNPROCESSABLE_ENTITY = 422
+    HTTP_STATUS_CODE_FORBIDDEN              = 403
+    HTTP_STATUS_CODE_NOT_FOUND              = 404
+    HTTP_STATUS_CODE_CONFLICT               = 409
+    HTTP_STATUS_CODE_UNPROCESSABLE_ENTITY   = 422
 
-    HTTP_STATUS_CODE_INTERNAL_SERVER_ERROR = 500
+    HTTP_STATUS_CODE_INTERNAL_SERVER_ERROR  = 500
 
     def self.included(base)
       self.constants.each do |const|

data/lib/angus/version.rb

@@ -1,3 +1,3 @@
 module Angus
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/angus/middleware/exception_handler_spec.rb

@@ -36,7 +36,7 @@ describe Angus::Middleware::ExceptionHandler, { :work_dir => work_dir } do
       app.stub(:call).with(any_args).and_raise(error)
     end
 
-    it 'returns CONFLICT ERROR' do
+    it 'returns HTTP_STATUS_CODE_CONFLICT ERROR' do
       response = middleware.call(env)
 
       response.first.should eq(Angus::StatusCodes::HTTP_STATUS_CODE_CONFLICT)

data/spec/functional/basic/definitions/messages.yml

@@ -1,4 +1,15 @@
 UserNotFound:
   status_code: 404
   level: error
-  description: User not found
+  description: User not found
+
+UserCreatedSuccessfully:
+  status_code: 200
+  level: Info
+  description: The User has been created successfully.
+  text: The User has been created successfully.
+
+UserDeletedSuccessfully:
+  status_code: 200
+  level: Info
+  description: The User has been deleted successfully.

data/spec/functional/basic/definitions/representations.yml

@@ -1,9 +1,25 @@
-user_profile:
+user:
   - field: id
-    description: Idenfiticador del usuario
+    description: User identifier
     required: true
     type: integer
   - field: name
-    description: Nombres del usuario
+    description: User name
     required: true
-    type: string
+    type: string
+  - field: last_login
+    description: User last login time
+    required: true
+    type: datetime
+  - field: birth_date
+    description: User birth date
+    required: true
+    type: date
+  - field: gender
+    description: User gender
+    required: true
+    type: string
+  - field: roles
+    description: User roles
+    required: false
+    elements_type: integer

data/spec/functional/basic/definitions/users/operations.yml

@@ -13,7 +13,7 @@ get_user:
     - element: profile
       description: Perfil del usuario
       required: true
-      type: user_profile
+      type: user
 
   messages:
     - key: UserNotFound
@@ -30,4 +30,29 @@ get_users:
     - element: users
       description: Perfil del usuario
       required: true
-      elements_type: user_profile
+      elements_type: user
+
+create_user:
+  name: Create a new user
+  description: >
+    Creates and returns a new user.
+
+  path: /users
+  method: post
+
+  messages:
+    - key: UserCreatedSuccessfully
+
+delete_user:
+  name: Delete user
+  description: >
+    Deletes a user.
+
+  path: /users/:id
+  method: delete
+  uri:
+    - element: id
+      description: User identifier.
+
+  messages:
+      - key: UserDeletedSuccessfully

data/spec/functional/basic/models/user.rb

@@ -0,0 +1 @@
+User = Struct.new(:id, :name, :last_login, :birth_date, :gender, :roles)

data/spec/functional/basic/resources/users.rb

@@ -1,10 +1,18 @@
 require_relative '../exceptions/user_errors'
+require_relative '../models/user'
+
 
 class Users < Angus::BaseResource
-  USERS = [{ :id => 1, :name => 'ac/dc' }, { :id => 2, :name => 'madonna' }]
+  USERS = [{ :id => 1, :name => 'ac/dc', 'last_login' => DateTime.now, :birth_date => Date.today,
+             :gender => :male, :roles => [1, 2, 3] },
+           User.new(2, 'madonna', DateTime.now, Date.today, :female)]
 
   def get_user
-    user = USERS.find { |user| user[:id] == params[:user_id].to_i }
+    user = if params[:user_id] == '3'
+             { :id => 3 }
+           else
+             USERS.find { |user| user[:id] == params[:user_id].to_i }
+           end
 
     raise UserNotFound.new(params[:user_id]) unless user
 
@@ -15,4 +23,15 @@ class Users < Angus::BaseResource
     { :users => USERS }
   end
 
+  def create_user
+    { :messages => [:UserCreatedSuccessfully] }
+  end
+
+  def delete_user
+    if params[:id] == '2'
+      { :messages => [:UserAlreadyDeleted] }
+    else
+      { :messages => [:UserDeletedSuccessfully] }
+    end
+  end
 end

data/spec/functional/basic_spec.rb

@@ -7,14 +7,20 @@ require 'functional/basic/services/basic'
 describe Spec::Functional::Basic, { :work_dir => "#{File.dirname(__FILE__ )}/basic" } do
   include Rack::Test::Methods
 
-  def app
-    Spec::Functional::Basic.new
-  end
+  subject(:app) { Rack::Lint.new(Spec::Functional::Basic.new) }
 
   it 'responds to /' do
     get '/'
 
     last_response.status.should eq(200)
+    last_response.header['Content-Type'].should eq('application/json')
+  end
+
+  it 'responds to /' do
+    get '/basic'
+
+    last_response.status.should eq(200)
+    last_response.header['Content-Type'].should eq('application/json')
   end
 
   describe 'the documentation url' do
@@ -29,7 +35,7 @@ describe Spec::Functional::Basic, { :work_dir => "#{File.dirname(__FILE__ )}/bas
       it 'sets a html content type' do
         get '/basic/doc/0.1'
 
-        last_response.header['Content-Type'].should eq('text/html')
+        last_response.header['Content-Type'].should eq('text/html;charset=utf-8')
       end
     end
 
@@ -81,6 +87,109 @@ describe Spec::Functional::Basic, { :work_dir => "#{File.dirname(__FILE__ )}/bas
                                              'dsc' => 'User with id=-1 not found' })}
       end
     end
+
+    context 'when an attribute is missing from the response' do
+      it 'sets the correct status code' do
+        get '/basic/api/0.1/users/3'
+
+        last_response.status.should eq(500)
+      end
+
+      it 'sets a json content type' do
+        get '/basic/api/0.1/users/3'
+
+        last_response.header['Content-Type'].should eq('application/json')
+      end
+
+      describe 'the response body' do
+        subject(:body) {
+          get '/basic/api/0.1/users/3'
+          JSON(last_response.body)
+        }
+
+        its(['status']) { should eq('error')}
+        its(['messages']) { should include({ 'level' => 'error', 'key' => 'Angus::Marshalling::InvalidGetterError',
+                                             'dsc' => 'The requested getter (name) does not exist. ' })}
+      end
+    end
+
+    context 'when a message is returned' do
+      context 'when the message has a given text' do
+        it 'sets the correct status code' do
+          post '/basic/api/0.1/users'
+
+          last_response.status.should eq(200)
+        end
+
+        it 'sets a json content type' do
+          post '/basic/api/0.1/users'
+
+          last_response.header['Content-Type'].should eq('application/json')
+        end
+
+        describe 'the response body' do
+          subject(:body) {
+            post'/basic/api/0.1/users'
+            JSON(last_response.body)
+          }
+
+          its(['status']) { should eq('success')}
+          its(['messages']) { should include({ 'level' => 'info', 'key' => 'UserCreatedSuccessfully',
+                                               'dsc' => 'The User has been created successfully.' })}
+        end
+      end
+
+      context 'when a message does not have a given text' do
+        it 'sets the correct status code' do
+          delete '/basic/api/0.1/users/1'
+
+          last_response.status.should eq(200)
+        end
+
+        it 'sets a json content type' do
+          delete '/basic/api/0.1/users/1'
+
+          last_response.header['Content-Type'].should eq('application/json')
+        end
+
+        describe 'the response body' do
+          subject(:body) {
+            delete '/basic/api/0.1/users/1'
+            JSON(last_response.body)
+          }
+
+          its(['status']) { should eq('success')}
+          its(['messages']) { should include({ 'level' => 'info', 'key' => 'UserDeletedSuccessfully',
+                                               'dsc' => 'The User has been deleted successfully.' })}
+        end
+      end
+
+      context 'when an inexistent message is returned' do
+        it 'sets the correct status code' do
+          delete '/basic/api/0.1/users/2'
+
+          last_response.status.should eq(500)
+        end
+
+        it 'sets a json content type' do
+          delete '/basic/api/0.1/users/2'
+
+          last_response.header['Content-Type'].should eq('application/json')
+        end
+
+        describe 'the response body' do
+          subject(:body) {
+            delete '/basic/api/0.1/users/2'
+            JSON(last_response.body)
+          }
+
+          its(['status']) { should eq('error')}
+          its(['messages']) { should include({ 'level' => 'error', 'key' => 'NameError',
+                                               'dsc' => 'Could not found message with key: UserAlreadyDeleted, level: info' })}
+        end
+      end
+    end
+
   end
 
 end

data/spec/functional/empty_resource_spec.rb

@@ -8,9 +8,7 @@ describe Spec::Functional::EmptyResource,
          { :work_dir => "#{File.dirname(__FILE__ )}/empty_resource" } do
   include Rack::Test::Methods
 
-  def app
-    Spec::Functional::EmptyResource.new
-  end
+  subject(:app) { Rack::Lint.new(Spec::Functional::EmptyResource.new) }
 
   it 'responds to /' do
     get '/'
@@ -50,7 +48,7 @@ describe Spec::Functional::EmptyResource,
       it 'sets a html content type' do
         get url
 
-        last_response.header['Content-Type'].should eq('text/html')
+        last_response.header['Content-Type'].should eq('text/html;charset=utf-8')
       end
     end
 

data/spec/functional/no_resources_spec.rb

@@ -8,9 +8,7 @@ describe Spec::Functional::NoResources,
          { :work_dir => "#{File.dirname(__FILE__ )}/no_resources" } do
   include Rack::Test::Methods
 
-  def app
-    Spec::Functional::NoResources.new
-  end
+  subject(:app) { Rack::Lint.new(Spec::Functional::NoResources.new) }
 
   it 'responds to /' do
     get '/'
@@ -50,7 +48,7 @@ describe Spec::Functional::NoResources,
       it 'sets a html content type' do
         get url
 
-        last_response.header['Content-Type'].should eq('text/html')
+        last_response.header['Content-Type'].should eq('text/html;charset=utf-8')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angus
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -39,7 +39,7 @@ dependencies:
         version: '0.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '0.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: angus-router
   requirement: !ruby/object:Gem::Requirement
@@ -210,8 +210,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/angus/responses.rb
-- lib/angus/marshallings/unmarshalling.rb
 - lib/angus/marshallings/marshalling.rb
+- lib/angus/marshallings/exceptions.rb
 - lib/angus/marshallings/base.rb
 - lib/angus/generator.rb
 - lib/angus/status_codes.rb
@@ -221,8 +221,8 @@ files:
 - lib/angus/renders/html_render.rb
 - lib/angus/renders/base.rb
 - lib/angus/renders/json_render.rb
+- lib/angus/generator/templates/Gemfile.erb
 - lib/angus/generator/templates/resources/resource.rb.erb
-- lib/angus/generator/templates/Gemfile
 - lib/angus/generator/templates/README.md
 - lib/angus/generator/templates/config.ru.erb
 - lib/angus/generator/templates/services/service.rb.erb
@@ -246,6 +246,7 @@ files:
 - lib/angus/utils.rb
 - lib/angus/definition_reader.rb
 - lib/angus/base.rb
+- lib/angus/proxy_actions.rb
 - lib/angus.rb
 - spec/spec_helper.rb
 - spec/angus/request_handler_spec.rb
@@ -254,6 +255,7 @@ files:
 - spec/functional/no_resources_spec.rb
 - spec/functional/empty_resource_spec.rb
 - spec/functional/basic/exceptions/user_errors.rb
+- spec/functional/basic/models/user.rb
 - spec/functional/basic/resources/users.rb
 - spec/functional/basic/services/basic.rb
 - spec/functional/basic/definitions/representations.yml
@@ -305,6 +307,7 @@ test_files:
 - spec/functional/no_resources_spec.rb
 - spec/functional/empty_resource_spec.rb
 - spec/functional/basic/exceptions/user_errors.rb
+- spec/functional/basic/models/user.rb
 - spec/functional/basic/resources/users.rb
 - spec/functional/basic/services/basic.rb
 - spec/functional/basic/definitions/representations.yml

data/lib/angus/marshallings/unmarshalling.rb

@@ -1,29 +0,0 @@
-require 'bigdecimal'
-require 'date'
-
-module Angus
-  module Unmarshalling
-
-    def self.unmarshal_scalar(scalar, type)
-      return nil if scalar.nil?
-
-      case type
-      when :string
-        scalar
-      when :integer
-        scalar
-      when :boolean
-        scalar
-      when :date
-        Date.iso8601(scalar)
-      when :date_time
-        DateTime.iso8601(scalar)
-      when :decimal
-        BigDecimal.new(scalar.to_s)
-      else
-        raise ArgumentError, "Unknown type: #{type}"
-      end
-    end
-
-  end
-end