skylight 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a889a7a09786acddcdf866faaf84ed4862909f4
-  data.tar.gz: 5e2f48fcfcea4166894f19422b435eb82d809856
+  metadata.gz: 46377b71401533410551ea729a2fc51c14c8ab19
+  data.tar.gz: 98f06fa6bb8032857b23fce319ad91a397e58d1a
 SHA512:
-  metadata.gz: 59381efc987947df3b1a8bff022beb0a61288c02b41124b861ea3923db126a4b38fb74100ad67b8efac86b694843fa7c70545bef02be511c9b1892d265a998fa
-  data.tar.gz: 7c433c0b9b74b350955aa27641b3ae1ac6d1a2ddd8d018f71f94302078d04e1a000c697b8f339663d8af12d2417df4b973c5f786386cb14a426865eaa9b9ea95
+  metadata.gz: 5348784baea5422f5f4361ff7ee7bf56424783c485a5549e998acb60611c8504d691558a8813efbf2d10a44cfca46b04ecc0e2e7d4d9fa94ff3af1d9479c2cbd
+  data.tar.gz: 99712c702e5d9bc99baee91408a7fc072f2a4bce9271e9eb0fc94f5648f316e8f736950efa2ad20085c7d43dbb0980274343bbfa17474ddc8dff4d002d064d2d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.10.0 (December 3, 2015)
+
+* [FEATURE] ActiveModel::Serializers Instrumentation. Always on in latest HEAD, for previous version add 'active_model_serializers' to probes list.
+* [BUGFIX] Handle multi-byte characters in SQL lexer
+
 ## 0.9.4 (November 23, 2015)
 
 * [FEATURE] Added instrumentation for official Mongo Ruby Driver (utilized by Mongoid 5+). Add 'mongo' to probes list to enable. 

data/ext/libskylight.yml

@@ -1,6 +1,6 @@
 ---
-version: "0.7.0-ffe066b"
+version: "0.7.0-b2a5f4b"
 checksums:
-  x86-linux:     "311cf34d25383d1a0c7f4611919ac78e49cbd2e227532ea9aa2b308212e9fca9"
-  x86_64-linux:  "9d4969487f16e0f1d2ed6410dc4ea408e28ec4ea157c1a56c93b0bf596600461"
-  x86_64-darwin: "4e40e9a08efa8953ed1afca07c684385fa374833a057136057bf36ef41cce55e"
+  x86-linux:     "4ea1f0382dbbba12454d5121a4b400278b2b515b79b676e7d4a2655cdc088bfe"
+  x86_64-linux:  "42a958e6fe7f5d9b459e10ffc62c336c44f00e46c253b7f466a72f2902e8e130"
+  x86_64-darwin: "7958533c605d98f43fbe54cdd7f7a6e39d6c8fee30acd29494465213afd123ef"

data/ext/skylight_native.c

@@ -444,6 +444,7 @@ lex_sql(VALUE klass, VALUE rb_sql) {
 
   // Set the statement return
   rb_str_set_len(rb_statement, statement.len);
+  rb_enc_associate(rb_statement, rb_utf8_encoding());
 
   ret = rb_ary_new2(2);
 

data/lib/skylight/normalizers.rb

@@ -131,6 +131,7 @@ module Skylight
         action_view/render_collection
         action_view/render_partial
         action_view/render_template
+        active_model_serializers/render
         active_record/sql
         active_support/cache
         grape/endpoint

data/lib/skylight/normalizers/active_model_serializers/render.rb

@@ -0,0 +1,24 @@
+module Skylight
+  module Normalizers
+    module ActiveModelSerializers
+      class Render < Normalizer
+        register "render.active_model_serializers"
+
+        CAT = "view.render.active_model_serializers".freeze
+
+        def normalize(trace, name, payload)
+          serializer_class = payload[:serializer]
+
+          title = serializer_class.name.sub(/^ActiveModel::(Serializer::)?/, '')
+
+          if adapter_instance = payload[:adapter]
+            adapter_name = adapter_instance.class.name.sub(/^ActiveModel::Serializer::Adapter::/, '')
+            desc = "Adapter: #{adapter_name}"
+          end
+
+          [ CAT, title, desc ]
+        end
+      end
+    end
+  end
+end

data/lib/skylight/probes/active_model_serializers.rb

@@ -0,0 +1,55 @@
+module Skylight
+  module Probes
+    module ActiveModelSerializers
+      class Probe
+        def install
+          version = nil
+
+          # File moved location between version
+          %w(serializer serializers).each do |dir|
+            begin
+              require "active_model/#{dir}/version"
+            rescue LoadError
+            end
+          end
+
+          if defined?(::ActiveModel::Serializer::VERSION)
+            version = Gem::Version.new(::ActiveModel::Serializer::VERSION)
+          end
+
+          if !version || version < Gem::Version.new("0.5.0")
+            # Using $stderr here isn't great, but we don't have a logger accessible
+            $stderr.puts "[SKYLIGHT] [#{Skylight::VERSION}] Instrumention is only available for " \
+                          "ActiveModelSerializers version 0.5.0 and greater."
+            return
+          end
+
+          # We don't actually support the RCs correctly, requires
+          # a release after 0.10.0.rc3
+          if version >= Gem::Version.new("0.10.0.rc1")
+            # AS::N is built in to newer versions
+            return
+          end
+
+          # End users could override as_json without calling super, but it's likely safer
+          # than overriding serializable_array/hash/object.
+
+          [::ActiveModel::Serializer, ::ActiveModel::ArraySerializer].each do |klass|
+            klass.class_eval do
+              alias as_json_without_sk as_json
+              def as_json(*args)
+                payload = { serializer: self.class }
+                ActiveSupport::Notifications.instrument('render.active_model_serializers', payload) do
+                  as_json_without_sk(*args)
+                end
+              end
+            end
+          end
+
+        end
+      end
+    end
+
+    register("ActiveModel::Serializer", "active_model/serializer", ActiveModelSerializers::Probe.new)
+  end
+end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.9.4'
+  VERSION = '0.10.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -63,6 +63,7 @@ files:
 - lib/skylight/normalizers/action_view/render_collection.rb
 - lib/skylight/normalizers/action_view/render_partial.rb
 - lib/skylight/normalizers/action_view/render_template.rb
+- lib/skylight/normalizers/active_model_serializers/render.rb
 - lib/skylight/normalizers/active_record/sql.rb
 - lib/skylight/normalizers/active_support/cache.rb
 - lib/skylight/normalizers/active_support/cache_clear.rb
@@ -83,6 +84,7 @@ files:
 - lib/skylight/normalizers/moped/query.rb
 - lib/skylight/probes.rb
 - lib/skylight/probes/action_view.rb
+- lib/skylight/probes/active_model_serializers.rb
 - lib/skylight/probes/excon.rb
 - lib/skylight/probes/excon/middleware.rb
 - lib/skylight/probes/grape.rb