peek-active_record 0.3.0 → 0.4.0

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ``` ruby
 # config/initializers/peek.rb
-Peek.into Peek::Views::ActiveRecord
+Peek.into Peek::Views::ActiveRecord, :type_tracking => false
 ```
 
 ``` coffee

data/app/assets/javascripts/peek/views/active_record.coffee

@@ -1,6 +1,12 @@
 $(document).on 'peek:update', ->
   arContext = $('#peek-context-active-record')
   if arContext.size()
-    context = arContext.data('context')
-    objects = context.object_count
-    $('#active_record-tooltip').attr('title', "#{objects} AR Objects").tipsy()
+    context      = arContext.data('context')
+    objects      = context.object_count
+    object_types = context.object_types
+
+    title = "<strong>#{objects} AR Objects</strong>"
+    for key, val of object_types
+      title += "<br>#{val} #{key}"
+
+    $('#active_record-tooltip').attr('title', title).tipsy({html: true})

data/lib/peek-active_record.rb

@@ -1,3 +1,2 @@
-require "peek/extensions/active_record"
 require "peek/views/active_record"
 require "peek-active_record/railtie"

data/lib/peek/extensions/active_record.rb

@@ -17,11 +17,7 @@ class ActiveRecord::Base
     ActiveRecord::Base.obj_count.update { |val| val + 1 }
 
     if ActiveRecord::Base.obj_types_enabled
-      if ActiveRecord::Base.obj_types.has_key? self.class.name
-        ActiveRecord::Base.obj_types[self.class.name].update { |val| val + 1 }
-      else
-        ActiveRecord::Base.obj_types[self.class.name] = Atomic.new(1)
-      end
+      ActiveRecord::Base.obj_types[self.class.name] += 1
     end
   end
 end

data/lib/peek/views/active_record.rb

@@ -1,24 +1,38 @@
-require "atomic"
+require "peek/extensions/active_record"
 
 module Peek
   module Views
     class ActiveRecord < View
-      def result
-        { :objects => ::ActiveRecord::Base.obj_count.value }
+      def initialize options = {}
+        @type_tracking = options.fetch(:type_tracking, false)
+
+        setup_subscribers
       end
 
       def context
-        Hash.new.tap do |ctx|
-          ctx[:object_count] = ::ActiveRecord::Base.obj_count.value
-          ctx[:object_types] = ::ActiveRecord::Base.obj_types
-        end
+        {
+          :object_count => object_count,
+          :object_types => object_types
+        }
       end
 
+
       private
+      def object_count
+        ::ActiveRecord::Base.obj_count.value
+      end
+
+      def object_types
+        Hash[::ActiveRecord::Base.obj_types.sort_by(&:last).reverse]
+      end
 
       def setup_subscribers
         before_request do
-          ::ActiveRecord::Base.tap { |ar| ar.obj_count = Atomic.new(0) }
+          ::ActiveRecord::Base.tap do |ar|
+            ar.obj_count = Atomic.new(0)
+            ar.obj_types = Hash.new(0)
+            ar.obj_types_enabled = @type_tracking
+          end
         end
       end
     end

data/peek-active_record.gemspec

@@ -2,7 +2,7 @@
 #
 Gem::Specification.new do |spec|
   spec.name          = "peek-active_record"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["Will Farrington"]
   spec.email         = ["wfarr@github.com"]
   spec.description   = %q{Peek into your ActiveRecord stats.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peek-active_record
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors: