X-Git-Url: https://nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/9d982cb5d7f9abe598c8df3eefabe10501056110..0b680a9c9a8b5208f995a23970e1a1a202778ab1:/lib/nos_oignons/member.rb diff --git a/lib/nos_oignons/member.rb b/lib/nos_oignons/member.rb index 46fc41b..a67581c 100644 --- a/lib/nos_oignons/member.rb +++ b/lib/nos_oignons/member.rb @@ -21,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 @@ -59,7 +59,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