Merge branch 'develop'

Conflicts: .gitignore
openphacts · Jun 17, 2015 · e1f25d7 · e1f25d7
2 parents ba3f811 + 2f72850
commit e1f25d7
Show file tree

Hide file tree

Showing 26 changed files with 3,648 additions and 2,326 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *~
 *.swp
+test/PartIntegrationTests.html
diff --git a/.travis.yml b/.travis.yml
@@ -2,4 +2,4 @@ branches:
   only:
     - develop
 script:
-  - "phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes test/spec/phantomjs_jasminexml_runner.js test/PhantomIntegrationTests.html 1c22cbe7 167a3a3d8539b5d85280e7178f4e62ab https://beta.openphacts.org/1.4 testout"
+  - "phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes test/spec/phantomjs_jasminexml_runner.js test/PhantomIntegrationTests.html 1c22cbe7 167a3a3d8539b5d85280e7178f4e62ab https://beta.openphacts.org/1.5 testout"
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Open PHACTS API Version
 
-1.4
+1.5
 
 ## About
 OPS.js is a javascript based library for accessing the Open PHACTS Linked Data API (LDA). It uses jquery to handle the asynchronous nature of the requests. OPS.js can also be used to parse responses from the LDA.
@@ -28,12 +28,12 @@ We love receiving patches for bug fixes and new features. Please follow these si
 ## Citations  
 To cite OPS.js in publications please use:  
 
->Ian Dunlop. OPS.js. 5.0.0. Javascript library for accessing the Open PHACTS Linked Data API. University of Manchester. http://github.com/openphacts/ops.js
+>Ian Dunlop. OPS.js. 5.0.2. Javascript library for accessing the Open PHACTS Linked Data API. University of Manchester. http://github.com/openphacts/ops.js
 
 Bibtex:
 
 >@Manual{,  
->title = {OPS.js 5.0.0: Javascript library for accessing the Open PHACTS Linked Data API},  
+>title = {OPS.js 5.0.2: Javascript library for accessing the Open PHACTS Linked Data API},  
 >author = {{Ian Dunlop}},  
 >organization = {School of Computer Science},  
 >address = {University of Manchester, United Kingdom},  
@@ -58,7 +58,7 @@ Look at https://dev.openphacts.org for more information about the source methods
 [Jasmine](http://pivotal.github.io/jasmine/ "Jasmine javascript testing framework") is used to test the ops.js api. There are various test runners which can be used, they
 are contained within the 'test' directory with the specs for the tests in the 'test/spec' directory. FunctionalTests.html and IntegrationTests.html should be run within a browser.
 
-`file:///path_to_ops.js/test/FunctionalTests.html?app_id=sdfsdf&app_key=sdfsdfsdf&app_url=https://beta.openphacts.org/1.4`
+`file:///path_to_ops.js/test/FunctionalTests.html?app_id=sdfsdf&app_key=sdfsdfsdf&app_url=https://beta.openphacts.org/1.5`
 
 Use the appropriate values for `app_id`, `app_key` & `app_url`
 
@@ -76,7 +76,7 @@ More examples can be found in the integration tests.
 ### Concept Wiki free text search
 
 ```javascript
-var searcher = new Openphacts.ConceptWikiSearch("https://beta.openphacts.org/1.4", appID, appKey);  
+var searcher = new Openphacts.ConceptWikiSearch("https://beta.openphacts.org/1.5", appID, appKey);  
 var callback=function(success, status, response){  
     searcher.parseResponse(response);
 };  
@@ -88,7 +88,7 @@ searcher.byTag('Aspirin', '20', '4', '07a84994-e464-4bbf-812a-a4b96fa3d197', cal
 ### Concept Wiki compound search
 
 ```javascript
-var searcher = new Openphacts.ConceptWikiSearch("https://beta.openphacts.org/1.4", appID, appKey);  
+var searcher = new Openphacts.ConceptWikiSearch("https://beta.openphacts.org/1.5", appID, appKey);  
 var callback=function(success, status, response){  
     searcher.parseResponse(response);
 };  
@@ -100,7 +100,7 @@ searcher.findCompounds('Aspirin', '20', '4', callback);
 ### Compound information
 
 ```javascript
-var searcher = new Openphacts.CompoundSearch("https://beta.openphacts.org/1.4", appID, appKey);  
+var searcher = new Openphacts.CompoundSearch("https://beta.openphacts.org/1.5", appID, appKey);  
 var callback=function(success, status, response){  
     var compoundResult = searcher.parseCompoundResponse(response);  
 };  
@@ -112,7 +112,7 @@ searcher.fetchCompound('http://www.conceptwiki.org/concept/38932552-111f-4a4e-a4
 ### Compound Pharmacology
 
 ```javascript
-var searcher = new Openphacts.CompoundSearch("https://beta.openphacts.org/1.4", appID, appKey);  
+var searcher = new Openphacts.CompoundSearch("https://beta.openphacts.org/1.5", appID, appKey);  
 var callback=function(success, status, response){  
     var compoundResult = searcher.parseCompoundPharmacologyResponse(response);  
 };  
@@ -124,7 +124,7 @@ searcher.compoundPharmacology('http://www.conceptwiki.org/concept/38932552-111f-
 ### Compound Pharmacology Count
 
 ```javascript
-var searcher = new Openphacts.CompoundSearch("https://beta.openphacts.org/1.4", appID, appKey);  
+var searcher = new Openphacts.CompoundSearch("https://beta.openphacts.org/1.5", appID, appKey);  
 var callback=function(success, status, response){  
     var result = searcher.parseCompoundPharmacologyCountResponse(response);  
 };  
@@ -137,7 +137,7 @@ searcher.compoundPharmacologyCount('http://www.conceptwiki.org/concept/38932552-
 ### Exact Structure Search
 
 ```javascript
-var searcher = new Openphacts.StructureSearch("https://beta.openphacts.org/1.4", appID, appKey);  
+var searcher = new Openphacts.StructureSearch("https://beta.openphacts.org/1.5", appID, appKey);  
 var callback=function(success, status, response){  
     var result = searcher.parseExactResponse(response);  
 };  

diff --git a/citation.txt b/citation.txt
@@ -1,5 +1,5 @@
 @Manual{,
-title = {OPS.js 5.0.0: Javascript library for accessing the Open PHACTS Linked Data API},
+title = {OPS.js 5.0.2: Javascript library for accessing the Open PHACTS Linked Data API},
 author = {{Ian Dunlop}},
 organization = {School of Computer Science},
 address = {University of Manchester, United Kingdom},

diff --git a/create_combined_js.sh b/create_combined_js.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 rm ./src/combined.js
-cat ./src/OPS.js ./src/Constants.js ./src/CompoundSearch.js ./src/ConceptWikiSearch.js ./src/TargetSearch.js ./src/StructureSearch.js ./src/ActivitySearch.js ./src/TreeSearch.js ./src/PathwaySearch.js ./src/MapSearch.js ./src/DataSources.js ./src/DiseaseSearch.js ./src/Version.js > ./src/combined.js
+cat ./src/OPS.js ./src/Constants.js ./src/CompoundSearch.js ./src/ConceptWikiSearch.js ./src/TargetSearch.js ./src/StructureSearch.js ./src/ActivitySearch.js ./src/TreeSearch.js ./src/PathwaySearch.js ./src/MapSearch.js ./src/DataSources.js ./src/DiseaseSearch.js ./src/TissueSearch.js ./src/Version.js > ./src/combined.js