groupdate 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1388ce20a1c1a41fdd0fe87d5cda7d28522ad2d2
-  data.tar.gz: 62660c4bb7aabbf6e619274038f2335c0dbed0dd
+  metadata.gz: dd126e51d0c9b683eae721f9c2bf6a133409039b
+  data.tar.gz: 0f5f4487b87fbe82f22eea5edebe9558cc883593
 SHA512:
-  metadata.gz: 471f406dd29530940a51bd7b1547a3a19d8399098a6949d50a94e08be5fefb1e256cd3b996f0f964101541858b4744d85e6e85d1eb2c162e35ffc3fec2eb4df5
-  data.tar.gz: d199353fbccd7b4c1aa74609e4c28d187fc19036785c236cd23e4d0559a2c50a380fe3e273fd8a1f324d13b42e9e3b90b9ebc75bea7527a2661083bca1e2f43f
+  metadata.gz: 7b9c7878256b705354bb3ccef1c87946fa94815f34144cf1332775ec448f2db35bcd485399dc91bddef7089d56d92e94ed9be18acf4332fe415074b927a1d32e
+  data.tar.gz: 8653c47e5f08f1001974aad183fbd7c182673a0da9436d8e1d79b288cac728621a472d3c9abc92ee5b5303ffc0d4a5d2090e96a69df3b33786096e92d845d35f

data/.travis.yml

@@ -8,7 +8,7 @@ gemfile:
   - test/gemfiles/activerecord32.gemfile
   - test/gemfiles/activerecord40.gemfile
   - test/gemfiles/activerecord41.gemfile
-  - test/gemfiles/activerecord50.gemfile
+  - test/gemfiles/activerecord42.gemfile
 sudo: false
 script: bundle exec rake test
 before_install:
@@ -24,4 +24,5 @@ matrix:
   allow_failures:
     - rvm: jruby
       gemfile: Gemfile
-    - gemfile: test/gemfiles/activerecord50.gemfile
+    - rvm: jruby
+      gemfile: test/gemfiles/activerecord42.gemfile

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.1
+
+- Added support for Redshift
+- Fix for infinite loop in certain cases for Rails 5
+
 ## 3.0.0
 
 Breaking changes

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in groupdate.gemspec
 gemspec
 
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "~> 5.0.0"

data/README.md

@@ -13,7 +13,7 @@ The simplest way to group by:
 
 Works with Rails 3.1+
 
-Supports PostgreSQL and MySQL, plus arrays and hashes
+Supports PostgreSQL, MySQL, and Redshift, plus arrays and hashes
 
 [![Build Status](https://travis-ci.org/ankane/groupdate.svg?branch=master)](https://travis-ci.org/ankane/groupdate)
 
@@ -164,6 +164,20 @@ User.group_by_hour_of_day(:created_at, format: "%-l %P").count
 
 Takes a `String`, which is passed to [strftime](http://strfti.me/), or a `Symbol`, which is looked up by `I18n.localize` in `i18n` scope 'time.formats', or a `Proc`.  You can pass a locale with the `locale` option.
 
+### Series
+
+The entire series is returned by default. To exclude points without data, use:
+
+```ruby
+User.group_by_day(:created_at, series: false).count
+```
+
+Or change the default value with:
+
+```ruby
+User.group_by_day(:created_at, default_value: "missing").count
+```
+
 ### Dynamic Grouping
 
 ```ruby

data/Rakefile

@@ -4,7 +4,7 @@ require "rake/testtask"
 task default: :test
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
+  t.test_files = FileList["test/**/*_test.rb"].exclude(/redshift/)
 end
 
 namespace :test do
@@ -16,4 +16,8 @@ namespace :test do
     t.libs << "test"
     t.pattern = "test/mysql_test.rb"
   end
+  Rake::TestTask.new(:redshift) do |t|
+    t.libs << "test"
+    t.pattern = "test/redshift_test.rb"
+  end
 end

data/lib/groupdate/magic.rb

@@ -77,6 +77,25 @@ module Groupdate
           else
             ["(DATE_TRUNC('#{field}', (#{column}::timestamptz - INTERVAL '#{day_start} second') AT TIME ZONE ?) + INTERVAL '#{day_start} second') AT TIME ZONE ?", time_zone, time_zone]
           end
+        when "Redshift"
+          case field
+          when :day_of_week # Sunday = 0, Monday = 1, etc.
+            ["EXTRACT(DOW from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
+          when :hour_of_day
+            ["EXTRACT(HOUR from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
+          when :day_of_month
+            ["EXTRACT(DAY from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
+          when :month_of_year
+            ["EXTRACT(MONTH from CONVERT_TIMEZONE(?, #{column}::timestamp) - INTERVAL '#{day_start} second')::integer", time_zone]
+          when :week # start on Sunday, not Redshift default Monday
+            # Redshift does not return timezone information; it
+            # always says it is in UTC time, so we must convert
+            # back to UTC to play properly with the rest of Groupdate.
+            #
+            ["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{week_start} day' - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{week_start} day' + INTERVAL '#{day_start} second'", time_zone, field, time_zone]
+          else
+            ["CONVERT_TIMEZONE(?, 'Etc/UTC', DATE_TRUNC(?, CONVERT_TIMEZONE(?, #{column}) - INTERVAL '#{day_start} second'))::timestamp + INTERVAL '#{day_start} second'", time_zone, field, time_zone]
+          end
         else
           raise "Connection adapter not supported: #{adapter_name}"
         end
@@ -205,8 +224,14 @@ module Groupdate
               step = 1.send(field)
             end
 
-            while (next_step = round_time(series.last + step)) && time_range.cover?(next_step)
+            last_step = series.last
+            while (next_step = round_time(last_step + step)) && time_range.cover?(next_step)
+              if next_step == last_step
+                last_step += step
+                next
+              end
               series << next_step
+              last_step = next_step
             end
 
             series

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/test/gemfiles/{activerecord50.gemfile → activerecord42.gemfile}

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec path: "../../"
 
-gem "activerecord", "~> 5.0.0.rc1"
+gem "activerecord", "~> 4.2.0"

data/test/gemfiles/redshift.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../../"
+
+gem "activerecord", "~> 4.2.0"
+gem "activerecord4-redshift-adapter", "~> 0.2.0"

data/test/redshift_test.rb

@@ -0,0 +1,18 @@
+require_relative "test_helper"
+
+class TestRedshift < Minitest::Test
+  include TestGroupdate
+  include TestDatabase
+
+  def setup
+    super
+    @@setup ||= begin
+      abort("REDSHIFT_URL environment variable must be set in order to run tests") unless ENV["REDSHIFT_URL"].present?
+
+      ActiveRecord::Base.establish_connection(ENV["REDSHIFT_URL"])
+
+      create_redshift_tables
+      true
+    end
+  end
+end

data/test/test_helper.rb

@@ -49,6 +49,22 @@ def create_tables
   end
 end
 
+def create_redshift_tables
+  ActiveRecord::Migration.verbose = false
+
+  if ActiveRecord::Migration.table_exists?(:users)
+    ActiveRecord::Migration.drop_table(:users, force: :cascade)
+  end
+
+  if ActiveRecord::Migration.table_exists?(:posts)
+    ActiveRecord::Migration.drop_table(:posts, force: :cascade)
+  end
+
+  ActiveRecord::Migration.execute "CREATE TABLE users (id INT IDENTITY(1,1) PRIMARY KEY, name VARCHAR(255), score INT, created_at DATETIME, created_on DATE);"
+
+  ActiveRecord::Migration.execute "CREATE TABLE posts (id INT IDENTITY(1,1) PRIMARY KEY, user_id INT REFERENCES users, created_at DATETIME);"
+end
+
 module TestDatabase
   def test_zeros_previous_scope
     create_user "2013-05-01"
@@ -332,12 +348,19 @@ module TestDatabase
         created_on: created_at ? Date.parse(created_at) : nil
       )
 
-    # hack for MySQL adapter
-    # user.update_attributes(created_at: nil, created_on: nil) if created_at.nil?
+    # hack for Redshift adapter, which doesn't return id on creation...
+    user = User.last if user.id.nil?
+
+    # hack for MySQL & Redshift adapters
+    user.update_attributes(created_at: nil, created_on: nil) if created_at.nil? && is_redshift?
 
     user
   end
 
+  def is_redshift?
+    ActiveRecord::Base.connection.adapter_name == "Redshift"
+  end
+
   def teardown
     User.delete_all
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,9 +136,11 @@ files:
 - test/gemfiles/activerecord32.gemfile
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
-- test/gemfiles/activerecord50.gemfile
+- test/gemfiles/activerecord42.gemfile
+- test/gemfiles/redshift.gemfile
 - test/mysql_test.rb
 - test/postgresql_test.rb
+- test/redshift_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ankane/groupdate
 licenses:
@@ -170,8 +172,10 @@ test_files:
 - test/gemfiles/activerecord32.gemfile
 - test/gemfiles/activerecord40.gemfile
 - test/gemfiles/activerecord41.gemfile
-- test/gemfiles/activerecord50.gemfile
+- test/gemfiles/activerecord42.gemfile
+- test/gemfiles/redshift.gemfile
 - test/mysql_test.rb
 - test/postgresql_test.rb
+- test/redshift_test.rb
 - test/test_helper.rb
 has_rdoc: