hijri 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a98ec623ad77ab2b54f166fdbcc38ef4eeb97f2
-  data.tar.gz: d052e589d43a0b18880b65e4c631d46ecccd4d5a
+  metadata.gz: b39edec389003c4f6316089abb8d05064dc358e0
+  data.tar.gz: a5b1e9d6c3befcf5c844d45e16a84ba05c0882e5
 SHA512:
-  metadata.gz: 720df8d0d28ebb2feb1236ecdf36a69a611eb8a9672bb1d4c79f8923dbcedc8433d034e9b32eef147b97168c70b9a1e268e9cfcded8fcd60f775ff56ce698da2
-  data.tar.gz: ba4885f4f7e184715c3b03fa90c20ce5a68b76895dbc1a10fd9666592ea017d63fec6ef5c1dc30a8593c945a825a2f4cef937d5999ebdabea735d9e2abbeddb8
+  metadata.gz: 84c845014dfa450e82fe2e249577bf22a15f1a115c38a64591149fda133bdee8d13bd773d7c5b9ad957129d07b330978e16a4852748abc6a06d7dd5c444f3eb0
+  data.tar.gz: 87df415c8902d0c828ba5f5afb78d41c28b19eaeb27e097489ddb0776d86cac1f8816ef2a1d49b5a03f649a856f14e0fe95fb49141bd3bd3f2d43d76a33ac9ea

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 0.1.0 / 2014-12-09
+
+* Add Hijri::DateTime class.
+* Add ability to convert Hijri::DateTime to and from DateTime.
+* Add Hijri::DateTime.now.
+
 === 0.0.5 / 2014-12-08
 
 * Clean up unwanted code.

data/README.md

@@ -5,7 +5,7 @@ hijri is full Islamic Hijri calendar lib for ruby. The way it work is to convert
 ### Hijri Calendar (from Wikipedia)
 The Islamic calendar or Muslim calendar or Hijri calendar: is a lunar calendar consisting of 12 lunar months in a year of 354 or 355 days. It is used to date events in many Muslim countries (concurrently with the Gregorian calendar), and used by Muslims everywhere to determine the proper day on which to celebrate Islamic holy days and festivals. The first year was the year during which the emigration of the Islamic prophet Muhammad from Mecca to Medina, known as the Hijra, occurred. Each numbered year is designated either H for Hijra or AH for the Latin anno Hegirae (in the year of the Hijra).[1] A limited number of years before Hijra (BH) are used to date events related to Islam, such as the birth of Muhammad in 53 BH.[2] The current Islamic year is 1431 AH, from approximately 18 December 2009 (evening) to 6 December 2010 (evening).
 
-(read more in wikipedia)[http://en.wikipedia.org/wiki/Islamic_calendar]
+http://en.wikipedia.org/wiki/Islamic_calendar
 
 
 
@@ -25,17 +25,28 @@ Or install it yourself as:
 
 ## Usage
 
-    DateTime.now.to_hijri
-    hijri = Hijri.new 1430, 1, 3
-    hijri.to_greo
+```ruby
+require 'hijri'
+
+# you can create hijri date from stdlib Date class.
+h = Date.today.to_hijri
+# or you can initialize new one.
+hijri = Hijri::Date.new 1430, 1, 3
+# or you get today hijri date directly.
+toady = Hijri::Date.today
+# and you can convert hijri date to greogian date.
+hijri.to_greo
+# and there is DateTime too
+date_and_time = Hijri::DateTime.now
+```
 
 
 ## TODO
 
-- [ ] Add Hijri::Date and Hijri::DateTime.
-- [ ] Accept test error with one day range.
-- [ ] Add Hijri.now to create Hijri::DateTime object.
-- [ ] Add Hijri.today to create Hijri::Date object.
+- [x] Add Hijri::Date and Hijri::DateTime.
+- [x] Accept test error with one day range.
+- [x] Add Hijri::DateTime.now to create Hijri::DateTime object.
+- [x] Add Hijri::Date.today to create Hijri::Date object with today date.
 - [ ] Implement strftime method.
 - [ ] Add Comparable for Hijri::Date.
 

data/lib/hijri.rb

@@ -3,7 +3,8 @@ module Hijri
 end
 
 require 'hijri/version'
-require 'hijri/hijri'
 require 'hijri/date'
+require 'hijri/datetime'
+require 'hijri/gregorian'
 require 'hijri/converter'
 

data/lib/hijri/converter.rb

@@ -1,11 +1,19 @@
 module Hijri
   module Converter
     def self.hijri_to_greo hijri
-      absolute_to_greo(hijri_to_absolute(hijri.year, hijri.month, hijri.day))
+      results = absolute_to_greo(hijri_to_absolute(hijri.year, hijri.month, hijri.day))
+      if hijri.is_a? DateTime
+        results.push hijri.hour, hijri.minute, hijri.second, hijri.zone
+      end
+      results
     end
       
     def self.greo_to_hijri greg
-      absolute_to_hijri(greo_to_absolute(greg.year, greg.month, greg.day))
+      results = absolute_to_hijri(greo_to_absolute(greg.year, greg.month, greg.day))
+      if greg.is_a? ::DateTime
+        results.push greg.hour, greg.minute, greg.second, greg.zone
+      end
+      results
     end
 
     module_function 

data/lib/hijri/date.rb

@@ -1,22 +1,46 @@
-class Date
-  def to_hijri
-    Hijri::Hijri.new *Hijri::Converter.greo_to_hijri(self)
-  end
-  
-  def last_day_of_gregorian_month(month)
-    # Compute the last date of the month for the Gregorian calendar.
-    if month == 2
-      return 29 if (self.year % 4 == 0 && self.year % 100 != 0) || (self.year % 400 == 0)
+module Hijri
+  class Date
+
+    attr_accessor :day, :month, :year
+    MONTHNAMES_EN = %w(Muharram Safar Rabia-Awwal Rabia-Thani Jumaada-Awal Jumaada-Thani Rajab Sha'ban Ramadan Shawwal Dhul-Qi'dah Dhul-Hijjah)
+    DAYNAMES = %w(as-Sabt al-Ahad al-Ithnayn ath-Thalaathaa al-Arba'aa' al-Khamis al-Jumu'ah)
+
+    def initialize(year=1, month=1, day=1)
+       @year, @month, @day = year, month, day
     end
-    return [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month - 1]
-  end
-  
-  def to_abs
-    @d = self.day
-    @m = self.month - 1
-    @m.downto(1) do |m|
-      @d += last_day_of_gregorian_month(@m, year)
+
+    def islamic_leap_year?
+      return (((((11 * self.year) + 14) % 30) < 11) ? true : false)
+    end
+
+    def last_day_of_islamic_month
+      # Last day in month during year on the Islamic calendar.
+      return ((self.month % 2 == 1) || (self.month == 12 && islamic_leap_year?) ? 30 : 29)
+    end
+
+    def to_s
+      "#{@year}-#{sprintf('%02d', @month)}-#{sprintf('%02d', @day)}"
+    end
+
+    def to_abs
+      month_days = 29 * (month - 1) # days on this year
+      nonleap_year_days  = 354 * (year - 1)
+      leap_year_days = (3 + (11 * year)) / 30.0
+      this_year  = (month / 2.0).to_i
+      
+      return (day + month_days + this_year + nonleap_year_days + leap_year_days + Hijri::ISLAMIC_EPOCH).to_i
+    end
+
+    def to_greo
+      ::Date.new *Converter.hijri_to_greo(self)
+    end
+
+    class << self
+      def today
+        date = ::Date.today
+        date.to_hijri
+      end
     end
-    return (@d + 365 * (year - 1) + (year -1) / 4.0 - (year - 1) / 100.0 + (year - 1) / 400.0).to_i
+
   end
-end
+end

data/lib/hijri/datetime.rb

@@ -0,0 +1,37 @@
+module Hijri
+  class DateTime < Date
+    
+    attr_reader :hour, :minute, :second, :zone
+    def initialize(year=1, month=1, day=1, hour=0, minute=0, second=0, zone="00:00")
+      super(year, month, day)
+      @hour   = hour
+      @minute = minute
+      @second = second
+      @zone   = zone
+    end
+    
+    def change(kargs)
+      @hour   = kargs.fetch :hour, hour
+      @minute = kargs.fetch :minute, minute
+      @second = kargs.fetch :second, second
+      @zone   = kargs.fetch :zone, zone
+    end
+    
+    def to_greo
+      ::DateTime.new *Converter.hijri_to_greo(self)
+    end
+    
+    # TODO to_s
+
+    class << self
+      def now
+        datetime = ::DateTime.now
+        hijri = datetime.to_hijri
+        hijri.change hour: datetime.hour, minute: datetime.minute, second: datetime.second
+        hijri
+      end
+    end
+
+  end
+
+end

data/lib/hijri/gregorian.rb

@@ -0,0 +1,28 @@
+class Date
+  def to_hijri
+    Hijri::Date.new *Hijri::Converter.greo_to_hijri(self)
+  end
+  
+  def last_day_of_gregorian_month(month)
+    # Compute the last date of the month for the Gregorian calendar.
+    if month == 2
+      return 29 if (self.year % 4 == 0 && self.year % 100 != 0) || (self.year % 400 == 0)
+    end
+    return [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month - 1]
+  end
+  
+  def to_abs
+    @d = self.day
+    @m = self.month - 1
+    @m.downto(1) do |m|
+      @d += last_day_of_gregorian_month(@m, year)
+    end
+    return (@d + 365 * (year - 1) + (year -1) / 4.0 - (year - 1) / 100.0 + (year - 1) / 400.0).to_i
+  end
+end
+
+class DateTime
+  def to_hijri
+    Hijri::DateTime.new *Hijri::Converter.greo_to_hijri(self)
+  end
+end

data/lib/hijri/version.rb

@@ -1,3 +1,3 @@
 module Hijri
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/test/test_hijri.rb

@@ -10,7 +10,7 @@ class TestHijri < MiniTest::Unit::TestCase
   end
   
   def test_hijri_to_string
-    date = Hijri::Hijri.new 1433, 9, 18
+    date = Hijri::Date.new 1433, 9, 18
     assert_equal "1433-09-18", date.to_s
   end
   
@@ -24,12 +24,34 @@ class TestHijri < MiniTest::Unit::TestCase
   end
   
   def test_hijri_to_greo
-    h = Hijri::Hijri.new 1430, 1, 1
-    g = Date.new  2008, 12, 29
+    h = Hijri::Date.new 1430, 1, 1
+    g = Date.new 2008, 12, 29
     assert_equal(g , h.to_greo)
   end
   
-  # TODO test hijri.now  
-  # TODO test Hijri::Date
-  # TODO test Hijri::DateTime
+  def test_hijri_date_today
+    gdate = Date.today
+    hdate = Hijri::Date.today
+    assert_equal gdate, hdate.to_greo
+  end
+  
+  def test_hijri_datetime_now_create_datetime_object_with_now_date_and_time
+    g_datetime = DateTime.now
+    h_datetime = Hijri::DateTime.now
+    exact_date = h_datetime.to_greo
+
+    # I assert it one by one because there is a different in n variable in
+    # DateTime and I couldn't find it.
+    # -#<DateTime: 2014-12-09T13:46:30+03:00 ((2457001j,38790s,467109000n),+10800s,2299161j)>
+    # +#<DateTime: 2014-12-09T13:46:30+03:00 ((2457001j,38790s,0n),+10800s,2299161j)>
+    assert_equal g_datetime.year, exact_date.year
+    assert_equal g_datetime.month, exact_date.month
+    assert_equal g_datetime.day, exact_date.day
+    assert_equal g_datetime.hour, exact_date.hour
+    assert_equal g_datetime.minute, exact_date.minute
+    assert_equal g_datetime.second, exact_date.second
+    assert_equal g_datetime.zone, exact_date.zone
+  end
+
+  # TODO test hijri.now
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hijri
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Abdulaziz AlShetwi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,8 @@ files:
 - lib/hijri/absolute.rb
 - lib/hijri/converter.rb
 - lib/hijri/date.rb
-- lib/hijri/hijri.rb
+- lib/hijri/datetime.rb
+- lib/hijri/gregorian.rb
 - lib/hijri/version.rb
 - test/helper.rb
 - test/test_hijri.rb

data/lib/hijri/hijri.rb

@@ -1,45 +0,0 @@
-module Hijri
-  class Hijri
-
-    attr_accessor :day, :month, :year
-    MONTHNAMES_EN = %w(Muharram Safar Rabia-Awwal Rabia-Thani Jumaada-Awal Jumaada-Thani Rajab Sha'ban Ramadan Shawwal Dhul-Qi'dah Dhul-Hijjah)
-    DAYNAMES = %w(as-Sabt al-Ahad al-Ithnayn ath-Thalaathaa al-Arba'aa' al-Khamis al-Jumu'ah)
-  
-    def initialize(year=1, month=1, day=1)
-       @year, @month, @day = year, month, day
-    end
-  
-    def islamic_leap_year?
-      return (((((11 * self.year) + 14) % 30) < 11) ? true : false)
-    end
-  
-    def last_day_of_islamic_month
-      # Last day in month during year on the Islamic calendar.
-      return ((self.month % 2 == 1) || (self.month == 12 && islamic_leap_year?) ? 30 : 29)
-    end
-  
-    def to_s
-      "#{@year}-#{sprintf('%02d', @month)}-#{sprintf('%02d', @day)}"
-    end
-  
-    def to_abs
-      month_days = 29 * (month - 1) # days on this year
-      nonleap_year_days  = 354 * (year - 1)
-      leap_year_days = (3 + (11 * year)) / 30.0
-      this_year  = (month / 2.0).to_i
-      
-      return (day + month_days + this_year + nonleap_year_days + leap_year_days + Hijri::ISLAMIC_EPOCH).to_i
-    end
-  
-    def to_greo
-      Date.new *Converter.hijri_to_greo(self)
-    end
-  
-    class << self
-      def today
-        d = Date.send(:now)
-        # Hijri.new.greo_to_hijri(d)
-      end
-    end
-  end
-end