grape-batch 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483ecfa0b036413cd49c11f55a3c59529488e7a8
-  data.tar.gz: 32baccf14eaa0a23afff45f9d86802d42323defb
+  metadata.gz: c814c50a907a565423f1154df0315082ce01b368
+  data.tar.gz: 3d6a2ecc29a6e0e11903c126618095c3154b6818
 SHA512:
-  metadata.gz: 1a78f087d10ac368f6fc7db6aec78c87bad58268da4fe374a19269eb199dc1d0d2cd4a3894b89cb3739b46a66b6606d01ed44e9b067113c8073706b79083d230
-  data.tar.gz: 678c766c786aba5a407851a28322bf3ec447f629a80086593cbe65242800f4ba2f1902a86ef3101a512cc275576730c14ebde618c7742d50a016be7e939d08b6
+  metadata.gz: c0ca65a811be6de53282bf1b112195a06f6aaa0c922a5facee2f59c896f2bf346988d456a0a0bdc85c3eed09fccbd587dc395fcb27f3b61cffac75870515caa1
+  data.tar.gz: 6e05351a95f28d24fe58451dfdc08f20fdb9ead667c4bdfdb0426124499b424e209e502c21fb861692036e4a79eaa12f210ac4727d1c3283af573b565458786a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.2.0 (23rd July 2015)
+* Removed logging
+
 # 1.1.4 (17th July 2015)
 * Added batch session
 

data/lib/grape/batch/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Batch
-    VERSION = '1.1.4'
+    VERSION = '1.2.0'
   end
 end

data/lib/grape/batch.rb

@@ -1,5 +1,4 @@
 require 'active_support'
-require 'grape/batch/log_subscriber'
 require 'grape/batch/version'
 require 'grape/batch/errors'
 require 'grape/batch/configuration'
@@ -24,7 +23,7 @@ module Grape
       def batch_call(env)
         status = 200
         headers = { 'Content-Type' => 'application/json' }
-
+        logger.info('--- Grape::Batch BEGIN')
         begin
           batch_requests = Grape::Batch::Validator::parse(env, Grape::Batch.configuration.limit)
           result = dispatch(env, batch_requests)
@@ -33,7 +32,7 @@ module Grape
           e.class == TooManyRequestsError ? status = 429 : status = 400
           body = e.message
         end
-
+        logger.info('--- Grape::Batch END')
         [status, headers, [body]]
       end
 
@@ -46,25 +45,18 @@ module Grape
       end
 
       def dispatch(env, batch_requests)
-        ActiveSupport::Notifications.instrument 'dispatch.batch' do |event|
-          event[:requests] = []
-
-          session_data = env[Grape::Batch.configuration.session_header]
-          env['api.session'] = Grape::Batch.configuration.session_proc.call(session_data)
+        session_data = env[Grape::Batch.configuration.session_header]
+        env['api.session'] = Grape::Batch.configuration.session_proc.call(session_data)
 
-          # iterate
-          batch_env = env.dup
-          batch_requests.map do |request|
-            # init env for Grape resource
-            tmp_env = prepare_tmp_env(batch_env, request)
-            status, headers, response = @app.call(tmp_env)
+        # iterate
+        batch_env = env.dup
+        batch_requests.map do |request|
+          # init env for Grape resource
+          tmp_env = prepare_tmp_env(batch_env, request)
+          status, headers, response = @app.call(tmp_env)
 
-            # format response
-            @response_klass::format(status, headers, response).tap do |formatted_response|
-              # log call
-              event[:requests] << [tmp_env, formatted_response]
-            end
-          end
+          # format response
+          @response_klass::format(status, headers, response)
         end
       end
 
@@ -87,6 +79,21 @@ module Grape
         tmp_env['rack.input'] = rack_input
         tmp_env
       end
+
+      def logger
+        @logger ||= Grape::Batch.configuration.logger || rails_logger || default_logger
+      end
+
+      def default_logger
+        logger = Logger.new($stdout)
+        logger.level = Logger::INFO
+        logger
+      end
+
+      # Get the Rails logger if it's defined.
+      def rails_logger
+        defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-batch
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Lionel Oto
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -148,7 +148,6 @@ files:
 - lib/grape/batch/configuration.rb
 - lib/grape/batch/errors.rb
 - lib/grape/batch/hash_converter.rb
-- lib/grape/batch/log_subscriber.rb
 - lib/grape/batch/parser.rb
 - lib/grape/batch/response.rb
 - lib/grape/batch/version.rb

data/lib/grape/batch/log_subscriber.rb

@@ -1,64 +0,0 @@
-module Grape
-  module Batch
-    class LogSubscriber < ActiveSupport::LogSubscriber
-      def dispatch(event)
-        requests = event.payload[:requests]
-
-        if logger.debug?
-          debug_log(requests)
-        else
-          info_log(requests)
-        end
-      end
-
-      private
-
-      def debug_log(requests)
-        logger.info 'grape/batch'
-
-        requests.map do |params|
-          request, response = params
-          logger.info " method=#{request['REQUEST_METHOD']} path=#{request['PATH_INFO']}"
-
-          if request['REQUEST_METHOD'] == 'GET'
-            unless request['QUERY_STRING'].empty?
-              logger.debug "  params: #{request['QUERY_STRING'].to_s}"
-            end
-          else
-            if request['rack.input'].respond_to? :string
-              logger.debug "  body: #{request['rack.input'].string}"
-            end
-          end
-          logger.debug "  response: #{response.to_s}"
-        end
-      end
-
-      def info_log(requests)
-        messages = []
-        requests.each do |params|
-          request, response = params
-          messages << "method=#{request['REQUEST_METHOD']} path=#{request['PATH_INFO']}"
-        end
-
-        logger.info 'grape/batch ' + messages.join(', ')
-      end
-
-      def logger
-        @logger ||= Grape::Batch.configuration.logger || rails_logger || default_logger
-      end
-
-      def default_logger
-        logger = Logger.new($stdout)
-        logger.level = Logger::INFO
-        logger
-      end
-
-      # Get the Rails logger if it's defined.
-      def rails_logger
-        defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
-      end
-    end
-  end
-end
-
-Grape::Batch::LogSubscriber.attach_to(:batch)