culpa 0.5.0 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmIyYjkwNWQxYjk0ODc5MzQ5MWIxOTFmMGUzYTYwNThlZWU3ZGI0Ng==
+    NDFjODlhNWQyYmVlMGRjYTU4MjM4Mzc4ZjhkZWY2YzI5NGE2ZjYzOQ==
   data.tar.gz: !binary |-
-    NGQzM2I2ZGY0NzE5ODg0OTlkYWU5MjM2MzYxOGViMjdjMGE2YTExZQ==
+    YThiMTZhNDI0YzNkMDg2MTA2YTE5NTk2MzQzNDVjOTgwNWYxYjNlNQ==
 SHA512:
   metadata.gz: !binary |-
-    MWVlZTE0Y2EyZjgzNzg2YWZmZjBlODdkZTEyZjMwMmFkODA4ZmI1MmNhOGVj
-    MzkxYjA4NzdlMTc0NTk3MTcyMzdlZGYxZDM0YWFhMWQ1YjY0NTYxYTU2NTQ2
-    YWRkYTFiZTkwNGQ2MzIyYWM1Y2JmZGFiOWViY2NlMjkzOGI0Mjc=
+    NjEzNTUxY2ZjYWE3Yzk5OTE1NTUyMzQxOTk2OTZjZDNlY2VlMGQ4ZTVmMmVh
+    MmFlY2Q1MmFiMTAzY2ExZDc3ZjA2ODY2YzMxNmVkZDlhNTg3MDZhZGVkNTc2
+    ZjBlMTBlOWQzZDg4N2NlZmJlMjAwODEzNWI0MjI4Yjk3YzEyOTk=
   data.tar.gz: !binary |-
-    YjYyY2QxZGViYWE3ZTI5NTA2MDU0OWVkM2NiMjIwNzY1YTM2NjE1ODU1NWEy
-    MzlmNWQ1ZmMyZDhhNTBjNTJlM2U5MDc5YWIwMWQ4YmUxNzYxNDhhYzYwYTZm
-    YTg5NmVlYWQ1MzMxNjcxNTMwMWI4OGRjYmMzNmExODAwNzAwM2Q=
+    MWE4NDAwYTY3MGQzMWYxMDUxYzgyMDhlYzRkMjZjZTAxZTdhZDQ2ZDk4NTY4
+    ZTFhNDI1ZDQ3ZjBlZGZkNjZmYzM2MTVhODhjNDM2NTI3MGQ3NTNjNDUyNzQz
+    NzhhZTRmN2NkZDNmYzllNmU2NGQ4ZGRmMWQ1Y2UxOTIwNzg0MWY=

data/lib/action.rb

@@ -63,6 +63,14 @@ class Action
     @to_render = nil
   end
 
+  def e
+    @e
+  end
+
+  def r
+    @r
+  end
+
   def render(options={})
     options[:headers] ||= {}
     if options.has_key? :json
@@ -95,4 +103,3 @@ class Action
   end
 
 end
-

data/lib/culpa.rb

@@ -1,6 +1,7 @@
 require 'bundler'
 require 'json'
 require 'yaml'
+require 'logger'
 
 require 'envelope'
 require 'path_parser'
@@ -36,42 +37,16 @@ module Culpa
   class Application
 
     def initialize(options = {})
-      @brick_call_chains_cache = {}
       @router = YAML.load_file(options[:router] || './config/router.yml')
-    end
-
-    def call_brickchain(options)
-      router_method_name = "#{options[:sub_call]}_#{options[:res_name]}"
-      envelope =  Envelope.new
-      request = EnvelopeRequest.new(options)
-      bricks = @router[router_method_name]
-      return not_found unless bricks
-      bricks.each do |brick|
-        action_class_name, method_name = brick.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
-      raise NoRenderCalled.new
-    end
-
-    ##
-    # Renders a json or anything else
-    def do_render(to_render)
-      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 ]
+      @logger = Logger.new(STDOUT)
+      @logger.level = ENV['RACK_ENV'] == 'development' ? Logger::DEBUG : Logger::WARN
+      @logger.info 'Culpa initialized'
     end
 
     ##
     # Rack entrypoint
     def call(env)
+      @logger.debug "Request received : #{env['PATH_INFO']}"
       call_options = {
           verb: env['REQUEST_METHOD'].downcase.to_sym,
           params: Rack::Utils.parse_nested_query(env['QUERY_STRING'])
@@ -115,12 +90,44 @@ module Culpa
         call_options[:id] = route_params[:id]
         call_options[:sub_call] = route_params[:sub_call]
       else
+        @logger.debug "Refused request, #{env['PATH_INFO']} didn't match enforced routes"
         return bad_request
       end
       # Call the brickchain and return the value to Rack
+      @logger.debug "Calling brickchain => subcall: #{call_options[:sub_call]}, action: #{call_options[:res_name]}, id: #{call_options[:id]}"
       call_brickchain call_options
     end
 
+    def call_brickchain(options)
+      router_method_name = "#{options[:sub_call]}_#{options[:res_name]}"
+      envelope =  Envelope.new
+      request = EnvelopeRequest.new(options)
+      bricks = @router[router_method_name]
+      return not_found unless bricks
+      @logger.info "Brickchain determined for #{router_method_name} :\n#{bricks.join("\n")}\n"
+      bricks.each do |brick|
+        action_class_name, method_name = brick.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
+      raise NoRenderCalled.new
+    end
+
+    ##
+    # Renders a json or anything else
+    def do_render(to_render)
+      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
+
     ##
     # Rack pre-formatted 400 : Bad request
     def bad_request
@@ -135,4 +142,4 @@ module Culpa
 
   end
 
-end
+end

data/lib/rspec_helper.rb

@@ -0,0 +1,39 @@
+require 'envelope'
+require 'action'
+require 'rspec/expectations'
+
+module CulpaHelpers
+
+  class BrickCallMock
+    def initialize(opts)
+      @action, @method = opts.first
+      @action = @action.to_s.split('_').map{|w| w.capitalize}.join
+      opts.delete(@action)
+      @envelope = Envelope.new(opts[:envelope]) if opts.has_key? :envelope
+      @request = EnvelopeRequest.new(opts[:request]) if opts.has_key? :request
+    end
+
+    def call
+      action_class = Actions.const_get(@action).new(@envelope, @request)
+      action_class.send @method.to_s
+      return action_class.to_render
+    end
+  end
+
+end
+
+RSpec::Matchers.define :have_status do |expected|
+  match do |actual|
+    actual[:status] == Action::RETURN_CODES[expected]
+  end
+end
+
+RSpec::Matchers.define :have_headers do |expected|
+  match do |actual|
+    expected.each do |k,v|
+      return false unless actual[:headers].has_key?(k) and
+                          actual[:headers][k] == expected[k]
+    end
+    true
+  end
+end

data/templates/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'culpa', '~> 0.3'
+gem 'culpa', '~> 0.5'
 
 # Use rspec to test your project.
 gem 'rspec', '~> 3.4'

data/templates/config.ru

@@ -1,6 +1,2 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'yaml'
 require 'culpa'
-
 run Culpa::Application.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,7 @@ files:
 - lib/envelope.rb
 - lib/file_helpers.rb
 - lib/path_parser.rb
+- lib/rspec_helper.rb
 - templates/Dockerfile
 - templates/Gemfile
 - templates/config.ru