coligny 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3295057f0fb4fced0262abd1d2f72676cdceb877
-  data.tar.gz: aba880f151f9c0526cb008ac13ea21498cf5d9de
+  metadata.gz: fc67a66c3f3e877286a04f186e084f23b623b119
+  data.tar.gz: 19382a3acbd89a2a94011b99a3fa915ad511235f
 SHA512:
-  metadata.gz: 2e34fd03ca6baccf5b06b7ebeec7809d8f20e621bb14b03d4bd8c8ee36d0a518e42be340bc4cced3ed31f03fac994d3e27a562a86412ce01292c6e040f48ccd1
-  data.tar.gz: 8b7392dca2b263b5f735d32ce6f23121a25ab2fd720dd10f4b4a727a262027c03e08eb49e84bd7e9347c5c121911fbe4656348bb6a4cfd9e47040bca2d824b34
+  metadata.gz: e376cb7ce3dbcdf27d0be87a60aa4e8bfb66d327760041b0974a2cc75fbca9f84624704eba4c4dab09d22c26d8ae81c7f9a1e146e394711ae47a56825aaa85d8
+  data.tar.gz: 6286e7124c78c07898f41a6ea309be3363866b3337774c90397414dfab2a45fa70f6681ed4c1d8bc147d7deddb43d636ef82ddf00886d5e648eda5c37fe4ab64

data/.travis.yml

@@ -5,3 +5,6 @@ rvm:
   - 2.2
   - 2.1
 before_install: gem install bundler
+addons:
+    code_climate:
+        repo_token: 10f028bb1baf916f23d507d00141194d9cdba69543fb01e556e906e8a5287988

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in coligny.gemspec
 gemspec
+
+gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -1,6 +1,6 @@
 # Coligny
 
-[![Build Status](https://travis-ci.org/shanekrusen/coligny.svg?branch=master)](https://travis-ci.org/shanekrusen/coligny) [![Code Climate](https://codeclimate.com/github/shanekrusen/coligny/badges/gpa.svg)](https://codeclimate.com/github/shanekrusen/coligny)
+[![Gem Version](https://badge.fury.io/rb/coligny.svg)](https://badge.fury.io/rb/coligny) [![Build Status](https://travis-ci.org/shanekrusen/coligny.svg?branch=master)](https://travis-ci.org/shanekrusen/coligny) [![Code Climate](https://codeclimate.com/github/shanekrusen/coligny/badges/gpa.svg)](https://codeclimate.com/github/shanekrusen/coligny) [![Test Coverage](https://codeclimate.com/github/shanekrusen/coligny/badges/coverage.svg)](https://codeclimate.com/github/shanekrusen/coligny/coverage) [![Dependency Status](https://gemnasium.com/badges/github.com/shanekrusen/coligny.svg)](https://gemnasium.com/github.com/shanekrusen/coligny)
 
 Welcome!
 Swáel!
@@ -9,7 +9,7 @@ This gem is intended to provide a resource for the use of the Coligny Calendar,
 
 ##To-DO
 
-- Finish long-term adjustments for slippage.
+- Refactor populate methods for 30-year cycle
 - Add Inscriptions for dates
 - Comments
 
@@ -129,5 +129,7 @@ The gem is available as open source under the terms of the [MIT License](http://
 ## Credit
 
 Developer - Shane Krusen
-The model of the Coligny Calendar used for this project is the product of the work of the brilliant and lovely Helen McKay.
+
+The model of the Coligny Calendar used for this project is the product of the work of the brilliant and lovely Helen McKay, the leading expert on the calendar.
+
 Support and feedback from the Modern Gaulish Community, Steve Hansen, Helen McKay, and my mentor, Klint Thrasher.

data/coligny.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'rake', '~> 11.2', '>= 11.2.2'
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/coligny/version.rb

@@ -1,3 +1,3 @@
 module Coligny
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/coligny.rb

@@ -1,20 +1,11 @@
+# Copyright 2016 @shanekrusen 
+# License MIT (https://opensource.org/licenses/MIT)
+
 require "./lib/coligny/version"
 
 module Coligny
   require 'date'
   
-  def to_bg(ce)
-     return ce + 1019
-  end
-  
-  module_function :to_bg
-  
-  def to_ce(bg)
-    return bg - 1019
-  end
-  
-  module_function :to_ce
-  
   class ColignyMonth
     attr_reader :name
     attr_accessor :days
@@ -27,11 +18,11 @@ module Coligny
   
   class ColignyYear
     attr_accessor :months, :days 
+    attr_reader :is_early
     
     def initialize(year, is_metonic=false)
       @is_metonic = is_metonic
-      @year = year
-      @working_year = Coligny.to_ce(@year)    
+      @year = year    
       @months = [ColignyMonth.new("Samonios", 30), 
                  ColignyMonth.new("Dumanios", 29), 
                  ColignyMonth.new("Rivros", 30), 
@@ -44,6 +35,8 @@ module Coligny
                  ColignyMonth.new("Aedrinni", 30),
                  ColignyMonth.new("Cantlos", 29)]
       
+      is_early?
+      
       if !is_metonic           
         populate_saturn_months  
       else
@@ -53,18 +46,24 @@ module Coligny
     
     private
     
-    def is_early
+    def is_early?
       if @is_metonic
-        return true if (@year < 3035)
-        return false
+        if (@year < 3035)
+          @is_early = true 
+        else
+          @is_early = false
+        end
       else
-        return true if (@year < 3034)
-        return false
+        if (@year < 3034)
+          @is_early = true 
+        else
+          @is_early = false
+        end
       end
     end
     
     def populate_saturn_earlier_equos
-      if ((2015 - @working_year) % 5 == 1) || ((2015 - @working_year) % 5 == 0)
+      if ((3034 - @year) % 5 == 1) || ((3034 - @year) % 5 == 0)
         @months.insert(8, ColignyMonth.new("Equos", 30))
       else
         @months.insert(8, ColignyMonth.new("Equos", 29))
@@ -72,15 +71,15 @@ module Coligny
     end
     
     def populate_saturn_earlier_int
-      if ((2015 - @working_year) % 5 == 0) && ((2015 - @working_year) % 30 != 5)
+      if ((3034 - @year) % 5 == 0) && ((3034 - @year) % 30 != 5)
         @months.unshift(ColignyMonth.new("Intercalary One", 29))
-      elsif ((2015 - @working_year) % 5 == 3)
+      elsif ((3034 - @year) % 5 == 3)
         @months.insert(6, ColignyMonth.new("Intercalary Two", 30))
       end
     end
     
     def populate_saturn_later_equos
-      if ((@working_year - 2015) % 5 == 0) || ((@working_year - 2015) % 5 == 4)
+      if ((@year - 3034) % 5 == 0) || ((@year - 3034) % 5 == 4)
         @months.insert(8, ColignyMonth.new("Equos", 30))
       else
         @months.insert(8, ColignyMonth.new("Equos", 29))
@@ -88,26 +87,49 @@ module Coligny
     end
     
     def populate_saturn_later_int
-      if ((@working_year - 2015) % 5 == 0) 
+      if ((@year - 3034) % 5 == 0) 
         @months.unshift(ColignyMonth.new("Intercalary One", 29))
-      elsif ((@working_year - 2015) % 5 == 2) && ((@working_year - 2015) % 30 != 27)
+      elsif ((@year - 3034) % 5 == 2) && ((@year - 3034) % 30 != 27)
+        @months.insert(6, ColignyMonth.new("Intercalary Two", 30))
+      end
+    end
+    
+    def saturn_cycle_check(difference, years_between_instances, cycle, cycle_remainder)
+      if ((@year - 3034) % difference <= years_between_instances) && ((@year - 3034) >= difference) && ((@year - 3034) & cycle == cycle_remainder)
+        return true
+      else
+        return false
+      end
+    end
+    
+    def saturn_longcycle_equos_check
+      if saturn_cycle_check(198, 4, 5, 4)
+        equos = @months.find { |s| s.name == "Equos" }
+        equos.days = 29
+      end
+    end
+    
+    def saturn_longcycle_int2_check
+      if saturn_cycle_check(635, 29, 30, 27)
         @months.insert(6, ColignyMonth.new("Intercalary Two", 30))
       end
     end
       
     def populate_saturn_months      
-      if (@year < 3034)
+      if @is_early
         populate_saturn_earlier_equos
         populate_saturn_earlier_int
       else        
         populate_saturn_later_equos
         populate_saturn_later_int
+        saturn_longcycle_equos_check
+        saturn_longcycle_int2_check
       end
     end
     
     def test_against_cases(cases)
       cases.each do |test|
-        if ((@working_year - 2016) % 19) == test
+        if ((@year - 3035) % 19) == test
           return true
         end
       end
@@ -117,24 +139,24 @@ module Coligny
     def test_equos_days_metonic
       cases = [3,4,8,9,13,14,18]
       
-      test_against_cases(cases)
+      return test_against_cases(cases)
     end
     
     def test_intone_metonic
       cases = [4,9,14]
       
-      test_against_cases(cases)
+      return test_against_cases(cases)
     end
     
     def test_inttwo_metonic
       cases = [1,6,11,16]
       
-      test_against_cases(cases)
+      return test_against_cases(cases)
     end
     
     def earlier_than_start_date_test_cases(cases)
       cases.each do |test|
-        if ((2016 - @working_year) % 19) == test
+        if ((3035 - @year) % 19) == test
           return true
         end
       end
@@ -144,23 +166,23 @@ module Coligny
     def test_earlier_than_start_equos_days_metonic
       cases = [1,5,6,10,11,15,16]
       
-      earlier_than_start_date_test_cases(cases)
+      return earlier_than_start_date_test_cases(cases)
     end
     
     def test_earlier_than_start_date_intone_metonic
       cases = [5,10,15]
       
-      earlier_than_start_date_test_cases(cases)
+      return earlier_than_start_date_test_cases(cases)
     end
     
     def test_earlier_than_start_date_inttwo_metonic
       cases = [3,8,13,18]
       
-      earlier_than_start_date_test_cases(cases)
+      return earlier_than_start_date_test_cases(cases)
     end
     
     def populate_metonic_equos
-      if ((@year < 3035) && (test_earlier_than_start_equos_days_metonic)) || ((@year >= 3035) && (test_equos_days_metonic))
+      if (@is_early && (test_earlier_than_start_equos_days_metonic)) || (!@is_early && (test_equos_days_metonic))
         @months.insert(8, ColignyMonth.new("Equos", 30))
       else
         @months.insert(8, ColignyMonth.new("Equos", 29))
@@ -168,25 +190,25 @@ module Coligny
     end
     
     def populate_metonic_int1
-      if (is_early && test_earlier_than_start_date_intone_metonic) || (!is_early && test_intone_metonic)
+      if (@is_early && test_earlier_than_start_date_intone_metonic) || (!@is_early && test_intone_metonic)
         @months.unshift(ColignyMonth.new("Intercalary One", 29))
       end      
     end
     
     def populate_metonic_int2
-      if (is_early && test_earlier_than_start_date_inttwo_metonic) || (!is_early && test_inttwo_metonic)
+      if (@is_early && test_earlier_than_start_date_inttwo_metonic) || (!@is_early && test_inttwo_metonic)
         @months.insert(6, ColignyMonth.new("Intercalary Two", 30))
       end
     end
     
     def metonic_longcycle_int2_check
-      if ((@working_year - 2016) % 6569 <= 4) && ((@working_year - 2016) >= 6569) && (@months[6].name = "Intercalary Two")
+      if ((@year - 3035) % 6569 <= 4) && ((@year - 3035) >= 6569) && (@months[6].name = "Intercalary Two")
         @months.delete_at(6)
       end
     end
     
     def metonic_longcycle_equos_check
-      if ((@working_year - 2016) % 61 <= 4) && ((@working_year - 2016) >= 61) && ((@working_year - 2016) % 5 == 4)
+      if ((@year - 3035) % 61 <= 4) && ((@year - 3035) >= 61) && test_equos_days_metonic
         @months.find { |s| s.name == "Equos" }.days = 29
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coligny
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shane Krusen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-06 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement