groupdate 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
 SHA1:
-  metadata.gz: !binary |-
-    MGY4OTc0MzM2NTNlMjVlOWM1ZjhlNzczN2FjZmNjZjkyZDI4M2Y5Yg==
-  data.tar.gz: !binary |-
-    OGE0ZDVhNmNjNDNjYWI4ZmFlNGY4MTYzNTc5M2VjNDRlMWI4MjUwYQ==
+  metadata.gz: aca7ed94e70ba77cb94f64a51398c1c7a8b3a888
+  data.tar.gz: f8601b3f0fc5c9ee1a0886ecd717b02901c215ef
 SHA512:
-  metadata.gz: !binary |-
-    NmI0MDM0MzEyOWFjMjYyNjk4N2VhNTE4Y2M5MzRlMzM5NTYyODc4OTA5M2Zh
-    ZTRkM2RiYjY0ODZkM2IyOGQxMzU4NTA4MTNiOGNjNWRlMjUyZWQ2MDNhYWQw
-    ZDlkOGVkYjZiOGE4MTE5MDBiYzUxZmQxYjQ3NjBiYmNjYWJkZjQ=
-  data.tar.gz: !binary |-
-    OWVmMTM2YmU1Y2IyY2ZmOGY5MWEzOTAxYjQ5NGIwNTVkOWM1Y2Q4NDZiOGVi
-    ODQ5MWZkZGM5ZDkzODU2ODlmZDk2MGU2NGMyOTFkZDRlZDU5ZDM4MmJkM2Q1
-    NTIyZjE0MzM4NzkzYzVmYWIzNzk0MWI1YjE2NTVlNzY4NWUxNGI=
+  metadata.gz: 285ff44107dc4028bf1369203abcf466443a0faf90d36060cdfc688511c87ca33b88a242cd37c6b9ad45f0c5f9702b381ef3a3fed00ce6d5b3e6b5b98934887e
+  data.tar.gz: 2a068e99ecdfe6c6feaf1dd1a6134440dcaf17b284fa85488abe57adabc27c2bfd4228c1a5307efe1cca4a0820c8d39c2cc43fd92f895cff6c6637d32fb278e8

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - jruby

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.4
+
+- Added global week_start option
+- Fixed bug with NULL values and series
+
 ## 1.0.3
 
 - Fixed deprecation warning when used with will_paginate

data/README.md

@@ -68,6 +68,9 @@ User.group_by_week(:created_at, :start => :mon) # first three letters of day
 
 # must be the last argument
 User.group_by_week(:created_at, time_zone, :start => :sat)
