hightop 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8123384a25f9687e070f4ee86677c1afc5060a1f
-  data.tar.gz: 3b3776446331302a639859ba54d12cfa77b450aa
+  metadata.gz: 19538edc7ac8f8cc81df7ad682c47ec6dfe0d38e
+  data.tar.gz: 2f2bb4d909ead9b64fa293627a784c5adeaadd2d
 SHA512:
-  metadata.gz: 51c28c43483583167675608a90698f5a3e5b2b7bcf362278ab89b63a56c065d7adad51993e111005201b70e2e63ae5f7570db5e5eb1ce39cec1df085f32952ad
-  data.tar.gz: 191b537904fcb730a4e313714f9168b475e8017a791131e60c9173ea4ec5c7a5e817e73324af5388c0161a106eb336e20da3b4a8e6074f2ed5bcc81db0d2dd8c
+  metadata.gz: ac01a53983e69a760c745bcddd99287774ae73d7b743dcf4be327b252c0524e3147b6e815a1560b735f6cdf2252d651402ea9b775468bd93300d056fdcea18d3
+  data.tar.gz: 37252ef2688c355c2aa327f36fd5025c7809986abfc256bb4f8ea0df48442c8add698d944261b2a0ee0d16ee5c3d52b352023ad7c334a6ec39fe80e80a3922f0

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 2.1
 gemfile:
   - Gemfile
+sudo: false
+before_install: gem install bundler
 script: bundle exec rake test
 notifications:
   email:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4
+
+- Added `distinct` option to replace `uniq`
+
 ## 0.1.3
 
 - Fixed `min` option with `uniq`

data/README.md

@@ -43,7 +43,7 @@ Visit.top("LOWER(referring_domain)")
 And distinct
 
 ```ruby
-Visit.top(:city, uniq: :user_id)
+Visit.top(:city, distinct: :user_id)
 ```
 
 And min count

data/lib/hightop.rb

@@ -8,8 +8,9 @@ module Hightop
       limit = nil
     end
 
+    distinct = options[:distinct] || options[:uniq]
     order_str = column.is_a?(Array) ? column.map(&:to_s).join(", ") : column
-    relation = group(column).order("count_#{options[:uniq] || 'all'} DESC, #{order_str}")
+    relation = group(column).order("count_#{distinct || 'all'} DESC, #{order_str}")
     if limit
       relation = relation.limit(limit)
     end
@@ -21,11 +22,16 @@ module Hightop
     end
 
     if options[:min]
-      relation = relation.having("COUNT(#{options[:uniq] ? "DISTINCT #{options[:uniq]}" : '*'}) >= #{options[:min].to_i}")
+      relation = relation.having("COUNT(#{distinct ? "DISTINCT #{distinct}" : '*'}) >= #{options[:min].to_i}")
     end
 
-    if options[:uniq]
-      relation.uniq.count(options[:uniq])
+    if distinct
+      # since relation.respond_to?(:distinct) can't be used
+      if ActiveRecord::VERSION::MAJOR > 3
+        relation.distinct.count(distinct)
+      else
+        relation.uniq.count(distinct)
+      end
     else
       relation.count
     end

data/lib/hightop/version.rb

@@ -1,3 +1,3 @@
 module Hightop
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/hightop_test.rb

@@ -62,6 +62,15 @@ class TestHightop < Minitest::Test
     assert_equal expected, Visit.top("LOWER(city)")
   end
 
+  def test_distinct
+    create(city: "San Francisco", user_id: 1)
+    create(city: "San Francisco", user_id: 1)
+    expected = {
+      "San Francisco" => 1
+    }
+    assert_equal expected, Visit.top(:city, distinct: :user_id)
+  end
+
   def test_uniq
     create(city: "San Francisco", user_id: 1)
     create(city: "San Francisco", user_id: 1)
@@ -80,6 +89,18 @@ class TestHightop < Minitest::Test
     assert_equal expected, Visit.top(:city, min: 3)
   end
 
+  def test_min_distinct
+    create(city: "San Francisco", user_id: 1)
+    create(city: "San Francisco", user_id: 1)
+    create(city: "San Francisco", user_id: 2)
+    create(city: "Chicago", user_id: 1)
+    create(city: "Chicago", user_id: 1)
+    expected = {
+      "San Francisco" => 2
+    }
+    assert_equal expected, Visit.top(:city, min: 2, distinct: :user_id)
+  end
+
   def create_city(city, count = 1)
     create({city: city}, count)
   end

data/test/test_helper.rb

@@ -4,6 +4,8 @@ require "minitest/autorun"
 require "minitest/pride"
 require "logger"
 
+Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
+
 # for debugging
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hightop
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A nice shortcut for group count queries