union_station_hooks_rails 1.0.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBmNjQ1YWNkZDdjZjAwOTMzZWQ1NjEyZDBiOGZjYWJhMWYzMmM5Zg==
+    ZTI3YjEwNTE3MTBiMWIwNmY3N2MxN2QyNTc2OGI0OGFhZGFkODY3Ng==
   data.tar.gz: !binary |-
-    NDEyNzgzMWJjMjdiMWFhNTkyMjUyZWQxNWY1Mzg4NGYwZDgzODE4OA==
+    NWVmMzI3NDdlYmEwMzVlMjFiY2Q3ZWI3MzIxNjQzN2JmNDNjZGEyNQ==
 SHA512:
   metadata.gz: !binary |-
-    NDYzNzBiZjk4MmZhY2JhYmJkNGJjM2JiNWZjNWU5NTRkYjRiNmE5ZGY2ZmQw
-    YmI3YzRhM2YxNzBjZWYzNWVhZmUwNjYzNDUxMTUzOGQ1MTQwMTY0OTI1ZjVj
-    YTVkMWM4N2IzMTdlOGMzN2UzNjI1NmRjOTBiYzZlZGM1NDlhNmY=
+    MDRjNWQ5YjkyZWQ0ZTg5MzEyOTBkMTk0ZDZlZjc3OTRhYTFmMmU2ODllOGYx
+    MjU5MmM1N2QzYjM0NGViZjFkMjRiZTAxYmEyNGE3YzZhODdmOWJhM2FkNGVh
+    YTBkNjYzMTgyN2Q4Njc0ZTYxMDAyMGYzMWQwNDJkZTAzMzU2N2E=
   data.tar.gz: !binary |-
-    MWQ2YzQ2ZWJkNWRiNTRmZDQ1NzE5NjFhZDk5YzRjNTZhMzNkODMwZGM3MzZl
-    NDA0M2NiYzUyOGU2M2QxNGNkZGFhYmNkYzdmOTExNDY2MTBiZTJiMjFmNzgz
-    MjI3MTM3OTA4MjlkMzFlOGUzODExMGQ0MGQ4ZTMyYjNjMjYxMGE=
+    Y2NiYWY5YzAwNWM4MzQ3MTg3YWQxMWM4MDVkMTM3MDFkYzk3MzZhZjU3N2Nl
+    ZjliY2Y2MTQxZjQ4ZTlhYzQ0NmM2ODM1NDA3OGFlYzZlOGI5YWYzZDMyZTgw
+    NjI2M2Q2ZmVmNTc3NjU1ZWE4MzkyNjllMjA0NzQ5ZjI4ODU5MTk=

data/lib/union_station_hooks_rails.rb

@@ -92,6 +92,9 @@ module UnionStationHooksRails
       require_lib('initialize')
       require_lib('active_record_subscriber')
       require_lib('exception_logger')
+      if defined?(ActionView)
+        require_lib('action_view_subscriber')
+      end
       if defined?(ActiveSupport::Cache::Store)
         require_lib('active_support_cache_subscriber')
       end
@@ -153,12 +156,12 @@ module UnionStationHooksRails
 
       # If you update the dependency version here, also update
       # the version in the gemspec and in the Gemfile.
-      compatible = UnionStationHooks::MAJOR_VERSION == 1 &&
+      compatible = UnionStationHooks::MAJOR_VERSION == 2 &&
         UnionStationHooks::MINOR_VERSION >= 0
       if !compatible
         raise "This version of the union_station_hooks_rails gem " \
           "(#{VERSION_STRING}) is only compatible with the " \
-          "union_station_hooks_core gem 1.x.x. However, you have loaded " \
+          "union_station_hooks_core gem 2.x.x. However, you have loaded " \
           "union_station_hooks_core #{UnionStationHooks::VERSION_STRING}"
       end
     end

data/lib/union_station_hooks_rails/action_controller_extension.rb

@@ -37,15 +37,6 @@ module UnionStationHooksRails
         super
       end
     end
-
-    def render(*args)
-      reporter = request.env['union_station_hooks']
-      return super if !reporter
-
-      reporter.log_view_rendering_block do
-        super
-      end
-    end
   end
 end
 

data/lib/union_station_hooks_rails/action_view_subscriber.rb

@@ -0,0 +1,55 @@
+#  Union Station - https://www.unionstationapp.com/
+#  Copyright (c) 2015 Phusion Holding B.V.
+#
+#  "Union Station" and "Passenger" are trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+module UnionStationHooksRails
+  class ActionViewSubscriber < ActiveSupport::LogSubscriber
+    def render_collection(event)
+      log_view_rendering(event)
+    end
+
+    def render_template(event)
+      log_view_rendering(event)
+    end
+
+    def render_partial(event)
+      log_view_rendering(event)
+    end
+
+  private
+
+    def log_view_rendering(event)
+      reporter = Thread.current[:union_station_hooks]
+      return if !reporter
+
+      UnionStationHooks.call_event_pre_hook(event)
+      reporter.log_view_rendering(
+        :begin_time => event.time,
+        :end_time => UnionStationHooks.now,
+        :name => event.payload[:identifier],
+        :has_error => event.payload[:exception]
+      )
+    end
+  end
+end
+
+UnionStationHooksRails::ActionViewSubscriber.attach_to(:action_view)

data/lib/union_station_hooks_rails/active_record_subscriber.rb

@@ -31,7 +31,7 @@ module UnionStationHooksRails
       UnionStationHooks.call_event_pre_hook(event)
       reporter.log_database_query(
         :begin_time => event.time,
-        :end_time => event.time,
+        :end_time => UnionStationHooks.now,
         :query => event.payload[:sql]
       )
     end

data/lib/union_station_hooks_rails/version_data.rb

@@ -37,8 +37,8 @@
 # here.
 
 {
-  :major  => 1,
+  :major  => 2,
   :minor  => 0,
   :tiny   => 0,
-  :string => '1.0.0'
+  :string => '2.0.0'
 }

data/union_station_hooks_rails.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # If you update the dependency version here, also update
   # the version in Gemfile and union_station_hooks_rails.rb method
   # `require_and_check_union_station_hooks_core`
-  s.add_dependency("union_station_hooks_core", "~> 1.0")
+  s.add_dependency("union_station_hooks_core", "~> 2.0")
 
   s.add_dependency("activesupport", ">= 3.0")
   s.add_dependency("activemodel", ">= 3.0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: union_station_hooks_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: union_station_hooks_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ files:
 - README.md
 - lib/union_station_hooks_rails.rb
 - lib/union_station_hooks_rails/action_controller_extension.rb
+- lib/union_station_hooks_rails/action_view_subscriber.rb
 - lib/union_station_hooks_rails/active_record_subscriber.rb
 - lib/union_station_hooks_rails/active_support_benchmarkable_extension.rb
 - lib/union_station_hooks_rails/active_support_cache_subscriber.rb