groupdate 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf83ef79d462a5e64a5718a32473030971ac38c
-  data.tar.gz: f7223697deffaeca83fff949081837397da1aaea
+  metadata.gz: 16e0f474a6785462e83ab5811c44e54bc71689ce
+  data.tar.gz: 7b66609e83996472c4e501f1502d4b76f73f4908
 SHA512:
-  metadata.gz: 20e08fd6c4737c5624fbee1bb3651af4b50b30d863ce50d3a3ef6e574bfdc8b3b072149cff799bd62eb7d6a38a4d474b376f0f9caaff5e35fb226abcd0f72b4b
-  data.tar.gz: 7ef016743a24bab4dcc51b69f4a48cdd7670eb86165f4158f0dd3c3f56c8c720e92bbcfce1952cfbb0b72add483ec4492f973953c8acd5942a178808e05cc23a
+  metadata.gz: 260e9bf32e334238baa95e59b085418aedc824046312699d69827f6b54a736287d68a70a87bb22a62f936b5336efe0f60012c59e1d1d9babc0c9b5434702767c
+  data.tar.gz: 5fe2dab3320cb3b0b119191440a490d967a12174290afa872d499858173c9a0c099867fff28e018369a3a8d8bc0e1afd2bc532ebcfa70c649e6dbbc4ae7a79f3

data/.gitignore

@@ -3,8 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
-*.gemfile.lock
+*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,13 +1,14 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.1
   - jruby
 gemfile:
   - Gemfile
   - gemfiles/activerecord31.gemfile
   - gemfiles/activerecord32.gemfile
   - gemfiles/activerecord40.gemfile
+  - gemfiles/activerecord41.gemfile
 script: bundle exec rake test
 before_script:
   - mysql -e 'create database groupdate_test;'
@@ -17,3 +18,7 @@ notifications:
   email:
     on_success: never
     on_failure: change
+matrix:
+  allow_failures:
+    - rvm: jruby
+      gemfile: Gemfile

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.4.0
+
+- Added localization
+- Added `carry_forward` option
+- Added `series: false` option for arrays and hashes
+- Fixed issue w/ Brasilia Summer Time
+- Fixed issues w/ ActiveRecord 4.2
+
 ## 2.3.0
 
 - Raise error when ActiveRecord::Base.default_timezone is not `:utc`
@@ -11,7 +19,7 @@
 
 ## 2.2.0
 
-- Added support for Arrays and Hashes
+- Added support for arrays and hashes
 
 ## 2.1.1
 

data/Gemfile

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

data/README.md

@@ -47,8 +47,8 @@ and
 
 - hour_of_day
 - day_of_week (Sunday = 0, Monday = 1, etc)
-- day_of_month [master]
-- month_of_year [master]
+- day_of_month
+- month_of_year
 
 Use it anywhere you can use `group`.
 
@@ -137,7 +137,7 @@ To get keys in a different format, use:
 User.group_by_hour_of_day(:created_at, format: "%l %P").count.keys.first # 12 am
 ```
 
-Takes a `String`, which is passed to [strftime](http://strfti.me/), or a `Proc`
+Takes a `String`, which is passed to [strftime](http://strfti.me/), or a `Proc`.  You can pass a locale with the `locale` option.
 
 ## Arrays and Hashes
 
@@ -175,18 +175,6 @@ mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
 
 or copy and paste [these statements](https://gist.githubusercontent.com/ankane/1d6b0022173186accbf0/raw/time_zone_support.sql) into a SQL console.
 
-#### For JRuby
-
-Use the master version of your JDBC adapter.  You will get incorrect results for versions before [this commit](https://github.com/jruby/activerecord-jdbc-adapter/commit/c1cdb7cec8d3f06fc54995e8d872d830bd0a4d91).
-
-```ruby
-# postgresql
-gem "activerecord-jdbcpostgresql-adapter", :github => "jruby/activerecord-jdbc-adapter"
-
-# mysql
-gem "activerecord-jdbcmysql-adapter", :github => "jruby/activerecord-jdbc-adapter"
-```
-
 ## Upgrading to 2.0
 
 Groupdate 2.0 brings a number a great improvements.  Here are two things to be aware of:

data/gemfiles/activerecord31.gemfile

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

data/gemfiles/activerecord32.gemfile

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

data/gemfiles/activerecord40.gemfile

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

data/gemfiles/activerecord41.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../"
+
+gem "activerecord", "~> 4.1.0"

data/groupdate.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", ">= 5"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "activerecord"
 
   if RUBY_PLATFORM == "java"

data/lib/groupdate/magic.rb

@@ -1,3 +1,5 @@
+require "i18n"
+
 module Groupdate
   class Magic
     attr_accessor :field, :options
@@ -16,7 +18,12 @@ module Groupdate
     end
 
     def group_by(enum, &block)
-      series(enum.group_by{|v| v = yield(v); v ? round_time(v) : nil }, [])
+      group = enum.group_by{|v| v = yield(v); v ? round_time(v) : nil }
+      if options[:series] == false
+        group
+      else
+        series(group, [])
+      end
     end
 
     def relation(column, relation)
@@ -103,13 +110,16 @@ module Groupdate
       # undo reverse since we do not want this to appear in the query
       reverse = relation.reverse_order_value
       if reverse
-        relation = relation.reverse_order
+        relation = relation.except(:reverse_order)
       end
       order = relation.order_values.first
       if order.is_a?(String)
         parts = order.split(" ")
-        reverse_order = (parts.size == 2 && parts[0].to_sym == field && parts[1].to_s.downcase == "desc")
-        reverse = !reverse if reverse_order
+        reverse_order = (parts.size == 2 && (parts[0].to_sym == field || (activerecord42? && parts[0] == "#{relation.quoted_table_name}.#{relation.quoted_primary_key}")) && parts[1].to_s.downcase == "desc")
+        if reverse_order
+          reverse = !reverse
+          relation = relation.reorder(relation.order_values[1..-1])
+        end
       end
 
       multiple_groups = relation.group_values.size > 1
@@ -198,8 +208,8 @@ module Groupdate
 
             step = 1.send(field)
 
-            while time_range.cover?(series.last + step)
-              series << series.last + step
+            while (next_step = round_time(series.last + step)) and time_range.cover?(next_step)
+              series << next_step
             end
 
             if multiple_groups
@@ -221,6 +231,7 @@ module Groupdate
         series = series.to_a.reverse
       end
 
+      locale = options[:locale] || I18n.locale
       key_format =
         if options[:format]
           if options[:format].respond_to?(:call)
@@ -238,15 +249,17 @@ module Groupdate
               when :month_of_year
                 key = Date.new(2014, key, 1).to_time
               end
-              key.strftime(options[:format].to_s)
+              I18n.localize(key, format: options[:format].to_s, locale: locale)
             end
           end
         else
           lambda{|k| k }
         end
 
+      value = 0
       Hash[series.map do |k|
-        [multiple_groups ? k[0...@group_index] + [key_format.call(k[@group_index])] + k[(@group_index + 1)..-1] : key_format.call(k), count[k] || default_value]
+        value = count[k] || (@options[:carry_forward] && value) || default_value
+        [multiple_groups ? k[0...@group_index] + [key_format.call(k[@group_index])] + k[(@group_index + 1)..-1] : key_format.call(k), value]
       end]
     end
 
@@ -286,5 +299,9 @@ module Groupdate
       time.is_a?(Time) ? time + day_start.hours : time
     end
 
+    def activerecord42?
+      ActiveRecord::VERSION::STRING.starts_with?("4.2.")
+    end
+
   end
 end

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/test/test_helper.rb

@@ -3,12 +3,10 @@ Bundler.require(:default)
 require "minitest/autorun"
 require "minitest/pride"
 require "logger"
-require "active_record"
 
-# TODO determine why this is necessary
-if RUBY_PLATFORM == "java"
-  ENV["TZ"] = "UTC"
-end
+Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test)
+
+ENV["TZ"] = "UTC"
 
 # for debugging
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
@@ -24,6 +22,14 @@ end
 class Post < ActiveRecord::Base
 end
 
+# i18n
+I18n.enforce_available_locales = true
+I18n.backend.store_translations :de, {
+  :date => {
+    :abbr_month_names => %w(Jan Feb Mar Apr Mai Jun Jul Aug Sep Okt Nov Dez).unshift(nil)
+  }
+}
+
 # migrations
 %w(postgresql mysql2).each do |adapter|
   ActiveRecord::Base.establish_connection :adapter => adapter, :database => "groupdate_test", :username => adapter == "mysql2" ? "root" : nil
@@ -49,7 +55,11 @@ module TestGroupdate
   # second
 
   def test_second_end_of_second
-    assert_result_time :second, "2013-05-03 00:00:00 UTC", "2013-05-03 00:00:00.999"
+    if ActiveRecord::Base.connection.adapter_name == "Mysql2" and ActiveRecord::VERSION::STRING.starts_with?("4.2.")
+      skip # no millisecond precision
+    else
+      assert_result_time :second, "2013-05-03 00:00:00 UTC", "2013-05-03 00:00:00.999"
+    end
   end
 
   def test_second_start_of_second
@@ -713,6 +723,19 @@ module TestGroupdate
     assert_format :month_of_year, "Jan", "%b"
   end
 
+  def test_format_locale
+    create_user "2014-10-01 00:00:00 UTC"
+    assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b", locale: :de).count
+  end
+
+  def test_format_locale_global
+    create_user "2014-10-01 00:00:00 UTC"
+    I18n.locale = :de
+    assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b").count
+  ensure
+    I18n.locale = :en
+  end
+
   def test_format_multiple_groups
     create_user "2014-03-01 00:00:00 UTC"
     assert_equal ({["Sun", 1] => 1}), User.group_by_week(:created_at, format: "%a").group(:score).count
@@ -737,6 +760,28 @@ module TestGroupdate
     end
   end
 
+  # Brasilia Summer Time
+
+  def test_brasilia_summer_time
+    # must parse and convert to UTC for ActiveRecord 3.1
+    create_user(brasilia.parse("2014-10-19 02:00:00").utc.to_s)
+    create_user(brasilia.parse("2014-10-20 02:00:00").utc.to_s)
+    expected = {
+      brasilia.parse("2014-10-19 01:00:00") => 1,
+      brasilia.parse("2014-10-20 00:00:00") => 1
+    }
+    assert_equal expected, User.group_by_day(:created_at, time_zone: "Brasilia").count
+  end
+
+  # carry_forward option
+
+  def test_carry_forward
+    create_user "2014-05-01 00:00:00 UTC"
+    create_user "2014-05-01 00:00:00 UTC"
+    create_user "2014-05-03 00:00:00 UTC"
+    assert_equal 2, User.group_by_day(:created_at, carry_forward: true).count[utc.parse("2014-05-02 00:00:00 UTC")]
+  end
+
   # helpers
 
   def assert_format(method, expected, format, options = {})
@@ -778,6 +823,10 @@ module TestGroupdate
     ActiveSupport::TimeZone["UTC"]
   end
 
+  def brasilia
+    ActiveSupport::TimeZone["Brasilia"]
+  end
+
   def teardown
     User.delete_all
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
 - gemfiles/activerecord31.gemfile
 - gemfiles/activerecord32.gemfile
 - gemfiles/activerecord40.gemfile
+- gemfiles/activerecord41.gemfile
 - groupdate.gemspec
 - lib/groupdate.rb
 - lib/groupdate/active_record.rb
@@ -167,4 +168,3 @@ test_files:
 - test/mysql_test.rb
 - test/postgresql_test.rb
 - test/test_helper.rb
-has_rdoc: