Merge pull request #1121 from scieloorg/beta

Incorporação de códigos estáveis

scielomanager/api/resources_v1.py

@@ -23,7 +23,6 @@
     AheadPressRelease,
     PressReleaseTranslation,
     PressReleaseArticle,
-    Article,
     SubjectCategory,
 )
 
@@ -456,13 +455,3 @@ def build_filters(self, filters=None):
             orm_filters['pk__in'] = preleases
 
         return orm_filters
-
-
-class ArticleResource(ModelResource):
-    issue = fields.ForeignKey(IssueResource, 'issue')
-
-    class Meta(ApiKeyAuthMeta):
-        queryset = Article.objects.all()
-        resource_name = 'articles'
-        default_format = "application/json"
-        allowed_methods = ['get', 'post', 'put']

scielomanager/api/resources_v2.py

@@ -340,16 +340,6 @@ def build_filters(self, filters=None):
         return orm_filters
 
 
-class ArticleResource(ModelResource):
-    issue = fields.ForeignKey(IssueResource, 'issue')
-
-    class Meta(ApiKeyAuthMeta):
-        queryset = models.Article.objects.all()
-        resource_name = 'articles'
-        default_format = "application/json"
-        allowed_methods = ['get', 'post', 'put']
-
-
 class PressReleaseTranslationResource(ModelResource):
     language = fields.CharField(readonly=True)
 

scielomanager/api/tests_resources_v1.py

@@ -16,11 +16,6 @@
     IssueResource,
     SectionResource,
     JournalResource,
-    # CheckinResource,
-    # CheckinNoticeResource,
-    # CheckinArticleResource,
-    # TicketResource,
-    # CommentResource,
     )
 
 from scielomanager.utils.modelmanagers.helpers import (

scielomanager/health/domain.py

@@ -17,8 +17,28 @@ class BackendUnavailable(Exception):
 class StatusChecker(object):
     """ Realiza e agrupa as verificações de saúde do sistema.
     """
-    def __init__(self, client=health.Client):
-        self.client = client(timeout=5)
+
+    def __init__(self):
+        self.Client = health.Client
+        self.client = None
+
+    def __enter__(self, **kwargs):
+        self.dial(**kwargs)
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.close()
+
+    def dial(self, timeout=5):
+        self.client = self.Client(timeout=timeout)
+
+    def close(self):
+        try:
+            self.client.close()
+        except AttributeError as exc:
+            logger.exception(exc)
+
+        return None
 
     @property
     def is_fully_operational(self):

scielomanager/health/views.py

@@ -6,28 +6,27 @@
 
 
 def home(request):
-    status_checker = domain.StatusChecker()
+    with domain.StatusChecker() as status_checker:
+        try:
+            statuses = status_checker.overall_status()
+            is_fully_operational = status_checker.is_fully_operational
+            elapsed_time = status_checker.elapsed_time[2:7]
+        except domain.BackendUnavailable as e:
+            statuses = None
+            is_fully_operational = None
+            elapsed_time = None
+            is_backend_available = False
 
-    try:
-        statuses = status_checker.overall_status()
-        is_fully_operational = status_checker.is_fully_operational
-        elapsed_time = status_checker.elapsed_time[2:7]
-    except domain.BackendUnavailable as e:
-        statuses = None
-        is_fully_operational = None
-        elapsed_time = None
-        is_backend_available = False
+        else:
+            is_backend_available = True
 
-    else:
-        is_backend_available = True
-
-    return render_to_response(
-        'health/overall_status.html',
-        {
-            'statuses': statuses,
-            'is_fully_operational': is_fully_operational,
-            'is_backend_available': is_backend_available,
-            'elapsed_time': elapsed_time,
-        },
-        context_instance=RequestContext(request)
-    )
+        return render_to_response(
+            'health/overall_status.html',
+            {
+                'statuses': statuses,
+                'is_fully_operational': is_fully_operational,
+                'is_backend_available': is_backend_available,
+                'elapsed_time': elapsed_time,
+            },
+            context_instance=RequestContext(request)
+        )

scielomanager/journalmanager/admin.py

@@ -176,11 +176,3 @@ def queryset(self, request):
         return PressRelease.nocacheobjects
 
 admin.site.register(PressRelease, PressReleaseAdmin)
-
-
-class ArticleAdmin(admin.ModelAdmin):
-
-    def queryset(self, request):
-        return Article.nocacheobjects
-
-admin.site.register(Article, ArticleAdmin)

scielomanager/journalmanager/models.py

@@ -1317,44 +1317,6 @@ class AheadPressRelease(PressRelease):
 
     journal = models.ForeignKey(Journal, related_name='press_releases')
 
-
-class Article(caching.base.CachingMixin, models.Model):
-    objects = caching.base.CachingManager()
-    nocacheobjects = models.Manager()
-
-    issue = models.ForeignKey(Issue, related_name='articles')
-    front = jsonfield.JSONField()
-    xml_url = models.CharField(_('XML URL'), max_length=256)
-    pdf_url = models.CharField(_('PDF URL'), max_length=256)
-    images_url = models.CharField(_('Images URL'), max_length=256)
-
-    def __unicode__(self):
-        return u' - '.join([self.title, str(self.issue)])
-
-    class Meta:
-        permissions = (("list_article", "Can list Article"),)
-
-    @property
-    def title(self):
-
-        if not 'title-group' in self.front:
-            return None
-
-        default_language = self.front.get('default-language', None)
-
-        if default_language in self.front['title-group']:
-            return self.front['title-group'][default_language]
-
-        return self.front['title-group'].values()[0]
-
-    @property
-    def titles(self):
-
-        if not 'title-group' in self.front:
-            return None
-
-        return self.front['title-group']
-
 # ---- SIGNALS ------
 models.signals.post_save.connect(create_api_key, sender=User)
 

scielomanager/journalmanager/tests/modelfactories.py

@@ -7,22 +7,6 @@
 from django.contrib.auth.models import Group
 
 
-class ArticleFactory(factory.Factory):
-    FACTORY_FOR = models.Article
-
-    front = {
-        'default-language': 'en',
-        'title-group': {
-            'en': u'Article Title',
-            'pt': u'Título do Artigo',
-        }
-    }
-
-    xml_url = 'http://xml.url/'
-    pdf_url = 'http://pdf.url/'
-    images_url = 'http://img.url/'
-
-
 class UserFactory(factory.Factory):
     FACTORY_FOR = models.User