hightop 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19538edc7ac8f8cc81df7ad682c47ec6dfe0d38e
-  data.tar.gz: 2f2bb4d909ead9b64fa293627a784c5adeaadd2d
+  metadata.gz: 0b7e3f9ed74cce5d6a2e2a40f74634de04bcdcf8
+  data.tar.gz: a4b20f5a241a447bac6b3d1eefc3123d93d076e2
 SHA512:
-  metadata.gz: ac01a53983e69a760c745bcddd99287774ae73d7b743dcf4be327b252c0524e3147b6e815a1560b735f6cdf2252d651402ea9b775468bd93300d056fdcea18d3
-  data.tar.gz: 37252ef2688c355c2aa327f36fd5025c7809986abfc256bb4f8ea0df48442c8add698d944261b2a0ee0d16ee5c3d52b352023ad7c334a6ec39fe80e80a3922f0
+  metadata.gz: 8a9fa28eac3b9273a8cb63f74031c1bfd6698dd409601ab4ccc8182b9eca4f8233e7e1d8de67053de8ae9a0bc621eee849f34e60addbba089a566ee698603eaf
+  data.tar.gz: 046cb949463896d1ee5637dcb58529c5d6a9742c8f868fc6a2d85d252d353c6ccff2c8d0dd03e65e715c51d7d2347aaba309e18d1010171ac1b53f659ababcb1

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
-rvm:
-  - 2.1
+rvm: 2.2.5
 gemfile:
   - Gemfile
 sudo: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0
+
+- Use keyword arguments
+
 ## 0.1.4
 
 - Added `distinct` option to replace `uniq`

data/lib/hightop.rb

@@ -2,27 +2,23 @@ require "hightop/version"
 require "active_record"
 
 module Hightop
-  def top(column, limit = nil, options = {})
-    if limit.is_a?(Hash)
-      options = limit
-      limit = nil
-    end
-
-    distinct = options[:distinct] || options[:uniq]
+  def top(column, limit = nil, distinct: nil, uniq: nil, min: nil, nil: nil)
+    distinct ||= uniq
     order_str = column.is_a?(Array) ? column.map(&:to_s).join(", ") : column
     relation = group(column).order("count_#{distinct || 'all'} DESC, #{order_str}")
     if limit
       relation = relation.limit(limit)
     end
 
-    unless options[:nil]
+    # terribly named option
+    unless binding.local_variable_get(:nil)
       (column.is_a?(Array) ? column : [column]).each do |c|
         relation = relation.where("#{c} IS NOT NULL")
       end
     end
 
-    if options[:min]
-      relation = relation.having("COUNT(#{distinct ? "DISTINCT #{distinct}" : '*'}) >= #{options[:min].to_i}")
+    if min
+      relation = relation.having("COUNT(#{distinct ? "DISTINCT #{distinct}" : '*'}) >= #{min.to_i}")
     end
 
     if distinct

data/lib/hightop/version.rb

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

data/test/hightop_test.rb

@@ -101,6 +101,12 @@ class TestHightop < Minitest::Test
     assert_equal expected, Visit.top(:city, min: 2, distinct: :user_id)
   end
 
+  def test_bad_argument
+    assert_raises(ArgumentError) do
+      Visit.top(:city, boom: true)
+    end
+  end
+
   def create_city(city, count = 1)
     create({city: city}, count)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hightop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -119,11 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A nice shortcut for group count queries
 test_files:
 - test/hightop_test.rb
 - test/test_helper.rb
-has_rdoc: