darian 0.0.1 → 0.0.2

data/ChangeLog

@@ -0,0 +1,5 @@
+== 0.0.2 (Mars 6)
+* Add Date class and converter.
+
+== 0.0.1 (Mars 3)
+* Initial release

data/README.md

@@ -18,7 +18,7 @@ Based on [JS converter] by Thomas Gangale.
 require 'darian'
 
 earth_time = Time.now
-mars_time  = Darian::Time.from_earth(earth_time)
+mars_time  = Darian.from_earth(earth_time)
 
 mars_time.to_s #=> "214-09-17 15:07:17"
 
@@ -29,6 +29,9 @@ mars_time.day   #=> 17
 
 mars_time.month_name    #=> "Aries"
 mars_time.week_sol_name #=> "Sol Martis"
+
+earth_date = Date.today
+mars_date  = Darian.from_earth(earth_date)
 ```
 
 ## License

data/lib/darian.rb

@@ -20,4 +20,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dir = File.join(File.dirname(__FILE__), 'darian')
 require File.join(dir, 'version')
+require File.join(dir, 'date_methods')
 require File.join(dir, 'time')
+require File.join(dir, 'date')
+
+module Darian
+  class << self
+
+    # Convert `arg` to martian time or date, depend on `arg` class.
+    def from_earth(arg)
+      if arg.is_a? ::Time
+        Darian::Time.from_earth(arg)
+      elsif arg.is_a? ::Date
+        Darian::Date.from_earth(arg)
+      else
+        raise ArgumentError, "Can't convert #{arg.class} to martian time or date"
+      end
+    end
+
+  end
+end

data/lib/darian/date.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+=begin
+Darian Mars calendar date converter.
+
+Copyright (C) 2012 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+module Darian
+  # Darian Mars calendar date converter.
+  #
+  #   mars = Darian::Date.from_earth(Date.today)
+  #   puts mars
+  #   puts mars.month_name
+  class Date
+    include DateMethods
+
+    def self.from_earth(date)
+      time = ::Time.parse(date.to_s + " 00:00:00")
+      ::Darian::Time.from_earth(time).to_date
+    end
+
+    # Create martian date by time.
+    def initialize(time)
+      @year     = time.year
+      @month    = time.month
+      @sol      = time.sol
+      @week_sol = time.week_sol
+
+      @season          = time.season
+      @sol_of_season   = time.sol_of_season
+      @month_of_season = time.month_of_season
+    end
+
+    # Printable string of martian date.
+    def to_s
+      sprintf '%d-%02d-%02d', @year, @month, @sol
+    end
+  end
+end

data/lib/darian/date_methods.rb

@@ -0,0 +1,57 @@
+module Darian
+  module DateMethods
+    attr_reader :year
+    attr_reader :month
+    attr_reader :sol
+
+    attr_reader :week_sol
+    attr_reader :season
+    attr_reader :sol_of_season
+    attr_reader :month_of_season
+
+    alias :day      :sol
+    alias :week_day :week_sol
+
+    def month_name
+      case @month
+        when  1 then 'Sagittarius'
+        when  2 then 'Dhanus'
+        when  3 then 'Capricornus'
+        when  4 then 'Makara'
+        when  5 then 'Aquarius'
+        when  6 then 'Kumbha'
+        when  7 then 'Pisces'
+        when  8 then 'Mina'
+        when  9 then 'Aries'
+        when 10 then 'Mesha'
+        when 11 then 'Taurus'
+        when 12 then 'Rishabha'
+        when 13 then 'Gemini'
+        when 14 then 'Mithuna'
+        when 15 then 'Cancer'
+        when 16 then 'Karka'
+        when 17 then 'Leo'
+        when 18 then 'Simha'
+        when 19 then 'Virgo'
+        when 20 then 'Kanya'
+        when 21 then 'Libra'
+        when 22 then 'Tula'
+        when 23 then 'Scorpius'
+        when 24 then 'Vrishika'
+      end
+    end
+
+    def week_sol_name
+      case @week_sol
+        when 1 then 'Sol Solis'
+      	when 2 then 'Sol Lunae'
+      	when 3 then 'Sol Martis'
+      	when 4 then 'Sol Mercurii'
+      	when 5 then 'Sol Jovis'
+      	when 6 then 'Sol Veneris'
+      	when 7 then 'Sol Saturni'
+      end
+    end
+    alias :week_day_name :week_sol_name
+  end
+end

data/lib/darian/time.rb

@@ -23,28 +23,18 @@ module Darian
   #
   #   mars = Darian::Time.from_earth(Time.now)
   #   puts mars
-  #   puts mars.sol_name
+  #   puts mars.month_name
   class Time
     MARS_TO_EARTH_DAYS = 1.027491251
     EPOCH_OFFSET       = 587744.77817
     ROUND_UP_SECOND    = 1/86400
 
-    attr_reader :year
-    attr_reader :season
-    attr_reader :month
-    attr_reader :month_name
-    attr_reader :sol
-    attr_reader :week_sol
+    include DateMethods
+
     attr_reader :hour
     attr_reader :min
     attr_reader :sec
 
-    alias :day      :sol
-    alias :week_day :week_sol
-
-    attr_reader :sol_of_season
-    attr_reader :month_of_season
-
     # Return Mars time converted from Earth time.
     #
     #   Darian.from_earth(Time.now)
@@ -123,51 +113,15 @@ module Darian
       @sec  = ((min - min.floor) * 60).floor
     end
 
-    def month_name
-      case @month
-        when  1 then 'Sagittarius'
-        when  2 then 'Dhanus'
-        when  3 then 'Capricornus'
-        when  4 then 'Makara'
-        when  5 then 'Aquarius'
-        when  6 then 'Kumbha'
-        when  7 then 'Pisces'
-        when  8 then 'Mina'
-        when  9 then 'Aries'
-        when 10 then 'Mesha'
-        when 11 then 'Taurus'
-        when 12 then 'Rishabha'
-        when 13 then 'Gemini'
-        when 14 then 'Mithuna'
-        when 15 then 'Cancer'
-        when 16 then 'Karka'
-        when 17 then 'Leo'
-        when 18 then 'Simha'
-        when 19 then 'Virgo'
-        when 20 then 'Kanya'
-        when 21 then 'Libra'
-        when 22 then 'Tula'
-        when 23 then 'Scorpius'
-        when 24 then 'Vrishika'
-      end
-    end
-
-    def week_sol_name
-      case @week_sol
-        when 1 then 'Sol Solis'
-      	when 2 then 'Sol Lunae'
-      	when 3 then 'Sol Martis'
-      	when 4 then 'Sol Mercurii'
-      	when 5 then 'Sol Jovis'
-      	when 6 then 'Sol Veneris'
-      	when 7 then 'Sol Saturni'
-      end
-    end
-    alias :week_day_name :week_sol_name
-
+    # Printable string of martian time.
     def to_s
       sprintf '%d-%02d-%02d %02d:%02d:%02d',
               @year, @month, @sol, @hour, @min, @sec
     end
+
+    # Return martian date.
+    def to_date
+      ::Darian::Date.new(self)
+    end
   end
 end

data/lib/darian/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Darian
-  VERSION = '0.0.1'.freeze unless defined? Darian::VERSION
+  VERSION = '0.0.2'.freeze unless defined? Darian::VERSION
 end

data/spec/darian_spec.rb

@@ -7,42 +7,9 @@ describe Darian do
     Darian::VERSION.should be_a(String)
   end
 
-  describe Darian::Time do
-    before do
-      earth = Time.parse('2012-05-16 10:00:00 UTC')
-      @mars = Darian::Time.from_earth(earth)
-    end
-
-    it "should convert Earch time to Mars" do
-      @mars.year.should  == 214
-      @mars.month.should == 9
-      @mars.sol.should   == 17
-      @mars.hour.should  == 15
-      @mars.min.should   == 7
-      @mars.sec.should   == 17
-
-      @mars.week_sol.should == 3
-
-      @mars.season.should          == 1
-      @mars.month_of_season.should == 2
-    end
-
-    it "should set month name" do
-      @mars.month_name.should == 'Aries'
-    end
-
-    it "should set week sol name" do
-      @mars.week_sol_name.should == 'Sol Martis'
-    end
-
-    it "should alias day to sol" do
-      @mars.day.should == @mars.sol
-      @mars.week_day.should == @mars.week_sol
-      @mars.week_day_name.should == @mars.week_sol_name
-    end
-
-    it "should print mars time" do
-      @mars.to_s.should == '214-09-17 15:07:17'
-    end
+  it "should convert by argument class" do
+    Darian.from_earth(Time.now).should be_a(Darian::Time)
+    Darian.from_earth(Date.today).should be_a(Darian::Date)
   end
+
 end

data/spec/date_spec.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Darian::Date do
+
+  before do
+    earth = Date.parse('2012-05-16')
+    @mars = Darian::Date.from_earth(earth)
+  end
+
+  it "should convert Earch time to Mars" do
+    @mars.year.should  == 214
+    @mars.month.should == 9
+    @mars.sol.should   == 17
+
+    @mars.week_sol.should == 3
+
+    @mars.season.should          == 1
+    @mars.month_of_season.should == 2
+  end
+
+  it "should set month and week sol name" do
+    @mars.month_name.should    == 'Aries'
+    @mars.week_sol_name.should == 'Sol Martis'
+  end
+
+  it "should alias day to sol" do
+    @mars.day.should == @mars.sol
+    @mars.week_day.should == @mars.week_sol
+    @mars.week_day_name.should == @mars.week_sol_name
+  end
+
+  it "should print mars time" do
+    @mars.to_s.should == '214-09-17'
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'pp'
 require 'time'
+require 'date'
 
 dir = Pathname(__FILE__).dirname
 

data/spec/time_spec.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Darian::Time do
+
+  before do
+    earth = Time.parse('2012-05-16 10:00:00 UTC')
+    @mars = Darian::Time.from_earth(earth)
+  end
+
+  it "should convert Earch time to Mars" do
+    @mars.year.should  == 214
+    @mars.month.should == 9
+    @mars.sol.should   == 17
+    @mars.hour.should  == 15
+    @mars.min.should   == 7
+    @mars.sec.should   == 17
+
+    @mars.week_sol.should == 3
+
+    @mars.season.should          == 1
+    @mars.month_of_season.should == 2
+  end
+
+  it "should set month and week sol name" do
+    @mars.month_name.should    == 'Aries'
+    @mars.week_sol_name.should == 'Sol Martis'
+  end
+
+  it "should alias day to sol" do
+    @mars.day.should == @mars.sol
+    @mars.week_day.should == @mars.week_sol
+    @mars.week_day_name.should == @mars.week_sol_name
+  end
+
+  it "should print mars time" do
+    @mars.to_s.should == '214-09-17 15:07:17'
+  end
+
+  it "should convert to date" do
+    date = @mars.to_date
+    date.should be_a(Darian::Date)
+    date.to_s.should == '214-09-17'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: darian
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13725480 !ruby/object:Gem::Requirement
+  requirement: &8318580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *13725480
+  version_requirements: *8318580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13724980 !ruby/object:Gem::Requirement
+  requirement: &8318080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13724980
+  version_requirements: *8318080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13724500 !ruby/object:Gem::Requirement
+  requirement: &8317580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13724500
+  version_requirements: *8317580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13723960 !ruby/object:Gem::Requirement
+  requirement: &8317060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13723960
+  version_requirements: *8317060
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &13723480 !ruby/object:Gem::Requirement
+  requirement: &8316580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13723480
+  version_requirements: *8316580
 description: ! '    Converter from Earth dates to mars dates by Darian calendar.
 
 '
@@ -80,6 +80,7 @@ files:
 - .rspec
 - .travis.yml
 - .yardopts
+- ChangeLog
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -87,10 +88,14 @@ files:
 - Rakefile
 - darian.gemspec
 - lib/darian.rb
+- lib/darian/date.rb
+- lib/darian/date_methods.rb
 - lib/darian/time.rb
 - lib/darian/version.rb
 - spec/darian_spec.rb
+- spec/date_spec.rb
 - spec/spec_helper.rb
+- spec/time_spec.rb
 homepage: https://github.com/ai/darian
 licenses: []
 post_install_message: 
@@ -105,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4170314655358135603
+      hash: 3704348501470939124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4170314655358135603
+      hash: 3704348501470939124
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11