application_controller.rb in ditty-0.10.1

- old
+ new

@@ -18,11 +18,11 @@
 
 module Ditty
   class ApplicationController < Sinatra::Base
     include ActiveSupport::Inflector
 
-    set :root, ENV['APP_ROOT'] || ::File.expand_path(::File.dirname(__FILE__) + '/../../../')
+    set :root, ENV['APP_ROOT'] || ::File.expand_path("#{::File.dirname(__FILE__)}/../../../")
     set :map_path, nil
     set :view_location, nil
     set :view_folder, nil
     set :base_path, nil
     set :model_class, nil
@@ -35,11 +35,11 @@
     helpers Sinatra::Param
 
     register Sinatra::Flash, Sinatra::RespondWith
 
     use Rack::Csrf, raise: ENV['APP_ENV'] == 'development' unless ENV['APP_ENV'] == 'test'
-    use Rack::PostBodyContentTypeParser
+    use Rack::JSONBodyParser
     use Rack::MethodOverride
     use Rack::NestedParams
 
     helpers do
       def logger
@@ -147,11 +147,12 @@
         format.html do
           flash.now[:danger] = env['sinatra.error'].message
           haml :'400', locals: { title: '4 oh oh' }, layout: layout
         end
         format.json do
-          json code: 400, errors: { env['sinatra.error'].param => env['sinatra.error'].message }, full_errors: [env['sinatra.error'].message]
+          json code: 400, errors: { env['sinatra.error'].param => env['sinatra.error'].message },
+               full_errors: [env['sinatra.error'].message]
         end
       end
     end
 
     error ::Sequel::NoMatchingRow do
@@ -236,11 +237,11 @@
       elsif /.*\.csv\Z/.match?(request.path)
         content_type :csv
         request.path_info = request.path_info.gsub(/.csv$/, '')
       elsif request.env['ACCEPT']
         content_type request.env['ACCEPT']
-      else
-        content_type(:json) if request.accept.count.eql?(1) && request.accept.first.to_s.eql?('*/*')
+      elsif request.accept.count.eql?(1) && request.accept.first.to_s.eql?('*/*')
+        content_type(:json)
       end
     end
 
     after do
       return if params[:layout].nil?