coligny 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ac5981b5527fd98ba326d0b53e0dae72310da8
-  data.tar.gz: 6a1fcf9eb2becbe38cf7f81dffcfbaf05eb9d467
+  metadata.gz: a4f92c2525cbed0013f9d1e231750a273b95c72a
+  data.tar.gz: 83b315694b856f5f6a42d6f45b8129e219e1ce55
 SHA512:
-  metadata.gz: 05115bf556215f51a3cbf056dccea82331fe59b454a65b042a585a019c53452c69aa7ccdcd15548ad35bb6b7ccd2d1aa101d20450e082c1d454966cff19473a7
-  data.tar.gz: 478d163555fc3c27f00a273888ad48a1f34e41b354c57babcc49b28531243520a177377bdf0ad194cb64cb7af8309675a448c55d08caa8f66942b87c19112ddd
+  metadata.gz: 9575a9406579430ed4602abff45596eb2d7ac526c5d67009b11c4cbf22c217567a6404960eb7edfce60618ecabe2da022ee20dc0ec81feb4412db4e95d93f0aa
+  data.tar.gz: 6db4c853da184705765d8bb078c6c15532e3d2fc83661c7503b2a80a11ee98a6f351eb9c1215607205d075638c279ada97723909fd2cd9b9469d788c7f898717

data/README.md

@@ -9,9 +9,8 @@ This gem is intended to provide a resource for the use of the Coligny Calendar,
 
 ##To-DO
 
-- Finish long-cycle checks for dates earlier than cycle start dates.
 - Refactor populate methods for 30-year cycle
-- Add Inscriptions for dates
+- Add Inscriptions for dates(?)
 - Comments
 
 ## Installation

data/lib/coligny/version.rb

@@ -1,3 +1,3 @@
 module Coligny
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/coligny.rb

@@ -64,52 +64,52 @@ module Coligny
     
     def year_difference
       if @is_metonic
-       if @is_early
-         return 3035 - @year
-       else
-         return @year - 3035
-       end
-     else
-       if @is_early
-         return 3034 - @year
-       else
-         return @year - 3034
-       end
-     end
-    end
-    
-    def populate_saturn_earlier_equos
-      if (year_difference % 5 == 1) || (year_difference % 5 == 0)
+        if @is_early
+          return 3035 - @year     
+        else
+          return @year - 3035
+        end
+      else
+        if @is_early
+          return 3034 - @year
+        else
+          return @year - 3034
+        end
+      end
+    end
+    
+    def populate_saturn_equos
+      if @is_early
+        if (year_difference % 5 == 1) || (year_difference % 5 == 0) 
+          @months.insert(8, ColignyMonth.new("Equos", 30))
+        end
+      elsif (year_difference % 5 == 0) || (year_difference % 5 == 4)
         @months.insert(8, ColignyMonth.new("Equos", 30))
       else
         @months.insert(8, ColignyMonth.new("Equos", 29))
       end
     end
     
-    def populate_saturn_earlier_int
-      if (year_difference % 5 == 0) && (year_difference % 30 != 5)
+    def populate_saturn_int1
+      if year_difference % 5 == 0
         @months.unshift(ColignyMonth.new("Intercalary One", 29))
-      elsif (year_difference % 5 == 3)
-        @months.insert(6, ColignyMonth.new("Intercalary Two", 30))
       end
     end
     
-    def populate_saturn_later_equos
-      if (year_difference % 5 == 0) || (year_difference % 5 == 4)
-        @months.insert(8, ColignyMonth.new("Equos", 30))
+    def populate_saturn_int2_check(cycle_repeat, cycle_limit, exception_cycle, exception_limit)
+      if (year_difference % cycle_repeat == cycle_limit) && (year_difference % exception_cycle != exception_limit)
+        return true
       else
-        @months.insert(8, ColignyMonth.new("Equos", 29))
+        return false
       end
     end
     
-    def populate_saturn_later_int
-      if (year_difference % 5 == 0) 
-        @months.unshift(ColignyMonth.new("Intercalary One", 29))
-      elsif (year_difference % 5 == 2) && (year_difference % 30 != 27)
+    def populate_saturn_int2 
+      if (@is_early && populate_saturn_int2_check(5, 3, 30, 3)) || (!@is_early && populate_saturn_int2_check(5, 2, 30, 27))
         @months.insert(6, ColignyMonth.new("Intercalary Two", 30))
       end
     end
-    
+        
     def identify_year_locator(difference, years_between_instances)
       if @is_early
         if ((year_difference) % difference >= years_between_instances) || ((year_difference) % difference == 0)
@@ -135,7 +135,7 @@ module Coligny
     end
     
     def saturn_longcycle_equos_check
-      if saturn_cycle_check(198, 4, 5, 4)
+      if (@is_early && saturn_cycle_check(198, 194, 5, 1)) || (!@is_early && saturn_cycle_check(198, 4, 5, 4))
         equos = @months.find { |s| s.name == "Equos" }
         equos.days = 29
       end
@@ -147,29 +147,21 @@ module Coligny
       end
     end
     
-    def saturn_reverse_longcycle_equos_check
-      if saturn_cycle_check(198, 194, 5, 1)
-        equos = @months.find { |s| s.name == "Equos" }
-        equos.days = 29
-      end
-    end
-    
     def saturn_reverse_longcycle_int2_check
       if saturn_cycle_check(635, 606, 30, 3)
         @months.insert(6, ColignyMonth.new("Intercalary Two", 30))
       end 
     end
      
-    def populate_saturn_months      
+    def populate_saturn_months 
+      populate_saturn_equos
+      populate_saturn_int1
+      populate_saturn_int2
+      saturn_longcycle_equos_check
+           
       if @is_early
-        populate_saturn_earlier_equos
-        populate_saturn_earlier_int
-        saturn_reverse_longcycle_equos_check
         saturn_reverse_longcycle_int2_check
       else        
-        populate_saturn_later_equos
-        populate_saturn_later_int
-        saturn_longcycle_equos_check
         saturn_longcycle_int2_check
       end
     end
@@ -239,19 +231,27 @@ module Coligny
       end
     end
     
+    def metonic_longcycle_early_year_check(frequency_of_adjustment, case_limiter)
+      if ((year_difference % frequency_of_adjustment >= case_limiter) || (year_difference % frequency_of_adjustment == 0)) && (year_difference >= frequency_of_adjustment)
+        return true
+      else
+        return false
+      end
+    end
+
+    def metonic_longcycle_late_year_check(frequency_of_adjustment, case_limiter)
+      if (year_difference % frequency_of_adjustment <= case_limiter) && (year_difference >= frequency_of_adjustment)
+        return true
+      else
+        return false
+      end
+    end
+    
     def metonic_longcycle_year_check(frequency_of_adjustment, case_limiter)
       if @is_early
-        if ((year_difference % frequency_of_adjustment >= case_limiter) || (year_difference % frequency_of_adjustment == 0)) && (year_difference >= frequency_of_adjustment)
-          return true
-        else
-          return false
-        end
+        return metonic_longcycle_early_year_check(frequency_of_adjustment, case_limiter)
       else
-        if (year_difference % frequency_of_adjustment <= case_limiter) && (year_difference >= frequency_of_adjustment)
-          return true
-        else
-          return false
-        end
+        return metonic_longcycle_late_year_check(frequency_of_adjustment, case_limiter)
       end
     end
     
@@ -262,7 +262,7 @@ module Coligny
     end
     
     def metonic_longcycle_equos_check
-      if metonic_longcycle_year_check(61, 4) && test_earlier_than_start_date_inttwo_metonic
+      if (metonic_longcycle_year_check(61, 4) && test_earlier_than_start_date_inttwo_metonic) || (metonic_longcycle_year_check(61, 57) && test_inttwo_metonic)
         @months.find { |s| s.name == "Equos" }.days = 29
       end
     end
@@ -273,23 +273,16 @@ module Coligny
       end
     end
     
-    def metonic_longcycle_reverse_equos_check
-      if metonic_longcycle_year_check(61, 57) && test_inttwo_metonic
-        @months.find { |s| s.name == "Equos" }.days = 29
-      end
-    end
-    
     def populate_metonic_months
       populate_metonic_equos
       populate_metonic_int1
       populate_metonic_int2
+      metonic_longcycle_equos_check
       
       if @is_early
         metonic_longcycle_reverse_int2_check
-        metonic_longcycle_reverse_equos_check
       else
-        metonic_longcycle_int2_check 
-        metonic_longcycle_equos_check       
+        metonic_longcycle_int2_check        
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coligny
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shane Krusen