hebrew_date 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d30d98a5b4e655ed1d8394c69721ac66bceee7
-  data.tar.gz: a07b4a0f4d44c9f1c71656659cb8dcb85cfd28be
+  metadata.gz: dd6b7e10cb6a8302d5684530f17d395aa62195c4
+  data.tar.gz: 927c92e5d3f20df9ab055a52780a7f5d038c1c29
 SHA512:
-  metadata.gz: e0e483760e3c7098bd702c5a8f3438805c958ca0c5ac828a1f03ea72bbdd060158d7dfe26deb74154100e73fc40f0ceb75c06fa610352ac8dff71a4a65158c79
-  data.tar.gz: 3ea8a572c90e14c61e8a8bbfdfb034a2dd91ba5d5daee2fedc39bb03c4e5056bf00246bf7cdf5e824d3aaf27d30ae5dc03fd55cc32af0c2fe40d93f0636c3450
+  metadata.gz: 67b477cbe1da00c1a13ae4369d5a6b8ebe3ccce307e7e91b6b1a157050f0226a448771d26d6600c9526e5736addb4b4539bd6f12c0f56fc0f28c7d3d1e46d936
+  data.tar.gz: dd3a9e11529357ef0fea68e59b702c48cb57c8ce81ad6703be6628156f9acb99e07076d48e2ea28e1a92ee4db0f87889411ec6133240a37c949670a3417686ce

data/hebrew_date.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name         = 'hebrew_date'
   s.require_paths = %w(. lib)
-  s.version      = '1.0.12'
-  s.date         = '2014-02-03'
+  s.version      = '1.0.13'
+  s.date         = '2014-02-15'
   s.summary      = 'Hebrew/Jewish dates, times, and holidays.'
   s.description  = <<-EOF
    hebrew_date is a library designed to provide information about the Jewish

data/lib/hebrew_date.rb

@@ -63,6 +63,11 @@ class HebrewDate < Delegator
 
   def initialize(year_or_date_object=nil, month=nil, date=nil)
     @abs_date = 0
+    skip_hebrew_date = false
+    if year_or_date_object === true
+      skip_hebrew_date = true
+      year_or_date_object = nil
+    end
 
     if month && date
       @year = year_or_date_object
@@ -77,7 +82,7 @@ class HebrewDate < Delegator
     @israeli = self.class.israeli
     @ashkenaz = self.class.ashkenaz
     @debug = self.class.debug
-    set_date(@year, @month, @date)
+    set_date(@year, @month, @date) unless skip_hebrew_date
     super(Date.new)
   end
 
@@ -159,8 +164,11 @@ class HebrewDate < Delegator
   # @param month [Integer] the Hebrew month (1-13)
   # @param date [Integer] the day of the Hebrew month (1-30)
   def self.new_from_hebrew(year, month, date)
-    d = self.new
-    d.set_hebrew_date(year, month, date)
+    d = self.new(true)
+    @year = 1
+    @month = 1
+    @date = 1
+    d.set_hebrew_date(year, month, date, true)
     d
   end
 
@@ -193,8 +201,14 @@ class HebrewDate < Delegator
   # @param year [Integer] the Hebrew year (e.g. 2008)
   # @param month [Integer] the Hebrew month (1-13)
   # @param date [Integer] the Hebrew day of month (1-30)
+  # @param auto_set [Boolean] Used internally.
   # @return [void]
-  def set_hebrew_date(year, month, date)
+  def set_hebrew_date(year, month, date, auto_set=false)
+    if auto_set
+      @hebrew_year = year
+      @hebrew_month = month
+      @hebrew_date = date
+    end
     return "Illegal value for Hebrew year: #{year}" if year < 0
     if month < 0 || month > last_month_of_hebrew_year
       return "Illegal value for Hebrew month: #{month}"
@@ -500,7 +514,7 @@ class HebrewDate < Delegator
   # @param year [Integer]
   # @return [Integer]
   def _hebrew_calendar_elapsed_days(year)
-    puts "hebrew_calendar_elapsed_days #{year}" if @debug
+#    puts "hebrew_calendar_elapsed_days #{year}" if @debug
     months_elapsed =
 			(235 * ((year - 1) / 19.0).to_i) + # Months in complete cycles so far
 			(12 * ((year - 1).remainder(19))) +			# Regular months in this cycle
@@ -529,7 +543,7 @@ class HebrewDate < Delegator
     if [0, 3, 5].include?(alternative_day.remainder(7))
       alternative_day += 1
     end
-    puts "hebrew_calendar_elapsed_days calculated #{alternative_day}" if @debug
+#    puts "hebrew_calendar_elapsed_days calculated #{alternative_day}" if @debug
     alternative_day
   end
 
@@ -552,8 +566,14 @@ class HebrewDate < Delegator
   # @return [void]
   def _abs_date_to_hebrew_date!
     puts "abs_date_to_hebrew_date #{@abs_date}" if @debug
-    # Approximation from below.
-    @hebrew_year = ((@abs_date + HEBREW_EPOCH) / 366.0).ceil
+    # Speed this up - most dates will be current, so let's use a value
+    # we know about.
+    if @abs_date >= 735279
+      @hebrew_year = 5770
+    else
+      # Approximation from below.
+      @hebrew_year = ((@abs_date + HEBREW_EPOCH) / 366.0).ceil
+    end
     # Search forward for year from the approximation.
     while @abs_date >= _hebrew_date_to_abs_date(@hebrew_year + 1, 7, 1) do
       @hebrew_year += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hebrew_date
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Daniel Orner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard