orthanc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfad2aeeae25d4ff088160e28a91ea86b64fa01
-  data.tar.gz: d87077c820484914845e550b003562b5cb19b6b7
+  metadata.gz: cd7892469761f2610ebec1e93d457212a0231f4a
+  data.tar.gz: 6b5a8cbd7aac358337ca577e914997479473d97a
 SHA512:
-  metadata.gz: dbe6ececc0c65bc59f7da9f6dc76ebc06227dab0cad6b2af44cb7f259a742f225d9e6d91dc1daee4d45cc3bbaa76c10de30186e093976d0bb69cb4bf8133eeb3
-  data.tar.gz: 7f5ac39bbe99b695cce5c3099c954144bbaf12914fd46f9463bc337881d072bf8a34f8d040739903c48c91395975fe8ac2faf1ae1fc1b4578202862ecc50627a
+  metadata.gz: 1c6b7a5e8a156cf63bc64e80847d5f319dd3c9a197aec2622d49223feb451d2765d12d2a6e4410959c8815387bcaba61004ae77144a914701054a8ff0c257a50
+  data.tar.gz: 3541b04589e433c39e98cc8c56b1490efa2e843d98bc92e5b329d8cd6516eeb69b59afb3ef8d2ba88ce6694539894d60c9fb827ffd47195799a111a776d18208

data/README.md

@@ -8,6 +8,8 @@
 
 ## Installation
 
+**NOTE:** If you need an instance of Orthanc to test against, you can build a ready-to-use Orthanc server VM with the [orthanc-vagrant](https://github.com/chafey/orthanc-vagrant) project.
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -25,19 +27,19 @@ Or install it yourself as:
 ## Usage
 The gem tries to follow the Orthanc API naming scheme as closely as possible, converting methods and response items to snake case to make the experience more ruby-like.
 
-  api=Orthanc::Client.new("localhost", "8042")
-  api.all_patients
-  api.all_patients.first
-  api.system.database_version => 5
-  api.statistics.count_studies => 14
+    api=Orthanc::Client.new("localhost", "8042")
+    api.all_patients
+    api.all_patients.first
+    api.system.database_version => 5
+    api.statistics.count_studies => 14
+
+You get the picture.
 
-You get the picture. 
+You can see what Orthanc API resources have been mapped in the gem, and their status [here](https://docs.google.com/spreadsheets/d/1KWQHNGS-NEYppo3XW4TkNbZYk_AraPhWOmSwxcsScvU/edit?usp=sharing)
 
-## Development
+Basic documentation can be found in [here](http://www.rubydoc.info/github/simonmd/orthanc-ruby/master/Orthanc/Client)
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
@@ -49,4 +51,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## License
 
-MIT License
+MIT License

data/lib/orthanc/client.rb

@@ -18,27 +18,27 @@ module Orthanc
 
     # ------------- General -------------
     def system
-      objectify(base_uri["system"].get)
+      handle_response(base_uri["system"].get)
     end
 
     def statistics
-      objectify(base_uri["statistics"].get)
+      handle_response(base_uri["statistics"].get)
     end
 
     def changes(params = {}) # "last", "limit" and "since" arguments
-      objectify(base_uri["changes"].get({params: params}))
+      handle_response(base_uri["changes"].get({params: params}))
     end
 
     def delete_changes(params = {}) # "last", "limit" and "since" arguments
-      objectify(base_uri["changes"].delete({params: params}))
+      handle_response(base_uri["changes"].delete({params: params}))
     end
 
     def exports(params = {}) # "last", "limit" and "since" arguments
-      objectify(base_uri["exports"].get({params: params}))
+      handle_response(base_uri["exports"].get({params: params}))
     end
 
     def delete_exports(params = {}) # "last", "limit" and "since" arguments
-      objectify(base_uri["exports"].delete({params: params}))
+      handle_response(base_uri["exports"].delete({params: params}))
     end
 
 
@@ -54,19 +54,22 @@ module Orthanc
       return true if num == "1"
     end
 
-    def lowkey(h)
-      Hash[h.map{|k,v| v.class == Array ? [k,v.map{|r| f r}.to_a] : [k.downcase,v]}]
-    end
-
-    def objectify(response)
-      if JSON.parse(response).class == Array
-        return JSON.parse(response)
-      elsif JSON.parse(response).class == Hash
-        return RecursiveOpenStruct.new(JSON.parse(response).to_snake_keys, recurse_over_arrays: true )
-      else
+    def handle_response(response)
+      begin
+        # Try to parse response
+        parsed_response = JSON.parse(response)
+
+        if parsed_response.class == Array
+          return parsed_response
+        elsif parsed_response.class == Hash
+          return RecursiveOpenStruct.new(parsed_response.to_snake_keys, recurse_over_arrays: true )
+        else
+          return response
+        end
+      rescue JSON::ParserError => e # If JSON parse fails, return original response
         return response
       end
     end
 
   end
-end
+end

data/lib/orthanc/instances.rb

@@ -4,220 +4,220 @@ module Orthanc
 
     # GET /instances
     def all_instances
-      objectify(base_uri["instances"].get)
+      handle_response(base_uri["instances"].get)
     end
 
     # POST /instances
     def instances(dicom_file) # POST = Add the new DICOM file given in the POST body
-      objectify(base_uri["instances"].post(dicom_file))
+      handle_response(base_uri["instances"].post(dicom_file))
     end
 
     # GET /instances/{id}
     def instance(id)
-      objectify(base_uri["instances/#{id}"].get)
+      handle_response(base_uri["instances/#{id}"].get)
     end
 
     # DELETE /instances/{id}
     def delete_instance(id)
-      objectify(base_uri["instances/#{id}"].delete)
+      handle_response(base_uri["instances/#{id}"].delete)
     end
 
     # POST /instances/{id}/anonymize
     def anonymize_instance(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["instances/#{id}/anonymize"].post(payload))
+      base_uri["instances/#{id}/anonymize"].post(payload.to_s)
     end
 
     # GET /instances/{id}/content/
     def instance_content(id) # List the first-level DICOM tags
-      objectify(base_uri["instances/#{id}/frames"].get)
+      handle_response(base_uri["instances/#{id}/frames"].get)
     end
 
     # GET /instances/{id}/content/{group}-{element}
     def instance_content_tag(id, group, element) # Raw access to the value of DICOM tags (comprising the padding character)
-      objectify(base_uri["instances/#{id}/content/#{group}-#{element}"].get)
+      handle_response(base_uri["instances/#{id}/content/#{group}-#{element}"].get)
     end
 
     # GET /instances/{id}/content/{group}-{element}/{index}/...
     def instance_content_sequence(id, group, element, index) # Raw access to the content of DICOM sequences
-      objectify(base_uri["instances/#{id}/content/#{group}-#{element}/#{index}"].get)
+      handle_response(base_uri["instances/#{id}/content/#{group}-#{element}/#{index}"].get)
     end
 
     # POST /instances/{id}/export
-    def instance_export(id) # Write the DICOM file in the filesystem where Orthanc is running
-      objectify(base_uri["instances/#{id}/export"].post)
-    end   
+    def instance_export(id, payload = {}) # Write the DICOM file in the filesystem where Orthanc is running
+      base_uri["instances/#{id}/export"].post(payload)
+    end
 
     # GET /instances/{id}/file
     def instance_file(id)
-      objectify(base_uri["instances/#{id}/file"].get)
-    end 
+      base_uri["instances/#{id}/file"].get
+    end
 
     # GET /instances/{id}/frames
     def instance_frames(id) # Instance frames array
-      objectify(base_uri["instances/#{id}/frames"].get)
-    end    
+      handle_response(base_uri["instances/#{id}/frames"].get)
+    end
 
     # GET /instances/{id}/frames/{frameNumber}/image-int16
     def instance_frame_image_int16(id, frame_number) # Truncated image to the [-32768;32767] range
-      objectify(base_uri["instances/#{id}/frames/#{frame_number}/image-int16"].get)
+      base_uri["instances/#{id}/frames/#{frame_number}/image-int16"].get
     end
 
     # GET /instances/{id}/frames/{frameNumber}/image-uint16
     def instance_frame_image_uint16(id, frame_number) # Truncated image to the [0;65535] range
-      objectify(base_uri["instances/#{id}/frames/#{frame_number}/image-uint16"].get)
+      base_uri["instances/#{id}/frames/#{frame_number}/image-uint16"].get
     end
 
     # GET /instances/{id}/frames/{frameNumber}/image-uint8
     def instance_frame_image_uint8(id, frame_number) # Truncated image to the [0;255] range
-      objectify(base_uri["instances/#{id}/frames/#{frame_number}/image-uint8"].get)
+      base_uri["instances/#{id}/frames/#{frame_number}/image-uint8"].get
     end
 
     # GET /instances/{id}/frames/{frameNumber}/matlab
     def instance_frame_matlab(id, frame_number) # a = eval(urlread('http://localhost:8042/instances/.../matlab'))
-      objectify(base_uri["instances/#{id}/frames/#{frame_number}/matlab"].get)
+      base_uri["instances/#{id}/frames/#{frame_number}/matlab"].get
     end
 
     # GET /instances/{id}/frames/{frameNumber}/preview
     def instance_preview(id, frame_number) # Rescaled image (so that all the range [0;255] is used)
-      objectify(base_uri["instances/#{id}/frames/#{frame_number}/preview"].get)
+      base_uri["instances/#{id}/frames/#{frame_number}/preview"].get
     end
 
     # GET /instances/{id}/image-int16
     def instance_image_int16(id) # Truncated image to the [-32768;32767] range
-      objectify(base_uri["instances/#{id}/image-int16"].get)
+      base_uri["instances/#{id}/image-int16"].get
     end
 
     # GET /instances/{id}/image-uint16
     def instance_image_uint16(id) # Truncated image to the [0;65535] range
-      objectify(base_uri["instances/#{id}/image-uint16"].get)
+      base_uri["instances/#{id}/image-uint16"].get
     end
 
     # GET /instances/{id}/image-uint8
     def instance_image_uint8(id) # Truncated image to the [0;255] range
-      objectify(base_uri["instances/#{id}/image-uint8"].get)
+      base_uri["instances/#{id}/image-uint8"].get
     end
 
     # GET /instances/{id}/matlab
     def instance_matlab(id) # a = eval(urlread('http://localhost:8042/instances/.../matlab'))
-      objectify(base_uri["instances/#{id}/matlab"].get)
+      base_uri["instances/#{id}/matlab"].get
     end
 
     # POST /instances/{id}/modify
     def modify_instance(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["instances/#{id}/modify"].post(payload))
+      base_uri["instances/#{id}/modify"].post(payload.to_s)
     end
 
     # GET /instances/{id}/module
     def instance_module(id)
-      objectify(base_uri["instances/#{id}/module"].get)
+      handle_response(base_uri["instances/#{id}/module"].get)
     end
 
     # GET /instances/{id}/patient
     def instance_patient(id)
-      objectify(base_uri["instances/#{id}/patient"].get)
+      handle_response(base_uri["instances/#{id}/patient"].get)
     end
 
     # GET /instances/{id}/preview
     def instance_preview(id) # Rescaled image (so that all the range [0;255] is used)
-      objectify(base_uri["instances/#{id}/preview"].get)
+      handle_response(base_uri["instances/#{id}/preview"].get)
     end
 
     # GET /instances/{id}/series
     def instance_series(id)
-      objectify(base_uri["instances/#{id}/series"].get)
+      handle_response(base_uri["instances/#{id}/series"].get)
     end
 
     # GET /instances/{id}/simplified-tags
-    def instance_shared_tags(id) # "?simplify" argument to simplify output
-      objectify(base_uri["instances/#{id}/shared-tags"].get)
+    def instance_simplified_tags(id) # "?simplify" argument to simplify output
+      handle_response(base_uri["instances/#{id}/simplified-tags"].get)
     end
 
     # GET /instances/{id}/statistics
     def instance_statistics(id)
-      objectify(base_uri["instances/#{id}/statistics"].get)
+      handle_response(base_uri["instances/#{id}/statistics"].get)
     end
 
     # GET /instances/{id}/study
     def instance_study(id)
-      objectify(base_uri["instances/#{id}/study"].get)
+      handle_response(base_uri["instances/#{id}/study"].get)
     end
 
     # GET /instances/{id}/tags
     def instance_tags(id) # TODO: "?simplify" argument to simplify output (same as "simplified-tags")
-      objectify(base_uri["instances/#{id}/tags"].get)
+      handle_response(base_uri["instances/#{id}/tags"].get)
     end
 
     # TODO: Polymorphic resourceType resources. Repetitive. must refactor
 
     # GET /{resourceType}/{id}/attachments
     def instance_attachments(id)
-      objectify(base_uri["instances/#{id}/attachments"].get)
+      handle_response(base_uri["instances/#{id}/attachments"].get)
     end
 
     # DELETE /{resourceType}/{id}/attachments/{name}
     def delete_instance_attachment(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}"].delete)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}"].delete)
     end
 
     # PUT /{resourceType}/{id}/attachments/{name}
     def instance_attachment(id, name, payload = {})
-      objectify(base_uri["instances/#{id}/attachments/#{name}"].put(payload))
+      handle_response(base_uri["instances/#{id}/attachments/#{name}"].put(payload))
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-data
     def instance_attachment_compressed_data(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}/compressed-data"].get)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}/compressed-data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-md5
     def instance_attachment_compressed_md5(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}/compressed-md5"].get)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}/compressed-md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-size
     def instance_attachment_compressed_size(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}/compressed-size"].get)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}/compressed-size"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/data
     def instance_attachment_data(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}/data"].get)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}/data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/md5
     def instance_attachment_md5(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}/md5"].get)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}/md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/size
     def instance_attachment_size(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}/size"].get)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}/size"].get)
     end
 
     # POST /{resourceType}/{id}/attachments/{name}/verify-md5
     def instance_attachment_verify_md5(id, name)
