darian 0.0.3 → 0.1

data/ChangeLog

@@ -1,3 +1,8 @@
+== 0.1 (Viking 2)
+* Add Date.today and Time.now shortcuts.
+* Add parse_earth shortcut to Date and Time.
+* Allow to compare dates and times.
+
 == 0.0.3 (Viking 1)
 * Convert DateTime to martian time.
 * Fix documentation.

data/lib/darian.rb

@@ -44,5 +44,15 @@ module Darian
       end
     end
 
+    # Return current Mars time. Shortcut for `Darian.from_earth(Time.now)`.
+    def now
+      Darian::Time.from_earth(::Time.now)
+    end
+
+    # Return current Mars date. Shortcut for `Darian.from_earth(Date.today)`.
+    def today
+      Darian::Date.from_earth(::Date.today)
+    end
+
   end
 end

data/lib/darian/date.rb

@@ -32,12 +32,20 @@ module Darian
     #
     #   Darian.from_earth(Date.today)
     def self.from_earth(date)
-      time = ::Time.parse(date.to_s + " 00:00:00")
+      time = ::Time.parse(date.to_s + " 00:00:00 UTC")
       Darian::Time.from_earth(time).to_date
     end
 
+    # Parse Earth date and convert to Mars date.
+    # Shortcut for `Darian::Date.from_earth(Date.parse(string))`.
+    def self.parse_earth(string)
+      self.from_earth(::Date.parse(string))
+    end
+
     # Create martian date by martian time.
     def initialize(time)
+      @since_epoch = time.since_epoch.floor
+
       @year     = time.year
       @month    = time.month
       @sol      = time.sol

data/lib/darian/date_methods.rb

@@ -22,10 +22,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 module Darian
   # Common date methods for Time and Date classes.
   module DateMethods
+    include Comparable
+
     attr_reader :year
     attr_reader :month
     attr_reader :sol
 
+    attr_reader :since_epoch
     attr_reader :week_sol
     attr_reader :season
     attr_reader :sol_of_season
@@ -75,5 +78,9 @@ module Darian
       end
     end
     alias :week_day_name :week_sol_name
+
+    def <=>(another)
+      since_epoch <=> another.since_epoch
+    end
   end
 end

data/lib/darian/time.rb

@@ -46,10 +46,18 @@ module Darian
       self.new(sols)
     end
 
+    # Parse Earth time and convert to Mars time.
+    # Shortcut for `Darian::Time.from_earth(Time.parse(string))`.
+    def self.parse_earth(string)
+      self.from_earth(::Time.parse(string))
+    end
+
     # Create Mars time by sols since 0 year.
     #
     # It is internal contructor. Use `Darian.from_earth`.
     def initialize(sols)
+      @since_epoch = sols
+
       sD  = (sols / 334296).floor
       doD = (sols - (sD * 334296)).floor
 

data/lib/darian/version.rb

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

data/spec/darian_spec.rb

@@ -14,4 +14,18 @@ describe Darian do
     lambda { Darian.from_earth(1) }.should raise_error(ArgumentError)
   end
 
+  it "should return current time" do
+    earth = Time.parse('2012-05-16 10:00:00 UTC')
+    Time.should_receive(:now).and_return(earth)
+
+    Darian.now.should == Darian::Time.from_earth(earth)
+  end
+
+  it "should return current date" do
+    earth = Date.parse('2012-05-16')
+    Date.should_receive(:today).and_return(earth)
+
+    Darian.today.should == Darian::Date.from_earth(earth)
+  end
+
 end

data/spec/date_spec.rb

@@ -8,12 +8,13 @@ describe Darian::Date do
     @mars = Darian::Date.from_earth(earth)
   end
 
-  it "should convert Earch time to Mars" do
+  it "should convert Earth time to Mars" do
     @mars.year.should  == 214
     @mars.month.should == 9
     @mars.sol.should   == 17
 
-    @mars.week_sol.should == 3
+    @mars.since_epoch.should == 143318
+    @mars.week_sol.should    == 3
 
     @mars.season.should          == 1
     @mars.month_of_season.should == 2
@@ -25,8 +26,8 @@ describe Darian::Date do
   end
 
   it "should alias day to sol" do
-    @mars.day.should == @mars.sol
-    @mars.week_day.should == @mars.week_sol
+    @mars.day.should           == @mars.sol
+    @mars.week_day.should      == @mars.week_sol
     @mars.week_day_name.should == @mars.week_sol_name
   end
 
@@ -34,4 +35,21 @@ describe Darian::Date do
     @mars.to_s.should == '214-09-17'
   end
 
+  it "should parse Earth date" do
+    Darian::Date.parse_earth('2012-05-16').should == @mars
+  end
+
+  it "should compare dates" do
+    past   = Darian::Date.parse_earth('2012-05-15')
+    same   = Darian::Date.parse_earth('2012-05-16')
+    future = Darian::Date.parse_earth('2012-05-17')
+
+    @mars.should >  past
+    @mars.should <  future
+    @mars.should == same
+
+    @mars.should_not < past
+    @mars.should_not > future
+  end
+
 end

data/spec/time_spec.rb

@@ -8,7 +8,7 @@ describe Darian::Time do
     @mars = Darian::Time.from_earth(earth)
   end
 
-  it "should convert Earch time to Mars" do
+  it "should convert Earth time to Mars" do
     @mars.year.should  == 214
     @mars.month.should == 9
     @mars.sol.should   == 17
@@ -16,7 +16,8 @@ describe Darian::Time do
     @mars.min.should   == 7
     @mars.sec.should   == 17
 
-    @mars.week_sol.should == 3
+    @mars.since_epoch.should == 143318.630064585
+    @mars.week_sol.should    == 3
 
     @mars.season.should          == 1
     @mars.month_of_season.should == 2
@@ -28,8 +29,8 @@ describe Darian::Time do
   end
 
   it "should alias day to sol" do
-    @mars.day.should == @mars.sol
-    @mars.week_day.should == @mars.week_sol
+    @mars.day.should           == @mars.sol
+    @mars.week_day.should      == @mars.week_sol
     @mars.week_day_name.should == @mars.week_sol_name
   end
 
@@ -43,4 +44,22 @@ describe Darian::Time do
     date.to_s.should == '214-09-17'
   end
 
+  it "should parse Earth time" do
+    str = '2012-05-16 10:00:00 UTC'
+    Darian::Time.parse_earth(str).should == @mars
+  end
+
+  it "should compare times" do
+    past   = Darian::Time.parse_earth('2012-05-16 09:59:59 UTC')
+    same   = Darian::Time.parse_earth('2012-05-16 10:00:00 UTC')
+    future = Darian::Time.parse_earth('2012-05-16 10:00:01 UTC')
+
+    @mars.should >  past
+    @mars.should <  future
+    @mars.should == same
+
+    @mars.should_not < past
+    @mars.should_not > future
+  end
+
 end

metadata

@@ -1,17 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: darian
 version: !ruby/object:Gem::Version
-  version: 0.0.3
   prerelease: 
+  version: '0.1'
 platform: ruby
 authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+  prerelease: false
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -19,15 +27,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.10
-- !ruby/object:Gem::Dependency
+        version: '0'
+  prerelease: false
   name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -35,15 +43,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -51,15 +59,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -67,15 +75,15 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  prerelease: false
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
@@ -83,14 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ! "    This is Ruby library to convert Earth time to Mars time in Darian
   calendar.\n    It use 2002 version of calendar with Telescopic Epoch.\n"
 email: andrey@sitnik.ru
@@ -132,19 +132,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 856161155010593318
+      hash: 3911094043376791761
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 856161155010593318
+      hash: 3911094043376791761
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23