roqua-core-api 0.0.39 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd38de53cdc42dbe949e24daf7c94b16cd67cb1
-  data.tar.gz: e235d2508f48d15f974e0ca4fedd4c87727a631f
+  metadata.gz: 854a84f222ad107d7e8201a97f906fcac3f492bb
+  data.tar.gz: 2624aacd6d166cb8f3b3c4b38518f4500175421a
 SHA512:
-  metadata.gz: e460c86c6f6513d47983a8241b656c09da14f1a0f67de636ccab77eab448761e2ae69f58c0b46aaa453eab435d9e39ab17e2b284e73b83e3b5d52d8f295104f2
-  data.tar.gz: cc60593fd46d57fcf6904d534e9f960e413d5d56b434e5f7c09f8a889a7e6e67bd8a8a043477c3dc6e95bbe9c4ad5c9694721b4adfc6dbf7568a604f70053d43
+  metadata.gz: c2671c1a0bece7bb7a042398ed6c42edd558e84dcfa6fe4d495157404fbd0262358591b9e0d24d7057944b25fd959222ed8c552feb4636bee5e12771c7f5b390
+  data.tar.gz: e6d9331cf5c39ce4687ea78a129060e74bd69176650f333945feb2dfc5e325ed69448a2f30dcd6418d81438fc010bd7b524a916a1870292957f260ee6ddee1dd

data/ChangeLog.md

@@ -1,10 +1,14 @@
+### 0.1.0
+
+* BACKWARD INCOMPATIBLE: CreateDossier now needs a dossier and a person object.
+
 ### 0.0.39
 
-Handle empty rails date params
+* Handle empty rails date params
 
 ### 0.0.37
 
-Handling new 422 json format in addition to old (temporary hack)
+* Handling new 422 json format in addition to old (temporary hack)
 
 ### 0.0.36
 

data/lib/roqua/core_api/base.rb

@@ -9,8 +9,7 @@ module Roqua
       end
 
       def errors_to_object(response, obj)
-        (response['errors'][obj.class.name.demodulize.underscore] ||
-         response['errors']).each do |attribute, errors|
+        (response['errors'][obj.class.name.demodulize.underscore] || []).each do |attribute, errors|
           errors.each do |error|
             obj.errors.add(attribute.to_sym, error.to_sym)
           end

data/lib/roqua/core_api/create_dossier.rb

@@ -1,16 +1,33 @@
 module Roqua
   module CoreApi
     # @api private
-    class CreateDossier < ActiveInteraction::Base
+    class CreateDossier < Base
       model :session, class: Sessions::AuthSession
       string :dossier_group_id
-      hash :attributes, strip: false
+      model :dossier, class: Models::Dossier, default: nil
+      model :person, class: Models::Person, default: nil
 
       def execute
         response = session.post "/dossier_groups/#{dossier_group_id}/dossiers",
-                                person: attributes.delete(:person), dossier: attributes
+                                person: person_attributes, dossier: dossier_attributes
+        if response.code == 422
+          errors_to_object(response, person)
+          errors_to_object(response, dossier)
+        end
         Models::Dossier.new(response)
       end
+
+      private
+
+      def dossier_attributes
+        return {} unless dossier
+        dossier.serializable_hash(except: :people).keep_if { |_k, v| !v.nil? }
+      end
+
+      def person_attributes
+        return {} unless person
+        person.serializable_hash.keep_if { |_k, v| !v.nil? }
+      end
     end
   end
 end

data/lib/roqua/core_api/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module CoreApi
-    VERSION = '0.0.39'
+    VERSION = '0.1.0'
   end
 end

data/lib/roqua/core_api.rb

@@ -23,5 +23,10 @@ module Roqua
     # Raised when a request failed due to an expired/non-existant session.
     class NoSession < StandardError; end
     class Unauthorized < StandardError; end
+
+    def self.load_fabricators
+      gem_root = Gem::Specification.find_by_name("roqua-core-api").gem_dir
+      Fabrication::Config.path_prefixes << gem_root unless Fabrication::Config.path_prefixes.include? gem_root
+    end
   end
 end

data/spec/fabricators/auth_session_fabricator.rb

@@ -1,3 +1,3 @@
-Fabricator(:auth_session, from: Roqua::CoreApi::Sessions::AuthSession) do
+Fabricator(:roqua_core_api_auth_session, from: Roqua::CoreApi::Sessions::AuthSession) do
   initialize_with { Roqua::CoreApi::Sessions::AuthSession.new core_site: 'http://core.dev' }
 end

data/spec/fabricators/basic_auth_session_fabricator.rb

@@ -1,4 +1,4 @@
-Fabricator(:basic_auth_session, from: Roqua::CoreApi::Sessions::BasicAuthSession) do
+Fabricator(:roqua_core_api_basic_auth_session, from: Roqua::CoreApi::Sessions::BasicAuthSession) do
   initialize_with do
     Roqua::CoreApi::Sessions::BasicAuthSession.new username: 'some_username',
                                                    password: 'some_password',

data/spec/fabricators/dossier_fabricator.rb

@@ -1,6 +1,5 @@
-Fabricator(:dossier, from: Roqua::CoreApi::Models::Dossier) do
-  initialize_with do
-    Roqua::CoreApi::Models::Dossier.new id: 'dossier-id',
-                                        external_identifier: 'external-dossier-identifier'
-  end
+Fabricator(:roqua_core_api_dossier, from: Roqua::CoreApi::Models::Dossier) do
+  initialize_with { Roqua::CoreApi::Models::Dossier.new }
+  id 'dossier-id'
+  external_identifier 'external-dossier-identifier'
 end

data/spec/fabricators/oauth_session_fabricator.rb

@@ -1,4 +1,4 @@
-Fabricator(:oauth_session, from: Roqua::CoreApi::Sessions::OAuthSession) do
+Fabricator(:roqua_core_api_oauth_session, from: Roqua::CoreApi::Sessions::OAuthSession) do
   initialize_with do
     Roqua::CoreApi::Sessions::OAuthSession.new access_token: 'some_access_token', core_site: 'http://core.dev'
   end

data/spec/fabricators/person_fabricator.rb

@@ -0,0 +1,7 @@
+Fabricator(:roqua_core_api_person, from: Roqua::CoreApi::Models::Dossier) do
+  initialize_with { Roqua::CoreApi::Models::Person.new }
+  firstname 'John'
+  lastname 'Doe'
+  role 'patient'
+  email { sequence(:email) { |i| "test#{i}@roqua.nl" } }
+end

data/spec/lib/roqua/core_api/create_dossier_group_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CreateDossierGroup do
-  let(:session) { Fabricate :oauth_session }
+  let(:session) { Fabricate :roqua_core_api_oauth_session }
 
   it 'performs a post on the /dossier_groups api path' do
     expect(session).to receive(:post).with('/dossier_groups', dossier_group: {some: 'attributes'},

data/spec/lib/roqua/core_api/create_dossier_spec.rb

@@ -1,24 +1,68 @@
 require 'spec_helper'
 
 describe CreateDossier do
-  let(:session) { Fabricate :oauth_session }
+  let(:session) { Fabricate :roqua_core_api_oauth_session }
+  let(:person) { Fabricate :roqua_core_api_person, id: nil }
+  let(:dossier) { Fabricate :roqua_core_api_dossier, id: nil }
+  let(:response) { httparty_response('id' => 'some_id') }
 
   it 'performs a post on the /dossiers api path' do
-    expect(session).to receive(:post).with '/dossier_groups/some_dossier_group_id/dossiers',
-                                           person: 'person', dossier: {other: 'attributes'}
+    expect(session).to receive(:post) do |path, options|
+      expect(path).to eq '/dossier_groups/some_dossier_group_id/dossiers'
+      expect(options[:person][:firstname]).to eq 'John'
+      expect(options[:dossier][:external_identifier]).to eq 'external-dossier-identifier'
+    end.and_return(response)
+
+    CreateDossier.run!(session: session,
+                       person: person,
+                       dossier: dossier,
+                       dossier_group_id: 'some_dossier_group_id')
+  end
+
+  it 'works without dossier params' do
+    expect(session).to receive(:post) do |path, options|
+      expect(path).to eq '/dossier_groups/some_dossier_group_id/dossiers'
+      expect(options[:person][:firstname]).to eq 'John'
+    end.and_return(response)
+
+    CreateDossier.run!(session: session,
+                       person: person,
+                       dossier_group_id: 'some_dossier_group_id')
+  end
+
+  it 'works without person params' do
+    expect(session).to receive(:post) do |path, options|
+      expect(path).to eq '/dossier_groups/some_dossier_group_id/dossiers'
+    end.and_return(response)
+
     CreateDossier.run!(session: session,
-                       attributes: {person: 'person', other: 'attributes'},
                        dossier_group_id: 'some_dossier_group_id')
   end
 
   it 'returns a Dossier model' do
-    allow(session).to receive(:post).with('/dossier_groups/some_dossier_group_id/dossiers',
-                                          person: 'person', dossier: {other: 'attributes'})
-                                    .and_return 'id' => 'some_id'
-    dossier = CreateDossier.run!(session: session,
-                                 attributes: {person: 'person', other: 'attributes'},
-                                 dossier_group_id: 'some_dossier_group_id')
-    expect(dossier).to be_a(Dossier)
-    expect(dossier.id).to eq('some_id')
+    allow(session).to receive(:post).and_return(response)
+    new_dossier = CreateDossier.run!(session: session,
+                                     person: person,
+                                     dossier: dossier,
+                                     dossier_group_id: 'some_dossier_group_id')
+    expect(new_dossier).to be_a(Dossier)
+    expect(new_dossier.id).to eq('some_id')
+  end
+
+  describe 'with validation errors' do
+    let(:response) { httparty_response({'errors' => {'person' => {'email' => ['invalid_email']},
+                                                     'dossier' => {'external_identifier' => ['blank']}}},
+                                       422) }
+
+    it 'Set the errors on the objects' do
+      allow(session).to receive(:post).and_return(response)
+      new_dossier = CreateDossier.run!(session: session,
+                                       person: person,
+                                       dossier: dossier,
+                                       dossier_group_id: 'some_dossier_group_id')
+      expect(new_dossier.persisted?).to be_falsy
+      expect(person.errors[:email]).to eq ['Geen geldig email adres']
+      expect(dossier.errors[:external_identifier]).to eq ['moet opgegeven zijn']
+    end
   end
 end

data/spec/lib/roqua/core_api/dossiers_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Dossiers do
-  let(:session) { Fabricate :oauth_session }
+  let(:session) { Fabricate :roqua_core_api_oauth_session }
   let(:dossier_group_id) { 'some_dg_id' }
   let(:external_identifier) { 'some_eid' }
   let(:response) { {'headers' => %w(id birth_year gender firstname lastname),

data/spec/lib/roqua/core_api/models/active_virtus_spec.rb

@@ -19,7 +19,7 @@ module Roqua
           end
           it 'sets an error if the date is invalid' do
             subject.attributes = { 'date(1i)' => '1999', 'date(2i)' => '12', 'date(3i)' => '32'}
-            expect(subject.errors[:date][0]).to match 'invalid_date'
+            expect(subject.errors[:date][0]).to match 'Niet een bestaande datum'
           end
           it 'can create new with date(i1) params' do
             foo = Foo.new('date(1i)' => '1999', 'date(2i)' => '12', 'date(3i)' => '8')

data/spec/lib/roqua/core_api/send_invite_email_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SendInviteEmail do
-  let(:session) { Fabricate :oauth_session }
+  let(:session) { Fabricate :roqua_core_api_oauth_session }
 
   it 'performs a post on the send_invite_email api path' do
     expect(session).to receive(:post).with '/dossiers/some_dossier_id/send_invite_email',

data/spec/lib/roqua/core_api/sessions/auth_session_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'webmock/rspec'
 
 describe AuthSession do
-  let(:session) { Fabricate :auth_session }
+  let(:session) { Fabricate :roqua_core_api_auth_session }
   let(:response) { double('response', code: 201, parsed_response: 'some_response') }
 
   describe '#initialize' do

data/spec/lib/roqua/core_api/sessions/oauth_session_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'webmock/rspec'
 
 describe OAuthSession do
-  let(:session) { Fabricate :oauth_session }
+  let(:session) { Fabricate :roqua_core_api_oauth_session }
   let(:response) { double('response', code: 201, parsed_response: 'some_response') }
 
   describe '#initialize' do

data/spec/lib/roqua/core_api/update_dossier_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe UpdateDossier do
-  let(:session) { Fabricate :oauth_session }
-  let(:dossier) { Fabricate :dossier }
+  let(:session) { Fabricate :roqua_core_api_oauth_session }
+  let(:dossier) { Fabricate :roqua_core_api_dossier }
   let(:response) { double }
 
   before do
@@ -28,7 +28,7 @@ describe UpdateDossier do
   end
 
   describe 'returns false when the call was incorrect' do
-    let(:error) { { 'id' => ['empty'] } }
+    let(:error) { {'dossier' => { 'id' => ['empty']}} }
     before do
       allow(response).to receive(:[]).with('errors').and_return(error)
 
@@ -43,7 +43,7 @@ describe UpdateDossier do
 
     it 'should add the errors to the dossier' do
       expect(dossier.errors).to_not be_empty
-      expect(dossier.errors['id'][0]).to match(error['id'][0])
+      expect(dossier.errors[:id][0]).to eq 'moet opgegeven zijn'
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,4 +9,8 @@ include Roqua::CoreApi
 include Roqua::CoreApi::Sessions
 include Roqua::CoreApi::Models
 
+Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'support', '*.rb')].each { |f| require f }
+
+I18n.load_path << Dir[File.join(File.expand_path(File.dirname(__FILE__)), '..', 'config', 'locales', '*.yml')]
+I18n.enforce_available_locales = false
 I18n.default_locale = :nl

data/spec/support/httpparty_helpers.rb

@@ -0,0 +1,5 @@
+def httparty_response(response_data, code = 200)
+  allow(response_data).to receive(:code).and_return code
+  allow(response_data).to receive(:parsed_response).and_return response_data
+  response_data
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-core-api
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.1.0
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -218,6 +218,7 @@ files:
 - spec/fabricators/basic_auth_session_fabricator.rb
 - spec/fabricators/dossier_fabricator.rb
 - spec/fabricators/oauth_session_fabricator.rb
+- spec/fabricators/person_fabricator.rb
 - spec/lib/roqua/core_api/create_dossier_group_spec.rb
 - spec/lib/roqua/core_api/create_dossier_spec.rb
 - spec/lib/roqua/core_api/dossiers_spec.rb
@@ -231,6 +232,7 @@ files:
 - spec/lib/roqua/core_api/sessions/oauth_session_spec.rb
 - spec/lib/roqua/core_api/update_dossier_spec.rb
 - spec/spec_helper.rb
+- spec/support/httpparty_helpers.rb
 homepage: https://github.com/roqua/core/blob/master/core_api/README.markdown
 licenses:
 - MIT
@@ -251,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: API wrapper gem around Core's API
@@ -261,6 +263,7 @@ test_files:
 - spec/fabricators/basic_auth_session_fabricator.rb
 - spec/fabricators/dossier_fabricator.rb
 - spec/fabricators/oauth_session_fabricator.rb
+- spec/fabricators/person_fabricator.rb
 - spec/lib/roqua/core_api/create_dossier_group_spec.rb
 - spec/lib/roqua/core_api/create_dossier_spec.rb
 - spec/lib/roqua/core_api/dossiers_spec.rb
@@ -274,4 +277,5 @@ test_files:
 - spec/lib/roqua/core_api/sessions/oauth_session_spec.rb
 - spec/lib/roqua/core_api/update_dossier_spec.rb
 - spec/spec_helper.rb
+- spec/support/httpparty_helpers.rb
 has_rdoc: