hijri 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d85b27d3b44ff6c7d07d0c694b00e0ff7aa8b9c
-  data.tar.gz: 82fb98fc862f70e0d04477e12f74a77408979500
+  metadata.gz: 43396ddd0542fcf4246247863d340194bbf09f52
+  data.tar.gz: 7ef4ea0f4d761bdd723f0cf9cbeec3154249a2a3
 SHA512:
-  metadata.gz: cb74e3acfc640014bbd3499a74122f8b01d753fac32942015d4d3928f5dcde7133fdc8c34bfb6212c2fea76aa901b884f4132a80c1c1e2d735548925bfcc358f
-  data.tar.gz: 91fc784276f15e1a6b0e39adedf1830a15ee1fdf338a4cdd2337f747e52567eaea8d7440811d72a078ca88f3dc77a164f59286a7e0935aae1a4e12e3f2f99f70
+  metadata.gz: 3d027e1a118336127fa816ad25feda65fccc622b1449088cb8b7d378b80b994714fdf2fce28f5be9189231324351c8fffa6037a8035d23e794b9f32c45ae4e62
+  data.tar.gz: 53e4700a6e0615180881bef35d1af164158fb678cb4b26ec10193e214b09b28b6d62ce97217e62f25ac2fc02bb604c0d2d906e9c0fe9fc58bf7632800194c98b

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 0.5.0 / 2015-02-26
+
+* Add Hijri::Date.change
+* Add Hijri::DateTime.change
+* Raise ArgumentError if one of arguments not correct.
+
 === 0.4.0 / 2015-01-11
 
 * Add Hijri::DateTime.to_s

data/README.md

@@ -50,16 +50,16 @@ h = Date.today.to_hijri # => #<Hijri::Date:0x007f875e8c84e8 @year=1436, @month=2
 # or you can initialize new one.
 hijri = Hijri::Date.new 1430, 1, 3 # => #<Hijri::Date:0x007f875e8dbb38 @year=1430, @month=1, @day=3>
 
-# or you get today hijri date directly.
+# or you can get today hijri date directly.
 toady = Hijri::Date.today # => #<Hijri::Date:0x007f875e8d8410 @year=1436, @month=2, @day=16>
 
-# and you can convert hijri date to greogian date.
+# and you can convert hijri date to greogian date also.
 hijri.to_greo # => #<Date: 2009-01-01 ((2454833j,0s,0n),+0s,2299161j)>
 
 # and there is DateTime too
 date_and_time = Hijri::DateTime.now # => #<Hijri::DateTime:0x007f875e8eac00 @year=1436, @month=2, @day=16, @hour=14, @minute=14, @second=39, @zone="+03:00">
 
-# hijri support strftime method with the same option as Greogian date format
+# hijri support strftime method with the same options as Greogian date format method
 Hijri::DateTime.now.strftime('%c') # => "Ahad Rabia I 20 16:00:25 1436"
 ```
 
@@ -72,7 +72,9 @@ Hijri::DateTime.now.strftime('%c') # => "Ahad Rabia I 20 16:00:25 1436"
 - [x] Add Hijri::Date.today to create Hijri::Date object with today date.
 - [x] Add Comparable for Hijri::Date.
 - [x] Implement strftime method.
-- [ ] Add Hijri::Date.change method.
+- [x] Add Hijri::Date.change method.
+- [x] Raise ArgumentError when one of arguments has an invalid date value.
+- [ ] Implement Hijri::Date.strptime method.
 
 
 ## Contributing

data/lib/hijri.rb

@@ -4,6 +4,14 @@ module Hijri
   ISLAMIC_EPOCH = 227014
   AVERAGE_YEARS_DAYS = 354.367056
   AVERAGE_MONTH_DAYS = 29.530588
+  
+  INFINITY = +1.0/0.0
+  
+  if RUBY_VERSION < '1.8.8'
+    class ::Range
+      alias :cover? :include?
+    end
+  end
 end
 
 require 'hijri/version'

data/lib/hijri/date.rb

@@ -5,10 +5,8 @@ module Hijri
 
     attr_reader :day, :month, :year
 
-    # TODO change mon to month in format.rb.
     alias :mon  :month
     alias :mday :day
-    
 
     MONTHNAMES = [nil] + %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)
@@ -36,20 +34,23 @@ module Hijri
     end
 
     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)
+      if valid_date?(year, month, day)
+        @year, @month, @day = year, month, day
+      else
+        raise ArgumentError, "Invalid Date"           
+      end
     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)
+    
+    def change(kargs)
+      # Remove nil values
+      kargs.reject!{|k,v| v.nil?}
+      @year  = kargs.fetch :year , year
+      @month = kargs.fetch :month, month
+      @day   = kargs.fetch :day  , day
     end
 
     def to_s
-      "#{@year}-#{sprintf('%02d', @month)}-#{sprintf('%02d', @day)}"
+      format('%.4d-%02d-%02d', year, month, day)
     end
 
     def <=>(date)
@@ -57,7 +58,9 @@ module Hijri
       date = date.to_hijri
       if self.to_s == date.to_s
         return 0
-      elsif @year > date.year || (@year == date.year && @month > date.month) || (@year == date.year && @month == date.month && @day > date.day)
+      elsif @year > date.year ||
+           (@year == date.year && @month > date.month) ||
+           (@year == date.year && @month == date.month && @day > date.day)
         return 1
       else
         return -1
@@ -82,6 +85,13 @@ module Hijri
     def to_hijri
       self
     end
+    
+    def valid_date?(year, month, day)
+      return false unless (1..INFINITY).cover?(year)
+      return false unless (1..12).cover?(month)
+      return false unless (1..30).cover?(day)
+      return true
+    end
 
     def yday
       (((month - 1) * AVERAGE_MONTH_DAYS) + day).floor

data/lib/hijri/datetime.rb

@@ -1,35 +1,47 @@
 module Hijri
   class DateTime < Date
-    
+
     attr_reader :hour, :minute, :second, :offset, :zone
 
     alias :min :minute
     alias :sec :second
-    
 
     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
-      @offset = zone.to_f / 24
-      @zone   = zone
+      if valid_time?(hour, minute, second, zone)
+        @hour   = hour
+        @minute = minute
+        @second = second
+        @offset = zone.to_f / 24
+        @zone   = zone
+      else
+        raise ArgumentError, "Invalid Date"        
+      end
     end
-    
+
     def change(kargs)
+      super(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
-    
+
     def to_s
       zone_str = (@zone == '00:00' ? "+#{@zone}" : @zone)
-      "#{super}T#{sprintf('%02d', @hour)}:#{sprintf('%02d', @minute)}:#{sprintf('%02d', @second)}#{zone_str}"
+      format('%.4d-%02d-%02dT%02d:%02d:%02d%s',
+             year, mon, mday, hour, min, sec, zone_str)
+    end
+
+    def valid_time?(hour, minute, second, zone)
+      return false unless (0..23).cover?(hour)
+      return false unless (0..59).cover?(minute)
+      return false unless (0..59).cover?(second)
+      return true
     end
 
     class << self

data/lib/hijri/version.rb

@@ -1,3 +1,3 @@
 module Hijri
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/test_hijri.rb

@@ -90,8 +90,8 @@ class TestHijri < MiniTest::Unit::TestCase
   end
 
   def test_hijri_date_strftime_with_no_input
-    date = Hijri::Date.new 1433, 9, 18
-    assert_equal "1433-09-18", date.strftime
+    date = Hijri::Date.new 1433, 12, 18
+    assert_equal "1433-12-18", date.strftime
   end
   
   def test_hijri_datetime_strftime_with_no_input
@@ -131,10 +131,48 @@ class TestHijri < MiniTest::Unit::TestCase
   
   def test_hijri_week_number_of_the_year
     date = Hijri::Date.new 1436, 3, 20
-    assert_equal("11", date.strftime('%U'))
-    assert_equal("11", date.strftime('%W'))
+    assert_equal "11", date.strftime('%U')
+    assert_equal "11", date.strftime('%W')
+  end
+
+  def test_date_change
+    date = Hijri::Date.new 1436, 3, 20
+    date_to_be = Hijri::Date.new 1435, 4, 10
+    
+    date.change :year => 1435, :month => 4, :day => 10
+    assert_equal date_to_be, date
+  end
+
+  def test_date_change_with_nil_arguments
+    date = Hijri::Date.new 1436, 3, 20
+    date_to_be = Hijri::Date.new 1435, 4, 20
+    
+    date.change :year => 1435, :month => 4, :day => nil
+    assert_equal date_to_be, date
   end
 
-  # TODO add Hijri::Date.change and test it.
+  def test_datetime_change
+    datetime = Hijri::DateTime.new(1436, 3, 20, 10, 15, 30)
+    datetime_to_be = Hijri::DateTime.new(1435, 4, 10, 9, 30, 0)
+    
+    datetime.change :year => 1435, :month => 4, :day => 10, :hour => 9, :minute => 30, :second => 0
+    assert_equal datetime_to_be, datetime
+  end
+
+  def test_datetime_change_with_nil_arguments
+    datetime = Hijri::DateTime.new(1436, 3, 20, 10, 15, 30)
+    datetime_to_be = Hijri::DateTime.new(1435, 4, 10, 9, 30, 30)
+    
+    datetime.change :year => 1435, :month => 4, :day => 10, :hour => 9, :minute => 30, :second => nil
+    assert_equal datetime_to_be, datetime
+  end
+
+  def test_initilize_date_with_invalid_arguments
+    assert_raises(ArgumentError) { Hijri::Date.new(1430, 30, 10) }
+  end
+
+  def test_initilize_datetime_with_invalid_arguments
+    assert_raises(ArgumentError) { Hijri::DateTime.new(1430, 12, 10, 30, 70) }
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hijri
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Abdulaziz AlShetwi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler