X-Git-Url: https://nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/6a086c6afe926f02597b81b21b58000166b2c885..02ebfb9b4cb16eb20e2e66e7654bd63d65158b1d:/lib/nos_oignons/member.rb diff --git a/lib/nos_oignons/member.rb b/lib/nos_oignons/member.rb index 8b0bd97..32d32f7 100644 --- a/lib/nos_oignons/member.rb +++ b/lib/nos_oignons/member.rb @@ -35,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) @@ -59,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