when_easter 0.3.0 → 0.3.1

data/README.md

@@ -8,7 +8,7 @@ It's still being developed and refactored, so beware ;) Binaries work well thoug
 	
 ### Use
 	
-	$ when_easter
+	$ when_easter #the default year is current year
 	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).
@@ -33,7 +33,11 @@ If you wish, you can also use WhenEaster::EasterCalendar class and its methods t
 
 	
 	roman_date = WhenEaster::EasterCalendar.find_roman_easter_date(2010)
-	greek date is similiar - you can get it by replacing roman with greek
+or, if you wan't to play more with EasterCalendar instance, 
+	
+	my_calendar = WhenEaster::EasterCalendar.new(2010) #if you want to get data for the year 2010
+	another_roman_date = 	my_calendar.roman_easter
+greek date is similiar - you can get it by replacing roman with greek
 	
 And get
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/features/step_definitions/when_easter_steps.rb

@@ -13,10 +13,10 @@ 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)
+  @roman_date = @easter_calendar.roman_easter
 end
 When /^I find greek easter$/ do
-  @greek_date = @easter_calendar.class.find_greek_easter_date(@easter_calendar.year)
+  @greek_date = @easter_calendar.greek_easter
 end
 Then /^I should see year (\d+) in an easter_calendar$/ do |year|
   @year.should == year.to_i

data/lib/when_easter.rb

@@ -1,24 +1,24 @@
 module WhenEaster
   class EasterCalendar
 
-    attr_reader :year
+    attr_reader :year, :roman_easter, :greek_easter, :distance_in_weeks
     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
+      @roman_easter = self.class.find_roman_easter_date(@year)
+      @greek_easter = self.class.find_greek_easter_date(@year)
+      @distance_in_weeks = ((@greek_easter-@roman_easter)/3600/24/7).to_i
     end
     def find
       find_roman+"\n"+find_greek+"\n"+find_distance
     end
     
     def find_roman
-      "In the year #{@year} the Roman Easter is on #{self.class.find_roman_easter_date(@year).strftime("%d %B")}."
+      "In the year #{@year} the Roman Easter is on #{@roman_easter.strftime("%d %B")}."
     end
     def find_greek
-      "In the year #{@year} the Greek Easter is on #{self.class.find_greek_easter_date(@year).strftime("%d %B")}."
+      "In the year #{@year} the Greek Easter is on #{@greek_easter.strftime("%d %B")}."
     end
     def find_distance
       "In the year #{@year} the distance between Roman and Greek Easter is #{distance_in_weeks} week(s)."

data/when_easter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{when_easter}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Michał Nierebiński}]
-  s.date = %q{2011-07-14}
+  s.date = %q{2011-07-15}
   s.description = %q{A tool that calculates the dates of Roman and Greek Easter.}
   s.email = %q{michal@nierebinski.pl}
   s.executables = [%q{find_distance}, %q{when_roman_easter}, %q{when_greek_easter}, %q{when_easter}]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: when_easter
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Micha\xC5\x82 Nierebi\xC5\x84ski"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 Z
+date: 2011-07-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement