lifen_fhir 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a0ed993d46baf68edddbda17ef20c4140ddf0d
-  data.tar.gz: 7b45c21f3d3a4b98518b36a2550d99ecd538c196
+  metadata.gz: 444903207c6344dafb7a9fc38f6bec501fa136c4
+  data.tar.gz: 823d8c0d7bd31e27c15f6d39cc31ebdf8d2ecd35
 SHA512:
-  metadata.gz: 785f0ce96c4bd01f49958de43f553162619f41ec6fba062fbad1426e8737d743eba9c6b7bff2d07cd684dab13591fd8693d63f49700e5a58260b32c0a1ab705d
-  data.tar.gz: 1949b2369f4c939fb7979d55635ed4142a4c45bac6bd26e96988ffb95e2dee573c17ca49b0dca96b8d0b913a0f3e99de77a2b54331caa1179d85b2a7e7ef231b
+  metadata.gz: 4bc7ee300eb9427f5100c08e996e406d2d14a4235b8e4340543c065c727a656dae4c610e731e174f532fe8bbbd67a9eb4f8605598ec2b3a14b4a81952f929001
+  data.tar.gz: c6a2b3e3baf246bc3494e1e7feff523b14563f31a325bfe8a743e6d391ea5912626c0a2a85bfcad28a90301c89efc7b844d53dfbaaaf900e65ed5636e68fa5bb

data/CHANGELOG.md

@@ -1,8 +1,13 @@
-0.4.1
+0.4.2
 -----
 
 - Fixed incorrect FHIR payload for Patient
 
+0.4.1
+-----
+
+- Fixed empty birthDate issue with FHIR payload for Patient
+
 0.4.0
 -----
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lifen_fhir (0.4.1)
+    lifen_fhir (0.4.2)
       faraday (>= 0.9)
       inflecto
       virtus (>= 1.0)
@@ -16,6 +16,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     crack (0.4.3)
@@ -23,15 +24,51 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
+    docile (1.1.5)
     equalizer (0.0.11)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.18)
+    formatador (0.2.5)
+    guard (2.14.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.4)
     ice_nine (0.11.2)
     inflecto (0.0.2)
+    json (2.0.3)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.11)
+    method_source (0.8.2)
     multipart-post (2.0.0)
+    nenv (0.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     public_suffix (2.0.5)
     rake (10.5.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
+      ffi (>= 0.5.0)
+    rb-readline (0.5.4)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -45,7 +82,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
+    shellany (0.0.1)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slop (3.6.0)
+    thor (0.19.4)
     thread_safe (0.3.6)
     vcr (3.0.3)
     virtus (1.0.5)
@@ -64,9 +110,12 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   bundler (~> 1.12)
+  guard-rspec
   lifen_fhir!
   rake (~> 10.5)
+  rb-readline
   rspec (~> 3.5)
+  simplecov
   vcr (~> 3.0)
   webmock (~> 1.24)
 

data/Guardfile

@@ -0,0 +1,5 @@
+guard :rspec, cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/lifen_fhir/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -100,9 +100,11 @@ channel = recipient.create_telecom(type: "telecom", system: "fax", value: "+3310
 ```ruby
 # To create a new patient
 address = LifenFhir::Address.new(lines: ["39 rue d'Aboukir"], city: "Paris", postal_code: "75002")
+
 patient = LifenFhir::Patient.create(first_name: ["Jean", "Charles"], last_name: "Dupond", birth_date: Date.new(1974, 12, 25), address: address)
+patient = LifenFhir::Patient.create(first_name: "Jean", last_name: "Dupond", birth_date: Date.new(1974, 12, 25), address: address)
 
-# To find a patient by id
+# To find a patient
 patient = LifenFhir::Patient.find_by_uuid("c3f96278-3bfe-4933-96e7-171ebca7489f")
 
 # To set the patient as a recipient in a CommunicationRequest

data/lib/lifen_fhir/address.rb

@@ -1,11 +1,10 @@
 module LifenFhir
-  class Address < Base
-
-    attribute :uuid, String
+  class Address < Element
 
     attribute :lines, [String]
     attribute :postal_code, String
     attribute :city, String
+    attribute :country, String
 
     def attributes_from_json(json)
       self.lines = Array(json.fetch("line"))
@@ -17,11 +16,12 @@ module LifenFhir
       self
     end
 
-    def create_payload
+    def fhir_payload
       {
         "line": lines,
         "city": city,
-        "postalCode": postal_code
+        "postalCode": postal_code,
+        "country": country
       }
     end
 

data/lib/lifen_fhir/base.rb

@@ -3,5 +3,15 @@ module LifenFhir
 
     include Virtus.model
 
+    private
+
+      def application_client
+        @application_client ||= AppAuthenticatedClient.new
+      end
+
+      def self.application_client
+        @application_client ||= AppAuthenticatedClient.new
+      end
+
   end
 end

data/lib/lifen_fhir/binary.rb

@@ -1,7 +1,5 @@
 module LifenFhir
-  class Binary < Base
-
-    attribute :uuid, String
+  class Binary < Element
 
     def fhir_payload
       {
@@ -16,24 +14,10 @@ module LifenFhir
     end
 
     def attributes_from_json(json)
-      first_binary = Array(json).first
-
-      reference = first_binary["contentReference"]["reference"]
-
-      self.uuid = reference.gsub('Binary/', '')
-
-      self
+      super(json["contentReference"])
     end
 
     private
 
-      def application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
-      def reference
-        LifenFhir::Reference.new(self).to_s
-      end
-
   end
 end

data/lib/lifen_fhir/category.rb

@@ -18,6 +18,12 @@ module LifenFhir
       }
     end
 
+    def attributes_from_json(json)
+      self.code = Array(json["coding"]).first.fetch "code"
+
+      self
+    end
+
     def valid?
       CODES.include? code
     end

data/lib/lifen_fhir/channel.rb

@@ -1,10 +1,11 @@
 module LifenFhir
-  class Channel < Base
+  class Channel < Element
 
-    attribute :uuid, String
     attribute :type, String
     attribute :value, String
 
+    attribute :telecom, LifenFhir::Telecom
+
     def fhir_payload(user)
       raise LifenFhir::Error, "Invalid channel: an UUID is required" if !valid?
 
@@ -24,7 +25,14 @@ module LifenFhir
     end
 
     def self.from_json(json, type = nil)
-      new(uuid: json["id"], type: type, value: json["value"] || "#{Array(json["line"]).join(", ")}, #{json["postalCode"]} #{json["city"]}")
+      if type == "telecom"
+        telecom = Telecom.new.attributes_from_json(json)
+
+        new(uuid: telecom.uuid, type: type, value: telecom.value)
+      else
+
+        new(uuid: json["id"], type: type, value: "#{Array(json["line"]).join(", ")}, #{json["postalCode"]} #{json["city"]}")
+      end
     end
 
   end

data/lib/lifen_fhir/communication_request.rb

@@ -1,11 +1,10 @@
 module LifenFhir
-  class CommunicationRequest < Base
+  class CommunicationRequest < Element
 
-    attribute :uuid, String
     attribute :number_communications, Integer
 
-    attribute :sender, LifenFhir::Reference
-    attribute :recipients, [LifenFhir::Reference]
+    attribute :sender, LifenFhir::Sender
+    attribute :recipients, [LifenFhir::Recipient]
 
     attribute :category, LifenFhir::Category, default: LifenFhir::Category.new
     attribute :medium, [LifenFhir::Medium]
@@ -39,7 +38,15 @@ module LifenFhir
 
       self.status = json.fetch("status") { "unknown" }
 
-      self.binary = Binary.new.attributes_from_json(json["payload"])
+      self.binary = Binary.new.attributes_from_json(Array(json["payload"]).first)
+
+      self.category = Category.new.attributes_from_json(Array(json["category"]).first)
+
+      self.sender = Practitioner.new.attributes_from_json(json["sender"])
+
+      self.recipients = Array(json["recipient"]).map do |recipient_json|
+         Practitioner.new.attributes_from_json(recipient_json)
+      end
     end
 
     private
@@ -48,8 +55,8 @@ module LifenFhir
 
         payload = {
           resourceType: "CommunicationRequest",
-          sender: [ sender.fhir_payload ],
-          recipient: recipients.map(&:fhir_payload),
+          sender: [ sender.fhir_payload_as_reference ],
+          recipient: recipients.map(&:fhir_payload_as_reference),
           contained: [],
           medium: medium.map(&:fhir_payload) ,
           category: [ category.fhir_payload],
@@ -78,13 +85,5 @@ module LifenFhir
         end
       end
 
-      def application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
-      def self.application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
   end
 end

data/lib/lifen_fhir/element.rb

@@ -0,0 +1,37 @@
+module LifenFhir
+  class Element < Base
+
+    attribute :uuid, String
+
+    def reference
+      "#{resource_type}/#{uuid}"
+    end
+
+    def attributes_from_json(json)
+      self.uuid = extract_uuid(json["reference"])
+
+      self
+    end
+
+    def fhir_payload_as_reference
+      { reference: reference }
+    end
+
+    private
+
+      def extract_uuid(uuid_or_reference)
+        if m = uuid_or_reference.match(/^#(.*)/) # "#1234-abcd-5678'
+          return m[1]
+        elsif m = uuid_or_reference.match(/(.*)\/(.*)/) # "Binary/1234-abcd-5678'
+          return m[2]
+        else
+          return uuid_or_reference
+        end
+      end
+
+      def resource_type
+        self.class.name.gsub!('LifenFhir::', '')
+      end
+
+  end
+end

data/lib/lifen_fhir/medium.rb

@@ -1,7 +1,5 @@
 module LifenFhir
-  class Medium < Base
-
-    attribute :uuid, String
+  class Medium < Element
 
     def fhir_payload
       {

data/lib/lifen_fhir/patient.rb

@@ -1,7 +1,5 @@
 module LifenFhir
-  class Patient < Base
-
-    attribute :uuid, String
+  class Patient < Element
 
     attribute :first_name, [String]
     attribute :last_name, String
@@ -23,16 +21,16 @@ module LifenFhir
 
     def self.find_by_uuid(uuid)
       patient = new(uuid:uuid)
-      json = application_client.get("fhir/#{LifenFhir::Reference.new(patient)}")
 
-      patient = new
+      json = application_client.get("fhir/#{patient.reference}")
+
       patient.attributes_from_json(json)
 
       patient
     end
 
     def fhir_payload
-      {
+      fhir_payload = {
         id: "patient",
         resourceType: "Patient",
         name: [
@@ -40,9 +38,10 @@ module LifenFhir
             family: last_name,
             given: first_name
           }
-        ],
-        birthDate: birth_date.to_s
+        ]
       }
+      fhir_payload[:birthDate] = birth_date.to_s if birth_date
+      fhir_payload
     end
 
     def attributes_from_json(json)
@@ -72,23 +71,16 @@ module LifenFhir
 
         if address
           filtered_params["address"] = [
-            address.create_payload
+            address.fhir_payload
           ]
         end
 
-        filtered_params["birthDate"] = birth_date.to_s
+        if birth_date
+          filtered_params["birthDate"] = birth_date.to_s
+        end
 
         filtered_params
       end
 
-      def application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
-
-      def self.application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
   end
 end

data/lib/lifen_fhir/practitioner.rb

@@ -1,9 +1,8 @@
 module LifenFhir
-  class Practitioner < Base
+  class Practitioner < Element
 
     attribute :channels, [LifenFhir::Channel]
 
-    attribute :uuid, String
     attribute :last_name, String
     attribute :first_name, String
     attribute :rpps, String
@@ -37,14 +36,8 @@ module LifenFhir
     def create_address(params)
       filtered_params = {"resourceType" => "Practitioner"}
 
-      address = {
-        "line": Array(params[:lines]),
-        "city": params[:city],
-        "postalCode": params[:postal_code],
-        "country": params[:country]
-      }
-
-      filtered_params[params[:type]] = address
+      address = Address.new(params)
+      filtered_params[params[:type]] = address.fhir_payload
 
       json = application_client.post("fhir/#{reference}/$add-address", filtered_params)
 
@@ -55,23 +48,11 @@ module LifenFhir
       channel
     end
 
-    def self.from_json(json)
-      reference = json["reference"]
-
-      uuid = reference.gsub("Practitioner/", "")
-
-      new(uuid: uuid)
-    end
-
     def create_telecom(params)
       filtered_params = {"resourceType" => "Practitioner"}
 
-      telecom = {
-        "system": params[:system],
-        "value": params[:value]
-      }
-
-      filtered_params[params[:type]] = telecom
+      telecom = Telecom.new(params)
+      filtered_params[params[:type]] = telecom.fhir_payload
 
       json = application_client.post("fhir/#{reference}/$add-telecom", filtered_params)
 
@@ -83,19 +64,7 @@ module LifenFhir
 
     end
 
-    def reference
-      LifenFhir::Reference.new(self).to_s
-    end
-
     private
 
-      def application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
-      def self.application_client
-        @application_client ||= AppAuthenticatedClient.new
-      end
-
   end
 end

data/lib/lifen_fhir/telecom.rb

@@ -0,0 +1,23 @@
+module LifenFhir
+  class Telecom < Element
+
+    attribute :system, String
+    attribute :value, String
+
+    def attributes_from_json(json)
+      self.uuid = json.fetch("id")
+      self.system = json.fetch("system")
+      self.value = json.fetch("value")
+
+      self
+    end
+
+    def fhir_payload
+      {
+        "system": system,
+        "value": value
+      }
+    end
+
+  end
+end

data/lib/lifen_fhir/version.rb

@@ -1,3 +1,3 @@
 module LifenFhir
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/lifen_fhir.rb

@@ -5,6 +5,18 @@ module LifenFhir
   require 'inflecto'
   require 'base64'
 
+  class Recipient < Virtus::Attribute
+    def coerce(value)
+      (value.is_a?(Practitioner) or value.is_a?(Patient) or value.nil?) ? value : raise(Error)
+    end
+  end
+
+  class Sender < Virtus::Attribute
+    def coerce(value)
+      (value.is_a?(Practitioner) or value.nil?) ? value : raise(Error)
+    end
+  end
+
   require "lifen_fhir/version"
 
   require 'lifen_fhir/error'
@@ -13,9 +25,10 @@ module LifenFhir
   require 'lifen_fhir/app_authenticated_client'
   require 'lifen_fhir/configuration'
   require 'lifen_fhir/base'
+  require 'lifen_fhir/element'
 
-  require 'lifen_fhir/reference'
   require 'lifen_fhir/address'
+  require 'lifen_fhir/telecom'
   require 'lifen_fhir/channel'
   require 'lifen_fhir/practitioner'
   require 'lifen_fhir/category'

data/lifen_fhir.gemspec

@@ -23,6 +23,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", '~> 3.0'
   spec.add_development_dependency "webmock", '~> 1.24'
   spec.add_development_dependency "awesome_print"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rb-readline"
+
 
   spec.add_runtime_dependency     "virtus", '>= 1.0'
   spec.add_runtime_dependency     "inflecto"

data/spec/binary_spec.rb

@@ -2,28 +2,28 @@ require 'spec_helper'
 
 describe LifenFhir::Binary do
 
-  describe ':download with right uuid' do
+  describe ':download' do
 
     let(:binary)           { LifenFhir::Binary.new(uuid: "valid_binary_id") }
 
     it 'works' do
-
       VCR.use_cassette "binary/download/valid" do
         expect(Digest::MD5.hexdigest(binary.download)).to eq("2285abb032c5e9054a518690b4701ab6")
       end
     end
-  end
-
-    describe ':download with right uuid' do
 
-      let(:binary)           { LifenFhir::Binary.new(uuid: "wrong-binary-uuid") }
+    context 'with invalid uuid' do
 
-      it 'fails with wrong uuid' do
+      let(:binary)         { LifenFhir::Binary.new(uuid: "wrong-binary-uuid") }
 
+      it 'fails nicely' do
         VCR.use_cassette "binary/download/invalid" do
           expect{  binary.download }.to raise_error LifenFhir::Error
         end
       end
 
     end
+
   end
+
+end

data/spec/cassettes/communication_request/find_by_uuid/valid_uuid_with_no_status.yml

@@ -66,7 +66,7 @@ http_interactions:
               "coding": [
                 {
                   "system": "http://honestica.com/fhir/communication/category",
-                  "code": "MEDICAL_REPORT"
+                  "code": "MEDICATION_ORDER"
                 }
               ]
             }