timely 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cebe03ec2467f4efe23f881f70be2c08fbb7e20
-  data.tar.gz: 355bf2273646023df6e0f7e9218e7a91390dd25a
+  metadata.gz: 584fc428f9daeae0837d23072b66f7f9b243ff64
+  data.tar.gz: 5fb6844cfb6c8d57bd31993de1ad1d61c6bb3359
 SHA512:
-  metadata.gz: bec47226548cc65af0aa7e0da099b5dc4f4b80056eb1f47e0f5de53959db654b18ed851245fbab86f9d45a0d80cb3fcc3a0bbcc9cc6188958d120402832b78f1
-  data.tar.gz: c705e73fe8447761b8ea7a79984a77aeb13687bb81bc354e53f5f434d64f9d70f51325da10f81df7811e3c02a18621e02cc5b6dbcf7defcb33aa6f944ea066fe
+  metadata.gz: 09ba7d44b3b223dd336a0bfc80bf3ea265c9ae9f23d69184ce0844640cd1c26068846123908688e4f6dcd701b47437eb6e398d38d76bd41d940832a9d358e573
+  data.tar.gz: 5782e3428094d1272eb40a0923394a24c8196099601430374ccacf86fa59fa6b91606e4818938ba7f8f25bebf7a7ec45b8024938eedea19ea349cae0923cc95c

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 rvm:
-  - 2.2
+  - 2.2.2
+  - 2.3.0
 script: bundle exec rake spec
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
+  - gemfiles/rails5.gemfile
 notifications:
   email:
     - support@travellink.com.au

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.3.0
+
+* Add time zone awareness for Time#on (e.g. Rails)
+* Required Timely.load to load overrides
+
+## 0.2.0
+
+* Rails 5 support
+
 ## 0.1.0
 
 * Initial release

data/gemfiles/rails3.gemfile

@@ -2,7 +2,5 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do
-  gem 'activesupport', '~> 3.2.0'
   gem 'activerecord', '~> 3.2.0'
-  gem 'actionpack', '~> 3.2.0'
 end

data/gemfiles/rails4.gemfile

@@ -2,8 +2,5 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do
-  gem 'activesupport', '~> 4.0'
   gem 'activerecord', '~> 4.0'
-  gem 'actionpack', '~> 4.0'
 end
-

data/gemfiles/rails5.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activerecord', '~> 5.0'
+end

data/lib/timely/date.rb

@@ -1,7 +1,7 @@
 module Timely
   module Date
     def at_time(hour = nil, minute = nil, second = nil)
-      if hour.is_a?(Time)
+      if hour.is_a?(::Time)
         time = hour
         hour, minute, second = time.hour, time.min, time.sec
       end

data/lib/timely/rails/time.rb

@@ -0,0 +1,18 @@
+module Timely
+  module Rails
+    module Time
+      def on_date(year, month = nil, day = nil)
+        if year.is_a?(Date)
+          date = year
+          year, month, day = date.year, date.month, date.day
+        end
+
+        raise ArgumentError, "Year, month, and day needed" unless [year, month, day].all?
+
+        ::Time.zone.local(year, month, day, hour, min, sec)
+      end
+
+      alias_method :on, :on_date
+    end
+  end
+end

data/lib/timely/rails.rb

@@ -9,3 +9,4 @@ require 'timely/rails/calendar_tag'
 require 'timely/rails/date_time'
 require 'timely/rails/date'
 require 'timely/rails/period'
+require 'timely/rails/time'

data/lib/timely/time.rb

@@ -14,8 +14,3 @@ module Timely
     alias_method :on, :on_date
   end
 end
-
-class Time
-  include Timely::Time
-end
-

data/lib/timely/version.rb

@@ -1,3 +1,3 @@
 module Timely
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/timely.rb

@@ -18,4 +18,8 @@ module Timely
   require 'timely/trackable_date_set'
 
   require 'timely/railtie' if defined?(Rails::Railtie)
+
+  def self.load
+    ::Time.send :include, Timely::Time
+  end
 end

data/spec/rails/date_time_spec.rb

@@ -1,20 +1,26 @@
 require 'spec_helper'
 
 describe DateTime do
-  let(:date_time) { DateTime.parse("2010-01-01") }
+  let(:date_time) { parse_time("2010-01-01 00:00:00") }
 
   it "should allow advancing by calendar days" do
     expect(date_time.advance_considering_calendar(:calendar_days, 10))
-      .to eq DateTime.parse("2010-01-10 23:59:59")
+      .to eq parse_time("2010-01-10 23:59:59")
   end
 
   it "should allow advancing by calendar months" do
     expect(date_time.advance_considering_calendar(:calendar_months, 10))
-      .to eq DateTime.parse("2010-10-31 23:59:59")
+      .to eq parse_time("2010-10-31 23:59:59")
   end
 
   it "should allow advancing by calendar years" do
     expect(date_time.advance_considering_calendar(:calendar_years, 10))
-      .to eq DateTime.parse("2019-12-31 23:59:59")
+      .to eq parse_time("2019-12-31 23:59:59")
+  end
+
+  def parse_time(time)
+    # ActiveSupport 5.1+ returns end of day differently
+    # Returns with usec at 999999 vs 0
+    DateTime.parse(time).end_of_day
   end
 end

data/spec/rails/time_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+TestRailsTime = Class.new(Time) do
+  include ::Timely::Rails::Time
+end
+
+describe TestRailsTime do
+  before { TestRailsTime.zone = 'Australia/Sydney' }
+
+  it 'should be able to set date on a time' do
+    xmas = Date.new(2012, 12, 25)
+    lunch_time = TestRailsTime.parse("12:00")
+    xmas_lunch = lunch_time.on_date(xmas)
+    expect(xmas_lunch.year).to eq 2012
+    expect(xmas_lunch.month).to eq 12
+    expect(xmas_lunch.day).to eq 25
+    expect(xmas_lunch.hour).to eq 12
+    expect(xmas_lunch.min).to eq 0
+    expect(xmas_lunch.sec).to eq 0
+  end
+
+  it "should allow setting the date part given a date" do
+    time = TestRailsTime.parse("2010-01-01 09:30:00")
+    expect(time.on_date(Date.parse("2012-12-31"))).to eq TestRailsTime.zone.parse("2012-12-31 09:30:00")
+  end
+end
+
+describe Time do
+  before :each do
+    TestRailsTime.zone = 'Australia/Sydney'
+    @time = TestRailsTime.now
+
+    @year  = 2005
+    @month = 3
+    @day   = 15
+  end
+
+  it 'should give that time on a date' do
+    expect(@time).to respond_to(:on_date)
+  end
+
+  describe 'giving that time on a date' do
+    it 'should accept year, month and day' do
+      expect { @time.on_date(@year, @month, @day) }.to_not raise_error
+    end
+
+    it 'should require year, month, and day' do
+      expect { @time.on_date(@year, @month) }.to raise_error(ArgumentError)
+    end
+
+    it 'should return the same time on the specified year, month, and day' do
+      expected = TestRailsTime.zone.local(@year, @month, @day, @time.hour, @time.min, @time.sec)
+      expect(@time.on_date(@year, @month, @day)).to eq expected
+    end
+
+    it 'should accept a date' do
+      expect { @time.on_date(Date.today) }.to_not raise_error
+    end
+
+    it 'should return the same time on the specified date' do
+      @date = Date.today - 2345
+      expected = Time.zone.local(@date.year, @date.month, @date.day, @time.hour, @time.min, @time.sec)
+      expect(@time.on_date(@date)).to eq expected
+    end
+  end
+
+  it "should provide 'on' as an alias" do
+    expected = TestRailsTime.zone.local(@year, @month, @day, @time.hour, @time.min, @time.sec)
+    expect(@time.on(@year, @month, @day)).to eq expected
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'bundler/setup'
 require 'rspec/its'
 require 'active_record'
 
-require 'support/coverage'
+require 'support/coverage_loader'
 
 I18n.enforce_available_locales = true if I18n.respond_to? :enforce_available_locales=
 

data/spec/support/coverage_loader.rb

@@ -0,0 +1,4 @@
+require 'simplecov-rcov'
+require 'coveralls'
+require 'coverage/kit'
+Coverage::Kit.setup(minimum_coverage: 68.3)

data/spec/time_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
+TestTime = Class.new(Time) do
+  include ::Timely::Time
+end
+
 describe Time do
   it 'should be able to set date on a time' do
     xmas = Date.new(2012, 12, 25)
-    lunch_time = Time.parse("12:00")
+    lunch_time = TestTime.parse("12:00")
     xmas_lunch = lunch_time.on_date(xmas)
     expect(xmas_lunch.year).to eq 2012
     expect(xmas_lunch.month).to eq 12
@@ -14,14 +18,14 @@ describe Time do
   end
 
   it "should allow setting the date part given a date" do
-    time = Time.parse("2010-01-01 09:30:00")
+    time = TestTime.parse("2010-01-01 09:30:00")
     expect(time.on_date(Date.parse("2012-12-31"))).to eq Time.parse("2012-12-31 09:30:00")
   end
 end
 
 describe Time do
   before :each do
-    @time = Time.now - 12345
+    @time = TestTime.now
 
     @year  = 2005
     @month = 3

data/timely.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'simplecov-rcov'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coverage-kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,6 +210,7 @@ files:
 - Rakefile
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
+- gemfiles/rails5.gemfile
 - lib/timely.rb
 - lib/timely/date.rb
 - lib/timely/date_chooser.rb
@@ -224,6 +225,7 @@ files:
 - lib/timely/rails/extensions.rb
 - lib/timely/rails/period.rb
 - lib/timely/rails/season.rb
+- lib/timely/rails/time.rb
 - lib/timely/railtie.rb
 - lib/timely/range.rb
 - lib/timely/string.rb
@@ -246,11 +248,12 @@ files:
 - spec/rails/date_spec.rb
 - spec/rails/date_time_spec.rb
 - spec/rails/period_spec.rb
+- spec/rails/time_spec.rb
 - spec/schema.rb
 - spec/season_spec.rb
 - spec/spec_helper.rb
 - spec/string_spec.rb
-- spec/support/coverage.rb
+- spec/support/coverage_loader.rb
 - spec/temporal_patterns_spec.rb
 - spec/time_since_spec.rb
 - spec/time_spec.rb
@@ -277,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Set of time, date, weekday related methods.
@@ -291,11 +294,12 @@ test_files:
 - spec/rails/date_spec.rb
 - spec/rails/date_time_spec.rb
 - spec/rails/period_spec.rb
+- spec/rails/time_spec.rb
 - spec/schema.rb
 - spec/season_spec.rb
 - spec/spec_helper.rb
 - spec/string_spec.rb
-- spec/support/coverage.rb
+- spec/support/coverage_loader.rb
 - spec/temporal_patterns_spec.rb
 - spec/time_since_spec.rb
 - spec/time_spec.rb

data/spec/support/coverage.rb

@@ -1,26 +0,0 @@
-MINIMUM_COVERAGE = 68
-
-unless ENV['COVERAGE'] == 'off'
-  require 'simplecov'
-  require 'simplecov-rcov'
-  require 'coveralls'
-  Coveralls.wear!
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::RcovFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-  SimpleCov.start do
-    add_filter '/vendor/'
-    add_filter '/spec/'
-    add_group 'lib', 'lib'
-  end
-  SimpleCov.at_exit do
-    SimpleCov.result.format!
-    percent = SimpleCov.result.covered_percent
-    unless percent >= MINIMUM_COVERAGE
-      puts "Coverage must be above #{MINIMUM_COVERAGE}%. It is #{"%.2f" % percent}%"
-      Kernel.exit(1)
-    end
-  end
-end