time-zone 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f87514b362f81ee4964adead9a93cd19994225c85e06b8c3584caabe8102123
-  data.tar.gz: 5a0f736d97c9ad2093d9069a22a043b96e1d91ec53c833b7f8a60ff87e332e3e
+  metadata.gz: c45f75eb9cc62be35e1a2ab9a07932bcd26a82fe3b256f6da69a4d8fe436d961
+  data.tar.gz: 541336a54e240c1b6f65955f764c08adaaa4a772eeb73fb7c5e38ef1e10f0072
 SHA512:
-  metadata.gz: 79db731b27df02f4a817709403dd0450f780697f47818fb6cd77e07c893509c25a436c2dbd8c2c257191a14f075bee4a3fc3f162ba7b10d532446b2e347a2544
-  data.tar.gz: 2c65c7d6ff558e6b00f3629dff240eb0ae0dd2e99dbd985f99a5d7e678962c7f9b7d96b5ddd338e12fa84592ecb953f17e60fd8910962743dfb9ab2f43d7c3ef
+  metadata.gz: d6e8d0229d3a43912e324ddb4c9cf312d9384af9af7c3e76bd19631a1eb0ca9ce40c284cace46cd70324746fc421192d2f8974aee617254500e2443580325164
+  data.tar.gz: 6063d30135ae3c588bf10e62891ce1a10b0fd875d26de7052953bcf2035b167ac8fca9c8fe8fbb0c7dad945c2684851f63ae397ad8982c18674cb3c6b8ee0454

data/.travis.yml

@@ -1,9 +1,12 @@
 # Setup the environment:
 language: ruby
-sudo: false
-dist: trusty
+dist: xenial
 cache: bundler
 
+before_script:
+  - gem update --system
+  - gem install bundler
+
 rvm:
   - 2.1
   - 2.2

data/Rakefile

@@ -8,6 +8,7 @@ task :default => :spec
 task :console do
 	require 'pry'
 	require_relative 'lib/time/zone'
+	require_relative 'lib/time/zone/timestamp'
 	
 	Pry.start
 end

data/lib/time/zone.rb

@@ -22,8 +22,19 @@ require_relative 'zone/version'
 
 require_relative 'zone/locking'
 
+require 'time'
+
 class Time
+	alias minute min
+	alias second sec
+	
 	module Zone
+		def self.new(year, month, day, hour, minute, second, zone)
+			with(zone) do
+				return Time.new(year, month, day, hour, minute, second).localtime
+			end
+		end
+		
 		def self.now(zone)
 			with(zone) do
 				# Time instances are lazy initialized, so we need to force it to pick up the current TZ by invoking #localtime
@@ -33,7 +44,17 @@ class Time
 		
 		def self.convert(time, zone)
 			with(zone) do
-				return time.localtime
+				return Time.new(time.year, time.month, time.day, time.hour, time.minute, time.second, time.utc_offset).localtime
+			end
+		end
+		
+		def self.parse(string, zone = "UTC", *args)
+			if string.sub!(/\s([a-zA-Z][\w]*(\/[\w]+)?)$/, "")
+				zone = $1
+			end
+			
+			with(zone) do
+				return Time.parse(string, *args).localtime, zone
 			end
 		end
 	end

data/lib/time/zone/locking.rb

@@ -24,6 +24,18 @@ class Time
 	module Zone
 		LOCK = Mutex.new
 		
+		def self.zone=(zone)
+			LOCK.synchronize do
+				ENV['TZ'] = zone
+			end
+		end
+		
+		def self.zone(zone)
+			LOCK.synchronize do
+				ENV['TZ']
+			end
+		end
+		
 		def self.with(zone)
 			LOCK.synchronize do
 				original_zone = ENV['TZ']

data/lib/time/zone/timestamp.rb

@@ -0,0 +1,152 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative '../zone'
+
+require 'date'
+
+class Time
+	module Zone
+		class Timestamp
+			def self.load(string)
+				self.parse(string)
+			end
+			
+			def self.dump(time)
+				time.strftime
+			end
+			
+			def self.now(zone)
+				self.from(Zone.now(zone), zone)
+			end
+			
+			def self.from(time, zone)
+				self.new(time.year, time.month, time.day, time.hour, time.min, time.sec, zone)
+			end
+			
+			def self.parse(*args)
+				self.from(*Zone.parse(*args))
+			end
+			
+			def initialize(year, month, day, hour, minute, second, zone = "UTC")
+				@year = year
+				@month = month
+				@day = day
+				@hour = hour
+				@minute = minute
+				@second = second
+				@zone = zone
+				
+				@time = nil
+			end
+			
+			attr :year
+			attr :month
+			attr :day
+			attr :hour
+			attr :minute
+			attr :second
+			attr :zone
+			
+			def convert(zone)
+				self.class.from(Time::Zone.convert(to_time, zone), zone)
+			end
+			
+			private def with_offset(months, seconds = 0)
+				current = self
+				
+				if months != 0
+					current = current.to_datetime >> months
+				end
+				
+				if seconds != 0
+					current = current.to_time + seconds
+				end
+				
+				self.class.from(current, @zone)
+			end
+			
+			# Add duration in various units.
+			def offset_by(years: 0, months: 0, weeks: 0, days: 0, hours: 0, minutes: 0, seconds: 0)
+				with_offset(
+					years * 12 + months,
+					(((weeks * 7 + days) * 24 + hours) * 60 + minutes) * 60 + seconds
+				)
+			end
+			
+			# Add duration in seconds.
+			def + duration
+				with_offset(0, duration)
+			end
+			
+			# Return difference in seconds.
+			def - other
+				if other.is_a? Numeric
+					# We are subtracting a duration:
+					with_offset(0, -other)
+				else
+					to_time - other.to_time
+				end
+			end
+			
+			def to_time
+				@time ||= Time::Zone.new(@year, @month, @day, @hour, @minute, @second, @zone).freeze
+			end
+			
+			def to_date
+				to_time.to_date
+			end
+			
+			def to_datetime
+				to_time.to_datetime
+			end
+			
+			def iso8601
+				to_time.iso8601
+			end
+			
+			def <=> other
+				to_time <=> other.to_time
+			end
+			
+			DEFAULT_FORMAT = '%Y-%m-%d %H:%M:%S %Z'.freeze
+			
+			def to_s(format = relative_format)
+				to_time.strftime(format.gsub('%Z', @zone))
+			end
+			
+			def strftime(format = DEFAULT_FORMAT)
+				to_s(format)
+			end
+			
+			def relative_format(now = Timestamp.now(@zone))
+				if self.year != now.year
+					"%-l:%M%P, %B %-d, %Y, %Z"
+				elsif self.month != now.month or self.day != now.day
+					"%-l:%M%P, %B %-d, %Z"
+				else
+					"%-l:%M%P, %Z"
+				end
+			end
+			
+			alias to_str strftime
+		end
+	end
+end

data/lib/time/zone/version.rb

@@ -20,6 +20,6 @@
 
 class Time
 	module Zone
-		VERSION = "0.2.0"
+		VERSION = "1.0.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time-zone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - Rakefile
 - lib/time/zone.rb
 - lib/time/zone/locking.rb
+- lib/time/zone/timestamp.rb
 - lib/time/zone/version.rb
 - time-zone.gemspec
 homepage: https://github.com/ioquatix/time-zone