X-Git-Url: https://nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/9abd734720ddad01338b0556ed6210bac5c5b145..6257d0524bfb1247f04538b9fde2a7ddb7b15d2a:/lib/nos_oignons/member.rb

diff --git a/lib/nos_oignons/member.rb b/lib/nos_oignons/member.rb
index 7e6254e..32d32f7 100644
--- a/lib/nos_oignons/member.rb
+++ b/lib/nos_oignons/member.rb
@@ -1,6 +1,8 @@
 require 'safe_yaml'
 SafeYAML::OPTIONS[:default_mode] = :safe
 
+require 'nos_oignons/reminder_db'
+
 module NosOignons
   MEMBER_FIELDS = [:name, :address, :email, :joined_on, :membership_fee_paid_on]
   MEMBER_MANDATORY_FIELDS = [:name, :email]
@@ -19,7 +21,7 @@ module NosOignons
           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)
+            @db_path = File.join(File.expand_path('../wiki-ca', git_path), MEMBERS_DB_DIR)
           end
         end
         @db_path
@@ -33,7 +35,12 @@ module NosOignons
       end
 
       def filename_for_id(member_id)
-        "#{NosOignons::Member.db_path}/%06d.mdwn" % member_id
+        case member_id
+        when String
+          "#{NosOignons::Member.db_path}/#{member_id}.mdwn"
+        when Integer
+          "#{NosOignons::Member.db_path}/%06d.mdwn" % member_id
+        end
       end
 
       def read_from_git(ref, file)
@@ -57,7 +64,8 @@ module NosOignons
       unless page_content.start_with?("---\n")
         raise ArgumentError.new('content is not a proper YAML document')
       end
-      data = YAML.load(page_content)
+      yaml_content = /\A---\n(.*)\n---\n/m.match(page_content)[1]
+      data = YAML.load(yaml_content)
       MEMBER_FIELDS.each do |field|
         self[field] = data[field.to_s]
       end
@@ -78,9 +86,18 @@ module NosOignons
     def up_to_date?
       return false if !joined_on || !membership_fee_paid_on
 
-      now = Time.now.to_date
+      today = 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
+      today <= expire_on
+    end
+
+    def remind(reminder)
+      reminder.send(self)
+      ReminderDb.instance.record(self)
+    end
+
+    def reminded_on
+      ReminderDb.instance.last_reminder(self)
     end
   end
 end