when_easter 0.2.4 → 0.3.0

data/Gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.6.0"
+  gem "cucumber", ">= 0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.6.3"
+  gem "rcov", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,40 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    cucumber (1.0.1)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.4.5)
+      json (>= 1.4.6)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.5.3)
+    rake (0.9.2)
+    rcov (0.9.9)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  cucumber
+  jeweler (~> 1.6.3)
+  rcov
+  rspec (~> 2.6.0)

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Michał Nierebiński
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -2,18 +2,21 @@
 
 Ever wondered when will Easter (or Passover, if you prefer) be next year? No worries, use when_easter!
 
+It's still being developed and refactored, so beware ;) Binaries work well though.
 ### Install
 	$ gem install when_easter
 	
 ### Use
 	
 	$ when_easter
-	In the year 2010, the Roman Easter is on 24 April.
-	In the year 2010, the Greek Easter is on 24 April.
+	In the year 2011, the Roman Easter is on 24 April.
+	In the year 2011, the Greek Easter is on 24 April.
+	In the year 2010 the distance between Roman and Greek Easter is 0 week(s).
 	
 	$ when_easter 2010
 	In the year 2010, the Roman Easter is on 04 April.
 	In the year 2010, the Greek Easter is on 04 April.
+	In the year 2010 the distance between Roman and Greek Easter is 0 week(s).
 	
 If you want to find only one date, you can also try
 
@@ -21,7 +24,22 @@ If you want to find only one date, you can also try
 or
 
 	$ when_greek_easter
+
+and also
+
+	$ find_distance
+	
+If you wish, you can also use WhenEaster::EasterCalendar class and its methods to fetch the dates only
+
 	
+	roman_date = WhenEaster::EasterCalendar.find_roman_easter_date(2010)
+	greek date is similiar - you can get it by replacing roman with greek
+	
+And get
+
+	=> Sun Apr 21 00:00:00 +0200 2019
+A Date object
+
 ### License
 
 Released under the MIT license.

data/Rakefile

@@ -1,20 +1,54 @@
+# encoding: utf-8
+
 require 'rubygems'
-require 'rake'
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name= "when_easter"
-    gemspec.summary = "Get the date of Roman and Greek Easter"
-    gemspec.description = "A tool that calculates the dates of Roman and Greek Easter."
-    gemspec.email = "michal@nierebinski.pl"
-    gemspec.homepage = "https://github.com/Loyolny/when_easter"
-    gemspec.executables = ["when_easter","when_roman_easter","when_greek_easter"]
-    gemspec.authors = ["Michał Nierebiński"]
-    gemspec.date = File.utime(0,0,'VERSION')
-    
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Ya don't have Jeweler gem installed. Install it with: sudo gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "when_easter"
+  gem.homepage = "http://github.com/Loyolny/when_easter"
+  gem.license = "MIT"
+  gem.summary = %Q{Get the date of Roman and Greek Easter}
+  gem.description = %Q{A tool that calculates the dates of Roman and Greek Easter.}
+  gem.email = "michal@nierebinski.pl"
+  gem.authors = ["Michał Nierebiński"]
+  gem.date = File.utime(0,0,'VERSION')
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "when_easter #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 #Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/bin/find_distance

@@ -0,0 +1,5 @@
+#! /usr/bin/env ruby
+require "rubygems"
+require "when_easter"
+calendar = WhenEaster::EasterCalendar.new(ARGV[0])
+puts calendar.find_distance

data/bin/when_easter

@@ -1,5 +1,5 @@
 #! /usr/bin/env ruby
 require "rubygems"
 require "when_easter"
-
-puts WhenEaster.find(ARGV[0])
+calendar = WhenEaster::EasterCalendar.new(ARGV[0])
+puts calendar.find

data/bin/when_greek_easter

@@ -1,5 +1,5 @@
 #! /usr/bin/env ruby
 require "rubygems"
 require "when_easter"
-
-puts WhenEaster.find_greek(ARGV[0])
+calendar = WhenEaster::EasterCalendar.new(ARGV[0])
+puts calendar.find_greek

data/bin/when_roman_easter

@@ -1,5 +1,5 @@
 #! /usr/bin/env ruby
 require "rubygems"
 require "when_easter"
-
-puts WhenEaster.find_roman(ARGV[0])
+calendar = WhenEaster::EasterCalendar.new(ARGV[0])
+puts calendar.find_roman

data/features/step_definitions/when_easter_steps.rb

