vremya 1.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 29979ba2726045307bea89ab12de4138bdced601
+  data.tar.gz: 352eae23db9f81cc1de06a91239b62d5ef5882ef
+SHA512:
+  metadata.gz: 2c0efec2a2469615a1b3b697e45a3e3508680dc8e02ca3b5be4563e053b5091963a11b5ee57fbce4f04bc6c8af717616b2568e5ea442e02be304e1698bb69b2f
+  data.tar.gz: ebf2e5a5b56bdd5c439ac73ed4116da1616f7d75b6c0e99ec8e352b18adc98e353f356073b487a7c2329130f2769c059240cc1ca6c57a74f476d8ed9d1237862

data/Rakefile

@@ -1,17 +1,19 @@
 require 'rubygems'
 require 'bundler'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 require 'yard'
 
 Bundler.require
 Bundler::GemHelper.install_tasks
 
-desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
-  # nothing
+desc "Run tests"
+Rake::TestTask.new do |t|
+  t.test_files = FileList['spec/**/*_spec.rb']
 end
 
 desc "Generate docs"
 YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb']
+  t.files = ['lib/**/*.rb']
 end
+
+task :default => :test

data/lib/vremya/locale/ru.rb

@@ -0,0 +1,58 @@
+class Vremya
+  module Locale
+    RU = {
+      "январь"      => "January",
+      "января"      => "January",
+      "янв"         => "Jan",
+      "февраль"     => "February",
+      "февраля"     => "February",
+      "фев"         => "Feb",
+      "февр"        => "Feb",
+      "март"        => "March",
+      "марта"       => "March",
+      "мар"         => "Mar",
+      "апрель"      => "April",
+      "апреля"      => "April",
+      "апр"         => "Apr",
+      "май"         => "May",
+      "мая"         => "May",
+      "июнь"        => "June",
+      "июня"        => "June",
+      "июн"         => "Jun",
+      "июль"        => "July",
+      "июля"        => "July",
+      "июл"         => "Jul",
+      "август"      => "August",
+      "августа"     => "August",
+      "авг"         => "Aug",
+      "сентябрь"    => "September",
+      "сентября"    => "September",
+      "сен"         => "Sep",
+      "сент"        => "Sep",
+      "октябрь"     => "October",
+      "октября"     => "October",
+      "окт"         => "Oct",
+      "ноябрь"      => "November",
+      "ноября"      => "November",
+      "ноя"         => "Nov",
+      "нояб"        => "Nov",
+      "декабрь"     => "December",
+      "декабря"     => "December",
+      "дек"         => "Dec",
+      "понедельник" => "Monday",
+      "пн"          => "Mon",
+      "вторник"     => "Tuesday",
+      "вт"          => "Tue",
+      "среда"       => "Wednesday",
+      "ср"          => "Wed",
+      "четверг"     => "Thursday",
+      "чт"          => "Thu",
+      "пятница"     => "Friday",
+      "пт"          => "Fri",
+      "суббота"     => "Saturday",
+      "сб"          => "Sat",
+      "воскресенье" => "Sunday",
+      "вс"          => "Sun"
+    }
+  end
+end

data/lib/vremya/timezone.rb

@@ -0,0 +1,85 @@
+class Vremya
+  class Timezone
+    
+    def self.all
+      TZInfo::Timezone.all_identifiers
+    end
+    
+    STR = /([+-])(\d{2}):(\d{2})/
+    
+    attr_reader :value
+    
+    def self.at(value, year, mon = nil, day = nil, hour = nil, min = nil, sec = nil)
+      stamp = Time.gm(year, mon, day, hour, min, sec)
+      new(value, stamp.to_i - new(value, stamp).offset)
+    end
+    
+    def initialize(value, stamp = nil)
+      @value = value
+      @stamp = stamp
+      if block_given?
+        yield self
+      end
+    end
+    
+    def name_or_offset
+      name || offset
+    end
+    
+    def name
+      if value.nil?
+        return 'GMT'
+      end
+      unless value.is_a?(String)
+        return nil
+      end
+      if self.class.all.include?(value)
+        return value
+      end
+      nil
+    end
+    
+    def offset
+      if value.nil?
+        return 0
+      end
+      if value.is_a?(Numeric)
+        return value
+      end
+      if value.is_a?(String) && value =~ STR
+        return ($2.to_i * 3600 + $3.to_i * 60) * ($1 == '-' ? -1 : 1)
+      end
+      unless name.nil?
+        return period.utc_offset
+      end
+      0
+    end
+    
+    def dst?
+      tz.nil? ? false : tz.dst?
+    end
+    
+    def to_s
+      "%s%s" % [offset < 0 ? '-' : '+', "%02d:%02d" % (offset / 60).divmod(60)]
+    end
+    
+    private
+    
+    def tz
+      name.nil? ? nil : TZInfo::Timezone.get(value)
+    end
+    
+    def period
+      if tz.nil?
+        return nil
+      end
+      if @stamp.nil?
+        return tz.current_period
+      end
+      tz.period_for_utc(@stamp) do |p|
+        p.first
+      end
+    end
+    
+  end
+end

data/lib/vremya.rb

@@ -1,69 +1,139 @@
 require 'tzinfo'
+require_relative 'vremya/locale/ru'
+require_relative 'vremya/timezone'
 
 class Vremya
   
   SECONDS_IN_A_DAY = 60 * 60 * 24
   
+  def self.guess(options = {})
+    raise "not implemented"
+  end
+  
+  # %Y  - Year with century (can be negative, 4 digits at least)
+  # %C  - year / 100 (round down.  20 in 2009)
+  # %y  - year % 100 (00..99)
+  # %m  - Month of the year, zero-padded (01..12)
+  # %-m - Month of the year, no-padded (1..12)
+  # %B  - The full month name (``January'')
+  # %^B - Month name uppercased (``JANUARY'')
+  # %b  - Abbreviated month name (``Jan'')
+  # %^b - Abbreviated uppercased month (``JAN'')
+  # %d  - Day of the month, zero-padded (01..31)
+  # %-d - Day of the month, no-padded (1..31)
+  # %e  - Day of the month, blank-padded ( 1..31)
+  # %j  - Day of the year (001..366)
+  # %H  - Hour of the day, 24-hour clock, zero-padded (00..23)
+  # %k  - Hour of the day, 24-hour clock, blank-padded ( 0..23)
+  # %I  - Hour of the day, 12-hour clock, zero-padded (01..12)
+  # %l  - Hour of the day, 12-hour clock, blank-padded ( 1..12)
+  # %P  - Meridian indicator, lowercase (``am'' or ``pm'')
+  # %p  - Meridian indicator, uppercase (``AM'' or ``PM'')
+  # %M  - Minute of the hour (00..59)
+  # %S  - Second of the minute (00..59)
+  # %L  - Millisecond of the second (000..999)
+  # %N  - Fractional seconds digits, default is 9 digits (nanosecond)
+  # %z  - Time zone as hour and minute offset from UTC (e.g. +0900)
+  # %:z - hour and minute offset from UTC with a colon (e.g. +09:00)
+  # %Z  - Time zone abbreviation name
+  # %A  - The full weekday name (``Sunday'')
+  # %^A - Weekday, uppercased (``SUNDAY'')
+  # %a  - Weekday, abbreviated (``Sun'')
+  # %^a - Weekday, uppercased (``SUN'')
+  # %u  - Day of the week (Monday is 1, 1..7)
+  # %w  - Day of the week (Sunday is 0, 0..6)
+  # %s  - Number of seconds since 1970-01-01 00:00:00 UTC.
+  # %Q  - Number of milliseconds since 1970-01-01 00:00:00 UTC.
+  def self.parse(string, format, timezone = nil)
+    Locale::RU.each do |key, value|
+      string.gsub!(/\b#{key}\b/, value)
+    end
+    timestamp = DateTime.strptime(string, format)
+    self.at(timestamp).as_if_in(timezone)
+  end
+  
+  # Returns a new Vremya object initialized to the current time.
+  # @param [String, Numeric] offset Time zone name or GMT offset in seconds
   def self.now(zone = nil)
-    self.new(Time.now.gmtime.to_i, zone)
+    from_time Time.now, zone
   end
   
-  def self.parse(string, format, timezone = nil)
-    self.new(DateTime.strptime(string, format)).as_if_in(timezone)
+  # Returns a new Vremya object initialized at specified UNIX timestamp.
+  # @param [Integer] timestamp
+  # @param [String, Numeric] offset Time zone name or GMT offset in seconds
+  def self.at(timestamp, zone = nil)
+    from_time Time.at(timestamp + Timezone.new(zone, timestamp).offset), zone
   end
   
-  def self.timezones
-    TZInfo::Timezone.all_identifiers
+  # Creates a new Vremya object based on given values, interpreted as UTC (GMT).
+  def self.gm(*args)
+    from_time Time.gm(*args), "GMT"
   end
   
-  # Returns a new Vremya object with the value given by time since the Epoch.
+  # Create a new Vremya object from a native Time instance.
+  # @param [String, Numeric] offset Time zone name or GMT offset in seconds
+  def self.from_time(time, zone = nil)
+    new *time.utc.to_a[0..5].reverse, zone
+  end
+  
+  # Creates a new Vremya object based on given values.
+  # @param [Integer] year
+  # @param [Integer] month
+  # @param [Integer] day
+  # @param [Integer] hour
+  # @param [Integer] min
+  # @param [Integer] sec
+  # @param [String, Numeric] offset Time zone name or GMT offset in seconds
   # @return [Vremya]
-  def initialize(timestamp, zone = nil)
-    if timestamp.is_a?(DateTime)
-      timestamp = timestamp.strftime("%s").to_i
-    end
-    unless timestamp.respond_to?(:to_i)
-      raise 'Timestamp expected, %s' % timestamp.class
-    end
-    @zone  = TZInfo::Timezone.get(zone || 'GMT')
-    @stamp = timestamp.to_i
+  def initialize(year, month = nil, day = nil, hour = nil, min = nil, sec = nil, offset = nil)
+    @zone = Timezone.at(offset, year, month, day, hour, min, sec)
+    @time = Time.new(year, month, day, hour, min, sec, @zone.offset)
   end
   
   # Returns a new Vremya object where one or more of the elements have been
   # changed according to the options parameter. The following options are
   # available: :year, :month, :day, :hour, :minute, :second. 
-  def change(options)
-    opts = to_hash.merge(options)
-    date = Date.new(opts[:year], opts[:month], opts[:day])
-    advance({
-      :days    => (date - to_date).to_i,
-      :hours   => opts[:hour] - hour,
-      :minutes => opts[:minute] - minute,
-      :seconds => opts[:second] - second
-    })
+  def change(opts)
+    self.class.new(
+      opts[:year]   || year,
+      opts[:month]  || month,
+      opts[:day]    || day,
+      opts[:hour]   || hour,
+      opts[:minute] || minute,
+      opts[:second] || second,
+      @zone.name_or_offset
+    )
   end
   
   # Returns a new Vremya object by going forward or back in time according
   # to the options parameter. The following options are available:
   # :years, :months, :days, :hours, :minutes, :seconds. 
-  def advance(options)
-    opts = {
-      :years   => 0,
-      :months  => 0,
-      :days    => 0,
-      :hours   => 0,
-      :minutes => 0,
-      :seconds => 0
-    }.merge(options)
+  def advance(opts)
     date = to_date
-    date = date >> opts[:years] * 12
-    date = date >> opts[:months]
-    date = date + opts[:days]
-    diff = (date - to_date).to_i * 60 * 60 * 24
-    diff += opts[:hours] * 3600
-    diff += opts[:minutes] * 60
-    diff += opts[:seconds]
-    self + diff
+    diff = 0
+    unless opts[:years].nil?
+      date = date >> opts[:years] * 12
+    end
+    unless opts[:months].nil?
+      date = date >> opts[:months]
+    end
+    unless opts[:days].nil?
+      date = date + opts[:days]
+    end
+    unless opts[:hours].nil?
+      diff += opts[:hours] * 3600
+    end
+    unless opts[:minutes].nil?
+      diff += opts[:minutes] * 60
+    end
+    unless opts[:seconds].nil?
+      diff += opts[:seconds]
+    end
+    diff += (date - to_date) * 60 * 60 * 24
+    time  = self + diff
+    shift = utc_offset - time.utc_offset
+    time += shift if opts[:hours].nil? and shift != 0
+    time
   end
   
   # Returns same time and date one month ago. In cases where previous month
@@ -125,7 +195,7 @@ class Vremya
   # Returns a new Time representing the "start" of this week (Monday, 0:00).
   # @return [Vremya]
   def beginning_of_week
-    advance(:days => wday == 0 ? -6 : 1 - wday)
+    change(:day => day - wday_starting_on_monday, :hour => 0, :minute => 0, :second => 0)
   end
   
   alias_method :at_beginning_of_week, :beginning_of_week
@@ -149,7 +219,7 @@ class Vremya
   # Returns the second of the minute (0..60).
   # @return [Fixnum]
   def second
-    time_in_utc.sec
+    to_time.sec
   end
   
   alias_method :sec, :second
@@ -157,7 +227,7 @@ class Vremya
   # Returns the minute of the hour (0..59) for time.
   # @return [Fixnum]
   def minute
-    time_in_utc.min
+    to_time.min
   end
   
   alias_method :min, :minute
@@ -165,25 +235,25 @@ class Vremya
   # Returns the hour of the day (0..23).
   # @return [Fixnum]
   def hour
-    time_in_utc.hour
+    to_time.hour
   end
   
   # Returns the day of the month (1..n).
   # @return [Fixnum]
   def day
-    time_in_utc.day
+    to_time.day
   end
   
   # Returns the month of the year (1..12).
   # @return [Fixnum]
   def month
-    time_in_utc.month
+    to_time.month
   end
   
   # Returns the year (including the century).
   # @return [Fixnum]
   def year
-    time_in_utc.year
+    to_time.year
   end
   
   # Returns true if specified time lies in the future.
@@ -363,23 +433,30 @@ class Vremya
   # Returns an integer representing the day of the week, 0..6, with Sunday == 0.
   # @return [Fixnum]
   def wday
-    time_in_utc.wday
+    to_time.wday
   end
   
   # Returns an integer representing the day of the week, 0..6. Similar to #wday, but assumes Monday == 0 and Sunday == 6.
+  # @return [Fixnum]
   def wday_starting_on_monday
     sunday? ? 6 : wday - 1
   end
   
+  # Returns an integer representing the day of the year, 1..366.
+  # @return [Fixnnum]
+  def yday
+    to_time.yday
+  end
+  
   # Returns true if daylight savings are in effect at this timezone.
   # @return [Boolean]
   def daylight_saving?
-    @zone.current_period.dst?
+    @zone.dst?
   end
   
   alias_method :dst?, :daylight_saving?
   
-  # Returns timezone identifier, e.g. "Europe/Paris"
+  # Returns timezone identifier or GMT offset, e.g. "Europe/Paris", "+03:00"
   # @return [String]
   def timezone_name
     @zone.name
@@ -388,57 +465,69 @@ class Vremya
   # Returns the offset in seconds between the timezone of time and UTC.
   # @return [Fixnum]
   def utc_offset
-    @zone.current_period.utc_offset
+    @zone.offset
   end
   
   # Returns a new Vremya object in GMT timezone.
   # @return [Vremya]
   def to_utc
-    self.class.new(to_i)
+    self.class.at(to_i)
   end
   
   # Returns a new Vremya object in specified timezone.
+  # @param [String, Numeric] offset Time zone name or GMT offset in seconds
   # @return [Vremya]
   def to_timezone(zone)
-    self.class.new(to_i, zone)
+    self.class.at(to_i, zone)
   end
   
   # Returns the difference with specified timezone in seconds.
+  # @param [String, Numeric] offset Time zone name or GMT offset in seconds
   # @return [Integer]
   def difference_with_zone(zone)
     to_timezone(zone).utc_offset - utc_offset
   end
   
   # Returns a new Vremya instance by advancing in time.
+  # @param [String, Numeric] offset Time zone name or GMT offset in seconds
+  # @return [Vremya]
   def as_if_in(zone)
     to_timezone(zone) - difference_with_zone(zone)
   end
   
   # Substracts some number of seconds to time and returns that value as a new Vremya object.
+  # @param [Integer] seconds
   # @return [Vremya]
-  def -(value)
-    self.+(-value)
+  def -(seconds)
+    self.+(-seconds)
   end
   
   # Adds some number of seconds to time and returns that value as a new Vremya object.
+  # @param [Integer] seconds
   # @return [Vremya]
-  def +(value)
-    self.class.new(to_i + value, timezone_name)
+  def +(seconds)
+    self.class.at(to_i + seconds, timezone_name)
   end
   
   # Returns the number of seconds since 1970-01-01 00:00:00 UTC.
   # @return [Fixnum]
   def to_i
-    @stamp
+    @time.to_i
+  end
+  
+  # Returns a duplicate instance.
+  # @return [Vremya]
+  def dup
+    self + 0
   end
   
-  # Returns a native Ruby Time object in UTC timezone.
+  # Returns a native Ruby Time object in specified timezone.
   # @return [Time]
   def to_time
-    Time.at(@stamp).getutc
+    @time.dup
   end
-
-  # Returns a native Ruby Time object in UTC timezone.
+  
+  # Returns a native Ruby Time object.
   # @return [Time]
   def to_date
     Date.new(year, month, day)
@@ -465,7 +554,13 @@ class Vremya
   # Returns a string representing time.
   # @return [String]
   def to_s
-    strftime("%a %b %d %T %z %Y")
+    strftime("%Y-%m-%d %H:%M:%S %z")
+  end
+  
+  # Returns a ten-element array of values for time: [sec, min, hour, day, month, year, wday, yday, dst?, timezone_name]
+  # @return [Array]
+  def to_a
+    [sec, min, hour, day, month, year, wday, yday, dst?, timezone_name]
   end
   
   # Returns a hash with time & date attributes.
@@ -489,21 +584,7 @@ class Vremya
   # Returns time as a string according to the given format. The formatting is identical to Time.strftime 
   # @return [String]
   def strftime(string)
-    @zone.strftime string.gsub(/%z/, utc_offset_as_string), to_time
-  end
-  
-  private
-  
-  def utc_offset_as_string
-    "%s%s" % [utc_offset < 0 ? '-' : '+', formatted_hours(utc_offset)]
-  end
-  
-  def formatted_hours(seconds)
-    "%02d:%02d" % (seconds / 60).divmod(60)
-  end
-  
-  def time_in_utc
-    to_time + utc_offset
+    to_time.strftime string.gsub(/%z/, @zone.to_s)
   end
   
 end

data/spec/attributes_spec.rb

@@ -0,0 +1,132 @@
+require './spec/spec_helper'
+
+describe Vremya do
+  
+  let(:moscow) do
+    Vremya.new(2014, 10, 26, 18, 10, 15, "Europe/Moscow")
+  end
+  
+  describe ".new" do
+    it "returns valid Vremya when only one argument is specified" do
+      Vremya.new(2014).to_s.must_be :==, "2014-01-01 00:00:00 +00:00"
+    end
+    it "returns valid Vremya when only 2 arguments are specified" do
+      Vremya.new(2014, 10).to_s.must_be :==, "2014-10-01 00:00:00 +00:00"
+    end
+    it "returns valid Vremya when only 3 arguments are specified" do
+      Vremya.new(2014, 10, 26).to_s.must_be :==, "2014-10-26 00:00:00 +00:00"
+    end
+    it "returns valid Vremya when only 4 arguments are specified" do
+      Vremya.new(2014, 10, 26, 18).to_s.must_be :==, "2014-10-26 18:00:00 +00:00"
+    end
+    it "returns valid Vremya when only 5 arguments are specified" do
+      Vremya.new(2014, 10, 26, 18, 10).to_s.must_be :==, "2014-10-26 18:10:00 +00:00"
+    end
+    it "returns valid Vremya when offset is not specified" do
+      Vremya.new(2014, 10, 26, 18, 10, 15).to_s.must_be :==, "2014-10-26 18:10:15 +00:00"
+    end
+    it "returns valid Vremya when offset is specified as zone" do
+      Vremya.new(2014, 10, 26, 18, 10, 15, "Europe/Moscow").to_s.must_be :==, "2014-10-26 18:10:15 +03:00"
+    end
+    it "returns valid Vremya when offset is specified as a number" do
+      Vremya.new(2014, 10, 26, 18, 10, 15, 3600 * 3).to_s.must_be :==, "2014-10-26 18:10:15 +03:00"
+    end
+    it "returns valid Vremya when offset is specified as a string" do
+      Vremya.new(2014, 10, 26, 18, 10, 15, "+03:00").to_s.must_be :==, "2014-10-26 18:10:15 +03:00"
+    end
+  end
+  
+  describe ".now" do
+    it "returns valid Vremya object" do
+      Vremya.now.to_i.must_be :==, Time.now.to_i
+    end
+  end
+  
+  describe ".at" do
+    it "returns valid Vremya object when timezone is not specified" do
+      Vremya.at(1414336215).to_s.must_be :==, "2014-10-26 15:10:15 +00:00"
+    end
+    it "returns valid Vremya object with correct timezone" do
+      Vremya.at(1414336215, "Europe/Moscow").to_s.must_be :==, "2014-10-26 18:10:15 +03:00"
+    end
+  end
+
+  describe ".gm" do
+    it "returns valid Vremya object in UTC timezone" do
+      Vremya.gm(2014, 10, 26, 18, 10, 15).to_s.must_be :==, "2014-10-26 18:10:15 +00:00"
+    end
+  end
+  
+  describe "#second" do
+    it "returns correct second of the minute" do
+      moscow.second.must_be :==, 15
+    end
+  end
+  
+  describe "#minute" do
+    it "returns correct minute of the hour" do
+      moscow.minute.must_be :==, 10
+    end
+  end
+  
+  describe "#hour" do
+    it "returns correct hour of the day" do
+      moscow.hour.must_be :==, 18
+    end
+  end
+  
+  describe "#day" do
+    it "returns correct day of the month" do
+      moscow.day.must_be :==, 26
+    end
+  end
+  
+  describe "#month" do
+    it "returns correct month of the year" do
+      moscow.month.must_be :==, 10
+    end
+  end
+  
+  describe "#year" do
+    it "returns correct year" do
+      moscow.year.must_be :==, 2014
+    end
+  end
+  
+  describe "#yday" do
+    it "returns correct day of the year" do
+      moscow.yday.must_be :==, 299
+    end
+  end
+  
+  describe "#wday" do
+    it "returns correct working day index" do
+      moscow.wday.must_be :==, 0
+    end
+  end
+  
+  describe "#wday_starting_on_monday" do
+    it "returns correct working day index" do
+      moscow.wday_starting_on_monday.must_be :==, 6
+    end
+  end
+  
+  describe "#timezone_name" do
+    it "returns name of the timezone when specified" do
+      moscow.timezone_name.must_be :==, "Europe/Moscow"
+    end
+    it "returns nil when offset is supplied instead of zone" do
+      Vremya.new(2014, 10, 26, 18, 10, 15, "+01:00").timezone_name.must_be_nil
+    end
+    it "returns GMT by default" do
+      Vremya.new(2014, 10, 26, 18, 10, 15).timezone_name.must_be :==, "GMT"
+    end
+  end
+  
+  describe "#utc_offset" do
+    it "returns valid UTC offset" do
+      moscow.utc_offset.must_be :==, 3600 * 3
+    end
+  end
+  
+end

data/spec/conversion_spec.rb

@@ -0,0 +1,37 @@
+require './spec/spec_helper'
+
+describe Vremya do
+  
+  describe "#to_utc" do
+    it
+  end
+  
+  describe "#to_timezone" do
+    it
+  end
+  
+  describe "#to_i" do
+    it
+  end
+  
+  describe "#to_time" do
+    it
+  end
+  
+  describe "#to_date" do
+    it
+  end
+  
+  describe "#to_hash" do
+    it
+  end
+  
+  describe "#as_yaml" do
+    it
+  end
+  
+  describe "#to_yaml" do
+    it
+  end
+  
+end

data/spec/formatting_spec.rb

@@ -0,0 +1,25 @@
+require './spec/spec_helper'
+
+describe Vremya do
+  
+  describe "#rfc2616" do
+    it
+  end
+  
+  describe "#rfc2822" do
+    it
+  end
+  
+  describe "#iso8601" do
+    it
+  end
+  
+  describe "#to_s" do
+    it
+  end
+  
+  describe "#strftime" do
+    it
+  end
+  
+end

data/spec/helpers_spec.rb

@@ -0,0 +1,101 @@
+require './spec/spec_helper'
+
+describe Vremya do
+  
+  describe "#future?" do
+    it
+  end
+  
+  describe "#past?" do
+    it
+  end
+  
+  describe "#january?" do
+    it
+  end
+  
+  describe "#february?" do
+    it
+  end
+  
+  describe "#march?" do
+    it
+  end
+  
+  describe "#april?" do
+    it
+  end
+  
+  describe "#may?" do
+    it
+  end
+  
+  describe "#june?" do
+    it
+  end
+  
+  describe "#july?" do
+    it
+  end
+  
+  describe "#august?" do
+    it
+  end
+  
+  describe "#september?" do
+    it
+  end
+  
+  describe "#october?" do
+    it
+  end
+  
+  describe "#november?" do
+    it
+  end
+  
+  describe "#december?" do
+    it
+  end
+  
+  describe "#monday?" do
+    it
+  end
+  
+  describe "#tuesday?" do
+    it
+  end
+  
+  describe "#wednesday?" do
+    it
+  end
+  
+  describe "#thursday?" do
+    it
+  end
+  
+  describe "#friday?" do
+    it
+  end
+  
+  describe "#saturday?" do
+    it
+  end
+  
+  describe "#sunday?" do
+    it
+  end
+  
+  describe "#weekday?" do
+    it
+  end
+  
+  describe "#weekend?" do
+    it
+  end
+  
+  describe "#daylight_saving?" do
+    it
+  end
+  
+end

data/spec/parse_spec.rb

@@ -0,0 +1,11 @@
+require './spec/spec_helper'
+
+# https://github.com/mojombo/chronic/blob/master/test/test_parsing.rb
+
+describe Vremya do
+  
+  it "parses dates with Russian locale" do
+    #Vremya.parse("01:15, 29 августа 2014", "%H:%M, %d %B %Y", "Europe/Moscow").to_i.must_equal 1409260500
+  end
+  
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'minitest/autorun'
+require_relative '../lib/vremya'

data/spec/traversal_spec.rb

@@ -0,0 +1,145 @@
+require './spec/spec_helper'
+
+describe Vremya do
+  
+  let(:gmt) do
+    Vremya.new(2014, 10, 26, 15, 10, 15, "GMT")
+  end
+
+  let(:moscow) do
+    Vremya.new(2014, 10, 26, 18, 10, 15, "Europe/Moscow")
+  end
+  
+  describe "#change" do
+    it "supports :year option" do
+      gmt.change(:year => 2013).to_s.must_be :==, "2013-10-26 15:10:15 +00:00"
+    end
+    it "supports :month option" do
+      gmt.change(:month => 1).to_s.must_be :==, "2014-01-26 15:10:15 +00:00"
+    end
+    it "supports :day option" do
+      gmt.change(:day => 1).to_s.must_be :==, "2014-10-01 15:10:15 +00:00"
+    end
+    it "supports :hour option" do
+      gmt.change(:hour => 1).to_s.must_be :==, "2014-10-26 01:10:15 +00:00"
+    end
+    it "supports :minute option" do
+      gmt.change(:minute => 1).to_s.must_be :==, "2014-10-26 15:01:15 +00:00"
+    end
+    it "supports :second option" do
+      gmt.change(:second => 1).to_s.must_be :==, "2014-10-26 15:10:01 +00:00"
+    end
+    it "changes offset automatically" do
+      moscow.change(:day => 25).to_s.must_be :==, "2014-10-25 18:10:15 +04:00"
+    end
+  end
+  
+  describe "#advance" do
+    it "supports :years option" do
+      gmt.advance(:years => 1).to_s.must_be :==, "2015-10-26 15:10:15 +00:00"
+    end
+    it "supports :months option" do
+      gmt.advance(:months => 1).to_s.must_be :==, "2014-11-26 15:10:15 +00:00"
+    end
+    it "supports :days option" do
+      gmt.advance(:days => 1).to_s.must_be :==, "2014-10-27 15:10:15 +00:00"
+    end
+    it "supports :hours option" do
+      gmt.advance(:hours => 1).to_s.must_be :==, "2014-10-26 16:10:15 +00:00"
+    end
+    it "supports :minutes option" do
+      gmt.advance(:minutes => 1).to_s.must_be :==, "2014-10-26 15:11:15 +00:00"
+    end
+    it "supports :seconds option" do
+      gmt.advance(:seconds => 1).to_s.must_be :==, "2014-10-26 15:10:16 +00:00"
+    end
+    it "changes offset automatically" do
+      moscow.advance(:days => -1).to_s.must_be :==, "2014-10-25 18:10:15 +04:00"
+    end
+  end
+  
+  describe "#previous_month" do
+    it "returns same day and time last month" do
+      gmt.previous_month.to_s.must_be :==, "2014-09-26 15:10:15 +00:00"
+    end
+  end
+  
+  describe "#previous_year" do
+    it "returns same day and time last year" do
+      gmt.previous_year.to_s.must_be :==, "2013-10-26 15:10:15 +00:00"
+    end
+  end
+  
+  describe "#previous_day" do
+    it "returns same time yesterday" do
+      gmt.previous_day.to_s.must_be :==, "2014-10-25 15:10:15 +00:00"
+    end
+  end
+  
+  describe "#next_year" do
+    it "returns same day and time next year" do
+      gmt.next_year.to_s.must_be :==, "2015-10-26 15:10:15 +00:00"
+    end
+  end
+  
+  describe "#next_month" do
+    it "returns same day and time next month" do
+      gmt.next_month.to_s.must_be :==, "2014-11-26 15:10:15 +00:00"
+    end
+  end
+  
+  describe "#next_day" do
+    it "returns same time tomorrow" do
+      gmt.next_day.to_s.must_be :==, "2014-10-27 15:10:15 +00:00"
+    end
+  end
+  
+  describe "#beginning_of_day" do
+    it "returns midnight time same day" do
+      gmt.beginning_of_day.to_s.must_be :==, "2014-10-26 00:00:00 +00:00"
+    end
+  end
+  
+  describe "#beginning_of_week" do
+    it "returns midnight on Monday the same week" do
+      gmt.beginning_of_week.to_s.must_be :==, "2014-10-20 00:00:00 +00:00"
+    end
+  end
+  
+  describe "#beginning_of_month" do
+    it "returns midnight on the first day of the month" do
+      gmt.beginning_of_month.to_s.must_be :==, "2014-10-01 00:00:00 +00:00"
+    end
+  end
+  
+  describe "#beginning_of_year" do
+    it "returns midnight on the first of January" do
+      gmt.beginning_of_year.to_s.must_be :==, "2014-01-01 00:00:00 +00:00"
+    end
+  end
+  
+  describe "#difference_with_zone" do
+    it "returns current time difference in seconds with specified timezone" do
+      gmt.difference_with_zone("Europe/Moscow").must_be :==, 3600 * 3
+    end
+  end
+  
+  describe "#as_if_in" do
+    it "treats HH:MM as if it was local time in specified timezone" do
+      gmt.as_if_in("Europe/Moscow").to_s.must_be :==, "2014-10-26 15:10:15 +03:00"
+    end
+  end
+  
+  describe "#+" do
+    it "advances in time by specified number of seconds" do
+      (gmt + 1).to_s.must_be :==, "2014-10-26 15:10:16 +00:00"
+    end
+  end
+  
+  describe "#-" do
+    it "goes back in time by specified number of seconds" do
+      (gmt - 1).to_s.must_be :==, "2014-10-26 15:10:14 +00:00"
+    end
+  end
+  
+end

data/spec/zone_spec.rb

@@ -0,0 +1,50 @@
+require './spec/spec_helper'
+
+describe Vremya::Timezone do
+  
+  describe ".at" do
+    it "returns historical offset for valid timezones [1/2]" do
+      Vremya::Timezone.at("Europe/Moscow", 2014, 10, 26, 0, 0, 0).offset.must_be :==, 3600 * 4
+    end
+    it "returns historical offset for valid timezones [2/2]" do
+      Vremya::Timezone.at("Europe/Moscow", 2014, 10, 26, 1, 0, 0).offset.must_be :==, 3600 * 3
+    end
+  end
+  
+  describe "#name" do
+    it "returns nil for Numeric values" do
+      Vremya::Timezone.new(3600).name.must_be_nil
+    end
+    it "returns nil for String values" do
+      Vremya::Timezone.new("+01:00").name.must_be_nil
+    end
+    it "returns name when valid timezone if specified" do
+      Vremya::Timezone.new("Europe/Moscow").name.must_be :==, "Europe/Moscow"
+    end
+  end
+  
+  describe "#offset" do
+    it "returns offset in seconds for Numeric values" do
+      Vremya::Timezone.new(3600).offset.must_be :==, 3600
+    end
+    it "returns offset in seconds for String values" do
+      Vremya::Timezone.new("+01:00").offset.must_be :==, 3600
+    end
+    it "returns current offset in seconds for valid timezones" do
+      Vremya::Timezone.new("Europe/Moscow").offset.must_be :==, 3600 * 3
+    end
+  end
+  
+  describe "#to_s" do
+    it "returns formatted offset for Numeric values" do
+      Vremya::Timezone.new(3600).to_s.must_be :==, "+01:00"
+    end
+    it "returns formatted offset for String values" do
+      Vremya::Timezone.new("+01:00").to_s.must_be :==, "+01:00"
+    end
+    it "returns current offset for valid timezones" do
+      Vremya::Timezone.new("Europe/Moscow").to_s.must_be :==, "+03:00"
+    end
+  end
+  
+end

metadata

@@ -1,102 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vremya
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+version: !ruby/object:Gem::Version
+  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Alex Serebryakov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-08 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-11-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  name: rspec
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  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'
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  name: yard
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 37
-        version: 0.3.37
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-description: "A lump of syntactic sugar around native Date and Time objects, that takes the pain out of timezones, traversal, formatting etc. "
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'A lump of syntactic sugar around native Date and Time objects, that
+  takes the pain out of timezones, traversal, formatting etc. '
+email:
 - alex@merimond.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/vremya/locale/ru.rb
+- lib/vremya/timezone.rb
 - lib/vremya.rb
 - Rakefile
 - README.md
 - LICENSE
-has_rdoc: true
+- spec/attributes_spec.rb
+- spec/conversion_spec.rb
+- spec/formatting_spec.rb
+- spec/helpers_spec.rb
+- spec/parse_spec.rb
+- spec/spec_helper.rb
+- spec/traversal_spec.rb
+- spec/zone_spec.rb
 homepage: https://github.com/merimond/vremya
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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: vremya
-rubygems_version: 1.3.6
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Time & date library for Ruby
-test_files: []
-
+test_files:
+- spec/attributes_spec.rb
+- spec/conversion_spec.rb
+- spec/formatting_spec.rb
+- spec/helpers_spec.rb
+- spec/parse_spec.rb
+- spec/spec_helper.rb
+- spec/traversal_spec.rb
+- spec/zone_spec.rb
+has_rdoc: