Add join date, fix renewal logic and add ability to specify path to wiki-ca

[gestion-adh.git] / lib / nos_oignons / member.rb

diff --git a/lib/nos_oignons/member.rb b/lib/nos_oignons/member.rb
index 9787a63c4e597c20402c906ce4070d81b4b734d6..7e6254e81eeb8a6d4a82cee0dcd3c44ffc570e7a 100644 (file)
--- a/lib/nos_oignons/member.rb
+++ b/lib/nos_oignons/member.rb
@@ -2,21 +2,38 @@ require 'safe_yaml'
 SafeYAML::OPTIONS[:default_mode] = :safe
 
 module NosOignons
-  MEMBERS_ROOT = 'Membres'
-  MEMBER_FIELDS = [:name, :address, :email, :membership_fee_paid_on]
+  MEMBER_FIELDS = [:name, :address, :email, :joined_on, :membership_fee_paid_on]
   MEMBER_MANDATORY_FIELDS = [:name, :email]
+  # Directory in the board wiki which holds the member pages
+  MEMBERS_DB_DIR = 'Membres'
 
   class Member < Struct.new(*MEMBER_FIELDS)
     class << self
+      def db_path
+        if ENV['NOS_OIGNONS_BOARD_WIKI_PATH']
+          @db_path = File.join(ENV['NOS_OIGNONS_BOARD_WIKI_PATH'], MEMBERS_DB_DIR)
+        else
+          return @db_path if @db_path
+
+          git_path = `git rev-parse --show-toplevel`.strip
+          if File.exists?(File.join(git_path, MEMBERS_DB_DIR))
+            @db_path = File.join(git_path, MEMBERS_DB_DIR)
+          else
+            @db_path = File.join(File.expand_path('../wiki-ca', path), MEMBERS_DB_DIR)
+          end
+        end
+        @db_path
+      end
+
       def all
-        Dir.glob("#{MEMBERS_ROOT}/*.mdwn").sort.collect do |file|
+        Dir.glob("#{db_path}/*.mdwn").sort.collect do |file|
           member_id = File.basename(file).gsub(/\.mdwn$/, '')
           Member.new(member_id)
         end
       end
 
       def filename_for_id(member_id)
-        "Membres/%06d.mdwn" % member_id
+        "#{NosOignons::Member.db_path}/%06d.mdwn" % member_id
       end
 
       def read_from_git(ref, file)
@@ -51,15 +68,19 @@ module NosOignons
       MEMBER_MANDATORY_FIELDS.each do |sym|
         raise ArgumentError.new('missing mandatory fields') unless self[sym]
       end
-      if membership_fee_paid_on && !membership_fee_paid_on.is_a?(Date)
-        raise ArgumentError.new('membership_fee_paid_on is not a date')
+      [:joined_on, :membership_fee_paid_on].each do |sym|
+        if self[sym] && !self[sym].is_a?(Date)
+          raise ArgumentError.new("#{sym.to_s} is not a date")
+        end
       end
     end
 
     def up_to_date?
-      now = Time.now
-      last_year = Time.new(now.year - 1, now.month, now.day).to_date
-      membership_fee_paid_on && last_year < membership_fee_paid_on
+      return false if !joined_on || !membership_fee_paid_on
+
+      now = Time.now.to_date
+      expire_on = Time.new(membership_fee_paid_on.year + 1, joined_on.month, joined_on.day).to_date
+      now <= expire_on
     end
   end
 end