groonga-client-model 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280065806b16cf11124e4ce8a5d8550c6a427f4c
-  data.tar.gz: ea03fc0c321b8aea0df6951c94b15b5879852371
+  metadata.gz: 69aeb3216e670c96bb30d59565e4aab119267d6e
+  data.tar.gz: c30ae60d4a6ae6dc644aa01b3db6079dc8bb257f
 SHA512:
-  metadata.gz: fc49cbe218f850a775997ae6cd937799249720e9a70ed582d10009dffa8cac3a51695e69eb10a9958d8421faa4774eb989c3ecf19071613d3490745191dbe1a8
-  data.tar.gz: d8edfa839c110f51e7ec55978964e0de3bee6c79ffcbae99fbe5e4ed8a9facae653a895a7a1946f7103de7e66906953fbc3d2573a74c6875cdfb4e890a6a943f
+  metadata.gz: 6849d586cfa69b14047ddccc392db40cb4545a232d69b8df7d59163549d3ac04948064aa6b07cf6b2333a851143f8c444b644e7fb17472c26a055913dd0bc02b
+  data.tar.gz: f765054cdca37447290b1d5dfbd05a6406df40a4b30af4a7c187e406f99aec18b8a99239563ab9a578b342512e87f1789e4c4f81ada50ec438dd96babc5b722b

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # NEWS
 
+## 0.9.6 - 2016-01-12
+
+### Improvements
+
+  * Supported logging.
+
+### Improvements
+
 ## 0.9.5 - 2016-12-27
 
 ### Improvements

data/lib/groonga_client_model/client.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2016-2017  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -31,8 +31,22 @@ module GroongaClientModel
 
     def open
       Groonga::Client.open(url: @url) do |client|
+        client.extend(Notifiable)
         yield(client)
       end
     end
+
+    module Notifiable
+      private
+      def execute_command(command, &block)
+        name = "groonga.groonga_client_model"
+        payload = {
+          :command => command,
+        }
+        ActiveSupport::Notifications.instrument(name, payload) do
+          super(command, &block)
+        end
+      end
+    end
   end
 end

data/lib/groonga_client_model/log_subscriber.rb

@@ -0,0 +1,90 @@
+# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module GroongaClientModel
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    if respond_to?(:thread_cattr_accessor)
+      thread_cattr_accessor :runtime, instance_accessor: false
+    else
+      # For ActiveSupport < 5
+      class << self
+        def runtime
+          Thread.current["groonga_client_model.log_subscriber.runtime"]
+        end
+
+        def runtime=(value)
+          Thread.current["groonga_client_model.log_subscriber.runtime"] = value
+        end
+      end
+    end
+
+    class << self
+      def reset_runtime
+        self.runtime = 0.0
+      end
+
+      def measure
+        before_runtime = runtime
+        yield
+        runtime - before_runtime
+      end
+    end
+
+    def groonga(event)
+      self.class.runtime += event.duration
+
+      debug do
+        command = event.payload[:command]
+
+        title = color("#{command.command_name} (#{event.duration.round(1)}ms)",
+                      title_color(command),
+                      true)
+        formatted_command = color(command.to_command_format,
+                                  command_color(command),
+                                  true)
+        "  #{title}  #{formatted_command}"
+      end
+    end
+
+    private
+    def title_color(command)
+      if command.command_name == "select"
+        MAGENTA
+      else
+        CYAN
+      end
+    end
+
+    def command_color(command)
+      case command.command_name
+      when "select"
+        BLUE
+      when "load"
+        GREEN
+      when "delete"
+        RED
+      else
+        MAGENTA
+      end
+    end
+
+    def logger
+      GroongaClientModel.logger
+    end
+
+    attach_to :groonga_client_model
+  end
+end

data/lib/groonga_client_model/railtie.rb

@@ -44,6 +44,13 @@ module GroongaClientModel
       end
     end
 
+    initializer "groonga_client_model.log_runtime" do
+      require "groonga_client_model/railties/controller_runtime"
+      ActiveSupport.on_load(:action_controller) do
+        include GroongaClientModel::Railties::ControllerRuntime
+      end
+    end
+
     initializer "groonga_client_model.set_configs" do |app|
       ActiveSupport.on_load(:groonga_client_model) do
         app.config.groonga_client_model.each do |key, value|

data/lib/groonga_client_model/railties/controller_runtime.rb

@@ -0,0 +1,56 @@
+# Copyright (C) 2017  Kouhei Sutou <kou@clear-code.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "groonga_client_model/log_subscriber"
+
+module GroongaClientModel
+  module Railties
+    module ControllerRuntime
+      extend ActiveSupport::Concern
+
+      attr_internal :groonga_runtime
+
+      def process_action(action, *args)
+        GroongaClientModel::LogSubscriber.reset_runtime
+        super
+      end
+
+      def cleanup_view_runtime
+        total_runtime = nil
+        groonga_runtime_in_view = GroongaClientModel::LogSubscriber.measure do
+          total_runtime = super
+        end
+        total_runtime - groonga_runtime_in_view
+      end
+
+      def append_info_to_payload(payload)
+        super
+        payload[:groonga_runtime] = GroongaClientModel::LogSubscriber.runtime
+      end
+
+      module ClassMethods
+        def log_process_action(payload)
+          messages = super
+          groonga_runtime = payload[:groonga_runtime]
+          if groonga_runtime
+            messages << ("Groonga: %.1fms" % groonga_runtime.to_f)
+          end
+          messages
+        end
+      end
+    end
+  end
+end

data/lib/groonga_client_model/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaClientModel
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client-model
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-client
@@ -142,9 +142,11 @@ files:
 - lib/groonga_client_model/client_opener.rb
 - lib/groonga_client_model/error.rb
 - lib/groonga_client_model/load_value_generator.rb
+- lib/groonga_client_model/log_subscriber.rb
 - lib/groonga_client_model/modelizable.rb
 - lib/groonga_client_model/modelize.rb
 - lib/groonga_client_model/railtie.rb
+- lib/groonga_client_model/railties/controller_runtime.rb
 - lib/groonga_client_model/railties/groonga.rake
 - lib/groonga_client_model/record.rb
 - lib/groonga_client_model/schema.rb