feast_fast 0.1.0 → 0.2.0

data/README.md

@@ -38,10 +38,14 @@ if days_till_easter > 50
   if today.feasts.any?
     puts "Don't be sad, today you can celebrate #{today.feasts.first}"
   else
-    remaining_feasts = Date.with_feasts(today.year, FeastFast::Feast::STATUS::TWELVE).select{ |feast_day| feast_day > today }
+    remaining_feasts = Date.with_feasts(
+                                  today.year,
+                                  FeastFast::Feast::STATUS::TWELVE,
+                                  FeastFast::Feast::STATUS::GREAT
+                                  ).drop_while{ |feast_day| feast_day <= today }
     if remaining_feasts.size > 1
       puts "Don't be sad, there are still #{remaining_feasts.size} Great Feasts in this year:"
-      remaining_feasts.sort.each { |date| puts "At #{date.strftime('%d %b')}: #{date.feasts.first}" }
+      remaining_feasts.each { |date| puts "At #{date.strftime('%d %b')}: #{date.feasts.first}" }
     end
   end
   puts "And don't forget to fast today!" if today.fast?

data/lib/feast_fast/calculator.rb

@@ -5,7 +5,7 @@ module FeastFast
     def self.build_data(year)
 
       year = year.to_i
-      easter = Date.easter
+      easter = Date.easter(year)
 
       hash = Hash.new do |h, day|
         h[day] = {

data/lib/feast_fast/date.rb

@@ -16,8 +16,8 @@ class Date
     self.new(year, m, d) + 13
   end
 
-  def self.with_feasts(year, status)
-    FeastFast::DB.feasts(year, status).map{|a| a[0]}
+  def self.with_feasts(year, *statuses)
+    FeastFast::DB.feasts(year, *statuses).keys.sort
   end
 
   def feasts
@@ -37,6 +37,15 @@ class Date
 
   def feasts?() self.feasts.any? end
 
+  def next_with_feast(*statuses)
+    self.class.with_feasts(self.year, *statuses).find{|d| d > self } || self.class.with_feasts(self.year + 1, *statuses).first
+  end
+
+  def prev_with_feast(*statuses)
+    self.class.with_feasts(self.year, *statuses).reverse.find{|d| d < self } || self.class.with_feasts(self.year - 1, *statuses).last
+  end
+
+
   def next_date(n=1) self + n end
   def prev_date(n=1) self - n end
 

data/lib/feast_fast/db.rb

@@ -1,7 +1,6 @@
 module FeastFast
   module DB
     def self.data(year)
-      year = year.to_i
       return @data[year] if @data && @data.has_key?( year )
 
       @data ||= {}
@@ -20,12 +19,15 @@ module FeastFast
       self.data(date.year)[:days][date]
     end
 
-    def self.feasts(year, status)
-      year = year.to_i
-      self.data(year)[:days].select do |date, hash|
-        hash[:feasts].map{|feast| feast.status == status}.any?
+    def self.feasts(year, *params)
+      days = self.data(year)[:days].select do |date, hash|
+        if params.any?
+          hash[:feasts].map{|feast| params.include? feast.status}.any?
+        else
+          hash[:feasts].any?
+        end
       end
+      Hash[days]
     end
-
   end
 end

data/lib/feast_fast/version.rb

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

metadata

@@ -1,33 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: feast_fast
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - ilzoff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-08 00:00:00 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies: []
-
-description: Feasts and Fasts of Eastern Orthodox Church hardcoded and calculated based on easter.
-email: 
+description: Feasts and Fasts of Eastern Orthodox Church hardcoded and calculated
+  based on easter.
+email:
 - il.zoff@gmail.com
-executables: 
+executables:
 - feast_fast
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -43,37 +35,28 @@ files:
 - lib/feast_fast/feast.rb
 - lib/feast_fast/version.rb
 homepage: https://github.com/ilzoff/feast_fast
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Feasts and Fasts of Eastern Orthodox Church hardcoded and calculated
 test_files: []
-