hijri 0.5.0 → 0.6.0

data/lib/hijri/gregorian.rb

@@ -1,6 +1,6 @@
 class Date
-  def to_hijri
-    Hijri::Date.new *Hijri::Converter.greo_to_hijri(self)
+  def to_hijri(adjust=0)
+    Hijri::Date.new(*Hijri::Converter.greo_to_hijri(self + adjust))
   end
 
   def last_day_of_gregorian_month(month)

data/lib/hijri/version.rb

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

data/test/helper.rb

@@ -16,9 +16,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-if %w(1.8.7 2.2.0).include? RUBY_VERSION
-  require 'minitest/autorun'
-end
+require 'minitest/autorun'
 
 require 'minitest/unit'
 

data/test/test_hijri.rb

@@ -8,12 +8,12 @@ class TestHijri < MiniTest::Unit::TestCase
 
     assert(!version.empty?, 'should have a VERSION constant')
   end
-  
+
   def test_hijri_date_to_string
     date = Hijri::Date.new 1433, 9, 18
     assert_equal "1433-09-18", date.to_s
   end
-  
+
   def test_greo_date_to_hijri
     date = Date.new 2014, 12, 7
     # switiching between solar calendar and lunar calendar is a bit
@@ -22,19 +22,19 @@ class TestHijri < MiniTest::Unit::TestCase
     correct_dates = (14..16).map {|n| "1436-02-#{n}" }
     assert_includes correct_dates, date.to_hijri.to_s
   end
-  
+
   def test_hijri_to_greo
     h = Hijri::Date.new 1430, 1, 1
     g = Date.new 2008, 12, 29
     assert_equal(g , h.to_greo)
   end
-  
+
   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
@@ -56,7 +56,7 @@ class TestHijri < MiniTest::Unit::TestCase
   def test_comparing_two_hijri_date
     date1 = Hijri::Date.new 1435, 1, 1
     date2 = Hijri::Date.new 1435, 1, 1
-    
+
     assert_equal date1, date2
   end
 
@@ -83,7 +83,7 @@ class TestHijri < MiniTest::Unit::TestCase
     datetime = Hijri::DateTime.new 1433, 9, 18, 1, 1, 1, '00:00'
     assert_equal "1433-09-18T01:01:01+00:00", datetime.to_s
   end
-  
+
   def test_hijri_date_strftime_shows_hijri_month_names
     date = Hijri::Date.new 1436, 2, 21
     assert_equal "Safar", date.strftime("%B")
@@ -93,23 +93,23 @@ class TestHijri < MiniTest::Unit::TestCase
     date = Hijri::Date.new 1433, 12, 18
     assert_equal "1433-12-18", date.strftime
   end
-  
+
   def test_hijri_datetime_strftime_with_no_input
     datetime = Hijri::DateTime.new 1433, 9, 18, 1, 1, 1, '+03:00'
     #"1433-09-18T01:01:01+03:00"
     assert_equal datetime.to_s, datetime.strftime
   end
-  
+
   def test_hijri_full_arabic_month
     date = Hijri::Date.new 1436, 3, 1
     assert_equal "Rabia-Awwal", date.strftime('%B')
   end
-  
+
   def test_hijri_short_arabic_month_name
     date = Hijri::Date.new 1436, 3, 1
     assert_equal "Rabia I", date.strftime('%b')
   end
-  
+
   def test_hijri_full_arabic_day_name
     (15..21).each do |day|
       date = Hijri::Date.new 1436, 1, day
@@ -118,17 +118,17 @@ class TestHijri < MiniTest::Unit::TestCase
   end
 
   def test_hijri_short_arabic_day_name
-    (1..7).each do |day|      
+    (1..7).each do |day|
       date = Hijri::Date.new 1436, 3, day
       assert_equal Hijri::Date::ABBR_DAYNAMES[(day+2)%7], date.strftime('%a')
     end
   end
-  
+
   def test_hijri_day_of_the_year
     date = Hijri::Date.new 1436, 3, 20
     assert_equal "079", date.strftime('%j')
   end
-  
+
   def test_hijri_week_number_of_the_year
     date = Hijri::Date.new 1436, 3, 20
     assert_equal "11", date.strftime('%U')
@@ -138,7 +138,7 @@ class TestHijri < MiniTest::Unit::TestCase
   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
@@ -146,7 +146,7 @@ class TestHijri < MiniTest::Unit::TestCase
   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
@@ -154,7 +154,7 @@ class TestHijri < MiniTest::Unit::TestCase
   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
@@ -162,7 +162,7 @@ class TestHijri < MiniTest::Unit::TestCase
   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
@@ -175,4 +175,36 @@ class TestHijri < MiniTest::Unit::TestCase
     assert_raises(ArgumentError) { Hijri::DateTime.new(1430, 12, 10, 30, 70) }
   end
 
+  def test_to_hijri_accept_adjust_variable
+    today     = Date.today.to_hijri
+    yesterday = Date.today.to_hijri(-1)
+    tomorrow  = Date.today.to_hijri(+1)
+
+    assert today > yesterday
+    assert tomorrow > today
+  end
+
+  def test_to_goreg_accept_adjust_variable
+    today     = Hijri::Date.today.to_greo
+    yesterday = Hijri::Date.today.to_greo(-1)
+    tomorrow  = Hijri::Date.today.to_greo(+1)
+
+    assert today > yesterday
+    assert tomorrow > today
+  end
+
+  def test_resolve_hijri_date_1439_4_12_to_greo_not_raise_error
+    # this to test issue #5 https://github.com/ecleel/hijri/issues/5
+    hdate = Hijri::Date.new(1439, 4, 12)
+    gdate = Date.new(2017, 12, 31)
+    assert_equal gdate, hdate.to_greo
+  end
+
+  # def test_issue_4_of_wrong_conversion
+  #   gdate = Date.new 2017, 9, 1
+  #   hdate = Hijri::Date.new 1438, 12, 9
+  #
+  #   # assert_equal hdate, gdate.to_hijri
+  #   assert_equal Hijri::Date.new(1437, 12, 6), Date.new(2016, 9, 9).to_hijri
+  # end
 end

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: hijri
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Abdulaziz AlShetwi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 description: hijri is full Islamic Hijri calendar lib for ruby.
 email: ecleeld@gmail.com
 executables: []
@@ -96,12 +82,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Hijri Date Library for Ruby
 test_files:
 - test/helper.rb
 - test/test_hijri.rb
-has_rdoc: