Merge pull request #37 from rafaelpezzuto/change-editor-to-creator-and-fix-dockerfile

Altera editor para campo creator e melhora Dockerfile

Author: rafaelpezzuto

Dockerfile

@@ -1,29 +1,26 @@
-FROM python:2.7.14-jessie
-ENV PYTHONUNBUFFERED 1
+FROM python:2.7.14-jessie AS build
 
-# Build-time metadata as defined at http://label-schema.org
-ARG BUILD_DATE
-ARG VCS_REF
-ARG WEBAPP_VERSION
+COPY . /src
 
-ENV IMAGE_BUILD_DATE ${BUILD_DATE}
-ENV IMAGE_VCS_REF ${VCS_REF}
-ENV IMAGE_WEBAPP_VERSION ${WEBAPP_VERSION}
+RUN pip install --upgrade pip && pip install wheel
+RUN cd /src && python setup.py bdist_wheel -d /deps
 
-COPY requirements.txt production.ini /app/
-COPY dist /tmp/pypa/
 
-RUN apt-get update && apt-get install python-lxml
+FROM python:2.7.14-jessie
 
-RUN pip install --upgrade pip
+COPY --from=build /deps/* /deps/
+COPY requirements.txt production.ini /app/
 
-RUN pip --no-cache-dir install -r /app/requirements.txt && \
-    pip --no-cache-dir install -f file:///tmp/pypa -U booksoai
+RUN apt-get update && \
+    apt-get install python-lxml
+RUN pip install --upgrade pip && pip install waitress
+RUN pip install --no-cache-dir -r /app/requirements.txt && \
+    pip install --no-index --find-links=file:///deps -U booksoai
+RUN rm -rf /deps
 
-RUN rm -rf /tmp/pypa
+WORKDIR /app
 
 USER nobody
 EXPOSE 6543
 
 CMD gunicorn --paste /app/production.ini
-

booksoai/oaipmh.py

@@ -1,10 +1,8 @@
 from __future__ import unicode_literals
 
-import plumber
-
-from lxml import etree
 from datetime import datetime
 
+import plumber
 import pipeline
 
 

booksoai/pipeline.py

@@ -219,11 +219,11 @@ def transform(self, item):
         title = etree.SubElement(oai_rec, '{%s}title' % self.dc)
         title.text = data.get('title')
 
-        for author_role in ['individual_author', 'corporate_author', 'organizer', 'coordinator']:
+        for author_role in ['individual_author', 'corporate_author', 'organizer', 'coordinator', 'editor']:
             for ar in data.get('creators', {}).get(author_role, []):
                 self._append_node(oai_rec, '{%s}creator' % self.dc, ar[0])
 
-        for contributor_role in ['editor', 'collaborator', 'translator']:
+        for contributor_role in ['collaborator', 'translator']:
             for cr in data.get('creators', {}).get(contributor_role, []):
                 self._append_node(oai_rec, '{%s}contributor' % self.dc, cr[0])
 

booksoai/tests/test_pipeline.py

@@ -551,7 +551,7 @@ def test_metadata_pipe_add_record_as_dublin_core_with_translator_contributor(sel
 
         self.assertEqual(etree.tostring(xml), xml_str)
 
-    def test_metadata_pipe_add_record_as_dublin_core_with_editor_contributor(self):
+    def test_metadata_pipe_add_record_as_dublin_core_with_editor_creator(self):
         data = {
             'title': 'title',
             'creators': {
@@ -579,7 +579,7 @@ def test_metadata_pipe_add_record_as_dublin_core_with_editor_contributor(self):
         xml_str += ' xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/'
         xml_str += ' http://www.openarchives.org/OAI/2.0/oai_dc.xsd">'
         xml_str += '<dc:title>title</dc:title>'
-        xml_str += '<dc:contributor>editor1</dc:contributor>'
+        xml_str += '<dc:creator>editor1</dc:creator>'
         xml_str += '<dc:description>description</dc:description>'
         xml_str += '<dc:publisher>publisher</dc:publisher>'
         xml_str += '<dc:date>2014</dc:date>'
@@ -648,10 +648,10 @@ def test_metadata_pipe_add_record_as_dublin_core_with_multiple_contributor_group
                     ['translator1', None], 
                     ['translator2', None]
                 ],
-                'editor': [
-                    ['editor1', None], 
-                    ['editor2', None], 
-                    ['editor3', None]
+                'collaborator': [
+                    ['collaborator1', None], 
+                    ['collaborator2', None], 
+                    ['collaborator3', None]
                 ],
             },
             'description': 'description',
@@ -674,9 +674,9 @@ def test_metadata_pipe_add_record_as_dublin_core_with_multiple_contributor_group
         xml_str += ' xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/'
         xml_str += ' http://www.openarchives.org/OAI/2.0/oai_dc.xsd">'
         xml_str += '<dc:title>title</dc:title>'
-        xml_str += '<dc:contributor>editor1</dc:contributor>'
-        xml_str += '<dc:contributor>editor2</dc:contributor>'
-        xml_str += '<dc:contributor>editor3</dc:contributor>'
+        xml_str += '<dc:contributor>collaborator1</dc:contributor>'
+        xml_str += '<dc:contributor>collaborator2</dc:contributor>'
+        xml_str += '<dc:contributor>collaborator3</dc:contributor>'
         xml_str += '<dc:contributor>translator1</dc:contributor>'
         xml_str += '<dc:contributor>translator2</dc:contributor>'
         xml_str += '<dc:description>description</dc:description>'
@@ -719,6 +719,10 @@ def test_metadata_pipe_add_record_as_dublin_core_with_multiple_contributor_and_c
                     ['editor2', None], 
                     ['editor3', None]
                 ],
+                'collaborator': [
+                    ['collaborator1', None], 
+                    ['collaborator2', None], 
+                ],
                 'coordinator': [
                     ['coordinator1', None], 
                     ['coordinator2', None], 
@@ -753,9 +757,11 @@ def test_metadata_pipe_add_record_as_dublin_core_with_multiple_contributor_and_c
         xml_str += '<dc:creator>organizer2</dc:creator>'
         xml_str += '<dc:creator>coordinator1</dc:creator>'
         xml_str += '<dc:creator>coordinator2</dc:creator>'
-        xml_str += '<dc:contributor>editor1</dc:contributor>'
-        xml_str += '<dc:contributor>editor2</dc:contributor>'
-        xml_str += '<dc:contributor>editor3</dc:contributor>'
+        xml_str += '<dc:creator>editor1</dc:creator>'
+        xml_str += '<dc:creator>editor2</dc:creator>'
+        xml_str += '<dc:creator>editor3</dc:creator>'
+        xml_str += '<dc:contributor>collaborator1</dc:contributor>'
+        xml_str += '<dc:contributor>collaborator2</dc:contributor>'
         xml_str += '<dc:contributor>translator1</dc:contributor>'
         xml_str += '<dc:contributor>translator2</dc:contributor>'
         xml_str += '<dc:description>description</dc:description>'