Revert "Merge pull request #5 from rliebz/test"

This reverts commit d4205b2, reversing
changes made to 8e60018.

Author: codersquid

.gitignore

@@ -1,6 +1,3 @@
 .vagrant
 .DS_Store
 *pyc
-.idea/
-.cache/
-*~

__init__.py

@@ -1 +1,2 @@
-__author__ = 'RLiebowitz'
+# To change this template, choose Tools | Templates
+# and open the template in the editor.

dvn_client/__init__.py

@@ -0,0 +1,4 @@
+DEFAULT_USERNAME = "FIXME"
+DEFAULT_PASSWORD = "FIXME"
+DEFAULT_HOST = "dvn-4.hmdc.harvard.edu"
+DEFAULT_CERT = "../resources/dvn-4.hmdc.harvard.edu"

dvn_client/resources/atom-example.xml

@@ -16,16 +16,14 @@
 #local modules
 from dataverse import Dataverse
 
-
 class DvnConnection(object):
     # todo add port number
     def __init__(self, username, password, host, cert=None, sdUriOverride=None):
         # Connection Properties
         self.username = username
         self.password = password
         self.host = host
-        self.sdUri = "https://{host}/dvn/api/data-deposit/v1/swordv2/service-document".format(host=self.host) \
-            if not sdUriOverride else sdUriOverride.format(host=self.host)
+        self.sdUri = "https://{host}/dvn/api/data-deposit/v1/swordv2/service-document".format(host=self.host) if not sdUriOverride else sdUriOverride.format(host=self.host)
         self.cert = cert
 
         # Connection Status and SWORD Properties
@@ -41,12 +39,10 @@ def __init__(self, username, password, host, cert=None, sdUriOverride=None):
 
     # todo raise exception if connection fails?
     def _connect(self):
-        self.swordConnection = sword2.Connection(
-            service_document_iri=self.sdUri,
-            user_name=self.username,
-            user_pass=self.password,
-            ca_certs=self.cert,
-        )
+        self.swordConnection = sword2.Connection(self.sdUri, 
+                      user_name = self.username,
+                      user_pass = self.password, 
+                      ca_certs = self.cert)
 
         self.serviceDocument = self.swordConnection.get_service_document()
         self.connected = True

dvn_client/src/__init__.py

@@ -4,10 +4,10 @@
 # python base lib modules
 import pprint
 
-# downloaded modules
+#downloaded modules
 from lxml import etree
 
-# local modules
+#local modules
 from study import Study
 import utils
 
@@ -29,15 +29,14 @@ def is_released(self):
             collectionInfo,
             namespace="http://purl.org/net/sword/terms/state",
             tag="dataverseHasBeenReleased",
-            numberOfElements=1,
+            numberOfElements=1
         ).text
         return bool(status)
 
-    def add_study(self, study):
-        # this creates the study AND generates a deposit receipt
+    def add_study(self, study):        
         depositReceipt = self.connection.swordConnection.create(
-            col_iri=self.collection.href,
             metadata_entry=study.entry,
+            col_iri=self.collection.href
         )
 
         study.hostDataverse = self
@@ -46,9 +45,6 @@ def add_study(self, study):
 
     def delete_study(self, study):
         depositReceipt = self.connection.swordConnection.delete(study.editUri)
-        study.lastDepositReceipt = depositReceipt
-
-        # todo: Is this used? Should it be? Other ways to handle this?
         study.isDeleted = True
 
     # Note: Functionality removed
@@ -70,13 +66,13 @@ def get_studies(self):
         studiesResponse = self.connection.swordConnection.get_resource(self.collection.href)
 
         return [
-            Study.from_entry_element(element, hostDataverse=self)
+            Study.CreateStudyFromEntryElement(element, hostDataverse=self)
             for element in utils.get_elements(studiesResponse.content, tag='entry')
         ]
         # # get all the entry nodes and parse them into study objects
         # studies = []
         # for element in utils.get_elements(studiesResponse.content, tag="entry"):
-        #     s = Study.from_entry_element(element, hostDataverse=self)
+        #     s = Study.CreateStudyFromEntryElement(element, hostDataverse=self)
         #     studies.append(s)
         #
         # return studies

dvn_client/src/config.py

@@ -16,13 +16,11 @@
 from time import sleep
 import traceback
 
-# downloaded modules
+#downloaded modules
 
-# local modules
-from dvn_client.src.study import Study
-from dvn_client.src.connection import DvnConnection
-from config import DEFAULT_PASSWORD, DEFAULT_HOST, DEFAULT_CERT, DEFAULT_USERNAME, EXAMPLE_FILE, \
-    EXAMPLE_DICT
+#local modules
+from study import Study
+from connection import DvnConnection
 
 def parse_arguments():
     parser = argparse.ArgumentParser(description='dvn_client exercises the APIs available for a DataVerse Network')
@@ -45,7 +43,7 @@ def main():
         execfile(args.config, globals())
         execfile(args.runTests, globals())
 
-    dv = None # declare outside so except clause has access
+    dv = None #declare outside so except clause has access
     try:
         dvc = DvnConnection(username=DEFAULT_USERNAME,
                         password=DEFAULT_PASSWORD, 
@@ -61,36 +59,29 @@ def main():
         dv = dvs[0]
 
         # clean up the test dataverse
-        # dv.delete_all_studies()
-        # print "RELEASED:", dv.is_released()
-
-        # s = dv.get_studies()[0]
-        # s = Study(EXAMPLE_DICT)
-        # s = Study(EXAMPLE_FILE)
-        # dv.add_study(s)
-        # print s
-
-        # print s.get_entry()
-
-        # s.add_files([INGEST_FILES])
-        # print s.get_citation()
-        # print s.get_state()
-
-        # sleep(3) #wait for ingest`
+        #dv.delete_all_studies()
+        print "RELEASED: ", dv.is_released()
 
-        # fs = s.get_files()
-        # print "FILES: ", len(fs)
-        # s.delete_file(fs[-1])
-        # fs = s.get_files()
-        # print "FILES: ", len(fs)
-        # s.delete_all_files()
-        # fs = s.get_files()
-        # print "FILES: ", len(fs)
+        #s = Study.CreateStudyFromDict(PICS_OF_CATS_STUDY)
+        s = Study.CreateStudyFromAtomEntryXmlFile("/home/vagrant/dvn_client/resources/atom-entry-study.xml")
+        dv.add_study(s)
+        #s.add_files([INGEST_FILES])
+        print s.get_citation()
+        print s.get_state()
+        
+        #sleep(3) #wait for ingest`
+        
+        #fs = s.get_files()
+        #print "FILES: ", len(fs)
+        #s.delete_file(fs[-1])
+        #fs = s.get_files()
+        #print "FILES: ", len(fs)
+        #s.delete_all_files()
+        #fs = s.get_files()
+        #print "FILES: ", len(fs)
+        
+        #s.release()
 
-        # s.release()
-
-        # s.hostDataverse.delete_study(s)
-
         print "\n\ndvn_client succeeded"
 
     except Exception as e:

dvn_client/src/connection.py

@@ -14,10 +14,8 @@
 logging.basicConfig(level=logging.ERROR)
 
 #local modules
-from dvn_client.src.study import Study
-from dvn_client.src.connection import DvnConnection
-from dvn_client.src.example.config import DEFAULT_USERNAME, DEFAULT_CERT, DEFAULT_HOST, DEFAULT_PASSWORD
-from dvn_client.src.test.tests import PIC_OF_CAT, PICS_OF_CATS_STUDY, INGEST_FILES, ATOM_STUDY
+from study import Study
+from connection import DvnConnection
 
 class TestStudyOperations(unittest.TestCase):
     @classmethod
@@ -26,7 +24,7 @@ def setUpClass(self):
 
         print "Loading test data."
         testModulePath = os.path.dirname(__file__)
-        execfile(os.path.join(testModulePath, "../example/config.py"), globals())    #CREDS - This file is not committed.
+        execfile(os.path.join(testModulePath, "config.py"), globals())    #CREDS - This file is not committed.
         execfile(os.path.join(testModulePath, "tests.py"), globals())     #TEST DATA
 
         print "Connecting to DVN."
@@ -45,7 +43,7 @@ def setUp(self):
         #runs before each test method
 
         #create a study for each test
-        s = Study.from_dict(PICS_OF_CATS_STUDY)
+        s = Study.CreateStudyFromDict(PICS_OF_CATS_STUDY)
         self.dv.add_study(s)
         id = s.get_id()
         self.s = self.dv.get_study_by_hdl(id)
@@ -59,7 +57,7 @@ def tearDown(self):
             return
 
     def test_create_study_from_xml(self):
-        xmlStudy = Study.from_atom_xml_file(ATOM_STUDY)
+        xmlStudy = Study.CreateStudyFromAtomEntryXmlFile(ATOM_STUDY)
         self.dv.add_study(xmlStudy)
         atomStudy = self.dv.get_study_by_string_in_entry("The first study for the New England Journal of Coffee dataverse")
         self.assertTrue(atomStudy)
@@ -106,7 +104,7 @@ def test_delete_a_file(self):
         self.assertTrue(len(catFile) == 0)
 
     def test_delete_a_study(self):
-        xmlStudy = Study.from_atom_xml_file(ATOM_STUDY)
+        xmlStudy = Study.CreateStudyFromAtomEntryXmlFile(ATOM_STUDY)
         self.dv.add_study(xmlStudy)
         atomStudy = self.dv.get_study_by_string_in_entry("The first study for the New England Journal of Coffee dataverse")
         self.assertTrue(atomStudy)