hightop 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c663a3196a056d66875c95ac2ba74bd54f37671a
-  data.tar.gz: 6c0e8e59cafcfc7e9efa5e3680e55f093bff9758
+  metadata.gz: a5b161bc2d5fcb7b053be0581fe018c56fd818a0
+  data.tar.gz: 304d42b406499cbbd396948e1816369353f889f0
 SHA512:
-  metadata.gz: fbcb31e2cd64bf75a8ba6352321d3d85bc93a43548281c3d158cc7132c5aee732c8b065506cc22c248811109f24970df5571f842427bcf6ef169d5fb30020445
-  data.tar.gz: fdcd9b045ba3782787714d38f502d53e991af8f2f5ed26832fddf4610b8d1dfebc15c03fedc253d6b305eefaed965c3e859048d07e5dbe79ee8c4143803911e6
+  metadata.gz: 3a47145bd2f6858502a0e02314a04ce0c151924366f4531d15145fc98d171d77ab03dce2cf36bfa5f0a299e100e27d503d100cee8f14a7c4bcbb81b14bd7b9d7
+  data.tar.gz: d2c71a0da54bb8a9151c6ff71eb70f0587f1282d436b2dc7dd0af7aed8bef528f7bcfe582c454e4f239d20960e83c4a36af6fe012a1372ffefd2df01745b9fb6

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.1
+
+- Added `uniq` option
+- Fixed `Model.limit(n).top`
+
 ## 0.1.0
 
 - No changes, just bump

data/README.md

@@ -1,6 +1,6 @@
 # Hightop
 
-Super convenient group count
+A nice shortcut for group count queries
 
 ```ruby
 Visit.top(:browser)
@@ -38,6 +38,12 @@ And expressions
 Visit.top("LOWER(referring_domain)")
 ```
 
+And distinct
+
+```ruby
+Visit.top(:city, uniq: :user_id)
+```
+
 ## Installation
 
 Add this line to your application’s Gemfile:

data/Rakefile

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

data/hightop.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Hightop::VERSION
   spec.authors       = ["Andrew Kane"]
   spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = %q{Super convenient group count}
-  spec.description   = %q{Super convenient group count}
+  spec.summary       = %q{A nice shortcut for group count queries}
+  spec.description   = %q{A nice shortcut for group count queries}
   spec.homepage      = "https://github.com/ankane/hightop"
   spec.license       = "MIT"
 
@@ -18,6 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activerecord"
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "sqlite3"
 end

data/lib/hightop/version.rb

@@ -1,3 +1,3 @@
 module Hightop
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/hightop.rb

@@ -1,4 +1,5 @@
 require "hightop/version"
+require "active_record"
 
 module Hightop
 
@@ -9,7 +10,10 @@ module Hightop
     end
 
     order_str = column.is_a?(Array) ? column.map(&:to_s).join(", ") : column
-    relation = group(column).limit(limit).order("count_all DESC, #{order_str}")
+    relation = group(column).order("count_#{options[:uniq] || "all"} DESC, #{order_str}")
+    if limit
+      relation = relation.limit(limit)
+    end
 
     unless options[:nil]
       (column.is_a?(Array) ? column : [column]).each do |c|
@@ -17,7 +21,11 @@ module Hightop
       end
     end
 
-    relation.count
+    if options[:uniq]
+      relation.uniq.count(options[:uniq])
+    else
+      relation.count
+    end
   end
 
 end

data/test/hightop_test.rb

@@ -0,0 +1,83 @@
+require_relative "test_helper"
+
+class TestHightop < Minitest::Test
+
+  def setup
+    Visit.delete_all
+  end
+
+  def test_top
+    create_city("San Francisco", 3)
+    create_city("Chicago", 2)
+    expected = {
+      "San Francisco" => 3,
+      "Chicago" => 2
+    }
+    assert_equal expected, Visit.top(:city)
+  end
+
+  def test_limit
+    create_city("San Francisco", 3)
+    create_city("Chicago", 2)
+    create_city("Boston", 1)
+    expected = {
+      "San Francisco" => 3,
+      "Chicago" => 2
+    }
+    assert_equal expected, Visit.top(:city, 2)
+    assert_equal expected, Visit.limit(2).top(:city)
+  end
+
+  def test_nil_values
+    create_city("San Francisco", 3)
+    create_city(nil, 2)
+    expected = {
+      "San Francisco" => 3,
+    }
+    assert_equal expected, Visit.top(:city)
+  end
+
+  def test_nil_option
+    create_city("San Francisco", 3)
+    create_city(nil, 2)
+    expected = {
+      "San Francisco" => 3,
+      nil => 2
+    }
+    assert_equal expected, Visit.top(:city, nil: true)
+  end
+
+  def test_multiple_groups
+    create_city("San Francisco")
+    expected = {
+      ["San Francisco", "San Francisco"] => 1
+    }
+    assert_equal expected, Visit.top([:city, :city])
+  end
+
+  def test_expressions
+    create_city("San Francisco")
+    expected = {
+      "san francisco" => 1
+    }
+    assert_equal expected, Visit.top("LOWER(city)")
+  end
+
+  def test_uniq
+    create({city: "San Francisco", user_id: 1})
+    create({city: "San Francisco", user_id: 1})
+    expected = {
+      "San Francisco" => 1
+    }
+    assert_equal expected, Visit.top(:city, uniq: :user_id)
+  end
+
+  def create_city(city, count = 1)
+    create({city: city}, count)
+  end
+
+  def create(attributes, count = 1)
+    count.times{ Visit.create!(attributes) }
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,19 @@
+require "bundler/setup"
+Bundler.require(:default)
+require "minitest/autorun"
+require "minitest/pride"
+require "logger"
+
+# for debugging
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+# migrations
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+ActiveRecord::Migration.create_table :visits do |t|
+  t.string :city
+  t.string :user_id
+end
+
+class Visit < ActiveRecord::Base
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hightop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +52,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Super convenient group count
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A nice shortcut for group count queries
 email:
 - andrew@chartkick.com
 executables: []
@@ -54,6 +96,8 @@ files:
 - hightop.gemspec
 - lib/hightop.rb
 - lib/hightop/version.rb
+- test/hightop_test.rb
+- test/test_helper.rb
 homepage: https://github.com/ankane/hightop
 licenses:
 - MIT
@@ -77,5 +121,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Super convenient group count
-test_files: []
+summary: A nice shortcut for group count queries
+test_files:
+- test/hightop_test.rb
+- test/test_helper.rb