ethiopic_date 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5937169fe53913c5347835b9239988d117f0a211
+  data.tar.gz: 9a5afaaea202ad8fdcd25895676ed7a40958e87b
+SHA512:
+  metadata.gz: 1fb83708eddd0f1ef802ee1e54d764401655be3e0cd2786b8b06dad7be0cb30446b0a65b65fc2852f596adc29e0fe0e6d47c92ac106c53079f105111fc67e640
+  data.tar.gz: 1f39f2c21df660620b5ba225e4cd858dfe50f807bba52d0d8cfb7041aced2ab27524dcea0462739c27ffd1b39c5772b29d35ad76d7c607cf12a9f8d5b73594c4

data/lib/ethiopic_date/version.rb

@@ -1,3 +1,3 @@
 module EthiopicDate
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/ethiopic_date.rb

@@ -9,6 +9,9 @@ module EthiopicDate
   public
   	Nmonths = 12
 	MonthDays = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+	AmharicMonths = {:1=>'መስከረም',:2=>'ጥቅምት',:3=>'ህዳር',:4=>'ታህሳስ',:5=>'ጥር',:6=>'የካቲት',
+	:7=>'መጋቢት',:8=>'ሚያዝያ',:9=>'ግንቦት',:10=>'ሰኔ',:11=>'ሐምሌ',:12=>'ነሃሴ',:13=>'ጳጉሜ'}
+	AmharicDays = {:Sunday=>'እሁድ',:Monday=>'ሰኞ',:Tuesday=>'ማክሰኞ',:Wednesday=>'ሮብ',:Thursday=>'ሓሙስ',:Friday=>'ኣርብ',:Saturday=>'ቅዳሜ'}
 	
     #Ethiopic: Julian date offset
     JD_EPOCH_OFFSET_AMETE_MIHRET = 1723856  # ዓ/ም
@@ -27,11 +30,11 @@ module EthiopicDate
     #@return GregorianDate is returned
     #@example fromEthiopicToGregorian(2004,5,21)
     
-    def fromEthiopicToGregorian(ethiopic_date)
+    def fromEthiopicToGregorian(year,month,day)
       #TODO : Handle Exceptions when there is a wrong input
-      year=ethiopic_date[:year]
-      month=ethiopic_date[:month]
-      day=ethiopic_date[:day]
+      year=year
+      month=month
+      day=day
       if (year <=0)
 			era=JD_EPOCH_OFFSET_AMETE_ALEM
 		else
@@ -47,12 +50,14 @@ module EthiopicDate
     #@param  year,month, day in that order
     #@return EthiopicDate is returned
     #@example fromEthiopicToGregorian(2012,5,21)
-    def fromGregorianToEthiopic(gregorian_date)
+    def fromGregorianToEthiopic(year,month,day)
       #TODO : Handle Exceptions when there is a wrong input
-      year=gregorian_date.year
-      month=gregorian_date.month
-      day=gregorian_date.day
-      ethiopic_date = {:year=>-1,:month=>-1,:day => -1 }
+      year=year
+      month=month
+      day=day
+      date = Date.new.(year,month,day)
+      dayName = date.strftime('%A')
+      ethiopic_date = {:year=>-1,:month=>-1,:day => -1,:dayName=> dayName }
       jdn = jdn_from_gregorian(year,month,day)
       if jdn >=JD_EPOCH_OFFSET_AMETE_MIHRET + 365
   			era= JD_EPOCH_OFFSET_AMETE_MIHRET
@@ -65,7 +70,7 @@ module EthiopicDate
 	  	ethiopic_date[:month] =(n/30) + 1
 		ethiopic_date[:day] =(n.modulo(30)) + 1
 		
-		return ethiopic_date_format(ethiopic_date)
+		return ethiopic_date
     end
 
 
@@ -78,22 +83,7 @@ module EthiopicDate
 		year=ethiopic_date[:year]
         month=ethiopic_date[:month]
         day=ethiopic_date[:day]
-      case month
-        when 1 then month_name="መስከረም "
-        when 2 then month_name="ጥቅምት "
-        when 3 then month_name="ህዳር "
-        when 4 then month_name="ታህሳስ "
-        when 5 then month_name="ጥር "
-        when 6 then month_name="የካቲት "
-        when 7 then month_name="መጋቢት "
-        when 8 then month_name="ሚያዝያ "
-        when 9 then month_name="ግንቦት "
-        when 10 then month_name="ሰኔ "
-        when 11 then month_name="ሐምሌ "
-        when 12 then month_name="ነሃሴ "
-        when 13 then month_name="ጳጉሜን "
-      end
-    	return " #{month_name} #{day} ቀን  #{year}ዓ/ም  "
+    	return " #{AmharicDays[:ethiopic_date[:dayName]]}, #{day} #{AmharicMonths[:month]} #{year}  "
     end
 
     private

metadata

@@ -1,28 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ethiopic_date
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.9
+version: !ruby/object:Gem::Version
+  version: 0.0.10
 platform: ruby
-authors: 
+authors:
 - G/yohannes Zenebe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-22 00:00:00 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies: []
-
 description: Simple gem to convert between Ethiopian and Gregorian dates
-email: 
+email:
 - gebreyohannes@gemhalo.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -33,31 +27,25 @@ files:
 - lib/ethiopic_date/version.rb
 homepage: https://github.com/gyohannes/ethiopic_date
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      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: 
-rubygems_version: 1.8.8
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ethiopian date to Gregorian and Vice versa convertor
 test_files: []
-
-has_rdoc: