darian_calendar 1.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmY2MWYxMTY4NGFjODBhZjE4MTJjZTljMzQ5NDVkNGNlOGQ5ZDI3NA==
+    YjgyMGVjYTc4YTFlZTMzMDdkOTdjZTFlMDVkOGJhZGZmYzZhOWVmNg==
   data.tar.gz: !binary |-
-    NTY0MWU1OWUzOWVkNDcyM2EyM2E1OGUyNTZhMmE4ODJjZGQxZDM2NA==
+    ZmZhMDExOWRlM2NlZWQ4NDY5NTBjZTI4MzUyMzMzOTcxNjViNzExNw==
 SHA512:
   metadata.gz: !binary |-
-    NTI4M2QwYmQzZDY1ZTE3ZmU4MmVkYjE0ODI2OTNiYzcyYTgyMTZiZGI2NjQw
-    YzhmNWNiOGEwYzk3N2Q2NTFhM2IwYWNjYzUyZTc0MTg1ZjA2MDdhNDdjYWRl
-    YzkxZTQyMGZmYzczYzEwOTcwN2ZlMmQwZDQ4MTE0YjU2ZDhjM2M=
+    Mjg1YzA2NGJhMTUwNzdmYjVmOGVkYWZhYzEzNWNlN2E5ZTQ4NTViNTQxYTdj
+    ODM3OWUzNmZlZGNhZjFjYWQyYmVmZDAwOTI5MTAwMDg3N2JhZDc3NWYzYzgz
+    Yjg0NDMwYTEzMTZhOTQ1MWRmZWYyNjg4MTllNmQ3ZjFiYzcxMjM=
   data.tar.gz: !binary |-
-    YmUxYWIwYTBlNWY4OWYyM2JkZmI0YWFkMzZjODZkZmMxZGQ0MGZiODdhMTEz
-    MmYwYTMwMzJlYmQ2MWIzMmVmZmIyMTBkZTg5NzZjZjYzM2Y5ZGIyYTE5ZTFm
-    ZDdlNzhjNWJkNGQzODcwNjQ4NDBmZWNhY2E0YTM2MzMzNWZjNWU=
+    YjA5ZDQ0YjI2NDMyYTUxZWNiYTIyMmY5ZmVjMmE0MTFlOTJhMmM1NmM1M2I0
+    ZDEzMzQ5MzljZDBjY2E2YzA0NzM0NDY0NGYxZWY1ZGMxMzViMmNmM2NmZmIw
+    M2MzNjA4MDMxMDBmMTYxNTQxNTkxYmRhYzUyMDE4NGQzNDBjNTY=

data/.gitignore

@@ -1,6 +1,7 @@
 pkg
 rdoc
 doc
+coverage
 .yardoc
 .ruby-version
 .ruby-gemset

data/.rspec

@@ -1 +1 @@
---color --format doc
+--color

data/.travis.yml

@@ -1,8 +1,15 @@
 language: ruby
+
 rvm:
+  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - jruby
   - rbx
+  
 bundler_args: --without development
+
+branches:
+  only:
+    - master

data/.yardopts

@@ -0,0 +1,6 @@
+--title 'Darian Calendar'
+--readme README.md
+--no-private
+--charset utf-8
+--markup=markdown
+'lib/**/*.rb' - '*.md'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.1.0
+- Create Date and Time objects with by year, month, sol (hour, minute, second)
+
 ## 1.0
 - JSON support
 - Martian date object

data/Gemfile

@@ -11,6 +11,7 @@ end
 
 group :test do
   gem 'rspec'
+  gem 'simplecov'
 end
 
 platforms :rbx do

data/README.md

@@ -1,6 +1,6 @@
 # Darian Calendar
 
-[![Build Status](https://travis-ci.org/marsec/darian_calendar.png)](https://travis-ci.org/marsec/darian_calendar)
+[![Gem Version](https://badge.fury.io/rb/darian_calendar.png)](http://badge.fury.io/rb/darian_calendar) [![Build Status](https://travis-ci.org/marsec/darian_calendar.png)](https://travis-ci.org/marsec/darian_calendar)
 
 _The [Darian calendar] is a proposed system of time-keeping designed to serve the needs of any possible future human settlers on the planet Mars.
 It was created by aerospace engineer and political scientist Thomas Gangale in 1985 and named by him after his son Darius._ ([Wikipedia])
@@ -82,6 +82,18 @@ DarianCalendar::CalendarTypes::HENSEL
 DarianCalendar::CalendarTypes::AQUA
 ```
 
+## Supported Ruby Interpreters
+
+This library aims to support and is [tested](https://travis-ci.org/marsec/darian_calendar) against the following Ruby interpreters and versions:
+
+- MRI 1.9.2
+- MRI 1.9.3
+- MRI 2.0.0
+- MRI 2.1.0
+- JRuby
+- Rubinius
+
+
 ## Testing
 
 Unit tests are provided for all of Darian Calendar's methods:

data/Rakefile

@@ -13,5 +13,5 @@ task :default => :spec
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ['--color', '--format doc']
+  t.rspec_opts = ['--color']
 end

data/darian_calendar.gemspec

@@ -3,21 +3,22 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'darian_calendar/version'
 
-Gem::Specification.new do |s|
-  s.name        = 'darian_calendar'
-  s.version     = DarianCalendar::VERSION
-  s.date        = Time.now.strftime('%Y-%m-%d')
-  s.platform    = Gem::Platform::RUBY
-  s.summary     = 'Converts earth time to mars time and back again. You can choose between 5 variants of the Darian calendar system.'
-  s.description = 'This Ruby library converts earth time to mars time and back again. You can choose between 5 variants of the Darian calendar system; Martiana, Defrost, Areosynchronous, Hensel and Aqua.'
+Gem::Specification.new do |gem|
+  gem.name        = 'darian_calendar'
+  gem.version     = DarianCalendar::VERSION
+  gem.date        = Time.now.strftime('%Y-%m-%d')
+  gem.platform    = Gem::Platform::RUBY
+  gem.summary     = 'Converts earth time to mars time and back again. You can choose between 5 variants of the Darian calendar system.'
+  gem.description = 'This Ruby library converts earth time to mars time and back again. You can choose between 5 variants of the Darian calendar system; Martiana, Defrost, Areosynchronous, Hensel and Aqua.'
 
-  s.authors  = ['Christian Worreschk']
-  s.email    = ['info@marsec.de']
-  s.homepage = 'http://github.com/marsec/darian_calendar'
-  s.licenses  = ['EUPL-1.1']
+  gem.authors  = ['Christian Worreschk']
+  gem.email    = ['info@marsec.de']
+  gem.homepage = 'http://github.com/marsec/darian_calendar'
+  gem.licenses  = ['EUPL-1.1']
 
-  s.require_paths    = ['lib']
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {spec}/*`.split("\n")
-  s.extra_rdoc_files = ['README.md', 'LICENSE.md', 'CHANGELOG.md']
+  gem.require_paths    = ['lib']
+  gem.files            = `git ls-files`.split("\n")
+  gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
+  gem.extra_rdoc_files = ['README.md', 'LICENSE.md', 'CHANGELOG.md']
+  gem.rdoc_options     = ['--line-numbers', '--inline-source', '--title', 'Darian Calendar']
 end

data/lib/darian_calendar.rb

@@ -63,6 +63,18 @@ module DarianCalendar
       DarianCalendar::Date.today(type)
     end
 
+    # Returns true if the given martian year is a leap year
+    # @param year [Integer] martian year
+    # @return [Boolean] true if the given year is a leap year
+    def is_mars_leap_year?(year)
+      return false if year.nil?
+      return true if (year % 500) == 0
+      return false if (year % 100) == 0
+      return true if (year %  10) == 0
+      return false if (year % 2) == 0
+      return true
+    end
+
   end
 
 end

data/lib/darian_calendar/date.rb

@@ -36,6 +36,9 @@ module DarianCalendar
 
     protected
 
+    # Set all attributes by the number of martian sols and calendar type
+    # @param total_sols [Float] Total number of martian sols
+    # @param type [DarianCalendar::CalendarTypes] Calendar type
     def set_attributes(total_sols, type)
       @calendar_type = type.to_s.capitalize
       @total_sols    = total_sols
@@ -137,7 +140,7 @@ module DarianCalendar
     end
 
     # Sets the model attributes from a JSON string. Returns self.
-    # @param json [String] JSON string
+    # @param string [String] JSON string
     # @return [DarianCalendar::Date] mars date
     def self.from_json(string)
       json = JSON::parse(string)
@@ -145,6 +148,31 @@ module DarianCalendar
       self.new(json['total_sols'].to_f, type)
     end
 
+    # Creates a date object by year, month and sol.
+    # If you pass the year with nothing else time will default to the first month 1 of that year.
+    # @param year [Integer] year
+    # @param month [Integer] month
+    # @param sol [Integer] sol
+    # @param type [DarianCalendar::CalendarTypes] Calendar type
+    # @return [DarianCalendar::Date] mars date
+    def self.by_digits(year=nil, month=1, sol=1, type=DarianCalendar::CalendarTypes::MARTIANA)
+      if year.nil?
+        raise ArgumentError, 'Invalid year'
+      end
+      if (month < 1) || (month >24)
+        raise ArgumentError, 'Invalid month'
+      end
+      if (sol < 1) || (sol > 28)
+        raise ArgumentError, 'Invalid sol'
+      end
+      if ((month % 6) == 0) && (sol == 28) && !((month == 24) && DarianCalendar::is_mars_leap_year?(year))
+        raise ArgumentError, 'Invalid sol for this month'
+      end
+
+      sols = sol + ((month-1) * 28) - ((month-1)/6).floor + 668 * year + (year / 2).floor + ((year-1) / 10).floor - ((year-1) / 100).floor + ((year-1) / 1000).floor
+     return self.new(sols)
+    end
+
     # Compares two dates and returns -1, zero, 1 or nil. The other should be a mars date object.
     # @param another [DarianCalendar::Date]
     # @return [Integer] Compare result
@@ -161,11 +189,7 @@ module DarianCalendar
     # Returns true if the given year is a leap year
     # @return [Boolean] true if the given year is a leap year
     def leap?
-      return true if (@year % 500) == 0
-      return false if (@year % 100) == 0
-      return true if (@year %  10) == 0
-      return false if (@year % 2) == 0
-      return true
+      DarianCalendar::is_mars_leap_year?(@year)
     end
 
     # Converts the given mars date to earth date
@@ -205,7 +229,7 @@ module DarianCalendar
     # @return [DarianCalendar::Date] mars date
     def initialize(sols=nil, type=DarianCalendar::CalendarTypes::MARTIANA)
       total_sols = sols.to_f != 0 ? sols.to_f : DarianCalendar.sols_from_earth(::Date.today)
-      self.set_attributes(total_sols, type)
+      self.set_attributes(total_sols.floor, type)
     end
 
   end

data/lib/darian_calendar/time.rb

@@ -28,6 +28,13 @@ module DarianCalendar
       self.from_earth(::Time.parse(string), type)
     end
 
+    # Creates a date object denoting the present mars day.
+    # @param type [DarianCalendar::CalendarTypes] Calendar type
+    # @return [DarianCalendar::Time] current mars date as time object
+    def self.today(type=DarianCalendar::CalendarTypes::MARTIANA)
+      self.new(DarianCalendar::Date.today.total_sols)
+    end
+
     # Returns the current mars time.
     # @param type [DarianCalendar::CalendarTypes] Calendar type
     # @return [DarianCalendar::Time] current mars time
@@ -35,6 +42,39 @@ module DarianCalendar
       self.from_earth(::Time.now, type)
     end
 
+    # Creates a date object by year, month, sol, hour, minute and second.
+    # If you pass the year with nothing else time will default to the first month 1 of that year at 00:00:00.
+    # @param year [Integer] year
+    # @param month [Integer] month
+    # @param month [Integer] sol
+    # @param month [Integer] hour
+    # @param month [Integer] minute
+    # @param sol [Integer] second
+    # @param type [DarianCalendar::CalendarTypes] Calendar type
+    # @return [DarianCalendar::Time] mars time
+    def self.by_digits(year=nil, month=1, sol=1, hour=0, minute=0, second=0, type=DarianCalendar::CalendarTypes::MARTIANA)
+      if (hour < 0) || (hour > 24)
+        raise ArgumentError, 'Invalid hour'
+      end
+      if (minute < 0) || (minute > 60)
+        raise ArgumentError, 'Invalid minute'
+      end
+      if (second < 0) || (second > 60)
+        raise ArgumentError, 'Invalid second'
+      end
+
+      date = DarianCalendar::Date.by_digits(year, month, sol)
+      sols = date.total_sols.to_f
+
+      second+=1 if (second != 0)
+
+      sols += (hour.to_f / 24.0)
+      sols += (minute.to_f / 1440.0)
+      sols += (second.to_f / 86400.0)
+
+      return self.new(sols, type)
+    end
+
     # Compares two times and returns -1, zero, 1 or nil. The other should be a mars time object.
     # @param another [DarianCalendar::Time]
     # @return [Integer] Compare result
@@ -59,7 +99,7 @@ module DarianCalendar
     # Returns the date of the given mars time
     # @return [DarianCalendar::Date] mars date
     def to_date
-      DarianCalendar::Date.new(self.total_sols)
+      DarianCalendar::Date.by_digits(self.year, self.month, self.sol, self.calendar_type)
     end
 
     # Converts a number of martian sols to mars time.

data/lib/darian_calendar/version.rb

@@ -1,3 +1,3 @@
 module DarianCalendar
-  VERSION = '1.0'
+  VERSION = '1.1.0'
 end

data/spec/darian_calendar_spec.rb

@@ -4,6 +4,12 @@ require 'spec_helper'
 
 describe DarianCalendar do
 
+  describe 'logical expections' do
+    it 'should compare if Date.today and Time.today are equal ' do
+      DarianCalendar::Date.today.should == DarianCalendar::Time.today
+    end
+  end
+
   describe 'class methods' do
 
     #def sols_from_earth(earth_date_time)
@@ -12,7 +18,7 @@ describe DarianCalendar do
     #  sols = (days - EPOCH_OFFSET) / MARS_TO_EARTH_DAYS
     #  return sols
     #end
-    describe '#sols_from_earth' do
+    describe '.sols_from_earth' do
       context 'parameter is a date object' do
         it 'returns the total number of martian sols' do
           earth = ::Date.new(2012, 10, 15)
@@ -27,7 +33,7 @@ describe DarianCalendar do
       end
     end
 
-    describe '#now' do
+    describe '.now' do
       it 'returns current mars time' do
         earth = ::Time.utc(2012, 10, 15, 16, 50, 0)
         ::Time.should_receive(:now).and_return(earth)
@@ -35,13 +41,20 @@ describe DarianCalendar do
       end
     end
 
-    describe '#today' do
+    describe '.today' do
       it 'returns current mars date' do
         earth = ::Date.new(2012, 10, 15)
         ::Date.should_receive(:today).and_return(earth)
         DarianCalendar.today.should == DarianCalendar::Date.from_earth(earth)
       end
     end
+
+    describe '.is_mars_leap_year?' do
+      it 'returns if year is a leap year' do
+        DarianCalendar::is_mars_leap_year?(214).should == false
+        DarianCalendar::is_mars_leap_year?(215).should == true
+      end
+    end
   end
 
 end

data/spec/date_spec.rb

@@ -6,8 +6,8 @@ describe DarianCalendar::Date do
 
   before do
     @earth_date = ::Date.new(2012, 10, 15)
-    @mars_date  = DarianCalendar::Date.from_earth(@earth_date)
-    @mars_date_json = '{"calendar_type":"Martiana","month":14,"month_name":"Mithuna","month_of_season":1,"season":2,"sol":26,"sol_of_season":53,"sol_of_year":387,"total_sols":143466.15767923463,"week_sol":5,"week_sol_name":"Sol Jovis","year":214}'
+    @mars_date  = DarianCalendar::Date.by_digits(214, 14, 26)
+    @mars_date_json = '{"calendar_type":"Martiana","month":14,"month_name":"Mithuna","month_of_season":1,"season":2,"sol":26,"sol_of_season":53,"sol_of_year":387,"total_sols":143466,"week_sol":5,"week_sol_name":"Sol Jovis","year":214}'
   end
 
   describe 'attributes' do
@@ -17,25 +17,37 @@ describe DarianCalendar::Date do
       @mars_date.week_day.should == @mars_date.week_sol
     end
 
-  end
-
-  describe 'initialize method' do
-    it 'converts earth date to mars date' do
+    it 'verifies all attributes' do
       @mars_date.year.should  == 214
       @mars_date.month.should == 14
       @mars_date.sol.should   == 26
 
-      @mars_date.total_sols.should      == 143466.15767923463
+      @mars_date.total_sols.should      == 143466.0
       @mars_date.season.should          == 2
       @mars_date.sol_of_season.should   == 53
       @mars_date.month_of_season.should == 1
       @mars_date.sol_of_year.should     == 387
       @mars_date.week_sol.should        == 5
     end
+
   end
 
   describe 'class methods' do
 
+    describe '.new' do
+      context 'total sols are given' do
+        it 'returns mars date by count of martian sols' do
+          DarianCalendar::Date.new(@mars_date.total_sols).should == @mars_date
+        end
+      end
+      context 'no sols are given' do
+        it 'returns current mars date' do
+          ::Date.stub(:today).and_return(@earth_date)
+          DarianCalendar::Date.new.should == DarianCalendar::Date.today
+        end
+      end
+    end
+
     describe '.from_earth' do
       it 'converts an earth date to a mars date' do
         DarianCalendar::Date.from_earth(@earth_date).should == @mars_date
@@ -50,7 +62,7 @@ describe DarianCalendar::Date do
 
     describe '.today' do
       it 'returns current mars date' do
-        ::Date.should_receive(:today).and_return(@earth_date)
+        ::Date.stub(:today).and_return(@earth_date)
         DarianCalendar::Date.today.should == DarianCalendar::Date.from_earth(@earth_date)
       end
     end
@@ -61,15 +73,63 @@ describe DarianCalendar::Date do
       end
     end
 
+    describe '.by_digits' do
+      context 'no digits are given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Date.by_digits}.to raise_error(ArgumentError, 'Invalid year')
+        end
+      end
+      context 'invalid month is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Date.by_digits(214, -5)}.to raise_error(ArgumentError, 'Invalid month')
+        end
+      end
+      context 'invalid sol is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Date.by_digits(214, 14, 35)}.to raise_error(ArgumentError, 'Invalid sol')
+        end
+      end
+      context 'invalid sol for a month is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Date.by_digits(214, 24, 28)}.to raise_error(ArgumentError, 'Invalid sol for this month')
+        end
+      end
+
+      context 'only year is given' do
+        it 'returns the first of the month 1 of the given year' do
+          date = DarianCalendar::Date.by_digits(214)
+          date.year.should  == 214
+          date.month.should == 1
+          date.sol.should   == 1
+        end
+      end
+      context 'only year and month are given' do
+        it 'returns the first of the given month and year' do
+          date = DarianCalendar::Date.by_digits(214, 14)
+          date.year.should  == 214
+          date.month.should == 14
+          date.sol.should   == 1
+        end
+      end
+      context 'all digits are given' do
+        it 'returns the date for the given digits' do
+          date = DarianCalendar::Date.by_digits(214, 14, 26)
+          date.year.should  == 214
+          date.month.should == 14
+          date.sol.should   == 26
+        end
+      end
+    end
+
   end
 
   describe 'instance methods' do
 
     describe '#<=>' do
       it 'compares mars date objects' do
-        same_date   = DarianCalendar::Date.from_earth(Date.new(2012, 10, 15))
-        past_date   = DarianCalendar::Date.from_earth(Date.new(2012, 10, 14))
-        future_date = DarianCalendar::Date.from_earth(Date.new(2012, 10, 16))
+        same_date   = DarianCalendar::Date.by_digits(214, 14, 26)
+        past_date   = DarianCalendar::Date.by_digits(214, 14, 25)
+        future_date = DarianCalendar::Date.by_digits(214, 14, 27)
 
         @mars_date.should == same_date
         @mars_date.should >  past_date
@@ -82,7 +142,7 @@ describe DarianCalendar::Date do
 
     describe '#sols_in_year' do
       it 'returns the number of sols in a martian year' do
-        leap_mars_date  = DarianCalendar::Date.from_earth(Date.new(2013, 10, 15))
+        leap_mars_date  = DarianCalendar::Date.by_digits(215)
         leap_mars_date.sols_in_year.should == 669
         @mars_date.sols_in_year.should     == 668
       end
@@ -90,7 +150,7 @@ describe DarianCalendar::Date do
 
     describe '#leap?' do
       it 'returns if year is a leap year' do
-        leap_mars_date  = DarianCalendar::Date.from_earth(Date.new(2013, 10, 15))
+        leap_mars_date  = DarianCalendar::Date.by_digits(215)
         leap_mars_date.leap?.should == true
         @mars_date.leap?.should     == false
       end
@@ -156,6 +216,12 @@ describe DarianCalendar::Date do
           mars_date.week_sol_name.should == '5'
         end
       end
+      context 'calendar type is ""' do
+        it 'returns ""' do
+          mars_date = DarianCalendar::Date.from_earth(@earth_date, :nothing)
+          mars_date.week_sol_name.should == ''
+        end
+      end
     end
 
     describe '#month_name' do
@@ -194,6 +260,12 @@ describe DarianCalendar::Date do
           mars_date.month_name.should == '14'
         end
       end
+      context 'calendar type is anything else' do
+        it 'returns ""' do
+          mars_date = DarianCalendar::Date.from_earth(@earth_date, :nothing)
+          mars_date.month_name.should == ''
+        end
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+require 'simplecov'
+SimpleCov.start
+
 require 'time'
 require 'date'
 require 'json'

data/spec/time_spec.rb

@@ -19,10 +19,7 @@ describe DarianCalendar::Time do
       @mars_time.week_day.should == @mars_time.week_sol
     end
 
-  end
-
-  describe 'initialize method' do
-    it 'converts earth time to mars time' do
+    it 'verifies all attributes' do
       @mars_time.year.should  == 214
       @mars_time.month.should == 14
       @mars_time.sol.should   == 26
@@ -37,6 +34,7 @@ describe DarianCalendar::Time do
       @mars_time.sol_of_year.should     == 387
       @mars_time.week_sol.should        == 5
     end
+
   end
 
   describe 'class methods' do
@@ -55,8 +53,8 @@ describe DarianCalendar::Time do
 
     describe '.today' do
       it 'returns current mars date' do
-        ::Date.should_receive(:today).and_return(@earth_date)
-        DarianCalendar::Time.today.should == DarianCalendar::Date.from_earth(@earth_date)
+        ::Date.stub(:today).and_return(@earth_date)
+        DarianCalendar::Time.today.should == DarianCalendar::Date.by_digits(214, 14, 26)
       end
     end
 
@@ -73,6 +71,114 @@ describe DarianCalendar::Time do
       end
     end
 
+    describe '.by_digits' do
+      context 'no digits are given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Time.by_digits}.to raise_error(ArgumentError, 'Invalid year')
+        end
+      end
+      context 'invalid month is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Time.by_digits(214, -5)}.to raise_error(ArgumentError, 'Invalid month')
+        end
+      end
+      context 'invalid sol is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Time.by_digits(214, 14, 35)}.to raise_error(ArgumentError, 'Invalid sol')
+        end
+      end
+      context 'invalid sol for a month is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Time.by_digits(214, 24, 28)}.to raise_error(ArgumentError, 'Invalid sol for this month')
+        end
+      end
+
+      context 'invalid hour is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Time.by_digits(214, 24, 28, 32)}.to raise_error(ArgumentError, 'Invalid hour')
+        end
+      end
+
+      context 'invalid minute is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Time.by_digits(214, 24, 28, 20, 72)}.to raise_error(ArgumentError, 'Invalid minute')
+        end
+      end
+
+      context 'invalid second is given' do
+        it 'should raise an argument error' do
+          expect{DarianCalendar::Time.by_digits(214, 24, 28, 20, 10, -18)}.to raise_error(ArgumentError, 'Invalid second')
+        end
+      end
+
+      context 'only year is given' do
+        it 'returns the first of the month 1 of the given year and 00:00:00' do
+          date = DarianCalendar::Time.by_digits(214)
+          date.year.should  == 214
+          date.month.should == 1
+          date.sol.should   == 1
+          date.hour.should  == 0
+          date.min.should   == 0
+          date.sec.should   == 0
+        end
+      end
+      context 'only year and month are given' do
+        it 'returns the first of the given month and year and 00:00:00' do
+          date = DarianCalendar::Time.by_digits(214, 14)
+          date.year.should  == 214
+          date.month.should == 14
+          date.sol.should   == 1
+          date.hour.should  == 0
+          date.min.should   == 0
+          date.sec.should   == 0
+        end
+      end
+      context 'all date but no time digits are given' do
+        it 'returns the date for the given digits and 00:00:00' do
+          date = DarianCalendar::Time.by_digits(214, 14, 26)
+          date.year.should  == 214
+          date.month.should == 14
+          date.sol.should   == 26
+          date.hour.should  == 0
+          date.min.should   == 0
+          date.sec.should   == 0
+        end
+      end
+      context 'all date digits and hour are given' do
+        it 'returns the date for the given digits and 20:00:00' do
+          date = DarianCalendar::Time.by_digits(214, 14, 26, 20)
+          date.year.should  == 214
+          date.month.should == 14
+          date.sol.should   == 26
+          date.hour.should  == 20
+          date.min.should   == 0
+          date.sec.should   == 0
+        end
+      end
+      context 'all date digits, hour and minute are given' do
+        it 'returns the date for the given digits and 20:10:00' do
+          date = DarianCalendar::Time.by_digits(214, 14, 26, 20, 10)
+          date.year.should  == 214
+          date.month.should == 14
+          date.sol.should   == 26
+          date.hour.should  == 20
+          date.min.should   == 10
+          date.sec.should   == 0
+        end
+      end
+      context 'all digits are given' do
+        it 'returns the date for the given digits and 20:10:02' do
+          date = DarianCalendar::Time.by_digits(214, 14, 26, 20, 10, 2)
+          date.year.should  == 214
+          date.month.should == 14
+          date.sol.should   == 26
+          date.hour.should  == 20
+          date.min.should   == 10
+          date.sec.should   == 2
+        end
+      end
+    end
+
   end
 
   describe 'instance methods' do
@@ -174,6 +280,12 @@ describe DarianCalendar::Time do
           mars_time.week_sol_name.should == '5'
         end
       end
+      context 'calendar type is anything else' do
+        it 'returns ""' do
+          mars_time = DarianCalendar::Time.from_earth(@earth_time, :nothing)
+          mars_time.week_sol_name.should == ''
+        end
+      end
     end
 
     describe '#month_name' do
@@ -212,6 +324,12 @@ describe DarianCalendar::Time do
           mars_time.month_name.should == '14'
         end
       end
+      context 'calendar type is anything else' do
+        it 'returns ""' do
+          mars_time = DarianCalendar::Time.from_earth(@earth_time, :nothing)
+          mars_time.month_name.should == ''
+        end
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darian_calendar
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.1.0
 platform: ruby
 authors:
 - Christian Worreschk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies: []
 description: This Ruby library converts earth time to mars time and back again. You
   can choose between 5 variants of the Darian calendar system; Martiana, Defrost,
@@ -25,6 +25,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- .yardopts
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -44,7 +45,11 @@ licenses:
 - EUPL-1.1
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --line-numbers
+- --inline-source
+- --title
+- Darian Calendar
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement