hightop 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f282f1928e3686e3b51e376e64c6caa727665dd
-  data.tar.gz: 6c8614fee9db943bc7b0c6ad8c65576116ffc9f4
+  metadata.gz: 846b498786282576ab175fcf91cf24bfb9b86034
+  data.tar.gz: 8392b028241d3b03f59c62dec5b46f694cb8a33d
 SHA512:
-  metadata.gz: b3c0135aebba9a186fdb2ab91e0f5d792c3c5d132305ae3b799c8a16b24a0239597b79d771d5e704e095602a0d048a084b41e2e2273b43c26a712435353534f5
-  data.tar.gz: ce487ed0b6cef4b566a35ae92c83403ac597cd608a1a52222e1de99914e415505e1356da82aa88fd839e125ddba43a6ea3f3d3298687d58deb4c4c1da14235a8
+  metadata.gz: 8c1f11dd88fcc63423a3d927c13c2ab4ded446bb062dd104aa2f08d1580bd8dbca9907835aab2cc220e6e06c394747e2f76863c460f029626254d22345715952
+  data.tar.gz: debd4bc6b2a97302db73b08c313a30cfa6825509b838c7bc90acbebb62439518f003108df241b6a52621982f015c319084c17859d5c13afd0b8d248212048274

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+## 0.0.4
+
+- Added support for multiple groups
+- Added `nil` option
+
+## 0.0.3
+
+- Fixed escaping
+
+## 0.0.2
+
+- Added `limit` parameter

data/README.md

@@ -12,13 +12,25 @@ instead of
 Visit.group(:browser).where("browser IS NOT NULL").order("count_all DESC, browser").count
 ```
 
+Be sure to [sanitize user input](http://rails-sqli.org/) like you must with `group`.
+
 Limit the results
 
 ```ruby
 Visit.top(:referring_domain, 10)
 ```
 
-Be sure to [sanitize user input](http://rails-sqli.org/) like you must with `group`.
+Include nil values
+
+```ruby
+Visit.top(:referring_domain, nil: true)
+```
+
+Works with multiple groups
+
+```ruby
+Visit.top([:city, :referring_domain])
+```
 
 ## Installation
 

data/lib/hightop/version.rb

@@ -1,3 +1,3 @@
 module Hightop
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/hightop.rb

@@ -2,9 +2,22 @@ require "hightop/version"
 
 module Hightop
 
-  def top(column, limit = nil)
-    column = connection.quote_table_name(column) if column.is_a?(Symbol)
-    group(column).where("#{column} IS NOT NULL").order("count_all DESC, #{column}").limit(limit).count
+  def top(column, limit = nil, options = {})
+    if limit.is_a?(Hash)
+      options = limit
+      limit = nil
+    end
+
+    order_str = column.is_a?(Array) ? column.map(&:to_s).join(", ") : column
+    relation = group(column).limit(limit).order("count_all DESC, #{order_str}")
+
+    unless options[:nil]
+      (column.is_a?(Array) ? column : [column]).each do |c|
+        relation = relation.where("#{c} IS NOT NULL")
+      end
+    end
+
+    relation.count
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hightop
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Kane
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md