Merge pull request #1178 from scieloorg/beta

Incorporação de códigos estáveis
scieloorg · Aug 6, 2015 · bf329d8 · bf329d8
2 parents dca2922 + 0f090db
commit bf329d8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/docs/dev/rpc_spec/getInterfaceVersion.rst b/docs/dev/rpc_spec/getInterfaceVersion.rst
@@ -0,0 +1,7 @@
+.. _func-getInterfaceVersion:
+
+``string getInterfaceVersion();``
+=================================
+
+Obtém a versão da interface Thrift do servidor. 
+
diff --git a/requirements.txt b/requirements.txt
@@ -13,7 +13,6 @@ webassets==0.7.1
 yuicompressor
 jsonfield
 django-tastypie==0.9.16
-django-waffle==0.9.1
 -e git+git://github.com/scieloorg/django-htmlmin.git#egg=django-htmlmin
 -e git+git://github.com/scieloorg/django-cache-machine.git#egg=django-cache-machine
 packtools

diff --git a/scielomanager/remove_tables_waffle_app.sql b/scielomanager/remove_tables_waffle_app.sql
@@ -0,0 +1,9 @@
+BEGIN;
+DROP TABLE IF EXISTS "waffle_sample" CASCADE;
+DROP TABLE IF EXISTS  "waffle_switch" CASCADE;
+ALTER TABLE IF EXISTS "waffle_flag_users" DROP CONSTRAINT IF EXISTS "flag_id_refs_id_8fef0c12" CASCADE;
+ALTER TABLE IF EXISTS "waffle_flag_groups" DROP CONSTRAINT IF EXISTS "flag_id_refs_id_8e6a807d" CASCADE;
+DROP TABLE IF EXISTS "waffle_flag" CASCADE;
+DROP TABLE IF EXISTS "waffle_flag_users" CASCADE;
+DROP TABLE IF EXISTS "waffle_flag_groups" CASCADE;
+COMMIT;
diff --git a/scielomanager/scielomanager/settings.py b/scielomanager/scielomanager/settings.py
@@ -131,7 +131,6 @@
     'scielomanager.utils.middlewares.threadlocal.ThreadLocalMiddleware',
     'maintenancewindow.middleware.MaintenanceMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
-    'waffle.middleware.WaffleMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
 )
@@ -161,7 +160,6 @@
     'widget_tweaks',
     'djcelery',
     'tastypie',
-    'waffle',
     'south',
 
     # SciELO shared apps

diff --git a/scielomanager/thrift/scielomanager.thrift b/scielomanager/thrift/scielomanager.thrift
@@ -31,7 +31,7 @@ namespace py scielomanager
  * IMPORTANTE! Alterar o valor de VERSION após qualquer alteração na interface.
  * Regras em: http://semver.org/lang/pt-BR/
  */
-const string VERSION = "1.1.0"
+const string VERSION = "1.2.0"
 
 
 #
@@ -56,6 +56,9 @@ exception TimeoutError {
  * Article representa um documento XML em conformidade com a especificação 
  * SciELO-PS, em qualquer uma das versões, ou pré-sps para os documentos 
  * mais antigos.
+ * 
+ * O campo `timestamp` é produzido pelo SciELO Manager e representa a data
+ * de modificação do registro.
  */
 struct Article {
     1: optional string abbrev_journal_title;
@@ -72,7 +75,7 @@ struct Article {
     12: required string version;
     13: optional bool is_aop;
     14: required string source;
-    15: required string timestamp;
+    15: optional string timestamp;
 }
 
 /*
@@ -147,5 +150,15 @@ service JournalManagerServices {
     ScanArticlesResults getScanArticlesBatch(1:string batch_id) throws (
             1:ServerError srv_err, 2:BadRequestError req_err, 
             3:TimeoutError tou_err); 
+
+
+    #
+    # Meta-API
+    #    
+
+    /*
+     * Obtém a versão da interface Thrift do servidor.
+     */
+    string getInterfaceVersion();
 }
 
diff --git a/scielomanager/thrift/server.py b/scielomanager/thrift/server.py
@@ -119,3 +119,6 @@ def getScanArticlesBatch(self, batch_id):
 
         return results
 
+    def getInterfaceVersion(self):
+        return spec.VERSION
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,3 +119,6 @@ def getScanArticlesBatch(self, batch_id):

		return results

		def getInterfaceVersion(self):
		return spec.VERSION