Nouvelle tentative de correction des rappels d'adhésion

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

diff --git a/lib/nos_oignons/member.rb b/lib/nos_oignons/member.rb
index 7e6254e81eeb8a6d4a82cee0dcd3c44ffc570e7a..4bf23ca6be693b7d4976eab37a4e98a647ab6f72 100644 (file)
--- 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 '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]
 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
           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
           end
         end
         @db_path


@@ -33,7 +35,12 @@ module NosOignons
       end
 
       def filename_for_id(member_id)
       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)
       end
 
       def read_from_git(ref, file)


@@ -52,12 +59,17 @@ module NosOignons
       end
       @member_id = member_id
       unless page_content
       end
       @member_id = member_id
       unless page_content

-        page_content = File.open(Member.filename_for_id(member_id)).read
+        begin
+          page_content = File.open(Member.filename_for_id(member_id)).read
+        rescue Errno::ENOENT
+          raise ArgumentError.new('unknown member')
+        end

       end
       unless page_content.start_with?("---\n")
         raise ArgumentError.new('content is not a proper YAML document')
       end
       end
       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
       MEMBER_FIELDS.each do |field|
         self[field] = data[field.to_s]
       end


@@ -78,9 +90,25 @@ module NosOignons
     def up_to_date?
       return false if !joined_on || !membership_fee_paid_on
 
     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
       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
+
+    def create_receipt!(amount)
+      require 'nos_oignons/receipt'
+
+      receipt = Receipt.new(self, amount)
+      receipt.create!

     end
   end
 end
     end
   end
 end