lines 0.1.26 → 0.1.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTY4ODEyZDBhZjRkNTgxY2JkOGI4NGY4ZDQ3Y2U5ZWQ0YmE5YTkyMg==
+    OTM0ODk2MzlkMTQ3YmJhMTc2MmI4MGMzNzYzNTQyMTFjNmQ5OTYyZQ==
   data.tar.gz: !binary |-
-    NDc1NTBjMjY0ZTExNjJiNzIxNmI0YTgwZGJiZTRhNWFlODBhMTAzNg==
+    OTA4YzE1ZTJkMjQwZDM0NmRiOGVlMDY1MzFkMmIxYmJhMzYxNzlmZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MThiZTY3ZTM4NDViYjFlNTQ5MmIyM2UwMjdiYTA2ZWVkMDMwYTA5NDk4MmM3
-    OGU5N2FjYWYzYzAyMWJlZGZlNDM5NzA2NjA4N2YyNDNiYjk0MTg0ZGJhOWU2
-    YWMzMzcxNjA5MmI1NjRlMGFiYjI2YTJlZWQwZWVhM2JmMGE2MzE=
+    YWZlYzZmYzdhNjBjOTIwNGU2MjYyMjFmMjNkNGNjYzE1NmI2NTk2NzJlOGYx
+    MGRhNmU2ZjYxNWY3MGJlMWExMjVjYzEwMTBiZGU0MGFlMWIyNzEyNjE0NjQ4
+    YzA0Y2QwZTc4NmI4N2E3YmI4OGQwZDY4Y2E4OTI5NmI2N2FmNzY=
   data.tar.gz: !binary |-
-    NWVjNjgzZTE4MWNlNmEwNTA0NWM2NzQxN2E2ZGIwMDYwNzVkMGZkNDZiNWE5
-    ZDE3YmM4OTBhMzI0ZmFjOTM0ODVhMmUwZDJkNWY3OWRlYmJkZjUwMzczMzg0
-    YjZiZTViM2ZmNDc2ZGEyY2NmMmQ1ZTQyMmU4M2NhZjAyMmRhN2Y=
+    NWFkZGFkNjY5OWE4NmViZWEzOWNhNzllNjZiZTg1NzI2YmFjNzRmOTYyNGE0
+    OTM4ZDA0YTc1ZmM5MzdmYzdlY2I0YzMwOTVhNDE0YTBjYjk5YzM0MjVhNGEw
+    NTUxOWIyOTkzOGExNDliZjY1ZTI0NTUyYzVlYjlkNTY3ZWE5Yzg=

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+0.1.27 / 2013-07-10 
+===================
+
+ * Fixes AR's notification by changing the ordering
+ * Update the ActiveRecord log subscriber to work with AR 4.0.0
+
 0.1.26 / 2013-07-10 
 ===================
 

data/lib/lines/active_record.rb

@@ -3,10 +3,22 @@ require 'lines'
 
 module Lines
   class ActiveRecordSubscriber < ActiveSupport::LogSubscriber
+    def render_bind(column, value)
+      if column
+        if column.binary?
+          value = "<#{value.bytesize} bytes of binary data>"
+        end
+
+        [column.name, value]
+      else
+        [nil, value]
+      end
+    end
+
     def sql(event)
       payload = event.payload
 
-      return if payload[:name] == 'SCHEMA'
+      return if payload[:name] == 'SCHEMA' || payload[:name] == 'EXPLAIN'
 
       args = {}
 
@@ -15,12 +27,13 @@ module Lines
 
       if payload[:binds] && payload[:binds].any?
         args[:binds] = payload[:binds].inject({}) do |hash,(col, v)|
-          hash[col.name] = v
+          k, v = render_bind(col, v)
+          hash[k] = v
           hash
         end
       end
 
-      args[:elapsed] = [event.duration, 's']
+      args[:elapsed] = [event.duration.round(1), 'ms']
 
       Lines.log(args)
     end
@@ -33,6 +46,9 @@ module Lines
   end
 end
 
+# Subscribe lines to the AR events
+Lines::ActiveRecordSubscriber.attach_to :active_record
+
 # Remove the default ActiveRecord::LogSubscriber to avoid double outputs
 ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
   if subscriber.is_a?(ActiveRecord::LogSubscriber)
@@ -47,6 +63,7 @@ ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
     end
   end
 end
+
+# Make sure it has a logger just in case
 ActiveRecord::Base.logger = Lines.logger
-Lines::ActiveRecordSubscriber.attach_to :active_record
 

data/lib/lines/version.rb

@@ -1,3 +1,3 @@
 module Lines
-  VERSION = "0.1.26"
+  VERSION = "0.1.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lines
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Jonas Pfenniger