ethiopic_date 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fce9fb16ecb21de263237af16ad2e8182574c17
-  data.tar.gz: adffff6562f40ed860ea780468d0ea1c9c35b75a
+  metadata.gz: 87e89fb624c31dc1070c0d2f035e8ff187ec897c
+  data.tar.gz: 751642d22b8eb6cefa999107532f1dd1ac85d3b8
 SHA512:
-  metadata.gz: 1b472f300ce7f9d240acc4990977c3ac65500933c46307247fbce4c77d233e618ede1a33a3445847cbec83a5af1aae875e198fb1eb55105d395e9358a302a501
-  data.tar.gz: 9b256c866f6498f4fdca2de6600b18746133904450b8369b5e32d7e52a354ab95720fc05e6d98467f0ed977faf390a5ad0b674a60f2d54ee6a4a48ee073e4198
+  metadata.gz: 7fe7a373ffbe0f8b425a4128eeb86b94551a0314d34c7fb38293b6899e0e7f06a2713cfc54c383fcebc022131cab02b47b4b1571a38949f4618613366d96913e
+  data.tar.gz: 9c2b7fafa46e658786d9396b61fd64f7cee16600cffb4bc3686d990ca097ff95511f5ee898456302a2387e9c00974e8dfc8ec4feededec6db24ece635629e426

data/lib/ethiopic_date.rb

@@ -47,17 +47,10 @@ module EthiopicDate
     #Changes from in_date:GregorianDate to EthiopicDate
     #
     #@api public
-    #@param  year,month, day in that order
+    #@param  year,month,day in that order
     #@return EthiopicDate is returned
     #@example fromEthiopicToGregorian(2012,5,21)
     def fromGregorianToEthiopic(year,month,day)
-      #TODO : Handle Exceptions when there is a wrong input
-      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
@@ -66,11 +59,11 @@ module EthiopicDate
   		end
 		  r = (jdn - era).modulo(1461)
 		  n = (r.modulo(365) ) + (365 * (r/1460 ))
-  		ethiopic_date[:year] =4 * ((jdn - era)/1461) + r/365 - r/1460
-	  	ethiopic_date[:month] =(n/30) + 1
-		ethiopic_date[:day] =(n.modulo(30)) + 1
+  		eyear = 4 * ((jdn - era)/1461) + r/365 - r/1460
+	  	emonth = (n/30) + 1
+		eday = (n.modulo(30)) + 1
 		
-		return ethiopic_date
+		return "#{eyear}/#{emonth}/#{eday}"
     end
 
 
@@ -80,11 +73,12 @@ module EthiopicDate
     #@return a formated Ethiopic date string
     #@example ethiopic_date_format('2004-5-21') will be ጥር  21 ቀን  2004ዓ/ም
     def ethiopic_date_format(ethiopic_date)
-	year=ethiopic_date[:year]
-        month=ethiopic_date[:month]
-        day=ethiopic_date[:day]
-        dayName = ethiopic_date[:dayName]
-    	return " #{AmharicDays[dayName.to_sym]}, #{day} #{AmharicMonths[month.to_s]} #{year}  "
+	d = ethiopic_date.split('/')
+	year = d[0]
+        month = d[1]
+        day = d[2]
+        day = day.to_s.length < 2 ? '0' << day.to_s : day
+    	return "#{AmharicMonths[month.to_s]} #{day}, #{year}"
     end
 
     private

data/lib/ethiopic_date/version.rb

@@ -1,3 +1,3 @@
 module EthiopicDate
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethiopic_date
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - G/yohannes Zenebe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies: []
 description: Simple gem to convert between Ethiopian and Gregorian dates
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -34,17 +34,17 @@ require_paths:
 - lib
 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: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ethiopian date to Gregorian and Vice versa convertor