-      objectify(base_uri["instances/#{id}/attachments/#{name}/verify-md5"].get)
+      handle_response(base_uri["instances/#{id}/attachments/#{name}/verify-md5"].get)
     end
 
     # GET /{resourceType}/{id}/metadata
     def instance_all_metadata(id)
-      objectify(base_uri["instances/#{id}/metadata"].get)
+      handle_response(base_uri["instances/#{id}/metadata"].get)
     end
 
     # GET /{resourceType}/{id}/metadata/{name}
     def instance_metadata(id, name)
-      objectify(base_uri["instances/#{id}/metadata/#{name}"].get)
+      handle_response(base_uri["instances/#{id}/metadata/#{name}"].get)
     end
 
     # DELETE /{resourceType}/{id}/metadata/{name}
     def instance_delete_metadata(id, name)
-      objectify(base_uri["instances/#{id}/metadata/#{name}"].delete)
+      handle_response(base_uri["instances/#{id}/metadata/#{name}"].delete)
     end
 
     # PUT /{resourceType}/{id}/metadata/{name}
     def instance_update_metadata(id, name, payload = {})
-      objectify(base_uri["instances/#{id}/metadata/#{name}"].put(payload))
+      handle_response(base_uri["instances/#{id}/metadata/#{name}"].put(payload))
     end
 
   end
-end
+end

data/lib/orthanc/modalities.rb

@@ -3,53 +3,53 @@ module Orthanc
     # ------------- Modalities -------------
     # GET /modalities
     def modalities
-      objectify(base_uri["modalities"].get)
+      handle_response(base_uri["modalities"].get)
     end
 
     # GET /modalities/{dicom}
     def modality(dicom)
-      objectify(base_uri["modalities/#{dicom}"].get)
+      handle_response(base_uri["modalities/#{dicom}"].get)
     end
 
     # DELETE /modalities/{dicom}
     def delete_modality(dicom)
-      objectify(base_uri["modalities/#{dicom}"].delete)
+      handle_response(base_uri["modalities/#{dicom}"].delete)
     end
 
     # PUT /modalities/{dicom}
-    def modify_modality(dicom)
-      objectify(base_uri["modalities/#{dicom}"].put)
+    def modify_modality(dicom, payload = {})
+      handle_response(base_uri["modalities/#{dicom}"].put(payload))
     end
 
     # POST /modalities/{dicom}/echo
     def modality_echo(dicom, payload = {}) # C-Echo SCU
-      objectify(base_uri["modalities/#{dicom}/echo"].post(payload))
+      handle_response(base_uri["modalities/#{dicom}/echo"].post(payload))
     end
 
     # POST /modalities/{dicom}/find
     def modality_find(dicom, payload = {})
-      objectify(base_uri["modalities/#{dicom}/find"].post(payload))
+      handle_response(base_uri["modalities/#{dicom}/find"].post(payload))
     end
 
     # POST /modalities/{dicom}/find-patient
     def modality_find_patient(dicom, payload = {})
-      objectify(base_uri["modalities/#{dicom}/find-patient"].post(payload))
+      handle_response(base_uri["modalities/#{dicom}/find-patient"].post(payload))
     end
 
     # POST /modalities/{dicom}/find-series
     def modality_find_series(dicom, payload = {})
-      objectify(base_uri["modalities/#{dicom}/find-series"].post(payload))
+      handle_response(base_uri["modalities/#{dicom}/find-series"].post(payload))
     end
 
     # POST /modalities/{dicom}/find-study
     def modality_find_study(dicom, payload = {})
-      objectify(base_uri["modalities/#{dicom}/find-study"].post(payload))
+      handle_response(base_uri["modalities/#{dicom}/find-study"].post(payload))
     end
 
     # POST /modalities/{dicom}/store
     def modality_store(dicom, payload = {}) # POST body = UUID series, UUID instance, or raw DICOM file
-      objectify(base_uri["modalities/#{dicom}/store"].post(payload))
+      handle_response(base_uri["modalities/#{dicom}/store"].post(payload))
     end
 
   end
-end
+end

data/lib/orthanc/patients.rb

@@ -3,22 +3,22 @@ module Orthanc
     # ------------- Patients -------------
     # GET /patients
     def all_patients
-      objectify(base_uri["patients"].get)
+      handle_response(base_uri["patients"].get)
     end
 
     # GET /patients/{id}
     def patient(id)
-      objectify(base_uri["patients/#{id}"].get)
+      handle_response(base_uri["patients/#{id}"].get)
     end
 
-    # DELETE /patients/{id} 
+    # DELETE /patients/{id}
     def delete_patient(id)
-      objectify(base_uri["patients/#{id}"].delete)
+      handle_response(base_uri["patients/#{id}"].delete)
     end
 
     # POST /patients/{id}/anonymize
     def anonymize_patient(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["patients/#{id}/anonymize"].post(payload))
+      handle_response(base_uri["patients/#{id}/anonymize"].post(payload.to_s))
     end
 
     # GET /patients/{id}/archive
@@ -28,7 +28,7 @@ module Orthanc
 
     # GET /patients/{id}/instances
     def patient_instances(id) # Retrieve all the instances of this patient in a single REST call
-      objectify(base_uri["patients/#{id}/instances"].get)
+      handle_response(base_uri["patients/#{id}/instances"].get)
     end
 
     # GET /patients/{id}/media
@@ -38,12 +38,12 @@ module Orthanc
 
     # POST /patients/{id}/modify
     def modify_patient(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["patients/#{id}/modify"].post(payload))
+      handle_response(base_uri["patients/#{id}/modify"].post(payload.to_s))
     end
 
     # GET /patients/{id}/module
     def patient_module(id)
-      objectify(base_uri["patients/#{id}/module"].get)
+      handle_response(base_uri["patients/#{id}/module"].get)
     end
 
     # GET /patients/{id}/protected
@@ -60,95 +60,95 @@ module Orthanc
 
     # GET /patients/{id}/series
     def patient_series(id) # Retrieve all the series of this patient in a single REST call
-      objectify(base_uri["patients/#{id}/series"].get)
+      handle_response(base_uri["patients/#{id}/series"].get)
     end
 
     # GET /patients/{id}/shared-tags
     def patient_shared_tags(id) # "?simplify" argument to simplify output
-      objectify(base_uri["patients/#{id}/shared-tags"].get)
+      handle_response(base_uri["patients/#{id}/shared-tags"].get)
     end
 
     # GET /patients/{id}/statistics
     def patient_statistics(id)
-      objectify(base_uri["patients/#{id}/statistics"].get)
+      handle_response(base_uri["patients/#{id}/statistics"].get)
     end
 
     # GET /patients/{id}/studies
     def patient_studies(id) # Retrieve all the studies of this patient in a single REST call
-      objectify(base_uri["patients/#{id}/studies"].get)
+      handle_response(base_uri["patients/#{id}/studies"].get)
     end
 
     # TODO: Polymorphic resourceType resources. Repetitive. must refactor
 
     # GET /{resourceType}/{id}/attachments
     def patient_attachments(id)
-      objectify(base_uri["patients/#{id}/attachments"].get)
+      handle_response(base_uri["patients/#{id}/attachments"].get)
     end
 
     # DELETE /{resourceType}/{id}/attachments/{name}
     def delete_patient_attachment(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}"].delete)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}"].delete)
     end
 
     # PUT /{resourceType}/{id}/attachments/{name}
     def patient_attachment(id, name, payload = {})
-      objectify(base_uri["patients/#{id}/attachments/#{name}"].put(payload))
+      handle_response(base_uri["patients/#{id}/attachments/#{name}"].put(payload))
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-data
     def patient_attachment_compressed_data(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}/compressed-data"].get)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}/compressed-data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-md5
     def patient_attachment_compressed_md5(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}/compressed-md5"].get)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}/compressed-md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-size
     def patient_attachment_compressed_size(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}/compressed-size"].get)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}/compressed-size"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/data
     def patient_attachment_data(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}/data"].get)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}/data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/md5
     def patient_attachment_md5(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}/md5"].get)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}/md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/size
     def patient_attachment_size(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}/size"].get)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}/size"].get)
     end
 
     # POST /{resourceType}/{id}/attachments/{name}/verify-md5
     def patient_attachment_verify_md5(id, name)
-      objectify(base_uri["patients/#{id}/attachments/#{name}/verify-md5"].get)
+      handle_response(base_uri["patients/#{id}/attachments/#{name}/verify-md5"].get)
     end
 
     # GET /{resourceType}/{id}/metadata
     def patient_all_metadata(id)
-      objectify(base_uri["patients/#{id}/metadata"].get)
+      handle_response(base_uri["patients/#{id}/metadata"].get)
     end
 
     # GET /{resourceType}/{id}/metadata/{name}
     def patient_metadata(id, name)
-      objectify(base_uri["patients/#{id}/metadata/#{name}"].get)
+      handle_response(base_uri["patients/#{id}/metadata/#{name}"].get)
     end
 
     # DELETE /{resourceType}/{id}/metadata/{name}
     def patient_delete_metadata(id, name)
-      objectify(base_uri["patients/#{id}/metadata/#{name}"].delete)
+      handle_response(base_uri["patients/#{id}/metadata/#{name}"].delete)
     end
 
     # PUT /{resourceType}/{id}/metadata/{name}
     def patient_update_metadata(id, name, payload = {})
-      objectify(base_uri["patients/#{id}/metadata/#{name}"].put(payload))
+      handle_response(base_uri["patients/#{id}/metadata/#{name}"].put(payload))
     end
-    
+
   end
-end
+end

data/lib/orthanc/peers.rb

@@ -3,28 +3,28 @@ module Orthanc
     # ------------- Peers -------------
     # GET /peers
     def peers # Get the list of all the registered plugins
-      objectify(base_uri["peers"].get)
+      handle_response(base_uri["peers"].get)
     end
 
     # GET /peers/{peer}
     def peer(peer)
-      objectify(base_uri["peers/#{peer}"].get)
+      handle_response(base_uri["peers/#{peer}"].get)
     end
 
     # DELETE /peers/{peer}
     def delete_peer(peer)
-      objectify(base_uri["peers/#{peer}"].delete)
+      handle_response(base_uri["peers/#{peer}"].delete)
     end
 
     # PUT /peers/{peer}
     def modify_peer(peer, payload = {})
-      objectify(base_uri["peers/#{peer}"].put(payload))
+      handle_response(base_uri["peers/#{peer}"].put(payload))
     end
 
     # GET /peers/{peer}/store
     def peer_store(peer, payload = {}) # POST body = UUID series, UUID instance, or raw DICOM file
-      objectify(base_uri["peers/#{peer}/store"].post(payload))
-    end   
+      handle_response(base_uri["peers/#{peer}/store"].post(payload))
+    end
 
   end
-end
+end

data/lib/orthanc/plugins.rb

@@ -3,18 +3,18 @@ module Orthanc
     # ------------- Plugins -------------
     # GET /plugins
     def plugins # Get the list of all the registered plugins
-      objectify(base_uri["plugins"].get)
+      handle_response(base_uri["plugins"].get)
     end
 
     # GET /plugins/explorer.js
     def plugins_explorerjs # Get the JavaScript code that is injected by plugins into Orthanc Explorer
-      objectify(base_uri["plugins/explorer.js"].get) 
+      handle_response(base_uri["plugins/explorer.js"].get)
     end
 
     # GET /plugins/{id}
     def plugin(id) # Get information about some plugin
-      objectify(base_uri["plugins/#{id}"].get)
-    end    
+      handle_response(base_uri["plugins/#{id}"].get)
+    end
 
   end
-end
+end

data/lib/orthanc/series.rb

@@ -3,22 +3,22 @@ module Orthanc
     # ------------- Series -------------
     # GET /series
     def all_series # Darn DICOM, why did you have to call them something that's spelled the same singular and plural?
-      objectify(base_uri["series"].get)
+      handle_response(base_uri["series"].get)
     end
 
     # GET /series/{id}
     def series(id)
-      objectify(base_uri["series/#{id}"].get)
+      handle_response(base_uri["series/#{id}"].get)
     end
 
     # DELETE /series/{id}
     def delete_series(id)
-      objectify(base_uri["series/#{id}"].delete)
+      handle_response(base_uri["series/#{id}"].delete)
     end
 
     # POST /series/{id}/anonymize
     def anonymize_series(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["series/#{id}/anonymize"].post(payload))
+      handle_response(base_uri["series/#{id}/anonymize"].post(payload.to_s))
     end
 
     # GET /series/{id}/archive
@@ -28,7 +28,7 @@ module Orthanc
 
     # GET /series/{id}/instances
     def series_instances(id) # Retrieve all the instances of this patient in a single REST call
-      objectify(base_uri["series/#{id}/instances"].get)
+      handle_response(base_uri["series/#{id}/instances"].get)
     end
 
     # GET /series/{id}/media
@@ -38,105 +38,105 @@ module Orthanc
 
     # POST /series/{id}/modify
     def modify_series(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["series/#{id}/modify"].post(payload))
+      handle_response(base_uri["series/#{id}/modify"].post(payload.to_s))
     end
 
     # GET /series/{id}/module
     def series_module(id)
-      objectify(base_uri["series/#{id}/module"].get)
+      handle_response(base_uri["series/#{id}/module"].get)
     end
 
     # GET /series/{id}/patient
     def series_patient(id)
-      objectify(base_uri["series/#{id}/patient"].get)
+      handle_response(base_uri["series/#{id}/patient"].get)
     end
 
     # GET /series/{id}/shared-tags
     def series_shared_tags(id) # "?simplify" argument to simplify output
-      objectify(base_uri["series/#{id}/shared-tags"].get)
+      handle_response(base_uri["series/#{id}/shared-tags"].get)
     end
 
     # GET /series/{id}/statistics
     def series_statistics(id)
-      objectify(base_uri["series/#{id}/statistics"].get)
+      handle_response(base_uri["series/#{id}/statistics"].get)
     end
 
     # GET /series/{id}/study
     def series_study(id)
-      objectify(base_uri["series/#{id}/study"].get)
+      handle_response(base_uri["series/#{id}/study"].get)
     end
 
     # TODO: Polymorphic resourceType resources. Repetitive. must refactor
 
     # GET /{resourceType}/{id}/attachments
     def series_attachments(id)
-      objectify(base_uri["series/#{id}/attachments"].get)
+      handle_response(base_uri["series/#{id}/attachments"].get)
     end
 
     # DELETE /{resourceType}/{id}/attachments/{name}
     def delete_series_attachment(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}"].delete)
+      handle_response(base_uri["series/#{id}/attachments/#{name}"].delete)
     end
 
     # PUT /{resourceType}/{id}/attachments/{name}
     def series_attachment(id, name, payload = {})
-      objectify(base_uri["series/#{id}/attachments/#{name}"].put(payload))
+      handle_response(base_uri["series/#{id}/attachments/#{name}"].put(payload))
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-data
     def series_attachment_compressed_data(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}/compressed-data"].get)
+      handle_response(base_uri["series/#{id}/attachments/#{name}/compressed-data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-md5
     def series_attachment_compressed_md5(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}/compressed-md5"].get)
+      handle_response(base_uri["series/#{id}/attachments/#{name}/compressed-md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-size
     def series_attachment_compressed_size(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}/compressed-size"].get)
+      handle_response(base_uri["series/#{id}/attachments/#{name}/compressed-size"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/data
     def series_attachment_data(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}/data"].get)
+      handle_response(base_uri["series/#{id}/attachments/#{name}/data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/md5
     def series_attachment_md5(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}/md5"].get)
+      handle_response(base_uri["series/#{id}/attachments/#{name}/md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/size
     def series_attachment_size(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}/size"].get)
+      handle_response(base_uri["series/#{id}/attachments/#{name}/size"].get)
     end
 
     # POST /{resourceType}/{id}/attachments/{name}/verify-md5
     def series_attachment_verify_md5(id, name)
-      objectify(base_uri["series/#{id}/attachments/#{name}/verify-md5"].get)
+      handle_response(base_uri["series/#{id}/attachments/#{name}/verify-md5"].get)
     end
 
     # GET /{resourceType}/{id}/metadata
     def series_all_metadata(id)
-      objectify(base_uri["series/#{id}/metadata"].get)
+      handle_response(base_uri["series/#{id}/metadata"].get)
     end
 
     # GET /{resourceType}/{id}/metadata/{name}
     def series_metadata(id, name)
-      objectify(base_uri["series/#{id}/metadata/#{name}"].get)
+      handle_response(base_uri["series/#{id}/metadata/#{name}"].get)
     end
 
     # DELETE /{resourceType}/{id}/metadata/{name}
     def series_delete_metadata(id, name)
-      objectify(base_uri["series/#{id}/metadata/#{name}"].delete)
+      handle_response(base_uri["series/#{id}/metadata/#{name}"].delete)
     end
 
     # GET /{resourceType}/{id}/metadata/{name}
     def series_update_metadata(id, name, payload = {})
-      objectify(base_uri["series/#{id}/metadata/#{name}"].put(payload))
+      handle_response(base_uri["series/#{id}/metadata/#{name}"].put(payload))
     end
-    
+
   end
-end
+end

data/lib/orthanc/studies.rb

@@ -3,22 +3,22 @@ module Orthanc
     # ------------- Studies -------------
     # GET /studies
     def all_studies
-      objectify(base_uri["studies"].get)
+      handle_response(base_uri["studies"].get)
     end
 
     # GET /studies/{id}
     def study(id)
-      objectify(base_uri["studies/#{id}"].get)
+      handle_response(base_uri["studies/#{id}"].get)
     end
 
     # DELETE /studies/{id}
     def delete_study(id)
-      objectify(base_uri["studies/#{id}"].delete)
+      handle_response(base_uri["studies/#{id}"].delete)
     end
 
     # POST /studies/{id}/anonymize
     def anonymize_study(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["studies/#{id}/anonymize"].post(payload))
+      handle_response(base_uri["studies/#{id}/anonymize"].post(payload.to_s))
     end
 
     # GET /studies/{id}/archive
@@ -28,7 +28,7 @@ module Orthanc
 
     # GET /studies/{id}/instances
     def study_instances(id) # Retrieve all the instances of this patient in a single REST call
-      objectify(base_uri["studies/#{id}/instances"].get)
+      handle_response(base_uri["studies/#{id}/instances"].get)
     end
 
     # GET /studies/{id}/media
@@ -38,110 +38,110 @@ module Orthanc
 
     # POST /studies/{id}/modify
     def modify_study(id, payload = {}) # https://code.google.com/p/orthanc/wiki/Anonymization
-      objectify(base_uri["studies/#{id}/modify"].post(payload))
+      handle_response(base_uri["studies/#{id}/modify"].post(payload.to_s))
     end
 
     # GET /studies/{id}/module
     def study_module(id)
-      objectify(base_uri["studies/#{id}/module"].get)
+      handle_response(base_uri["studies/#{id}/module"].get)
     end
 
     # GET /studies/{id}/module-patient
     def study_module_patient(id)
-      objectify(base_uri["studies/#{id}/module-patient"].get)
+      handle_response(base_uri["studies/#{id}/module-patient"].get)
     end
 
     # GET /studies/{id}/patient
     def study_patient(id)
-      objectify(base_uri["studies/#{id}/patient"].get)
+      handle_response(base_uri["studies/#{id}/patient"].get)
     end
 
     # GET /studies/{id}/series
     def study_series(id) # Retrieve all the series of this patient in a single REST call
-      objectify(base_uri["studies/#{id}/series"].get)
+      handle_response(base_uri["studies/#{id}/series"].get)
     end
 
     # GET /studies/{id}/shared-tags
     def study_shared_tags(id) # "?simplify" argument to simplify output
-      objectify(base_uri["studies/#{id}/shared-tags"].get)
+      handle_response(base_uri["studies/#{id}/shared-tags"].get)
     end
 
     # GET /studies/{id}/statistics
     def study_statistics(id)
-      objectify(base_uri["studies/#{id}/statistics"].get)
+      handle_response(base_uri["studies/#{id}/statistics"].get)
     end
 
     # TODO: Polymorphic resourceType resources. Repetitive. must refactor
 
     # GET /{resourceType}/{id}/attachments
     def study_attachments(id)
-      objectify(base_uri["studies/#{id}/attachments"].get)
+      handle_response(base_uri["studies/#{id}/attachments"].get)
     end
 
     # DELETE /{resourceType}/{id}/attachments/{name}
     def delete_study_attachment(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}"].delete)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}"].delete)
     end
 
     # PUT /{resourceType}/{id}/attachments/{name}
     def study_attachment(id, name, payload = {})
-      objectify(base_uri["studies/#{id}/attachments/#{name}"].put(payload))
+      handle_response(base_uri["studies/#{id}/attachments/#{name}"].put(payload))
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-data
     def study_attachment_compressed_data(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}/compressed-data"].get)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}/compressed-data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-md5
     def study_attachment_compressed_md5(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}/compressed-md5"].get)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}/compressed-md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/compressed-size
     def study_attachment_compressed_size(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}/compressed-size"].get)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}/compressed-size"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/data
     def study_attachment_data(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}/data"].get)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}/data"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/md5
     def study_attachment_md5(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}/md5"].get)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}/md5"].get)
     end
 
     # GET /{resourceType}/{id}/attachments/{name}/size
     def study_attachment_size(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}/size"].get)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}/size"].get)
     end
 
     # POST /{resourceType}/{id}/attachments/{name}/verify-md5
     def study_attachment_verify_md5(id, name)
-      objectify(base_uri["studies/#{id}/attachments/#{name}/verify-md5"].get)
+      handle_response(base_uri["studies/#{id}/attachments/#{name}/verify-md5"].get)
     end
 
     # GET /{resourceType}/{id}/metadata
     def study_all_metadata(id)
-      objectify(base_uri["studies/#{id}/metadata"].get)
+      handle_response(base_uri["studies/#{id}/metadata"].get)
     end
 
     # GET /{resourceType}/{id}/metadata/{name}
     def study_metadata(id, name)
-      objectify(base_uri["studies/#{id}/metadata/#{name}"].get)
+      handle_response(base_uri["studies/#{id}/metadata/#{name}"].get)
     end
 
     # DELETE /{resourceType}/{id}/metadata/{name}
     def study_delete_metadata(id, name)
-      objectify(base_uri["studies/#{id}/metadata/#{name}"].delete)
+      handle_response(base_uri["studies/#{id}/metadata/#{name}"].delete)
     end
 
     # PUT /{resourceType}/{id}/metadata/{name}
     def study_update_metadata(id, name, payload = {})
-      objectify(base_uri["studies/#{id}/metadata/#{name}"].put(payload))
+      handle_response(base_uri["studies/#{id}/metadata/#{name}"].put(payload))
     end
-    
+
   end
-end
+end

data/lib/orthanc/tools.rb

@@ -4,7 +4,7 @@ module Orthanc
 
     # POST /tools/create-dicom
     def tools_create_dicom(payload = {}) # Create and store a new DICOM instance (experimental)
-      objectify(base_uri["tools/create-dicom"].post(payload))
+      handle_response(base_uri["tools/create-dicom"].post(payload))
     end
 
     # GET /tools/dicom-conformance
@@ -14,17 +14,17 @@ module Orthanc
 
     # POST /tools/execute-script
     def tools_execute_script(payload = {}) # Execute the Lua script in the POST body (experimental)
-      objectify(base_uri["tools/execute-script"].post(payload))
+      handle_response(base_uri["tools/execute-script"].post(payload))
     end
 
     # GET /tools/generate-uid
     def tools_generate_uid(level) # "level" argument among "patient", "study", "series" and "instance"
-      objectify(base_uri["tools/generate-uid"].get({params: {level: level}}))
+      handle_response(base_uri["tools/generate-uid"].get({params: {level: level}}))
     end
 
     # POST /tools/lookup
     def tools_lookup(payload = {}) # Map DICOM UIDs to Orthanc identifiers
-      objectify(base_uri["tools/lookup"].post(payload))
+      handle_response(base_uri["tools/lookup"].post(payload))
     end
 
     # GET /tools/now
@@ -34,8 +34,8 @@ module Orthanc
 
     # POST /tools/reset
     def tools_reset(payload = {}) # Hot restart of Orthanc, the configuration file will be read again
-      objectify(base_uri["tools/reset"].post(payload))
+      handle_response(base_uri["tools/reset"].post(payload))
     end
 
   end
-end
+end

data/lib/orthanc/version.rb

@@ -1,3 +1,3 @@
 module Orthanc
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthanc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Simon Rascovsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler