orthanc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 509d31ee74414e383409a5189892149d32457ce2
-  data.tar.gz: 9867650b3e71e828cc86ae3c1096b1220fb0d792
+  metadata.gz: ccf9301babd64787d744d69a9a81464e3398fe4d
+  data.tar.gz: b8e4c42dac43349a5b14f8ac0fa0ad4cfb80433e
 SHA512:
-  metadata.gz: 2fc432f1593ad9c8a64c8042de72fc93360b36873f909fee6841977bdb533cb65ecd4db6b375f37a782a4e4a7a9a6cf279d4d5422f3355c4124b93955d653e0f
-  data.tar.gz: eda048fbf6e437af42013473290af66fd1234efc4d1f344372ad83a460f1f3e15d7d08294135e8230de03d43214237e6a731d3577a1cd44cf6d93ea78daacc96
+  metadata.gz: 185f53de1ddf328fbca69fb818d0b46c50ece065b54c78c5c0827d16232740ad450167bef087bece28312a4e0b36c2016ac060c459fdab0bf02f846f9e11fbb8
+  data.tar.gz: faf58cb724d81b4325a9052cb1046e41e0feed709f9db707298a71b434fba7779c0dd33ae4cace4f92b8336ac5669471f64adf2c0667100476e68b0813951298

data/lib/orthanc/modalities.rb

@@ -24,33 +24,69 @@ module Orthanc
     end
 
     # POST /modalities/{dicom}/echo
-    def echo(payload = {}) # C-Echo SCU
-      handle_response(base_uri["echo"].post(payload))
+    def echo(payload = {}) # C-Echo SCU. Return true if successful
+      base_uri["echo"].post(payload){|response, request, result, &block|
+        if response.code == 200
+          return true
+        else
+          return false
+        end
+      }
     end
 
     # POST /modalities/{dicom}/find
-    def find(payload = {})
-      handle_response(base_uri["find"].post(payload))
+    def find(payload = {}) # C-Echo SCU. Return true if successful
+      base_uri["find"].post(payload){|response, request, result, &block|
+        if response.code == 200
+          return handle_response(response)
+        else
+          return false
+        end
+      }
     end
 
     # POST /modalities/{dicom}/find-patient
-    def find_patient(payload = {})
-      handle_response(base_uri["find-patient"].post(payload))
+    def find_patient(payload = {}) # eg. '{"PatientName":"JOD*","PatientSex":"M"}'
+      base_uri["find-patient"].post(payload){|response, request, result, &block|
+        if response.code == 200
+          return handle_response(response)
+        else
+          return false
+        end
+      }
     end
 
     # POST /modalities/{dicom}/find-series
-    def find_series(payload = {})
-      handle_response(base_uri["find-series"].post(payload))
+    def find_series(payload = {}) # eg. '{"PatientID":"0555643F"}'
+      base_uri["find-series"].post(payload){|response, request, result, &block|
+        if response.code == 200
+          return handle_response(response)
+        else
+          return false
+        end
+      }
     end
 
     # POST /modalities/{dicom}/find-study
-    def find_study(payload = {})
-      handle_response(base_uri["find-study"].post(payload))
+    def find_study(payload = {}) # eg. '{"PatientID":"0555643F","StudyInstanceUID":"1.2.840.113704.1.111.2768.1239195678.57"}'
+      base_uri["find-study"].post(payload){|response, request, result, &block|
+        if response.code == 200
+          return handle_response(response)
+        else
+          return false
+        end
+      }
     end
 
     # POST /modalities/{dicom}/store
     def store(payload = {}) # POST body = UUID series, UUID instance, or raw DICOM file
-      handle_response(base_uri["store"].post(payload))
+      base_uri["store"].post(payload){|response, request, result, &block|
+        if response.code == 200
+          return true
+        else
+          return false
+        end
+      }
     end
 
   end

data/lib/orthanc/response.rb

@@ -16,7 +16,11 @@ module Response
         parsed_response = JSON.parse(response)
 
         if parsed_response.class == Array
-          return parsed_response
+          # Normalize to an array inside a hash, so RecursiveOpenStruct can act
+          data = {}
+          data["response"] = parsed_response
+          return RecursiveOpenStruct.new(data.to_snake_keys, recurse_over_arrays: true ).response
+
         elsif parsed_response.class == Hash
           return RecursiveOpenStruct.new(parsed_response.to_snake_keys, recurse_over_arrays: true )
         else

data/lib/orthanc/version.rb

@@ -1,4 +1,4 @@
 module Orthanc
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   ORTHANC_API_VERSION = "0.8.6"
 end

metadata

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