+
+# change globally
+Groupdate.week_start = :mon
 ```
 
 You can also group by the day of the week or hour of the day.

data/lib/groupdate.rb

@@ -21,3 +21,8 @@ module ActiveRecord
 
   end
 end
+
+module Groupdate
+  mattr_accessor :week_start
+  self.week_start = :sun
+end

data/lib/groupdate/scopes.rb

@@ -19,7 +19,7 @@ module Groupdate
         end
 
         # for week
-        week_start = [:mon, :tue, :wed, :thu, :fri, :sat, :sun].index((options[:start] || :sun).to_sym)
+        week_start = [:mon, :tue, :wed, :thu, :fri, :sat, :sun].index((options[:start] || Groupdate.week_start).to_sym)
         if field == "week" and !week_start
           raise "Unrecognized :start option"
         end

data/lib/groupdate/series.rb

@@ -2,9 +2,11 @@ module Groupdate
   class Series
 
     def initialize(relation, field, column, time_zone, time_range, week_start)
-      @relation = relation
       if time_range.is_a?(Range)
-        @relation = relation.where("#{column} BETWEEN ? AND ?", time_range.first, time_range.last)
+        # doesn't matter whether we include the end of a ... range - it will be excluded later
+        @relation = relation.where("#{column} >= ? AND #{column} <= ?", time_range.first, time_range.last)
+      else
+        @relation = relation.where("#{column} IS NOT NULL")
       end
       @field = field
       @time_zone = time_zone
@@ -23,9 +25,7 @@ module Groupdate
           lambda{|k| (k.is_a?(String) ? utc.parse(k) : k.to_time).utc }
         end
 
-      count = Hash[count.map do |k, v|
-        [cast_method.call(k), v]
-      end]
+      count = Hash[ count.map{|k, v| [cast_method.call(k), v] } ]
 
       series =
         case @field

data/lib/groupdate/version.rb

@@ -1,3 +1,3 @@
 module Groupdate
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/mysql_test.rb

@@ -1,18 +1,15 @@
 require "test_helper"
 
-class TestMysql < Minitest::Test
+class TestMysql < Minitest::Unit::TestCase
   include TestGroupdate
 
   def setup
+    super
     User.establish_connection :adapter => "mysql2", :database => "groupdate_test", :username => "root"
   end
 
   def time_key(key)
-    if RUBY_PLATFORM == "java"
-      key.utc.strftime("%Y-%m-%d %H:%M:%S").gsub(/ 00\:00\:00\z/, "")
-    else
-      key
-    end
+    key
   end
 
   def number_key(key)

data/test/postgresql_test.rb

@@ -1,21 +1,18 @@
 require "test_helper"
 
-class TestPostgresql < Minitest::Test
+class TestPostgresql < Minitest::Unit::TestCase
   include TestGroupdate
 
   def setup
+    super
     User.establish_connection :adapter => "postgresql", :database => "groupdate_test"
   end
 
   def time_key(key)
-    if RUBY_PLATFORM == "java"
-      key.utc.strftime("%Y-%m-%d %H:%M:%S%z")[0..-3]
+    if ActiveRecord::VERSION::MAJOR == 3
+      key.utc.strftime("%Y-%m-%d %H:%M:%S+00")
     else
-      if ActiveRecord::VERSION::MAJOR == 3
-        key.utc.strftime("%Y-%m-%d %H:%M:%S+00")
-      else
-        key
-      end
+      key
     end
   end
 

data/test/test_helper.rb

@@ -4,6 +4,11 @@ require "minitest/autorun"
 require "minitest/pride"
 require "logger"
 
+# TODO determine why this is necessary
+if RUBY_PLATFORM == "java"
+  ENV["TZ"] = "UTC"
+end
+
 # for debugging
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
 
@@ -18,17 +23,19 @@ end
 %w(postgresql mysql2).each do |adapter|
   ActiveRecord::Base.establish_connection :adapter => adapter, :database => "groupdate_test", :username => adapter == "mysql2" ? "root" : nil
 
-  unless ActiveRecord::Base.connection.table_exists? "users"
-    ActiveRecord::Migration.create_table :users do |t|
-      t.string :name
-      t.integer :score
-      t.timestamps
-    end
+  ActiveRecord::Migration.create_table :users, :force => true do |t|
+    t.string :name
+    t.integer :score
+    t.timestamps
   end
 end
 
 module TestGroupdate
 
+  def setup
+    Groupdate.week_start = :sun
+  end
+
   # second
 
   def test_second_end_of_second
@@ -271,7 +278,7 @@ module TestGroupdate
     7.times do |n|
       expected[n] = n == 3 ? 1 : 0
     end
-    assert_equal(expected, User.group_by_day_of_week(:created_at, Time.zone, true).count(:created_at))
+    assert_equal expected, User.group_by_day_of_week(:created_at, Time.zone, true).count(:created_at)
   end
 
   def test_zeros_hour_of_day
@@ -280,7 +287,7 @@ module TestGroupdate
     24.times do |n|
       expected[n] = n == 20 ? 1 : 0
     end
-    assert_equal(expected, User.group_by_hour_of_day(:created_at, Time.zone, true).count(:created_at))
+    assert_equal expected, User.group_by_hour_of_day(:created_at, Time.zone, true).count(:created_at)
   end
 
   def test_zeros_excludes_end
@@ -288,7 +295,7 @@ module TestGroupdate
     expected = {
       Time.parse("2013-05-01 00:00:00 UTC") => 0
     }
-    assert_equal(expected, User.group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")...Time.parse("2013-05-02 00:00:00 UTC")).count)
+    assert_equal expected, User.group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")...Time.parse("2013-05-02 00:00:00 UTC")).count
   end
 
   def test_zeros_previous_scope
@@ -296,7 +303,7 @@ module TestGroupdate
     expected = {
       Time.parse("2013-05-01 00:00:00 UTC") => 0
     }
-    assert_equal(expected, User.where("id = 0").group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")..Time.parse("2013-05-01 23:59:59 UTC")).count)
+    assert_equal expected, User.where("id = 0").group_by_day(:created_at, Time.zone, Time.parse("2013-05-01 00:00:00 UTC")..Time.parse("2013-05-01 23:59:59 UTC")).count
   end
 
   def test_zeros_datetime
@@ -304,30 +311,48 @@ module TestGroupdate
     expected = {
       Time.parse("2013-05-01 00:00:00 UTC") => 1
     }
-    assert_equal(expected, User.group_by_day(:created_at, Time.zone, DateTime.parse("2013-05-01 00:00:00 UTC")..DateTime.parse("2013-05-01 00:00:00 UTC")).count)
+    assert_equal expected, User.group_by_day(:created_at, Time.zone, DateTime.parse("2013-05-01 00:00:00 UTC")..DateTime.parse("2013-05-01 00:00:00 UTC")).count
+  end
+
+  def test_zeros_null_value
+    user = User.create!(name: "Andrew")
+    user.update_column :created_at, nil
+    assert_equal 0, User.group_by_hour_of_day(:created_at, Time.zone, true).count[0]
+  end
+
+  # week_start
+
+  def test_week_start
+    Groupdate.week_start = :mon
+    assert_result_time :week, "2013-03-18 00:00:00 UTC", "2013-03-24 23:59:59"
+  end
+
+  def test_week_start_and_start_option
+    Groupdate.week_start = :mon
+    assert_result_time :week, "2013-03-16 00:00:00 UTC", "2013-03-22 23:59:59", false, :start => :sat
   end
 
   # misc
 
   def test_order_day
-    assert_equal({}, User.group_by_day(:created_at).order("day desc").limit(20).count)
+    assert_empty User.group_by_day(:created_at).order("day desc").limit(20).count
   end
 
   def test_order_week
-    assert_equal({}, User.group_by_week(:created_at).order("week asc").count)
+    assert_empty User.group_by_week(:created_at).order("week asc").count
   end
 
   def test_order_hour_of_day
-    assert_equal({}, User.group_by_hour_of_day(:created_at).order("hour_of_day desc").count)
+    assert_empty User.group_by_hour_of_day(:created_at).order("hour_of_day desc").count
   end
 
   def test_table_name
-    assert_equal({}, User.group_by_day("users.created_at").count)
+    assert_empty User.group_by_day("users.created_at").count
   end
 
   def test_previous_scopes
     create_user "2013-05-01 00:00:00 UTC"
-    assert_equal({}, User.where("id = 0").group_by_day(:created_at).count)
+    assert_empty User.where("id = 0").group_by_day(:created_at).count
   end
 
   # helpers
@@ -339,7 +364,7 @@ module TestGroupdate
   def assert_result(method, expected, time_str, time_zone = false, options = {})
     create_user time_str
     expected = expected.is_a?(Time) ? time_key(expected) : number_key(expected)
-    assert_equal(ordered_hash({expected => 1}), User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, options).order(method.to_s).count)
+    assert_equal ordered_hash({expected => 1}), User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, options).order(method.to_s).count
   end
 
   def assert_zeros(method, created_at, keys, range_start, range_end, time_zone = nil, options = {})
@@ -348,7 +373,7 @@ module TestGroupdate
     keys.each_with_index do |key, i|
       expected[Time.parse(key)] = i == 1 ? 1 : 0
     end
-    assert_equal(expected, User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, Time.parse(range_start)..Time.parse(range_end), options).count)
+    assert_equal expected, User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, Time.parse(range_start)..Time.parse(range_end), options).count
   end
 
   def ordered_hash(hash)
@@ -356,7 +381,7 @@ module TestGroupdate
   end
 
   def create_user(created_at)
-    User.create!(:name => "Andrew", :score => 1, :created_at => ActiveSupport::TimeZone["UTC"].parse(created_at))
+    User.create! :name => "Andrew", :score => 1, :created_at => ActiveSupport::TimeZone["UTC"].parse(created_at)
   end
 
   def teardown

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: groupdate
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Andrew Kane
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: minitest
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbcpostgresql-adapter
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activerecord-jdbcmysql-adapter
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The simplest way to group temporal data
 email:
 - acekane1@gmail.com
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -121,24 +121,24 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.0.3
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.0.0
+signing_key: 
 specification_version: 4
 summary: The simplest way to group temporal data
 test_files: