fhir_client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00a173dc4e9ddb7b710daea38e2f89d3790db646
-  data.tar.gz: 6b5d0bc26cb16a2771b7ed760fa5be7ce8449868
+  metadata.gz: 7e798b19840921ad0695ecacbb3dcd0d7f662da9
+  data.tar.gz: c176b2138418157c1fc357c4c1fd18c335625692
 SHA512:
-  metadata.gz: 6dd8dbf2f5265f2755d7aacf63d052c0d525df7dfee39f9251f908d8de929af40d9d57aaef73233c2ffc4dc3b3ab23048c5af1abcbcfac24b574e27c459ff17b
-  data.tar.gz: f915a5d4f7b7bed90935c80f2015533de1b0ff6e943f8935502039b2fb82b906ebc2e9ae763d0913a82971a913a32da35788e657839cef3659cbaf6e2395c071
+  metadata.gz: f05664d0b45e1657d7147069ef1d04c59af7b722e0a9f043729ca66e8af4a58df9d822f4ca4f01c13dfc99a97cfedb418057b94531eaf608858db1ed6de2991f
+  data.tar.gz: 8417ee48735581a8bb2daef931af22bb0309e261dd163cabd6be225bfb4fbc61a6e10f33520d099581b2efe1fdfbfe6a5fc5bc908cc79772052d2623d7029eea

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    fhir_client (1.0.0)
+    fhir_client (1.0.2)
       activesupport (>= 3)
       addressable (>= 2.3)
-      fhir_models (~> 0.3)
+      fhir_models (>= 0.3.1)
       oauth2 (~> 1.1)
       rest-client (~> 1.8)
       tilt (>= 1.1)
@@ -30,7 +30,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fhir_models (0.3.0)
+    fhir_models (0.3.1)
       bcp47 (>= 0.3)
       date_time_precision (>= 0.8)
       mime-types (>= 1.16, < 3)
@@ -43,20 +43,22 @@ GEM
     jwt (1.5.1)
     method_source (0.8.2)
     mime-types (2.99.2)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (4.7.5)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    pkg-config (1.1.7)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -74,7 +76,7 @@ GEM
     simplecov-html (0.10.0)
     slop (3.6.0)
     thread_safe (0.3.5)
-    tilt (2.0.4)
+    tilt (2.0.5)
     turn (0.9.7)
       ansi
       minitest (~> 4)

data/fhir_client.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |s|
   s.email = "aquina@mitre.org"
   s.homepage = "https://github.com/hl7-fhir/fhir-svn"
   s.authors = ["Andre Quina", "Jason Walonoski", "Janoo Fernandes"]
-  s.version = '1.0.1'
+  s.version = '1.0.2'
 
   s.files = s.files = `git ls-files`.split("\n")
 
-  s.add_dependency 'fhir_models', '~> 0.3'
+  s.add_dependency 'fhir_models', '>= 0.3.1'
   s.add_dependency 'tilt', '>= 1.1'
   s.add_dependency 'rest-client', '~> 1.8'
   s.add_dependency 'oauth2', '~> 1.1'
@@ -19,3 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '>= 2.3'
   s.add_development_dependency 'pry'
 end
+
+

data/lib/client_interface.rb

@@ -214,6 +214,7 @@ module FHIR
       $LOG.error "Failed to parse #{format} as resource #{klass}: #{e.message} %n #{e.backtrace.join("\n")} #{response}"
       nil
     end
+    res.client = self
     res
   end
 

data/lib/{model → ext}/bundle.rb

@@ -1,5 +1,6 @@
 module FHIR
   class Bundle
+    include Enumerable
 
     def self_link
       link.select {|n| n.relation == 'self'}.first
@@ -28,5 +29,17 @@ module FHIR
       nil
     end
 
+    def each(&block)
+      iteration = @entry.map(&:resource).each(&block)
+      iteration += next_bundle.each(&block) if next_bundle
+      iteration
+    end
+
+    def next_bundle
+      # TODO: test this
+      return nil unless client && next_link.try(:url)
+      @next_bundle ||= client.parse_reply(self.class, client.default_format, client.raw_read_url(next_link.url))
+    end
   end
 end
+

data/lib/ext/model.rb

@@ -0,0 +1,67 @@
+module FHIR
+  class Model
+    class << self
+      cattr_accessor :client
+    end
+
+    def client
+      @client || self.class.client
+    end
+
+    def client=(client)
+      @client = client
+
+      # Ensure the client-setting cascades to all child models
+      instance_values.each do |_key, values|
+        Array.wrap(values).each do |value|
+          next unless value.is_a?(FHIR::Model)
+          next if value.client == client
+          value.client = client
+        end
+      end
+    end
+
+    def self.read(id, client = self.client)
+      client.read(self, id).resource
+    end
+
+    def self.read_with_summary(id, summary, client = self.client)
+      client.read(self, id, client.default_format, summary).resource
+    end
+
+    def self.search(params = {}, client = self.client)
+      client.search(self, search: { parameters: params }).resource
+    end
+
+    def self.create(model, client = self.client)
+      model = new(model) unless model.is_a?(self)
+      client.create(model).resource
+    end
+
+    def self.conditional_create(model, params, client = self.client)
+      model = new(model) unless model.is_a?(self)
+      client.conditional_create(model, params)
+    end
+
+    def create
+      client.create(self).resource
+    end
+
+    def conditional_create(params)
+      client.conditional_create(self, params)
+    end
+
+    def update
+      client.update(self, id).resource
+    end
+
+    def conditional_update(params)
+      client.conditional_update(self, self.id, params).resource
+    end
+
+    def destroy
+      client.destroy(self.class, id) unless id.nil?
+      nil
+    end
+  end
+end

data/lib/ext/reference.rb

@@ -0,0 +1,11 @@
+module FHIR
+  class Reference
+    def read
+      # TODO: how to follow contained references?
+      type, id = reference.to_s.split("/")
+      return unless [type, id].all?(&:present?)
+      klass = "FHIR::#{type}".constantize
+      klass.read(client, id)
+    end
+  end
+end

data/lib/fhir_client.rb

@@ -9,18 +9,6 @@ require 'addressable/uri'
 require 'oauth2'
 require 'active_support/core_ext'
 
-begin
-	generator = FHIR::Boot::Generator.new
-	# 1. generate the lists of primitive data types, complex types, and resources
-	generator.generate_metadata
-	# 2. generate the complex data types
-	generator.generate_types
-	# 3. generate the base Resources
-	generator.generate_resources
-rescue Exception => e 
-	$LOG.error("Could not re-generate fhir models... this can happen in production, but the code does not need to be re-generated")
-end
-
 # Simple and verbose loggers
 RestClient.log = Logger.new("fhir_client.log", 10, 1024000)
 $LOG = Logger.new("fhir_client_verbose.log", 10, 1024000)
@@ -29,13 +17,15 @@ root = File.expand_path '..', File.dirname(File.absolute_path(__FILE__))
 Dir.glob(File.join(root, 'lib','sections','**','*.rb')).each do |file|
   require file
 end
+Dir.glob(File.join(root, 'lib','ext','**','*.rb')).each do |file|
+  require file
+end
 
 require_relative File.join('.','client_interface.rb')
 require_relative File.join('.','resource_address.rb')
 require_relative File.join('.','resource_format.rb')
 require_relative File.join('.','feed_format.rb')
 require_relative File.join('.','patch_format.rb')
-require_relative File.join('.','model','bundle.rb')
 require_relative File.join('.','model','client_reply.rb')
 require_relative File.join('.','model','tag.rb')
 

data/lib/sections/crud.rb

@@ -156,11 +156,14 @@ module FHIR
               reply.resource = resource # just send back the submitted resource
             end
           else
+            resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.response[:headers]['location'])
             reply.resource = resource # don't know the content type, so return the resource provided
           end
         else
+          resource.id = FHIR::ResourceAddress.pull_out_id(resource.class.name.demodulize, reply.response[:headers]['location'])
           reply.resource = resource # just send back the submitted resource
         end
+        reply.resource.client = self
         reply.resource_class = resource.class
         reply
       end

data/lib/sections/search.rb

@@ -50,4 +50,4 @@ module FHIR
 
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fhir_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andre Quina
@@ -10,104 +10,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fhir_models
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Gem for handling FHIR client requests in ruby
@@ -116,8 +116,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -125,10 +125,12 @@ files:
 - Rakefile
 - fhir_client.gemspec
 - lib/client_interface.rb
+- lib/ext/bundle.rb
+- lib/ext/model.rb
+- lib/ext/reference.rb
 - lib/feed_format.rb
 - lib/fhir_api_validation.json
 - lib/fhir_client.rb
-- lib/model/bundle.rb
 - lib/model/client_reply.rb
 - lib/model/tag.rb
 - lib/patch_format.rb
@@ -160,17 +162,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Gem for handling FHIR client requests in ruby