activerecord-time 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3377582c4b69bbaffdfb4b2147c4c9fedd6bd87
-  data.tar.gz: e871b6b116bd17436c0b1f27e1ead868ccafb692
+  metadata.gz: 1dd3abdb57563a7a23de8e40e0e23d4413c80053
+  data.tar.gz: 4c43da1a4b7ad61c534ee949a8b90407d81d5363
 SHA512:
-  metadata.gz: 672aa67786ca42da38a78fd79f036c0954c43aedc186c767321e42ad9d56dddc931d557d709f8879a39d5311c66594937117da99a4bdfad27460f12bee0ce367
-  data.tar.gz: ec625e4fd2eb0ef826a0304a71de12177a39fac32ec71fc6f948e20fa110cd3820dc93a32812c0f0f37e4215ac050a8c05d54cf861e65cdc5e505899c3137509
+  metadata.gz: '091eb06ba8c9c8d5cc3c700a98c915be578703c09b357f9ea86f00ddc9f4b23e6048bb12e7eff2e40537d7eb9ab98a8fbf496bfca7e3c3e1db07cf7ed1e451a0'
+  data.tar.gz: 5898cf0e03e049d9ca0d4a88f7a4baba78f4dd5c3533c5b167ee8e2943c1adb55943e3c2e8cf2287638a65553bca161ff79c4db2e260255c15ebb8b061a37dc8

data/.rubocop.yml

@@ -13,6 +13,9 @@ AllCops:
 Rails:
   Enabled: true
 
+Security/YAMLLoad:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/.travis.yml

@@ -4,8 +4,9 @@ jdk:
   - oraclejdk8
 before_install: gem query -i -n ^bundler$ >/dev/null || gem install bundler
 rvm:
+  - ruby-2.4.0
+  - jruby-9.1.7.0
   - ruby-2.3.3
-  - jruby-9.1.6.0
   - ruby-2.2.6
   - ruby-2.1.9
   - ruby-head
@@ -28,5 +29,9 @@ matrix:
       gemfile: gemfiles/ar41.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/ar32.gemfile
+    - rvm: ruby-2.4.0
+      gemfile: gemfiles/ar41.gemfile
+    - rvm: ruby-2.4.0
+      gemfile: gemfiles/ar32.gemfile
     - rvm: ruby-2.1.9
       gemfile: gemfiles/ar50.gemfile

data/README.md

@@ -9,12 +9,12 @@ them in fixtures.
 
 Also adds JSON encode/decode.
 
-The gem supports MRI and JRuby at Ruby language level 1.9.3 and later.  Other
+The gem supports MRI and JRuby at Ruby language level 2.1.9 and later.  Other
 Ruby implementations may work.
 
 ActiveRecord 3.2 and later supported.
 
-Ruby 1.9.3 to 2.3.1 supported, including JRuby.
+Ruby 2.1.9 to 2.4.0 supported, including JRuby.
 
 
 ## Installation

data/activerecord-time.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.summary = %q{A handler for storing TimeOfDay objects in ActiveRecord objects as sql time values.}
   gem.homepage = 'https://github.com/donv/activerecord-time'
   gem.license = 'MIT'
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.1'
 
   gem.files = `git ls-files`.split($/)
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }

data/gemfiles/ar32.gemfile.lock

@@ -9,13 +9,13 @@ GEM
       activesupport (= 3.2.22.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.21)
+    activerecord-jdbc-adapter (1.3.22)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.21)
-      activerecord-jdbc-adapter (~> 1.3.21)
+    activerecord-jdbcpostgresql-adapter (1.3.22)
+      activerecord-jdbc-adapter (~> 1.3.22)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.21)
-      activerecord-jdbc-adapter (~> 1.3.21)
+    activerecord-jdbcsqlite3-adapter (1.3.22)
+      activerecord-jdbc-adapter (~> 1.3.22)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activesupport (3.2.22.5)
       i18n (~> 0.6, >= 0.6.4)
@@ -24,13 +24,13 @@ GEM
     arel (3.0.3)
     builder (3.0.4)
     docile (1.1.5)
-    i18n (0.7.0)
+    i18n (0.8.0)
     jdbc-postgres (9.4.1206)
     jdbc-sqlite3 (3.8.11.2)
-    json (2.0.2)
-    json (2.0.2-java)
+    json (2.0.3)
+    json (2.0.3-java)
     minitest (5.10.1)
-    minitest-reporters (1.1.13)
+    minitest-reporters (1.1.14)
       ansi
       builder
       minitest (>= 5.0)
@@ -39,12 +39,12 @@ GEM
     pg (0.19.0)
     rake (12.0.0)
     ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     tzinfo (0.3.52)
 
 PLATFORMS
@@ -63,4 +63,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/gemfiles/ar40.gemfile.lock

@@ -10,13 +10,13 @@ GEM
       activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-jdbc-adapter (1.3.21)
+    activerecord-jdbc-adapter (1.3.22)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.21)
-      activerecord-jdbc-adapter (~> 1.3.21)
+    activerecord-jdbcpostgresql-adapter (1.3.22)
+      activerecord-jdbc-adapter (~> 1.3.22)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.21)
-      activerecord-jdbc-adapter (~> 1.3.21)
+    activerecord-jdbcsqlite3-adapter (1.3.22)
+      activerecord-jdbc-adapter (~> 1.3.22)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activesupport (4.0.13)
       i18n (~> 0.6, >= 0.6.9)
@@ -28,12 +28,12 @@ GEM
     arel (4.0.2)
     builder (3.1.4)
     docile (1.1.5)
-    hashie (3.4.6)
-    i18n (0.7.0)
+    hashie (3.5.3)
+    i18n (0.8.0)
     jdbc-postgres (9.4.1206)
     jdbc-sqlite3 (3.8.11.2)
-    json (2.0.2)
-    json (2.0.2-java)
+    json (2.0.3)
+    json (2.0.3-java)
     minitest (4.7.5)
     minitest-reporters (0.14.24)
       ansi
@@ -42,15 +42,15 @@ GEM
       powerbar
     multi_json (1.12.1)
     pg (0.19.0)
-    powerbar (1.0.17)
+    powerbar (1.0.18)
       hashie (>= 1.1.0)
     rake (12.0.0)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tzinfo (0.3.52)
@@ -71,4 +71,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/gemfiles/ar42.gemfile.lock

@@ -8,13 +8,13 @@ GEM
       activemodel (= 4.2.7.1)
       activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activerecord-jdbc-adapter (1.3.21)
+    activerecord-jdbc-adapter (1.3.22)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.21)
-      activerecord-jdbc-adapter (~> 1.3.21)
+    activerecord-jdbcpostgresql-adapter (1.3.22)
+      activerecord-jdbc-adapter (~> 1.3.22)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.21)
-      activerecord-jdbc-adapter (~> 1.3.21)
+    activerecord-jdbcsqlite3-adapter (1.3.22)
+      activerecord-jdbc-adapter (~> 1.3.22)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
@@ -23,16 +23,16 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.5.0)
-    arel (6.0.3)
-    builder (3.2.2)
+    arel (6.0.4)
+    builder (3.2.3)
     docile (1.1.5)
-    i18n (0.7.0)
+    i18n (0.8.0)
     jdbc-postgres (9.4.1206)
     jdbc-sqlite3 (3.8.11.2)
-    json (1.8.3)
-    json (1.8.3-java)
+    json (1.8.6)
+    json (1.8.6-java)
     minitest (5.10.1)
-    minitest-reporters (1.1.13)
+    minitest-reporters (1.1.14)
       ansi
       builder
       minitest (>= 5.0)
@@ -40,12 +40,12 @@ GEM
     pg (0.19.0)
     rake (12.0.0)
     ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tzinfo (1.2.2)
@@ -67,4 +67,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/gemfiles/ar50.gemfile.lock

@@ -30,15 +30,15 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     arel (7.1.4)
-    builder (3.2.2)
-    concurrent-ruby (1.0.3)
-    concurrent-ruby (1.0.3-java)
+    builder (3.2.3)
+    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.4-java)
     docile (1.1.5)
-    i18n (0.7.0)
-    json (2.0.2)
-    json (2.0.2-java)
+    i18n (0.8.0)
+    json (2.0.3)
+    json (2.0.3-java)
     minitest (5.10.1)
-    minitest-reporters (1.1.13)
+    minitest-reporters (1.1.14)
       ansi
       builder
       minitest (>= 5.0)
@@ -46,12 +46,12 @@ GEM
     pg (0.19.0)
     rake (12.0.0)
     ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     tzinfo (1.2.2)
@@ -75,4 +75,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.13.6
+   1.13.7

data/lib/activerecord-time/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Time
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

data/lib/time_of_day.rb

@@ -2,6 +2,8 @@ require 'yaml'
 
 # rubocop: disable Rails/TimeZone, Rails/Date
 class TimeOfDay
+  include Comparable
+
   attr_accessor :hour # 0 - 23
   attr_accessor :minute # 0 - 59
   attr_accessor :second # 0 - 59
@@ -9,7 +11,7 @@ class TimeOfDay
   def initialize(hour, minute = 0, second = 0)
     raise "Invalid hour: #{hour}" unless hour >= 0 && hour <= 23
     raise "Invalid minute: #{minute}" unless minute >= 0 && minute <= 59
-    raise "Invalid second: #{second}" unless second >= 0 && hour <= 59
+    raise "Invalid second: #{second}" unless second >= 0 && second <= 59
     @hour, @minute, @second = hour, minute, second
   end
 
@@ -55,32 +57,15 @@ class TimeOfDay
   end
 
   def <=>(other)
-    [@hour, @minute, @second] <=> [other.hour, other.minute, other.second]
-  end
-
-  def ==(other)
-    return false unless other.is_a? TimeOfDay
-    (self <=> other) == 0
-  end
-
-  def <(other)
-    return false unless other.is_a? TimeOfDay
-    (self <=> other) < 0
-  end
+    other_tod = if other.is_a?(TimeOfDay)
+                  other
+                elsif other.respond_to?(:time_of_day)
+                  other.time_of_day
+                else
+                  other
+                end
 
-  def <=(other)
-    return false unless other.is_a? TimeOfDay
-    (self <=> other) <= 0
-  end
-
-  def >(other)
-    return false unless other.is_a? TimeOfDay
-    (self <=> other) > 0
-  end
-
-  def >=(other)
-    return false unless other.is_a? TimeOfDay
-    (self <=> other) >= 0
+    to_a <=> [other_tod.hour, other_tod.minute, other_tod.second]
   end
 
   def strftime(format)
@@ -89,10 +74,16 @@ class TimeOfDay
 
   def to_s(with_seconds = true)
     if with_seconds
-      '%02d:%02d:%02d' % [@hour, @minute, @second]
+      '%02d:%02d:%02d' % to_a
     else
       '%02d:%02d' % [@hour, @minute]
     end
+  rescue
+    "#{@hour.inspect}:#{@minute.inspect}:#{@second.inspect}"
+  end
+
+  def to_a
+    [@hour, @minute, @second]
   end
 
   def to_json(*)

data/matrix_test.rb

@@ -7,8 +7,34 @@ update_gemfiles = ARGV.delete('--update')
 require 'yaml'
 travis = YAML.load(File.read('.travis.yml'))
 
+def run_script(ruby, env, gemfile)
+  env.scan(/\b(?<key>[A-Z_]+)="(?<value>.+?)"/) do |key, value|
+    ENV[key] = value
+  end
+  puts '*' * 80
+  puts "Testing #{ruby} #{gemfile} #{env}"
+  puts
+  system("chruby-exec #{ruby} -- bundle exec rake") || exit(1)
+  puts '*' * 80
+end
+
+def use_gemfile(ruby, gemfile, update_gemfiles)
+  puts '$' * 80
+  puts "Testing #{gemfile}"
+  puts
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  if update_gemfiles
+    system "chruby-exec #{ruby} -- bundle update"
+  else
+    system "chruby-exec #{ruby} -- bundle check || chruby-exec #{ruby} -- bundle install"
+  end || exit(1)
+  yield
+  puts "Testing #{gemfile} OK"
+  puts '$' * 80
+end
+
 travis['rvm'].each do |ruby|
-  next if ruby =~ /head/
+  next if ruby =~ /head/ # ruby-install does not support HEAD installation
   puts '#' * 80
   puts "Testing #{ruby}"
   puts
@@ -16,31 +42,16 @@ travis['rvm'].each do |ruby|
   bundler_gem_check_cmd = "chruby-exec #{ruby} -- gem query -i -n bundler >/dev/null"
   system "#{bundler_gem_check_cmd} || chruby-exec #{ruby} -- gem install bundler" || exit(1)
   travis['gemfile'].each do |gemfile|
-    if travis['matrix']['exclude'].any? { |f| f['rvm'] == ruby && f['gemfile'] == gemfile }
+    if (travis['matrix']['exclude'].to_a + travis['matrix']['allowed_failures'].to_a)
+       .any? { |f| f['rvm'] == ruby && f['gemfile'] == gemfile }
       puts 'Skipping known failure.'
       next
     end
-    puts '$' * 80
-    puts "Testing #{gemfile}"
-    puts
-    ENV['BUNDLE_GEMFILE'] = gemfile
-    if update_gemfiles
-      system "chruby-exec #{ruby} -- bundle update"
-    else
-      system "chruby-exec #{ruby} -- bundle check || chruby-exec #{ruby} -- bundle install"
-    end || exit(1)
-    travis['env'].each do |env|
-      env.scan(/\b(?<key>[A-Z_]+)="(?<value>.+?)"/) do |key, value|
-        ENV[key] = value
+    use_gemfile(ruby, gemfile, update_gemfiles) do
+      travis['env'].each do |env|
+        run_script(ruby, env, gemfile)
       end
-      puts '*' * 80
-      puts "Testing #{ruby} #{gemfile} #{env}"
-      puts
-      system "chruby-exec #{ruby} -- bundle exec rake" || exit(1)
-      puts '*' * 80
     end
-    puts "Testing #{gemfile} OK"
-    puts '$' * 80
   end
   puts "Testing #{ruby} OK"
   puts '#' * 80

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-time
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A handler for storing TimeOfDay objects in ActiveRecord objects as sql time