@@ -0,0 +1,68 @@
+Given /^an easter_calendar with no date specified$/ do
+  @easter_calendar = WhenEaster::EasterCalendar.new
+end
+
+Given /^year (\d+)$/ do |year|
+  @given_year = year
+end
+
+Given /^an easter_calendar$/ do
+  @easter_calendar = WhenEaster::EasterCalendar.new(@given_year)
+end
+When /^I ask for the year$/ do
+  @year = @easter_calendar.year
+end
+When /^I find roman easter$/ do
+  @roman_date = @easter_calendar.class.find_roman_easter_date(@easter_calendar.year)
+end
+When /^I find greek easter$/ do
+  @greek_date = @easter_calendar.class.find_greek_easter_date(@easter_calendar.year)
+end
+Then /^I should see year (\d+) in an easter_calendar$/ do |year|
+  @year.should == year.to_i
+end
+
+Then /^I should see "([^"]*)" in the output$/ do |date|
+  @date.to_s.should == date
+end
+
+When /^I ask for roman easter date$/ do
+  @roman_date = @easter_calendar.find_roman
+end
+
+When /^I ask for greek easter date$/ do
+  @greek_date = @easter_calendar.find_greek
+end
+
+Then /^I should see "([^"]*)"$/ do |easter_date|
+  @date.should == easter_date
+end
+Then /^I should see roman easter date "([^"]*)" in the output$/ do |date|
+  @roman_date.to_s.should == date
+end
+
+Then /^I should see greek easter date "([^"]*)" in the output$/ do |date|
+  @greek_date.to_s.should == date
+end
+
+When /^I ask for distance between easters$/ do
+  @distance = @easter_calendar.find_distance
+end
+
+Then /^I should see a distance in weeks as "([^"]*)"$/ do |distance|
+  @distance.should == distance
+end
+Then /^I should see correct Roman date: "([^"]*)"$/ do |date|
+  @roman_date.to_s.should == date
+end
+
+Then /^I should see correct Greek date: "([^"]*)"$/ do |date|
+  @greek_date.to_s.should == date
+end
+
+When /^I ask for complete easter information$/ do
+  @roman_date = @easter_calendar.find_roman
+  @greek_date = @easter_calendar.find_greek
+  @distance = @easter_calendar.find_distance
+end
+

data/features/support/env.rb

@@ -0,0 +1,13 @@
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'when_easter'
+
+require 'rspec/expectations'

data/features/when_easter.feature

@@ -0,0 +1,54 @@
+Feature: EasterCalendar returns date
+
+	In order to find liturgical date
+	As a common churchgoer
+	I want an easter_calendar to find easter date
+	
+Scenario: easter_calendar sets default year
+	Given an easter_calendar with no date specified
+	When I ask for the year
+	Then I should see year 2011 in an easter_calendar
+
+Scenario: easter_calendar sets given year
+	Given year 2016
+	And an easter_calendar
+	When I ask for the year
+	Then I should see year 2016 in an easter_calendar
+	
+Scenario: easter_calendar finds roman easter date
+	Given year 2016
+	And an easter_calendar
+	When I find roman easter
+	Then I should see roman easter date "Sun Mar 27 00:00:00 +0100 2016" in the output
+
+Scenario: easter_calendar finds greek easter date
+	Given year 2017
+	And an easter_calendar
+	When I find greek easter
+	Then I should see greek easter date "Sun Apr 16 00:00:00 +0200 2017" in the output
+	
+Scenario: easter_calendar prints out the roman easter date
+	Given year 2016
+	And an easter_calendar
+	When I ask for roman easter date
+	Then I should see correct Roman date: "In the year 2016 the Roman Easter is on 27 March."
+	
+Scenario: easter_calendar prints out the greek easter date
+	Given year 2017
+	And an easter_calendar
+	When I ask for greek easter date
+	Then I should see correct Greek date: "In the year 2017 the Greek Easter is on 16 April."
+
+Scenario: easter_calendar prints out the distance between greek and roman easter
+	Given year 2020
+	And an easter_calendar
+	When I ask for distance between easters
+	Then I should see a distance in weeks as "In the year 2020 the distance between Roman and Greek Easter is 1 week(s)."
+
+Scenario: easter_calendar prints out full information about easter dates
+	Given year 2019
+	And an easter_calendar
+	When I ask for complete easter information
+	Then I should see correct Roman date: "In the year 2019 the Roman Easter is on 21 April."
+	And I should see correct Greek date: "In the year 2019 the Greek Easter is on 28 April."
+	And I should see a distance in weeks as "In the year 2019 the distance between Roman and Greek Easter is 1 week(s)."

data/lib/when_easter.rb

@@ -1,72 +1,70 @@
-class WhenEaster
-  # WhenEaster.find
-  #=> In the year 2011, the Roman Easter is on 24 April. \n In the year 2011, the Greek Easter is on 24 April.
-  def self.find(year = nil)
-    roman_date = self.roman_easter(year)
-    greek_date = self.greek_easter(year)
-    return "In the year #{roman_date.year}, the Roman Easter is on #{roman_date.strftime("%d %B")}. \nIn the year #{greek_date.year}, the Greek Easter is on #{greek_date.strftime("%d %B")}."
-  end
-  
-  # WhenEaster.find_roman
-  #=> In the year 2011, the Roman Easter is on 24 April.
-  def self.find_roman(year = nil)
-    date = self.roman_easter(year)
-    return "In the year #{date.year}, the Roman Easter is on #{date.strftime("%d %B")}."
-  end
-  
-  ## WhenEaster.find_greek
-  ##=> In the year 2011, the Greek Easter is on 24 April.
-  def self.find_greek(year)
-    date = self.greek_easter(year)
-    return "In the year #{date.year}, the Greek Easter is on #{date.strftime("%d %B")}."
-  end
-  # WhenEaster.roman_easter
-  # => Sun Apr 24 00:00:00 +0200 2011
-  def self.roman_easter(year = nil)
-    year = Time.now.year if year.nil?
-    year = year.to_i if year.is_a?(String)
-    g = year % 19 +1
-    s = (year -1600) / 100 - (year-1600) / 400
-    l = (((year - 1400) / 100) * 8) / 25
-    
-    p_2 = (3-11*g +s -l) % 30
-    if p_2 == 29 || (p_2 == 28 && g > 11) 
-      p = p_2 -1
-    else
-      p= p_2
+module WhenEaster
+  class EasterCalendar
+
+    attr_reader :year
+    def initialize(year = nil)
+      @year = Time.now.year if year.nil?
+      @year = year if year.is_a?(Integer)
+      @year = year.to_i if year.is_a?(String)
+    end
+    def distance_in_weeks
+      ((self.class.find_greek_easter_date(year) - self.class.find_roman_easter_date(year))/3600/24/7).to_i
+    end
+    def find
+      find_roman+"\n"+find_greek+"\n"+find_distance
     end
     
-    d= (year + year / 4 - year / 100 + year / 400) % 7
-    d_2 = (8-d) % 7
-    
-    p_3 = (80 + p) % 7
-    x_2 = d_2 - p_3
-    
-    x = (x_2 -1) % 7 +1
-    e = p+x
-    
-    if e < 11 
-      Time.local(year,3,e+21)
-    else
-      Time.local(year,4,e-10)
+    def find_roman
+      "In the year #{@year} the Roman Easter is on #{self.class.find_roman_easter_date(@year).strftime("%d %B")}."
     end
-  end
-  
-  # WhenEaster.greek_easter
-  # => Sun Apr 24 00:00:00 +0200 2011
-  def self.greek_easter(year = nil)
-    year = Time.now.year if year.nil?
-    year = year.to_i if year.is_a?(String)
-    a = year % 19
-    b = year % 4
-    c = year % 7
-    d = (19 * a + 16) % 30
-    e = (2 * b + 4 * c + 6 * d) % 7;
-    easter = 3 + d + e;
-    if easter <= 30
-      Time.local(year, 4, easter)
-    else
-      Time.local(year, 5, (easter - 30))
+    def find_greek
+      "In the year #{@year} the Greek Easter is on #{self.class.find_greek_easter_date(@year).strftime("%d %B")}."
+    end
+    def find_distance
+      "In the year #{@year} the distance between Roman and Greek Easter is #{distance_in_weeks} week(s)."
+    end
+    # => Sun Apr 24 00:00:00 +0200 2011
+    def self.find_roman_easter_date(year)
+      g = year % 19 +1
+      s = (year -1600) / 100 - (year-1600) / 400
+      l = (((year - 1400) / 100) * 8) / 25
+
+      p_2 = (3-11*g +s -l) % 30
+      if p_2 == 29 || (p_2 == 28 && g > 11) 
+        p = p_2 -1
+      else
+        p= p_2
+      end
+
+      d= (year + year / 4 - year / 100 + year / 400) % 7
+      d_2 = (8-d) % 7
+
+      p_3 = (80 + p) % 7
+      x_2 = d_2 - p_3
+
+      x = (x_2 -1) % 7 +1
+      e = p+x
+
+      if e < 11 
+        Time.local(year,3,e+21)
+      else
+        Time.local(year,4,e-10)
+      end
+    end
+
+# => Sun Apr 24 00:00:00 +0200 2011
+    def self.find_greek_easter_date(year)
+      a = year % 19
+      b = year % 4
+      c = year % 7
+      d = (19 * a + 16) % 30
+      e = (2 * b + 4 * c + 6 * d) % 7;
+      easter = 3 + d + e;
+      if easter <= 30
+        Time.local(year, 4, easter)
+      else
+        Time.local(year, 5, (easter - 30))
+      end
     end
   end
 end