culpa 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODRhZjgzN2MwYjZlMWVjNjZhMzk4NWYxYjFhOTE3YzQ5YzE3NjhlYQ==
+    M2RhNzVkZDU0NGRhNjVmNjFjYmJmNDFkMjJkM2IyMjg2MGVhMzk5Mw==
   data.tar.gz: !binary |-
-    ZjJlMWU0ZTViOWE1NTFmM2E3ZmQ0YzY0NzMxM2RjYWM1ODBkMGM5Nw==
+    MGI1N2NmYmJlNDM2MDM2ZTYzZGU4ZmVjM2U0MzU4MDMxMDliY2VkNQ==
 SHA512:
   metadata.gz: !binary |-
-    ODk0NTAzM2FjZjQ5MmM5NDA3Yjc0MTZlOGEzNzFmODVkMzM3Y2NhNzM4ZTc4
-    OTA1N2JhNDFhODEwZDdjMTA4NTI3ZGUxOWRmZTM5ZTM3NzIxZjk0NzhiNDM4
-    ZjQyMDBhM2Q5ODc4NTAwZGVmZjdhNTBhYzk3YjM1NDg3NmE0YTE=
+    NzhjNTQ3ZWExZjg1Mzc3MmQ0YTdhZWY2NjM1ZTE4M2Q4MWE1MDRkZDNjOTE5
+    NTM0NzM1MTZjZDNhMGZkMGYwN2RlNzFhM2Y0ZGMxYzZjMGFhODZmMzRkZGZk
+    YTI1ODAzN2Y0ZjcwYjEzM2M1NTU0MTg5NGZhYjBjM2U0NWVkMDI=
   data.tar.gz: !binary |-
-    M2VkOWY1NzFjOGZmYzMzNDNmYWM0MDlhNzZhNWU0Y2ZhMTJiZDI0YzYxMmQz
-    ZjE0OTc2NWMxMDBlOThlMDRhZDllN2UxZTRiZmNkM2EwNGU2ZjVmMDgyNjQ3
-    ZTg0Njk2ODM2NGYyOTY5NmJjOTMwOTZlYjY1NGRlMmI3MmU0MjU=
+    Zjk3OWRmMTgzZjgyODExYTFiN2UyMzM5OTViZTQ5NmIxYzYwNjNjM2EyYjY3
+    NzgwZmM0MTA2ZWI4OTc2MzJkYzI0N2FkMTNmYTg1MWNlMmZiOTA2MGE1ZGU2
+    YjgxYTBjMzRiOGQ1YmZjZWJkOTllODBlMTQ2MzZmN2YwODQxNzM=

data/lib/action.rb

@@ -1,5 +1,60 @@
 class Action
 
+  RETURN_CODES = {
+      # Information codes
+      continue: 100,
+      switching_procotols: 101,
+      # Success codes
+      ok: 200,
+      created: 201,
+      accepted: 202,
+      non_authoritative_information: 203,
+      no_content: 204,
+      reset_content: 205,
+      partial_content: 206,
+      # Redirection codes
+      multiple_choices: 300,
+      moved_permanently: 301,
+      moved_temporarily: 302,
+      see_other: 303,
+      not_modified: 304,
+      use_proxy: 305,
+      temporary_redirect: 307,
+      permanent_redirect: 308,
+      too_many_redirects: 310,
+      # Clients error codes
+      bad_request: 400,
+      unauthorized: 401,
+      payment_required: 402,
+      forbidden: 403,
+      not_found: 404,
+      method_not_allowed: 405,
+      not_acceptable: 406,
+      proxy_authentication_required: 407,
+      request_time_out: 408,
+      conflict: 409,
+      gone: 410,
+      length_required: 411,
+      precondition_failed: 412,
+      request_entity_too_large: 413,
+      request_uri_too_long: 414,
+      unsupported_media_type: 415,
+      request_range_unsatisfiable: 416,
+      expectation_failed: 417,
+      im_a_tea_pot: 418,
+      bad_mapping: 412,
+      unavailable_for_legal_reason: 451,
+      # Server error codes
+      internal_server_error: 500,
+      not_implemented: 501,
+      bad_gateway: 502,
+      proxy_error: 502,
+      service_unavailable: 503,
+      gateway_time_out: 504,
+      bandwidth_limit_exceeded: 509,
+      unknown_error: 520
+  }
+
   attr_accessor :to_render
 
   def initialize(envelope, request)
@@ -8,8 +63,33 @@ class Action
     @to_render = nil
   end
 
-  def render(response_object, options={})
-    @to_render = {object: response_object, options: options}
+  def render(options={})
+    options[:headers] ||= {}
+    if options.has_key? :json
+      @to_render = {
+         format: :json,
+         status: RETURN_CODES[options[:status]] || 200,
+         headers: { 'Content-Type' => 'application/json' }.merge(options[:headers]),
+         object: options[:json]
+      }
+    elsif options.has_key? :file
+      @to_render = {
+         format: :file_from_path,
+         headers: {
+             'Content-Type' => options[:content_type] || 'application/octet-stream'
+         }.merge(options[:headers]),
+         status: RETURN_CODES[options[:status]] || 200,
+         object: FileHelpers::Streamer.new(options[:file])
+      }
+    elsif options.has_key? :status
+      @to_render = {
+         format: :status,
+         headers: options[:headers],
+         status: RETURN_CODES[options[:status]]
+      }
+    else
+     raise Culpa::UnknownRenderCall.new
+    end
   end
 
 end

data/lib/culpa.rb

@@ -4,6 +4,7 @@ require 'yaml'
 
 require 'envelope'
 require 'path_parser'
+require 'file_helpers'
 
 ACTIONS_PATH ||= './actions/*.rb'
 MODELS_PATH ||= './models/*.rb'
@@ -25,6 +26,7 @@ module Culpa
 
   class UnpredictableSubCallError < StandardError; end
   class NoRenderCalled < StandardError; end
+  class UnknownRenderCall < StandardError; end
 
   class Application
 
@@ -32,45 +34,31 @@ module Culpa
        @router = router
     end
 
-    # Router's helpers
     def call_action(options)
-      # Preparing common parts
       router_method_name = "#{options[:sub_call]}_#{options[:res_name]}"
       envelope =  Envelope.new
       request = EnvelopeRequest.new(options)
-
-      # The router do not have the key
-      if !@router || !@router.has_key?(router_method_name)
-        default_class = options[:res_name].split('_').map{|w| w.capitalize}.join
-        action_default_class = Actions.const_get(default_class).new(envelope, request)
-        if action_default_class && action_default_class.respond_to?(options[:sub_call])
-          action_default_class.send(options[:sub_call])
-          if action_default_class.to_render
-            return do_render action_default_class.to_render if action_default_class.to_render
-          else
-            raise NoRenderCalled.new
-          end
-        end
-        return not_found
-      end
-
-      # The router have the key
+      return not_found unless @router.has_key? router_method_name
       @router[router_method_name].each do |method|
         action_class_name, method_name = method.split('.')
         action_class = Actions.const_get(action_class_name).new(envelope, request)
         action_class.send method_name
         return do_render action_class.to_render if action_class.to_render
       end
-
-      # If nothing called do_render...
       raise NoRenderCalled.new
     end
 
-    # Render a view
+    # Render a json or anything else
     def do_render(to_render)
-      code = to_render[:options][:status] || 200
-      content_type = to_render[:options][:content_type] || 'application/json'
-      [code.to_s, {'Content-Type' => content_type}, [to_render[:object].to_json]]
+      body = case to_render[:format]
+               when :json
+                 [ to_render[:object].to_json ]
+               when :file_from_path, :file_from_io
+                 to_render[:object]
+               when :status
+                 []
+             end
+      [ to_render[:status], to_render[:headers], body ]
     end
 
     # Called by rack
@@ -122,12 +110,12 @@ module Culpa
 
     # 400 : Bad request
     def bad_request
-      ['400', {'Content-Type' => 'application/json'}, ['{ "error": "bad_request" }']]
+      ['400', {'Content-Type' => 'application/json'}, []]
     end
 
     # 404 : Not found
     def not_found
-      ['404', {'Content-Type' => 'application/json'}, ['{ "error": "not_found" }']]
+      ['404', {'Content-Type' => 'application/json'}, []]
     end
 
   end

data/lib/file_helpers.rb

@@ -0,0 +1,14 @@
+module FileHelpers
+
+  class Streamer
+    def initialize(element)
+      @element = element
+    end
+    def each(&blk)
+      @element.each(&blk)
+    ensure
+      @element.close
+    end
+  end
+
+end

data/templates/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'culpa', '~> 0.0'
+gem 'culpa', '~> 0.2'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jérémy SEBAN
@@ -49,6 +49,7 @@ files:
 - lib/action.rb
 - lib/culpa.rb
 - lib/envelope.rb
+- lib/file_helpers.rb
 - lib/path_parser.rb
 - templates/Gemfile
 - templates/config.ru