hijri 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6c03b308b3dc9f76fe9c48033d795dfa43735ef
-  data.tar.gz: cb39d5115d8ab13f2f3d2a5f2751461e544cccb7
+  metadata.gz: 8a57a98c55f59a921c16661f2dde825a5600d32d
+  data.tar.gz: d1f368e87d525735c9e01afc3a4841e3ce2d1052
 SHA512:
-  metadata.gz: 2ddcb00c583ae8a0c083d5e638d2ed33f77d6aa825d706f58b16b1796b314257a5b50fdaf665eab56884c4765da5b8b7d1804f4d5aa621181706f2231575b82a
-  data.tar.gz: ba9cac95f86778db5c9049be96a221e4a4d1a6231016e6ccf3567d42385fbb498147a3fd5c1237982687a35508929adba7af904aefeda4963cc6b69b1ae4c18c
+  metadata.gz: 6d9061ec1e355f146a8be9b1ca1b58a2fe6c111078929fcb88b5aecc7d9edbf9dcaf5453ba120b899c5bdab8107c8b9c516e8adceea22ce40980cf974bb9ef35
+  data.tar.gz: 83e0d0511d673e93479a75520d9401f05aa5a6d6e3a7fb9911e508354e31aa8edf6b33e25438eeb59f31e9ea311bfb38e0fa55172e8480ab0824beaf8ea8401d

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
+
 rvm:
   - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - "2.1.1"
+  - "2.1"
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx
+  - rbx
+
+sudo: false

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.2.5 / 2014-12-11
+
+* Add Comparable for Hijri::Date.
+
 === 0.2.0 / 2014-12-09
 
 * hijri now tested and run in all major Ruby implementations and versions.

data/README.md

@@ -27,12 +27,12 @@ Or install it yourself as:
     $ gem install hijri
 
 ###hijri tested and worked in:
-- Ruby MRI:   
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.1"
+- Ruby MRI:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1
 - JRuby 1.7.16.1
   - jruby-18mode
   - jruby-19mode
@@ -45,12 +45,16 @@ require 'hijri'
 
 # you can create hijri date from stdlib Date class.
 h = Date.today.to_hijri # => #<Hijri::Date:0x007f875e8c84e8 @year=1436, @month=2, @day=16>
+
 # 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.
 toady = Hijri::Date.today # => #<Hijri::Date:0x007f875e8d8410 @year=1436, @month=2, @day=16>
+
 # and you can convert hijri date to greogian date.
 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">
 ```
@@ -62,8 +66,8 @@ date_and_time = Hijri::DateTime.now # => #<Hijri::DateTime:0x007f875e8eac00 @yea
 - [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.
+- [x] Add Comparable for Hijri::Date.
 - [ ] Implement strftime method.
-- [ ] Add Comparable for Hijri::Date.
 
 
 ## Contributing

data/hijri.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
   gem.authors       = ["Abdulaziz AlShetwi"]
   gem.email         = "ecleeld@gmail.com"
-  gem.homepage      = "https://rubygems.org/gems/hijri"
+  gem.homepage      = "https://github.com/ecleel/hijri"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/hijri/date.rb

@@ -1,10 +1,19 @@
 module Hijri
   class Date
 
+    include Comparable
+
     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)
 
+    class << self
+      def today
+        date = ::Date.today
+        date.to_hijri
+      end
+    end
+
     def initialize(year=1, month=1, day=1)
        @year, @month, @day = year, month, day
     end
@@ -22,12 +31,24 @@ module Hijri
       "#{@year}-#{sprintf('%02d', @month)}-#{sprintf('%02d', @day)}"
     end
 
+    def <=>(date)
+      # Make sure the date is a Hijri::Date instance
+      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)
+        return 1
+      else
+        return -1
+      end
+    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
 
@@ -35,12 +56,10 @@ module Hijri
       ::Date.new *Converter.hijri_to_greo(self)
     end
 
-    class << self
-      def today
-        date = ::Date.today
-        date.to_hijri
-      end
+    # Just to have a consistent Interface.
+    def to_hijri
+      self
     end
 
   end
-end
+end

data/lib/{format.rb → hijri/format.rb}

@@ -112,22 +112,22 @@ class Date
     class Bag # :nodoc:
 
       def initialize
-	@elem = {}
+      	@elem = {}
       end
 
       def method_missing(t, *args, &block)
-	t = t.to_s
-	set = t.chomp!('=')
-	t = t.intern
-	if set
-	  @elem[t] = args[0]
-	else
-	  @elem[t]
-	end
+      	t = t.to_s
+      	set = t.chomp!('=')
+      	t = t.intern
+      	if set
+      	  @elem[t] = args[0]
+      	else
+      	  @elem[t]
+      	end
       end
 
       def to_hash
-	@elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
+      	@elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
       end
 
     end

data/lib/hijri/gregorian.rb

@@ -2,7 +2,7 @@ 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
@@ -10,7 +10,7 @@ class Date
     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
@@ -25,10 +25,10 @@ class DateTime
   def to_hijri
     Hijri::DateTime.new *Hijri::Converter.greo_to_hijri(self)
   end
-  
+
   if RUBY_VERSION < '1.8.8'
     alias :minute :min
     alias :second :sec
   end
-    
-end
+
+end

data/lib/hijri/version.rb

@@ -1,3 +1,3 @@
 module Hijri
-  VERSION = "0.2.0"
+  VERSION = "0.2.5"
 end

data/test/test_hijri.rb

@@ -53,5 +53,10 @@ class TestHijri < MiniTest::Unit::TestCase
     assert_equal g_datetime.zone, exact_date.zone
   end
 
-  # TODO test hijri.now
+  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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hijri
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Abdulaziz AlShetwi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,17 +68,17 @@ files:
 - README.md
 - Rakefile
 - hijri.gemspec
-- lib/format.rb
 - lib/hijri.rb
 - lib/hijri/absolute.rb
 - lib/hijri/converter.rb
 - lib/hijri/date.rb
 - lib/hijri/datetime.rb
+- lib/hijri/format.rb
 - lib/hijri/gregorian.rb
 - lib/hijri/version.rb
 - test/helper.rb
 - test/test_hijri.rb
-homepage: https://rubygems.org/gems/hijri
+homepage: https://github.com/ecleel/hijri
 licenses:
 - MIT
 metadata: {}