culpa 1.3.2 → 1.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmM2OTI5MGVlMjg4MDliYWIwNjJkOGI3OGNkZmRkMDY2M2MzN2Q0MQ==
+    YjBjMzRjMTY2YjFiYmM2MTc0MTk0MTBhMzVmNDhmYTZmNzk4OGZkOQ==
   data.tar.gz: !binary |-
-    ZWU1MTVmMjZiN2Y0ZDk1NWJmODE3NDZiMmZjMjUyN2E4M2NkOWZjYw==
+    YzljY2FjMGFkMzMwMjM4MzIzNmVhMDdlN2U1ODI4YTRiNjdhNjcxOA==
 SHA512:
   metadata.gz: !binary |-
-    MjdlMzljODg1ZWI0NWVjYzIxOTkwNzE5NjhmMDlmMWFiMGE2YjRjMGYwZmEw
-    MjJmYTJkMzM1NDkxYzY4ZTdhOTI5YTFjMWVjYTBiMTVlMzZjZjYwMjY1NWYw
-    YjFjYTg1MzUxMWI0NjU2NzM0ZWMwZTRlMjM0ODdjZjEzNTY0NWM=
+    ZWE1ZWNkN2ZkZDdkZDYyMmQzZTIzMTc4OGMwMWQ4NWU2ZjRiMDQwYzZhNWVl
+    NjE2ODlmZTYyNDQ1YTNjMTY2OGUwZWEwZWM3MDNkMTFhNjI4ZDJiY2Q1OTMx
+    YzI5MjFmYzYxNTc4MTNmNDAwNmQ2NDYwNzlkODQ1MTVkZWQ5MDU=
   data.tar.gz: !binary |-
-    ZmQ1ZWIwNGQ0MWI1NzUxY2RhMTY1YmFkNzlkOTdjY2ZkN2FiMzFlMDU2MmZl
-    YWNkMmE5ZTk4NzdhZDNkYjdjM2NlMGNjMjUxMDY3MTlhMjVlZDI1NGFiODk2
-    YjI1YWY3ZTAzYTkxN2Y1MjFiZDIxZmEyZGFhZTA3NmVhZmY2YmU=
+    YmI4NmE5Y2NkZmQ0MzdhYTdhMmM1YjUxZDQzNGRiN2QyOTUxYjExZGZiZGZl
+    M2M0ZmU2YTIyMWRjNTlmNDE5NDUzODczZWVjZmJlYTFiMzA4YTFiYzk3NzZh
+    YmQyY2Q1NWQzZTQ0MjMwNTczYTYxNzY1ZDQ0ZmQ4NzU4MTllNTQ=

data/lib/culpa/brickchain_helpers.rb

@@ -19,7 +19,7 @@ module Culpa
     end
 
     def render_coliseum(file)
-      coliseum = ColiseumDSL.new("./coliseums/#{file}.rb", envelope)
+      coliseum = ColiseumDSL.new("./#{COLISEUMS_PATH || 'coliseums'}/#{file}.rb", envelope)
       raise Action::RenderNow, format: :json,
                                status: RendererDescriber::RETURN_CODES[coliseum.culpa_status] || 200,
                                headers: { 'Content-Type' => 'application/json' }.merge(coliseum.culpa_headers),

data/lib/culpa/coliseum_dsl.rb

@@ -47,7 +47,9 @@ class ColiseumDSL
                                begin
                                  target.send(att)
                                rescue
+                                 # :nocov:
                                  nil
+                                 # :nocov:
                                end
                              end
     end

data/lib/culpa/renderers/coliseum.rb

@@ -6,7 +6,7 @@
 require_relative '../coliseum_dsl'
 
 describe_renderer :coliseum do |options, envelope|
-  coliseum = ColiseumDSL.new("./coliseums/#{options[:coliseum]}.rb", envelope)
+  coliseum = ColiseumDSL.new("./#{ COLISEUMS_PATH || 'coliseums' }/#{options[:coliseum]}.rb", envelope)
 
   sent_headers = { 'Content-Type' => 'application/json' }.merge(options[:headers]).merge(coliseum.culpa_headers)
 

data/lib/culpa/version.rb

@@ -0,0 +1 @@
+CULPA_VERSION = '1.3.3'.freeze

data/lib/culpa.rb

@@ -7,8 +7,7 @@ require_relative 'culpa/envelope'
 require_relative 'culpa/path_parser'
 require_relative 'culpa/routes_builder'
 require_relative 'culpa/brickchain_helpers'
-
-CULPA_VERSION = '1.3.2'.freeze
+require_relative 'culpa/version'
 
 ACTIONS_PATH ||= './actions/*.rb'.freeze
 MODELS_PATH ||= './models/*.rb'.freeze
@@ -70,8 +69,10 @@ module Culpa
     # Rack entrypoint
     def call(env)
       # Checking if it is a static file before calling the router
-      static_asset = try_static_asset(env)
-      return static_asset if static_asset
+      if @rack_file
+        static_asset = try_static_asset(env)
+        return static_asset if static_asset
+      end
       # Calling the router
       @logger.info "Received request : #{env['PATH_INFO']}"
       # Request preparation
@@ -117,7 +118,6 @@ module Culpa
     ##
     # Serving static assets for dev purposes
     def try_static_asset(env)
-      return unless @rack_file
       if File.exist?("#{@public_folder}#{env['PATH_INFO']}") || env['PATH_INFO'] == '/'
         env['PATH_INFO'] = '/index.html' if env['PATH_INFO'] == '/'
         @logger.info "Serving static file : #{env['PATH_INFO']}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -87,6 +87,7 @@ files:
 - lib/culpa/renderers/status.rb
 - lib/culpa/routes_builder.rb
 - lib/culpa/test_helpers.rb
+- lib/culpa/version.rb
 - templates/culpa/Dockerfile
 - templates/culpa/Gemfile
 - templates/culpa/config.ru