hightop 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7afed0619ef7e10ad7396edd82f1b7ee4fd76bbd
-  data.tar.gz: a490f3b11648fc044a1f1e0b9b52f7686efe7638
+  metadata.gz: 8123384a25f9687e070f4ee86677c1afc5060a1f
+  data.tar.gz: 3b3776446331302a639859ba54d12cfa77b450aa
 SHA512:
-  metadata.gz: 8df32f44bc3eb512189840d6fb28b65af553aed3ad946de6e848975f5ad4faf052ef6d95a873217dafdd8ebde3f566eebf9884e3a303adc185746bcd89319315
-  data.tar.gz: 53a8a14e86db5f6ded22ef82e8cfea1c52437aaca8ca6219f842b5060281a792d87d1ab52fc1ec9005170a4281c59ec3a9958cd84922e5bc5f8acae4a81c9436
+  metadata.gz: 51c28c43483583167675608a90698f5a3e5b2b7bcf362278ab89b63a56c065d7adad51993e111005201b70e2e63ae5f7570db5e5eb1ce39cec1df085f32952ad
+  data.tar.gz: 191b537904fcb730a4e313714f9168b475e8017a791131e60c9173ea4ec5c7a5e817e73324af5388c0161a106eb336e20da3b4a8e6074f2ed5bcc81db0d2dd8c

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.1
+gemfile:
+  - Gemfile
+script: bundle exec rake test
+notifications:
+  email:
+    on_success: never
+    on_failure: change

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.1.2 [unreleased]
+## 0.1.3
+
+- Fixed `min` option with `uniq`
+
+## 0.1.2
 
 - Added `min` option
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in hightop.gemspec
 gemspec

data/README.md

@@ -2,6 +2,8 @@
 
 A nice shortcut for group count queries
 
+[![Build Status](https://travis-ci.org/ankane/hightop.svg)](https://travis-ci.org/ankane/hightop)
+
 ```ruby
 Visit.top(:browser)
 ```

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :default => :test
+task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"

data/hightop.gemspec

@@ -1,15 +1,15 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hightop/version'
+require "hightop/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "hightop"
   spec.version       = Hightop::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = %q{A nice shortcut for group count queries}
-  spec.description   = %q{A nice shortcut for group count queries}
+  spec.summary       = "A nice shortcut for group count queries"
+  spec.description   = "A nice shortcut for group count queries"
   spec.homepage      = "https://github.com/ankane/hightop"
   spec.license       = "MIT"
 

data/lib/hightop.rb

@@ -2,7 +2,6 @@ require "hightop/version"
 require "active_record"
 
 module Hightop
-
   def top(column, limit = nil, options = {})
     if limit.is_a?(Hash)
       options = limit
@@ -10,7 +9,7 @@ module Hightop
     end
 
     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_#{options[:uniq] || 'all'} DESC, #{order_str}")
     if limit
       relation = relation.limit(limit)
     end
@@ -22,7 +21,7 @@ module Hightop
     end
 
     if options[:min]
-      relation = relation.having("COUNT(*) >= #{options[:min].to_i}")
+      relation = relation.having("COUNT(#{options[:uniq] ? "DISTINCT #{options[:uniq]}" : '*'}) >= #{options[:min].to_i}")
     end
 
     if options[:uniq]
@@ -31,7 +30,6 @@ module Hightop
       relation.count
     end
   end
-
 end
 
 ActiveRecord::Base.send :extend, Hightop

data/lib/hightop/version.rb

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

data/test/hightop_test.rb

@@ -1,7 +1,6 @@
 require_relative "test_helper"
 
 class TestHightop < Minitest::Test
-
   def setup
     Visit.delete_all
   end
@@ -32,7 +31,7 @@ class TestHightop < Minitest::Test
     create_city("San Francisco", 3)
     create_city(nil, 2)
     expected = {
-      "San Francisco" => 3,
+      "San Francisco" => 3
     }
     assert_equal expected, Visit.top(:city)
   end
@@ -64,8 +63,8 @@ class TestHightop < Minitest::Test
   end
 
   def test_uniq
-    create({city: "San Francisco", user_id: 1})
-    create({city: "San Francisco", user_id: 1})
+    create(city: "San Francisco", user_id: 1)
+    create(city: "San Francisco", user_id: 1)
     expected = {
       "San Francisco" => 1
     }
@@ -86,7 +85,6 @@ class TestHightop < Minitest::Test
   end
 
   def create(attributes, count = 1)
-    count.times{ Visit.create!(attributes) }
+    count.times { Visit.create!(attributes) }
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hightop
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -118,10 +119,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 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: