lifen 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79deed444977cb5560f104a1507ad85d3f7066fa
-  data.tar.gz: ca4895e8cf1356a51d01661e18acfd3d4e52e8a6
+  metadata.gz: 4bd1233dcbd537aaa00f92d9d557d7a975341d30
+  data.tar.gz: 9e8d5cb3f5412e859fe3625e8053c0caf7f8ab40
 SHA512:
-  metadata.gz: f9a0a0d34c22b03898a17af6b078693e31d5d512073c1d7c35874d931d0c64e94743d3a8d584d8e388b8f597c03b9abfc333d3e2e5e82d831a2a33f17997b7f6
-  data.tar.gz: 813dc3995c10b1d70f4bf9fccb3190cd7dc2b0757ca1d401bc312552c835ff929160af47467dd2eee0b55be2079eea33ae1180f56df3706c08066c0ad9b2e62c
+  metadata.gz: bf7d49d1777e98a42d017f31dfe8e4ecf803a77daca3388a406171ceded5a1f61da7a69e52d3af53868c6a18fc75ab367ccad17097683f571e54978939248e52
+  data.tar.gz: 249e90557b597e25d625289c82d3f631e5ed31e889b897d5aceefd60fb91922f3dc72906ee0630741d4da66a02de8136cddb4697e1f9b0391647f4ddc273c4f7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+4.0.0
+-----
+
+Removed all FHIR endpoints
+
 3.0.0
 -----
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lifen (3.0.0)
+    lifen (4.0.0)
       faraday (>= 0.9)
       inflecto
       virtus (>= 1.0)
@@ -9,9 +9,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    awesome_print (1.7.0)
+    awesome_print (1.8.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -24,27 +24,27 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     equalizer (0.0.11)
-    faraday (0.11.0)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    hashdiff (0.3.2)
+    hashdiff (0.3.4)
     ice_nine (0.11.2)
     inflecto (0.0.2)
     multipart-post (2.0.0)
     public_suffix (2.0.5)
     rake (10.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     safe_yaml (1.0.4)
     thread_safe (0.3.6)
     vcr (3.0.3)

data/README.md

@@ -128,83 +128,6 @@ message = Lifen::Message.new(flow: flow, content: "Hello World !")
 message.create
 ```
 
-### FHIR examples
-
-#### Managing a Binary
-
-```ruby
-binary = Lifen::Binary.new(uuid: "b7c7dae671b93e951ce6a4f530736276")
-binary.download
-```
-
-#### Communications with an Attachment
-
-```ruby
-sender = Lifen::Practitioner.find_by_rpps("899900018483")
-
-recipient = Lifen::Practitioner.find_by_rpps("899900018484")
-channel = recipient.channels.first
-
-category = Lifen::Category.new(code: "MEDICAL_REPORT") # default case, optionnal element
-
-attachment = Lifen::Attachment.new(title: "Test document", path: "path/to/file")
-
-patient = Lifen::Patient.new(first_name: "Jean", last_name: "Dupond", birthdate: Date.new(2000,1,1))
-
-communication_request = Lifen::CommunicationRequest.new(sender: sender, recipient: recipient, channel: channel, attachment: attachment, patient: patient, category: category)
-communication_request.send
-
-communication_request = Lifen::CommunicationRequest.find("valid-communication_request-uuid")
-communication_request.status
-```
-
-### Communications with a Binary
-
-```ruby
-sender = Lifen::Practitioner.find_by_rpps("899900018483")
-
-recipient = Lifen::Practitioner.find_by_rpps("899900018484")
-channel = recipient.channels.first
-
-binary = Lifen::Binary.new(uuid: "b7c7dae671b93e951ce6a4f530736276")
-
-communication_request = Lifen::CommunicationRequest.new(sender: sender, recipient: recipient, channel: channel, binary: binary, patient: patient, category: category)
-
-communication_request.send
-
-```
-
-#### Communication requets with multiple recipients
-
-```ruby
-sender = Lifen::Practitioner.find_by_rpps("899900018483")
-
-recipient = Lifen::Practitioner.find_by_rpps("899900018484")
-medium = Lifen::Medium(uuid: recipient.channels.first.uuid)
-
-other_recipient = Lifen::Practitioner.find_by_rpps("899900018484")
-other_medium = Lifen::Medium(uuid: other_recipient.channels.first.uuid)
-
-binary = Lifen::Binary.new(uuid: "b7c7dae671b93e951ce6a4f530736276")
-
-communication_request_request = Lifen::CommunicationRequest.new(sender: sender, recipients: [recipient, other_recipient], medium: [medium, other_medium], binary: binary, patient: patient, category: category)
-
-communication_request_request.send
-
-```
-
-#### Custom Channels management
-
-```ruby
-recipient = Lifen::Practitioner.new(uuid: "valid-user-uuid")
-
-# To create a new mailing address channel
-channel = recipient.create_address(type: "address", lines: ["39 rue Aboukir"], city: "Paris", postal_code: "75002", country: "France")
-
-# To create a new telecom channel fax
-channel = recipient.create_telecom(type: "telecom", system: "fax", value: "+33102030405")
-```
-
 ## Deploying to Rubygems
 
 Once the new version is validated, the deployment follows those steps :

data/lib/lifen.rb

@@ -3,7 +3,6 @@ module Lifen
   require 'virtus'
   require 'faraday'
   require 'inflecto'
-  require 'base64'
 
   require "lifen/version"
 
@@ -22,16 +21,6 @@ module Lifen
   require 'lifen/flows'
   require 'lifen/message'
 
-  require 'lifen/channel'
-  require 'lifen/practitioner'
-  require 'lifen/category'
-  require 'lifen/medium'
-  require 'lifen/attachment'
-  require 'lifen/binary'
-  require 'lifen/patient'
-  require 'lifen/content_string'
-  require 'lifen/communication_request'
-
   Virtus.finalize
 
 end

data/lib/lifen/configuration.rb

@@ -1,11 +1,13 @@
 module Lifen
   class Configuration
-    attr_accessor :site, :application_access_token, :proxy_url, :expiration_margin
+    attr_accessor :site, :application_access_token, :proxy_url, :expiration_margin, :token_refresh_lock
 
     def initialize(args)
        args.each do |k,v|
         instance_variable_set("@#{k}", v) unless v.nil?
       end
+
+      @token_refresh_lock = Mutex.new
     end
 
     def site=(url)

data/lib/lifen/token.rb

@@ -1,7 +1,11 @@
 module Lifen
   class Token
 
-    @@refresh_lock = Mutex.new
+    # def self.refresh_lock
+    #   @refresh_lock ||= Mutex.new
+    # end
+
+    # @@refresh_lock = Mutex.new
 
     include Virtus.model(finalize: false)
 
@@ -45,11 +49,12 @@ module Lifen
     end
 
     def refresh_once_if_needed
-      @@refresh_lock.synchronize do
+      Lifen.configuration.token_refresh_lock.synchronize do
 
         load_from_db.call(self) if load_from_db.is_a? Proc
 
         return if active?
+
         refresh
 
         save_to_db.call(self) if save_to_db.is_a? Proc

data/lib/lifen/user.rb

@@ -5,7 +5,6 @@ module Lifen
     attribute :token, "Lifen::Token"
     attribute :status, "Lifen::Status"
     attribute :settings, "Lifen::Settings"
-    attribute :channels, ["Lifen::Channel"]
 
     attribute :uuid, String
     attribute :email, String
@@ -101,16 +100,6 @@ module Lifen
       UserAuthenticatedClient.new(token)
     end
 
-    # def self.where(params)
-    #   json = application_client.get("fhir/Practitioner/", params)
-
-    #   users = []
-
-    #   users << new(user_json)
-
-    #   users
-    # end
-
 
     private
 

data/lib/lifen/version.rb

@@ -1,3 +1,3 @@
 module Lifen
-  VERSION = "3.0.0"
+  VERSION = "4.0.0"
 end

data/spec/token_spec.rb

@@ -82,6 +82,7 @@ describe Lifen::Token do
 
     let(:user)                    { Lifen::User.new }
     let(:persisted_user)          { TokenPersistedUser.new("expired_token", Time.now.to_i - 60) }
+    let(:perstiting)              { double("Persisting") }
 
     let(:expired_token)           {
       Lifen::Token.new( user: user,
@@ -90,14 +91,20 @@ describe Lifen::Token do
                         load_from_db: ->(token) {
                           # Loading data from DB
 
+                          sleep 0.5
+
                           token.value = persisted_user.token_value
                           token.expires_at = persisted_user.token_expires_at
                         },
                         save_to_db: ->(token) {
                           # Saving data to DB
 
+                          # ap "saving to db on expired token #{token.expires_at}"
+
                           persisted_user.token_value = token.value
                           persisted_user.token_expires_at = token.expires_at
+
+                          perstiting.persist
                         }
                       )           }
 
@@ -109,35 +116,52 @@ describe Lifen::Token do
                         load_from_db: ->(token) {
                           # Loading data from DB
 
+                          sleep 0.5
+
                           token.value = persisted_user.token_value
                           token.expires_at = persisted_user.token_expires_at
+                        },
+                        save_to_db: ->(token) {
+                          # Saving data to DB
+                          # ap "saving to db on other expired token #{token.expires_at}"
+
+                          persisted_user.token_value = token.value
+                          persisted_user.token_expires_at = token.expires_at
+
+                          perstiting.persist
                         }
                       )            }
 
     before do
       allow(expired_token).to receive(:refresh) do
         expired_token.value = "valid_token"
-        expired_token.expires_at = Time.now.to_i + 60
+        expired_token.expires_at = Time.now.to_i + 180
+      end
+
+      allow(other_expired_token).to receive(:refresh) do
+        other_expired_token.value = "valid_token"
+        other_expired_token.expires_at = Time.now.to_i + 180
       end
     end
 
-    it 'queues refresh calls' do
-      expect(expired_token).to receive(:refresh).once
-      expect(other_expired_token).to_not receive(:refresh)
+    15.times do
+      it 'queues refresh calls' do
+        expect(perstiting).to receive(:persist).once
 
-      threads = []
+        threads = []
 
-      threads << Thread.new do
-        expired_token.refresh_once_if_needed
-      end
+        threads << Thread.new do
+          expired_token.refresh_once_if_needed
+        end
 
-      sleep 0.1 # Making sure the mocked call is received first
+        # sleep 0.1 # Making sure the mocked call is received first
 
-      threads << Thread.new do
-        other_expired_token.refresh_once_if_needed
-      end
+        threads << Thread.new do
+          other_expired_token.refresh_once_if_needed
+        end
 
-      threads.map { |t| t.join } # waiting for all threads to finish
+        threads.map { |t| t.join } # waiting for all threads to finish
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifen
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Etienne Depaulis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,22 +154,13 @@ files:
 - Rakefile
 - lib/lifen.rb
 - lib/lifen/app_authenticated_client.rb
-- lib/lifen/attachment.rb
 - lib/lifen/base.rb
-- lib/lifen/binary.rb
-- lib/lifen/category.rb
-- lib/lifen/channel.rb
 - lib/lifen/client.rb
-- lib/lifen/communication_request.rb
 - lib/lifen/configuration.rb
-- lib/lifen/content_string.rb
 - lib/lifen/error.rb
 - lib/lifen/flow.rb
 - lib/lifen/flows.rb
-- lib/lifen/medium.rb
 - lib/lifen/message.rb
-- lib/lifen/patient.rb
-- lib/lifen/practitioner.rb
 - lib/lifen/settings.rb
 - lib/lifen/status.rb
 - lib/lifen/token.rb
@@ -177,12 +168,6 @@ files:
 - lib/lifen/user_authenticated_client.rb
 - lib/lifen/version.rb
 - lifen.gemspec
-- spec/binary_spec.rb
-- spec/cassettes/binary/download/invalid.yml
-- spec/cassettes/binary/download/valid.yml
-- spec/cassettes/communication_request/send/invalid_medium.yml
-- spec/cassettes/communication_request/send/valid_attributes.yml
-- spec/cassettes/communication_request/send/valid_attributes_binary.yml
 - spec/cassettes/flows/attach_users/invalid_flow_uuid.yml
 - spec/cassettes/flows/attach_users/invalid_user_uuid.yml
 - spec/cassettes/flows/attach_users/valid.yml
@@ -195,12 +180,6 @@ files:
 - spec/cassettes/flows/update_valid_title.yml
 - spec/cassettes/flows/valid_token.yml
 - spec/cassettes/messages/valid_message.yml
-- spec/cassettes/practitionner/create_channel/address/old_valid_attributes.yml
-- spec/cassettes/practitionner/create_channel/address/valid_attributes.yml
-- spec/cassettes/practitionner/create_channel/telecom/valid_attributes.yml
-- spec/cassettes/practitionner/find_by_rpps/existing_rpps.yml
-- spec/cassettes/practitionner/find_by_rpps/missing_line_attribute.yml
-- spec/cassettes/practitionner/find_by_rpps/wrong_rpps.yml
 - spec/cassettes/settings/initial_state.yml
 - spec/cassettes/settings/reload.yml
 - spec/cassettes/settings/update.yml
@@ -221,12 +200,9 @@ files:
 - spec/cassettes/users/status/reload/valid_token.yml
 - spec/cassettes/users/token/refresh/invalid_user_uuid.yml
 - spec/cassettes/users/token/refresh/valid_user_uuid.yml
-- spec/category_spec.rb
-- spec/communication_request_spec.rb
 - spec/configuration_spec.rb
 - spec/flow_spec.rb
 - spec/message_spec.rb
-- spec/practitionner_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
 - spec/support/master_plan.pdf
@@ -257,12 +233,6 @@ signing_key:
 specification_version: 4
 summary: Lifen JSON API ruby client
 test_files:
-- spec/binary_spec.rb
-- spec/cassettes/binary/download/invalid.yml
-- spec/cassettes/binary/download/valid.yml
-- spec/cassettes/communication_request/send/invalid_medium.yml
-- spec/cassettes/communication_request/send/valid_attributes.yml
-- spec/cassettes/communication_request/send/valid_attributes_binary.yml
 - spec/cassettes/flows/attach_users/invalid_flow_uuid.yml
 - spec/cassettes/flows/attach_users/invalid_user_uuid.yml
 - spec/cassettes/flows/attach_users/valid.yml
@@ -275,12 +245,6 @@ test_files:
 - spec/cassettes/flows/update_valid_title.yml
 - spec/cassettes/flows/valid_token.yml
 - spec/cassettes/messages/valid_message.yml
-- spec/cassettes/practitionner/create_channel/address/old_valid_attributes.yml
-- spec/cassettes/practitionner/create_channel/address/valid_attributes.yml
-- spec/cassettes/practitionner/create_channel/telecom/valid_attributes.yml
-- spec/cassettes/practitionner/find_by_rpps/existing_rpps.yml
-- spec/cassettes/practitionner/find_by_rpps/missing_line_attribute.yml
-- spec/cassettes/practitionner/find_by_rpps/wrong_rpps.yml
 - spec/cassettes/settings/initial_state.yml
 - spec/cassettes/settings/reload.yml
 - spec/cassettes/settings/update.yml
@@ -301,12 +265,9 @@ test_files:
 - spec/cassettes/users/status/reload/valid_token.yml
 - spec/cassettes/users/token/refresh/invalid_user_uuid.yml
 - spec/cassettes/users/token/refresh/valid_user_uuid.yml
-- spec/category_spec.rb
-- spec/communication_request_spec.rb
 - spec/configuration_spec.rb
 - spec/flow_spec.rb
 - spec/message_spec.rb
-- spec/practitionner_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
 - spec/support/master_plan.pdf