groupdate 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edfe1e903c4ce720f5dfe74be0088937aa52b69f82dd88732802f49764205314
-  data.tar.gz: 85a0642b059de80a94ee621c028f117296e1baa09d93232ed6e97680b9d5fb25
+  metadata.gz: 624c0ae83a0c0952676b3d3efb79826b2b470d0a5efab6da31523ca8284db8f3
+  data.tar.gz: 6c15c17557aee5b8babd8b2939af9325449a4831ed0ee24901c27d37b7352fe3
 SHA512:
-  metadata.gz: f2c7f1f9d5cd73b00b89005a17d62897494deb51164ccb75cbf5b6917ce389cd2847c410f271c75118c74b17677d6fabb1ef0c327063c5b7de527ad46604e66d
-  data.tar.gz: c0a4f216150c83fa1cca7e8f10775b619da2b654b4a85e6f148bead6fe8fe82b1fd45b1741f89b7873e7c9c1ca6494f528b6cfbf41b4dda723b37c88b9d22cc2
+  metadata.gz: dfa2c03830675352029e74768bad800acd7ac56edc9dbcdb01f58787f34858120c4f9f1d1436ee4bdb38480922b111d746b75e3f0b7ff59f5bb770e74e01c4c9
+  data.tar.gz: f300e95cb3a7098486c910a4e94a8ecd4313fad14988b78fc68495783d99f49fef643f8361a4566f9ad2737238393a88c79efbc7df41cd28251d962916264626

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.0.2
+
+- Make `current` option work without `last`
+- Fixed default value for `maximum`, `minimum`, and `average`
+
 ## 4.0.1
 
 - Fixed incorrect range with `last` option near time change

data/CONTRIBUTING.md

@@ -2,17 +2,15 @@
 
 First, thanks for wanting to contribute. You’re awesome! :heart:
 
-## Questions
+## Help
 
-Use [Stack Overflow](https://stackoverflow.com/) with the tag `groupdate`.
+We’re not able to provide support through GitHub Issues. If you’re looking for help with your code, try posting on [Stack Overflow](https://stackoverflow.com/).
 
-## Feature Requests
+All features should be documented. If you don’t see a feature in the docs, assume it doesn’t exist.
 
-Create an issue. Start the title with `[Idea]`.
+## Bugs
 
-## Issues
-
-Think you’ve discovered an issue?
+Think you’ve discovered a bug?
 
 1. Search existing issues to see if it’s been reported.
 2. Try the `master` branch to make sure it hasn’t been fixed.
@@ -26,6 +24,10 @@ If the above steps don’t help, create an issue. Include:
 - Detailed steps to reproduce
 - Complete backtraces for exceptions
 
+## New Features
+
+If you’d like to discuss a new feature, create an issue and start the title with `[Idea]`.
+
 ## Pull Requests
 
 Fork the project and create a pull request. A few tips:

data/README.md

@@ -252,7 +252,7 @@ Groupdate.time_zone = false
 
 ### 4.0
 
-Groupdate 4.0 brings a number of improvements.  Here are a few to be aware of:
+Groupdate 4.0 brings a number of improvements. Here are a few to be aware of:
 
 - `group_by` methods return an `ActiveRecord::Relation` instead of a `Groupdate::Series`
 - Invalid options now throw an `ArgumentError`
@@ -261,7 +261,7 @@ Groupdate 4.0 brings a number of improvements.  Here are a few to be aware of:
 
 ### 3.0
 
-Groupdate 3.0 brings a number of improvements.  Here are a few to be aware of:
+Groupdate 3.0 brings a number of improvements. Here are a few to be aware of:
 
 - `Date` objects are now returned for day, week, month, quarter, and year by default. Use `dates: false` for the previous behavior, or change this globally with `Groupdate.dates = false`.
 - Array and hash methods no longer return the entire series by default. Use `series: true` for the previous behavior.
@@ -269,7 +269,7 @@ Groupdate 3.0 brings a number of improvements.  Here are a few to be aware of:
 
 ### 2.0
 
-Groupdate 2.0 brings a number of improvements.  Here are two things to be aware of:
+Groupdate 2.0 brings a number of improvements. Here are two things to be aware of:
 
 - the entire series is returned by default
 - `ActiveSupport::TimeWithZone` keys are now returned for every database adapter - adapters previously returned `Time` or `String` keys

data/lib/groupdate.rb

@@ -15,6 +15,14 @@ module Groupdate
   self.week_start = :sun
   self.day_start = 0
   self.dates = true
+
+  # api for gems like ActiveMedian
+  def self.process_result(relation, result, **options)
+    if relation.groupdate_values
+      result = Groupdate::Magic::Relation.process_result(relation, result, **options)
+    end
+    result
+  end
 end
 
 require "groupdate/enumerable"

data/lib/groupdate/magic.rb

@@ -63,7 +63,7 @@ module Groupdate
         @options = options
       end
 
-      def perform(relation, result)
+      def perform(relation, result, default_value:)
         multiple_groups = relation.group_values.size > 1
 
         check_time_zone_support(result, multiple_groups)
@@ -71,7 +71,7 @@ module Groupdate
 
         series_builder.generate(
           result,
-          default_value: options.key?(:default_value) ? options[:default_value] : 0,
+          default_value: options.key?(:default_value) ? options[:default_value] : default_value,
           multiple_groups: multiple_groups,
           group_index: group_index
         )
@@ -122,9 +122,10 @@ module Groupdate
         relation
       end
 
-      def self.process_result(relation, result)
+      # allow any options to keep flexible for future
+      def self.process_result(relation, result, **options)
         relation.groupdate_values.reverse.each do |gv|
-          result = gv.perform(relation, result)
+          result = gv.perform(relation, result, default_value: options[:default_value])
         end
         result
       end

data/lib/groupdate/relation.rb

@@ -9,11 +9,8 @@ module Groupdate
     end
 
     def calculate(*args, &block)
-      if groupdate_values
-        Groupdate::Magic::Relation.process_result(self, super)
-      else
-        super
-      end
+      default_value = [:count, :sum].include?(args[0]) ? 0 : nil
+      Groupdate.process_result(self, super, default_value: default_value)
     end
   end
 end

data/lib/groupdate/series_builder.rb

@@ -90,7 +90,6 @@ module Groupdate
             raise ArgumentError, "Cannot use last option with #{period}"
           end
           if step
-            now = time_zone.now
             # loop instead of multiply to change start_at - see #151
             start_at = now
             (options[:last].to_i - 1).times do
@@ -111,6 +110,10 @@ module Groupdate
 
     private
 
+    def now
+      @now ||= time_zone.now
+    end
+
     def generate_series(data, multiple_groups, group_index)
       case period
       when :day_of_week
@@ -136,7 +139,12 @@ module Groupdate
               else
                 data.keys.sort
               end
-            sorted_keys.first..sorted_keys.last
+
+            tr = sorted_keys.first..sorted_keys.last
+            if options[:current] == false && round_time(now) >= tr.last
+              tr = tr.first...round_time(now)
+            end
+            tr
           end
 
         if time_range.first

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,22 +123,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email:
-- andrew@chartkick.com
+email: andrew@chartkick.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- groupdate.gemspec
 - lib/groupdate.rb
 - lib/groupdate/active_record.rb
 - lib/groupdate/enumerable.rb
@@ -148,16 +141,6 @@ files:
 - lib/groupdate/relation_builder.rb
 - lib/groupdate/series_builder.rb
 - lib/groupdate/version.rb
-- test/enumerable_test.rb
-- test/gemfiles/activerecord42.gemfile
-- test/gemfiles/activerecord50.gemfile
-- test/gemfiles/activerecord51.gemfile
-- test/gemfiles/redshift.gemfile
-- test/mysql_test.rb
-- test/postgresql_test.rb
-- test/redshift_test.rb
-- test/sqlite_test.rb
-- test/test_helper.rb
 homepage: https://github.com/ankane/groupdate
 licenses:
 - MIT
@@ -170,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -178,18 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: The simplest way to group temporal data
-test_files:
-- test/enumerable_test.rb
-- test/gemfiles/activerecord42.gemfile
-- test/gemfiles/activerecord50.gemfile
-- test/gemfiles/activerecord51.gemfile
-- test/gemfiles/redshift.gemfile
-- test/mysql_test.rb
-- test/postgresql_test.rb
-- test/redshift_test.rb
-- test/sqlite_test.rb
-- test/test_helper.rb
+test_files: []

data/.github/ISSUE_TEMPLATE.md

@@ -1,7 +0,0 @@
-Hi,
-
-Before creating an issue, please check out the Contributing Guide:
-
-https://github.com/ankane/groupdate/blob/master/CONTRIBUTING.md
-
-Thanks!

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-*.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.ruby-version
-.ruby-gemset

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.2
-  - jruby-9.1.9.0
-gemfile:
-  - Gemfile
-  - test/gemfiles/activerecord51.gemfile
-  - test/gemfiles/activerecord50.gemfile
-  - test/gemfiles/activerecord42.gemfile
-sudo: false
-script: bundle exec rake test
-before_install:
-  - gem install bundler
-  - mysql -e 'create database groupdate_test;'
-  - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
-  - psql -c 'create database groupdate_test;' -U postgres
-notifications:
-  email:
-    on_success: never
-    on_failure: change
-matrix:
-  allow_failures:
-    - rvm: jruby-9.1.9.0
-      gemfile: Gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: test/gemfiles/activerecord51.gemfile

data/Gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in groupdate.gemspec
-gemspec
-
-gem "activerecord", "~> 5.2.0"
-
-if defined?(JRUBY_VERSION)
-  gem "activerecord-jdbcpostgresql-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter.git"
-  gem "activerecord-jdbcmysql-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter.git"
-  gem "activerecord-jdbcsqlite3-adapter", git: "https://github.com/jruby/activerecord-jdbc-adapter.git"
-end

data/Rakefile

@@ -1,9 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-task default: :test
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"].exclude(/redshift/)
-  t.warning = false
-end

data/groupdate.gemspec

@@ -1,38 +0,0 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "groupdate/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "groupdate"
-  spec.version       = Groupdate::VERSION
-  spec.authors       = ["Andrew Kane"]
-  spec.email         = ["andrew@chartkick.com"]
-  spec.summary       = "The simplest way to group temporal data"
-  spec.homepage      = "https://github.com/ankane/groupdate"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.2.0"
-
-  spec.add_dependency "activesupport", ">= 4.2"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "activerecord"
-
-  if RUBY_PLATFORM == "java"
-    spec.add_development_dependency "activerecord-jdbcpostgresql-adapter"
-    spec.add_development_dependency "activerecord-jdbcmysql-adapter"
-    spec.add_development_dependency "activerecord-jdbcsqlite3-adapter"
-  else
-    spec.add_development_dependency "pg", "< 1"
-    spec.add_development_dependency "mysql2", "< 0.5"
-    spec.add_development_dependency "sqlite3"
-  end
-end

data/test/enumerable_test.rb

@@ -1,60 +0,0 @@
-require_relative "test_helper"
-require "ostruct"
-
-class EnumerableTest < Minitest::Test
-  include TestGroupdate
-
-  def test_enumerable
-    user_a = create_user("2014-01-21")
-    user_b = create_user("2014-03-14")
-    expected = {
-      Date.parse("2014-01-01") => [user_a],
-      Date.parse("2014-03-01") => [user_b]
-    }
-    assert_equal expected, [user_a, user_b].group_by_month(&:created_at)
-  end
-
-  def test_enumerable_series
-    user_a = create_user("2014-01-21")
-    user_b = create_user("2014-03-14")
-    expected = {
-      Date.parse("2014-01-01") => [user_a],
-      Date.parse("2014-02-01") => [],
-      Date.parse("2014-03-01") => [user_b]
-    }
-    assert_equal expected, [user_a, user_b].group_by_month(series: true, &:created_at)
-  end
-
-  def test_no_block
-    assert_raises(ArgumentError) { [].group_by_day(:created_at) }
-  end
-
-  def call_method(method, field, options)
-    Hash[@users.group_by_period(method, options) { |u| u.send(field) }.map { |k, v| [k, v.size] }]
-  end
-
-  def create_user(created_at, score = 1)
-    user =
-      OpenStruct.new(
-        name: "Andrew",
-        score: score,
-        created_at: created_at ? utc.parse(created_at) : nil,
-        created_on: created_at ? Date.parse(created_at) : nil
-      )
-    @users << user
-    user
-  end
-
-  def setup
-    super
-    @users = []
-  end
-
-  def teardown
-    # do nothing
-  end
-
-  def enumerable_test?
-    true
-  end
-end