jalalidate 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    jalalidate (0.2.3)
+    jalalidate (0.3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    diff-lcs (1.2.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.3.0)
   jalalidate!
-  rspec (~> 2.1.0)
+  rspec (~> 2.13.0)

data/README.md

@@ -5,6 +5,9 @@
 
 ## History
 
+#### 0.3.2 - 8.APR.2013
+* Making JalaliDate class thread safe, courtesy of [Jahangir Zinedine](https://github.com/jzinedine)
+
 #### 0.3.1 - 26.APR.2011
 * Added ruby 1.9 compatibility, courtesy of [Reza](https://github.com/ryco)
 
@@ -21,11 +24,11 @@
 * Updated gemspec file for rubygems.org
 * Updated some documentations
 
-#### 0.02 - 08.AUG.2008
+#### 0.02 - 8.AUG.2008
 * Added jalali to geregorian date convertor.
 * Added JalaliDate class and ported Date class method to JalaliDate
 
-#### 0.01 - 07.AUG.2008
+#### 0.01 - 7.AUG.2008
 * Planning the project
 
 

data/jalalidate.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths             = ["lib"]
   s.extra_rdoc_files          = [ "LICENSE", "README.md"]
   s.rdoc_options              = ["--charset=UTF-8"]
-  s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
-  s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+  s.add_development_dependency(%q<rspec>, ["~> 2.13.0"])
+  s.add_development_dependency(%q<bundler>, ["~> 1.3.0"])
 end

data/lib/jalalidate.rb

@@ -276,6 +276,7 @@ class JalaliDate
   private #-------------------------------------------------------------------------
 
   def gregorian_to_jalali(year, month, day) # :nodoc:
+    jj=0
     gy = year - 1600
     gm = month - 1
     gd = day - 1
@@ -298,19 +299,20 @@ class JalaliDate
     11.times do |i|
       if j_day_no >= JDaysInMonth[i]
         j_day_no -= JDaysInMonth[i]
-        $j = i + 1
+        jj = i + 1
       else
-        $j = i
+        jj = i
         break
       end
     end
-    jm = $j + 1
+    jm = jj + 1
     jd = j_day_no + 1
 
     [jy, jm, jd]
   end
 
   def jalali_to_gregorian(year,month,day) # :nodoc:
+    gg=0
     jy = year - 979
     jm = month - 1
     jd = day - 1
@@ -344,13 +346,13 @@ class JalaliDate
       leap_day = (i==1 && leap) ?  1 : 0
       if g_day_no >= (GDaysInMonth[i] + leap_day )
         g_day_no -= (GDaysInMonth[i] + leap_day )
-        $g = i + 1
+        gg = i + 1
       else
-        $g = i
+        gg = i
         break
       end
     end
-    gm = $g + 1
+    gm = gg + 1
     gd = g_day_no + 1
 
     [gy,gm,gd]

data/lib/jalalidate/version.rb

@@ -1,3 +1,3 @@
 module Jalalidate
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/jalalidate_spec.rb

@@ -32,9 +32,9 @@ describe JalaliDate do
 
   it "should return today, yesterday, and tomorrow date according to jalali calendar" do
     Date.stub!(:today).and_return(Date.new(2010,1,1))
-    JalaliDate.today.should == JalaliDate.new(1388,10,11)
-    JalaliDate.yesterday.should == JalaliDate.new(1388,10,10)
-    JalaliDate.tomorrow.should == JalaliDate.new(1388,10,12)
+    JalaliDate.today.should === JalaliDate.new(1388,10,11)
+    JalaliDate.yesterday.should === JalaliDate.new(1388,10,10)
+    JalaliDate.tomorrow.should === JalaliDate.new(1388,10,12)
   end
 
   it "should distinguish invalid jalali dates" do
@@ -57,39 +57,39 @@ describe JalaliDate do
 
   it "should convert to string, array and hash correctly" do
     jdate = JalaliDate.new(1388,10,11)
-    jdate.to_s.should == "1388/10/11"
-    jdate.to_a.should == [1388,10,11]
-    jdate.to_hash.should == {:year => 1388, :month => 10, :day => 11}
+    jdate.to_s.should === "1388/10/11"
+    jdate.to_a.should === [1388,10,11]
+    jdate.to_hash.should === {:year => 1388, :month => 10, :day => 11}
   end
 
   it "should be able to add and substract days from the currect jalai date object" do
     jdate = JalaliDate.new(1388,10,11)
     five_days_later = jdate + 5
     twenty_days_ago = jdate - 20
-    five_days_later.should == JalaliDate.new(1388,10,16)
-    twenty_days_ago.should == JalaliDate.new(1388,9,21)
+    five_days_later.should === JalaliDate.new(1388,10,16)
+    twenty_days_ago.should === JalaliDate.new(1388,9,21)
   end
 
   it "should be able to compare two jalali dates" do
     jdate = JalaliDate.new(1388,10,11)
     next_month_jdate = JalaliDate.new(1388,11,11)
-    next_month_jdate.<=>(jdate).should == 1
-    jdate.<=>(next_month_jdate).should == -1
+    next_month_jdate.<=>(jdate).should === 1
+    jdate.<=>(next_month_jdate).should === -1
     jdate.<=>(jdate).should == 0
   end
 
   it "should now its next and previous dates" do
     jdate = JalaliDate.new(1388,10,11)
-    jdate.next.should == JalaliDate.new(1388,10,12)
-    jdate.previous.should == JalaliDate.new(1388,10,10)
+    jdate.next.should === JalaliDate.new(1388,10,12)
+    jdate.previous.should === JalaliDate.new(1388,10,10)
   end
 
   it "should be able to move the month forward and backward" do
     jdate = JalaliDate.new(1388,10,11)
     five_month_later = jdate >> 5
     five_month_ago = jdate << 5
-    five_month_later.should == JalaliDate.new(1389,3,11)
-    five_month_ago.should == JalaliDate.new(1388,5,11)
+    five_month_later.should === JalaliDate.new(1389,3,11)
+    five_month_ago.should === JalaliDate.new(1388,5,11)
   end
 
   it "should be able to cycle through dates in different ways, namely, step, upto and downto" do
@@ -99,13 +99,13 @@ describe JalaliDate do
     jdate.step( jdate + 10 , 2) do |jd|
       days_string += jd.day.to_s
     end
-    days_string.should == "101214161820"
+    days_string.should === "101214161820"
 
     days_string = ""
     jdate.upto(jdate+5) do |jd|
       days_string += jd.day.to_s
     end
-    days_string.should == "101112131415"
+    days_string.should === "101112131415"
 
     days_string = ""
     jdate.downto(jdate-5) do |jd|
@@ -115,10 +115,10 @@ describe JalaliDate do
   end
 
   it "should return a correct year day based on Jalali Calendar" do
-    JalaliDate.new(1388,1,1).yday.should == 1
-    JalaliDate.new(1388,12,29).yday.should == 365
-    JalaliDate.new(1387,12,30).yday.should == 366
-    JalaliDate.new(1388,9,17).yday.should == 263
+    JalaliDate.new(1388,1,1).yday.should === 1
+    JalaliDate.new(1388,12,29).yday.should === 365
+    JalaliDate.new(1387,12,30).yday.should === 366
+    JalaliDate.new(1388,9,17).yday.should === 263
   end
 
   it "should be able to print jalali date in different formats" do
@@ -131,15 +131,15 @@ describe JalaliDate do
   end
 
   it "should be able for format %H %I %M %p %S %X %Z correctly if initiallized with time" do
-    JalaliDate.new(1388,2,15,5,50,10).strftime("%H").should == "05"
-    JalaliDate.new(1388,2,15,18,50,10).strftime("%H %I").should == "18 06"
-    JalaliDate.new(1388,2,15,12,50,10).strftime("%H %I").should == "12 00"
-    JalaliDate.new(1388,2,15,12,50,10).strftime("%H %I %M %S").should == "12 00 50 10"
-    JalaliDate.new(1388,2,15,5,50,10).strftime("%p").should == "قبل از ظهر"
-    JalaliDate.new(1388,2,15,15,50,10).strftime("%p").should == "بعد از ظهر"
-    JalaliDate.new(1388,2,15,15,50,10).strftime("%X").should == "15:50:10"
-    JalaliDate.new(1388,2,15,15,50,10).strftime("%X").should == "15:50:10"
-    JalaliDate.new(1388,2,15,15,50,10,"CET",3600).strftime("%Z").should == "CET"
+    JalaliDate.new(1388,2,15,5,50,10).strftime("%H").should === "05"
+    JalaliDate.new(1388,2,15,18,50,10).strftime("%H %I").should === "18 06"
+    JalaliDate.new(1388,2,15,12,50,10).strftime("%H %I").should === "12 00"
+    JalaliDate.new(1388,2,15,12,50,10).strftime("%H %I %M %S").should === "12 00 50 10"
+    JalaliDate.new(1388,2,15,5,50,10).strftime("%p").should === "قبل از ظهر"
+    JalaliDate.new(1388,2,15,15,50,10).strftime("%p").should === "بعد از ظهر"
+    JalaliDate.new(1388,2,15,15,50,10).strftime("%X").should === "15:50:10"
+    JalaliDate.new(1388,2,15,15,50,10).strftime("%X").should === "15:50:10"
+    JalaliDate.new(1388,2,15,15,50,10,"CET",3600).strftime("%Z").should === "CET"
     time = Time.now
     JalaliDate.new(time).strftime("%Z").should == time.zone
   end

data/spec/spec_helper.rb

@@ -3,8 +3,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'jalalidate'
 require 'rspec'
-require 'rspec/autorun'
 
 RSpec.configure do |config|
-  
 end

metadata

@@ -1,65 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jalalidate
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Allen A. Bargi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+      - !ruby/object:Gem::Version
+        version: 2.13.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: A library for working with Jalali Calendar (a.k.a Persian Calendar)
 email: allen.bargi@gmail.com
-executables: 
+executables:
 - jcal
 - jdate
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -77,37 +70,29 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/aziz/jalalidate
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: jalalidate
-rubygems_version: 1.7.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A library for working with Jalali Calendar (a.k.a Persian Calendar)
-test_files: 
+test_files:
 - spec/jalalidate_spec.rb
 - spec/spec_helper.rb