elastic_record 0.9.3 → 0.10.0

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
  
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '0.9.3'
+  s.version = '0.10.0'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/log_subscriber.rb

@@ -1,6 +1,21 @@
 module ElasticRecord
   class LogSubscriber < ActiveSupport::LogSubscriber
+    def self.runtime=(value)
+      Thread.current["elastic_record_request_runtime"] = value
+    end
+
+    def self.runtime
+      Thread.current["elastic_record_request_runtime"] ||= 0
+    end
+
+    def self.reset_runtime
+      rt, self.runtime = runtime, 0
+      rt
+    end
+
     def request(event)
+      self.class.runtime += event.duration
+
       payload = event.payload
       request_log = "#{payload[:request].method} #{payload[:http].address}:#{payload[:http].port}#{payload[:request].path}"
 
@@ -17,4 +32,4 @@ module ElasticRecord
   end
 end
 
-ElasticRecord::LogSubscriber.attach_to :elastic_record
+ElasticRecord::LogSubscriber.attach_to :elastic_record

data/lib/elastic_record/railtie.rb

@@ -7,5 +7,13 @@ module ElasticRecord
     rake_tasks do
       load "elastic_record/tasks/index.rake"
     end
+
+    # Expose database runtime to controller for logging.
+    initializer "elastic_record.log_runtime" do |app|
+      require "elastic_record/railties/controller_runtime"
+      ActiveSupport.on_load(:action_controller) do
+        include ElasticRecord::Railties::ControllerRuntime
+      end
+    end
   end
-end
+end

data/lib/elastic_record/railties/controller_runtime.rb

@@ -0,0 +1,45 @@
+require 'active_support/core_ext/module/attr_internal'
+require 'elastic_record/log_subscriber'
+
+module ElasticRecord
+  module Railties # :nodoc:
+    module ControllerRuntime #:nodoc:
+      extend ActiveSupport::Concern
+
+      module ClassMethods # :nodoc:
+        def log_process_action(payload)
+          messages, elastic_record_runtime = super, payload[:elastic_record_runtime]
+          if elastic_record_runtime.to_i > 0
+            messages << ("ElasticRecord: %.1fms" % elastic_record_runtime.to_f) 
+          end
+          messages
+        end
+      end
+
+      #private
+
+        attr_internal :elastic_record_runtime
+
+        def process_action(action, *args)
+          # We also need to reset the runtime before each action
+          # because of queries in middleware or in cases we are streaming
+          # and it won't be cleaned up by the method below.
+          ElasticRecord::LogSubscriber.reset_runtime
+          super
+        end
+
+        def cleanup_view_runtime
+          runtime_before_render = ElasticRecord::LogSubscriber.reset_runtime
+          runtime = super
+          runtime_after_render = ElasticRecord::LogSubscriber.reset_runtime
+          self.elastic_record_runtime = runtime_before_render + runtime_after_render
+          runtime - runtime_after_render
+        end
+
+        def append_info_to_payload(payload)
+          super
+          payload[:elastic_record_runtime] = (elastic_record_runtime || 0) + ElasticRecord::LogSubscriber.reset_runtime
+        end
+    end
+  end
+end

data/test/elastic_record/log_subscriber_test.rb

@@ -25,4 +25,8 @@ class ElasticRecord::LogSubscriberTest < ActiveSupport::TestCase
     assert_match /GET (.*)test/, @logger.logged(:debug)[0]
     assert_match %r['#{ActiveSupport::JSON.encode('foo' => 'bar')}'], @logger.logged(:debug)[0]
   end
+
+  def test_initializes_runtime
+    Thread.new { assert_equal 0, ElasticRecord::LogSubscriber.runtime }.join
+  end
 end

data/test/elastic_record/railties/controller_runtime_test.rb

@@ -0,0 +1,49 @@
+require 'helper'
+require "elastic_record/railties/controller_runtime"
+
+class ElasticRecord::Railties::ControllerRuntimeTest < MiniTest::Spec
+  class TestRuntime
+    def self.log_process_action(payload)
+      ['sweet']
+    end
+
+    def cleanup_view_runtime
+      12
+    end
+
+    def append_info_to_payload(payload)
+      payload[:foo] = 42
+    end
+
+  end
+
+  class ElasticRuntime < TestRuntime
+    include ElasticRecord::Railties::ControllerRuntime
+  end
+
+  def test_cleanup_view_runtime
+    runtime = ElasticRuntime.new
+    ElasticRecord::LogSubscriber.runtime = 10
+
+    runtime.cleanup_view_runtime
+
+    assert_equal 0, ElasticRecord::LogSubscriber.runtime
+  end
+
+  def test_append_info_to_payload
+    runtime = ElasticRuntime.new
+    payload = {}
+    runtime.append_info_to_payload(payload)
+
+    assert_equal 42, payload[:foo]
+    assert payload.key?(:elastic_record_runtime)
+  end
+
+  def test_log_process_action
+    payload = {elastic_record_runtime: 12.3}
+    messages = ElasticRuntime.log_process_action(payload)
+
+    assert_equal 2, messages.size
+    assert_equal "ElasticRecord: 12.3ms", messages.last
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -72,6 +72,7 @@ files:
 - lib/elastic_record/model.rb
 - lib/elastic_record/orm/active_record.rb
 - lib/elastic_record/railtie.rb
+- lib/elastic_record/railties/controller_runtime.rb
 - lib/elastic_record/relation.rb
 - lib/elastic_record/relation/batches.rb
 - lib/elastic_record/relation/delegation.rb
@@ -99,6 +100,7 @@ files:
 - test/elastic_record/log_subscriber_test.rb
 - test/elastic_record/lucene_test.rb
 - test/elastic_record/model_test.rb
+- test/elastic_record/railties/controller_runtime_test.rb
 - test/elastic_record/relation/batches_test.rb
 - test/elastic_record/relation/delegation_test.rb
 - test/elastic_record/relation/finder_methods_test.rb