roqua-core-api 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71324b1ca72553ac40ddcf189844d29165eb3ac6
-  data.tar.gz: 168757a7425bafbb275d4e9ff8f76ba8a15ac575
+  metadata.gz: b6629a5792c576139c32eaf0a255f0785ab591bf
+  data.tar.gz: 899779caf5d2fb5352a44a21136097830c298f44
 SHA512:
-  metadata.gz: 551a34059fa64fa400f80da95efc44eaae46b517847f47407d1680145c189606947d7274590e208c3cdd62a281bc9291f3e63037addd54356a9d01f607654d6e
-  data.tar.gz: 62a53f9504b6ee2a45e07714760a50ecb536e0bd88ade84edffc95c15bd93616b494f9fd8115480d87eb1c016eb0b844280a9a282509fdafca331873cc4588ae
+  metadata.gz: a015867ee81c83bf90d53a458606ea866aab4dccfe90268754dce4936d66d3da4e6fd6b85eb7ab9cb4504f66ed857484ec91c08b72c83c1944d0fecb428f59ac
+  data.tar.gz: 79ba4c56d28fd44fc1589dbeecdc7d6a99a1b4b688bbba5f8c869542bf86c4be6032921f4d839c427fe5c21087a04a9b7345ff5a96dc19ec32f066a4cb1bf10c

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.0.13 / 2014-03-11
+
+* Fix doorkeeper setup
+
 ### 0.0.12 / 2014-03-10
 
 * Update gemspec to contain omniauth-oauth2

data/core_api.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'httparty',           '~> 0.12.0'
   gem.add_dependency 'active_interaction', '~> 1.0.4'
   gem.add_dependency 'omniauth-oauth2',    '~> 1.1.2'
+  gem.add_dependency 'activemodel', '>= 3.2', '< 5'
 
   gem.add_development_dependency 'bundler',     '~> 1.0'
   gem.add_development_dependency 'rake',        '~> 10.0'

data/lib/roqua/core_api/models/person.rb

@@ -1,15 +1,35 @@
-module Roqua
-  module CoreApi
-    module Models
-      class Person
-        def initialize(attributes)
-          @attributes = attributes
-        end
-
-        def id
-          @attributes.fetch("id")
-        end
-      end
-    end
+class Roqua::CoreApi::Models::Person
+  # when support for rails 3 is dropped: replace by include ActiveModel::Model
+  extend  ActiveModel::Naming
+  extend  ActiveModel::Translation
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  include ActiveModel::Serialization
+
+  attr_reader   :id
+  attr_accessor :role, :firstname, :lastname, :initials,
+                :email, :phone_home, :phone_work, :phone_cell,
+                :birthdate, :gender, :country_of_birth,
+                :address_type, :street, :city, :zipcode, :country
+
+  validates :role, inclusion: { in: %w( professional patient parent ) }
+
+  def initialize(params = {})
+    @id = params.delete('id')
+    params.each do |attr, value|
+      public_send("#{attr}=", value)
+    end if params
+
+    super()
+  end
+
+  def assign_attributes(params = {})
+    params.each do |attr, value|
+      public_send("#{attr}=", value)
+    end if params
+  end
+
+  def attributes
+    as_json
   end
 end

data/lib/roqua/core_api/models.rb

@@ -1,3 +1,4 @@
 require 'roqua/core_api/models/dossier_group'
 require 'roqua/core_api/models/dossier'
+require 'active_model'
 require 'roqua/core_api/models/person'

data/lib/roqua/core_api/people.rb

@@ -0,0 +1,14 @@
+module Roqua
+  module CoreApi
+    # @api private
+    class People < ActiveInteraction::Base
+      model :session, class: Sessions::OAuthSession
+      string :dossier_id
+
+      def execute
+        response = session.get "/dossiers/#{dossier_id}/people"
+        response["people"].map { |p| Models::Person.new(p) }
+      end
+    end
+  end
+end

data/lib/roqua/core_api/person.rb

@@ -0,0 +1,14 @@
+module Roqua
+  module CoreApi
+    # @api private
+    class Person < ActiveInteraction::Base
+      model :session, class: Sessions::OAuthSession
+      string :person_id
+
+      def execute
+        response = session.get "/people/#{person_id}"
+        Models::Person.new(response['person'])
+      end
+    end
+  end
+end

data/lib/roqua/core_api/sessions/auth_session.rb

@@ -3,38 +3,42 @@ module Roqua
     module Sessions
       class AuthSession
         attr_reader :core_host
+        attr_reader :default_timeout
 
-        def initialize(core_host: ENV['CORE_HOST'])
+        # timeout for requests in seconds
+        def initialize(core_host: ENV['CORE_HOST'], timeout: 5)
           @core_host = core_host
+          @default_timeout = timeout
         end
 
-        def get(path, params = {})
+        def get(path, timeout: default_timeout, **params)
           perform_request_or_fail do
-            HTTParty.get(full_url_for(path), headers: headers, query: params, basic_auth: basic_auth)
+            HTTParty.get(full_url_for(path), headers: headers, query: params, basic_auth: basic_auth, timeout: timeout)
           end
         end
 
-        def post(path, params = {})
+        def post(path, timeout: default_timeout, **params)
           perform_request_or_fail do
-            HTTParty.post(full_url_for(path), headers: headers, body: params, basic_auth: basic_auth)
+            HTTParty.post(full_url_for(path), headers: headers, body: params, basic_auth: basic_auth, timeout: timeout)
           end
         end
 
-        def patch(path, params = {})
+        def patch(path, timeout: default_timeout, **params)
           perform_request_or_fail do
-            HTTParty.patch(full_url_for(path), headers: headers, body: params, basic_auth: basic_auth)
+            HTTParty.patch(full_url_for(path), headers: headers, body: params, basic_auth: basic_auth, timeout: timeout)
           end
         end
 
-        def delete(path, params = {})
-          HTTParty.delete(full_url_for(path), headers: headers, query: params, basic_auth: basic_auth)
+        def delete(path, timeout: default_timeout, **params)
+          HTTParty.delete(full_url_for(path), headers: headers, query: params, basic_auth: basic_auth, timeout: timeout)
         end
 
         private
 
         def perform_request_or_fail(&block)
           response = yield
-          fail response.parsed_response unless (200..299).include? response.code
+          fail response.parsed_response unless (200..299).include?(response.code) ||
+                                               422 == response.code
           response
         end
 

data/lib/roqua/core_api/update_person.rb

@@ -0,0 +1,33 @@
+module Roqua
+  module CoreApi
+    # @api private
+    class UpdatePerson < ActiveInteraction::Base
+      model :session, class: Sessions::OAuthSession
+      model :person,  class: Models::Person
+
+      # Saves the person attributes to server.
+      # Returns true on success, false on validation errors.
+      # Adds errors to person object based on I18n errors.messages.
+      # Raises on other errors.
+      def execute
+        response = session.patch "/people/#{person.id}", person: person.serializable_hash
+        if response.code == 422
+          errors_to_object(response, person)
+          false
+        else
+          true
+        end
+      end
+
+      private
+
+      def errors_to_object(json, obj)
+        json['errors'].each do |attribute, errors|
+          errors.each do |error|
+            obj.errors.add(attribute, I18n.t("errors.messages.#{error}"))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/roqua/core_api/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module CoreApi
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/lib/roqua/core_api.rb

@@ -2,8 +2,10 @@ require 'active_interaction'
 require 'roqua/core_api/version'
 require 'roqua/core_api/sessions'
 require 'roqua/core_api/models'
-require 'roqua/core_api/me'
 require 'roqua/core_api/create_dossier'
 require 'roqua/core_api/create_dossier_group'
 require 'roqua/core_api/send_email_to'
 require 'roqua/core_api/send_invite_email'
+require 'roqua/core_api/people'
+require 'roqua/core_api/person'
+require 'roqua/core_api/update_person'

data/lib/roqua/omniauth/strategies/doorkeeper.rb

@@ -15,7 +15,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/v1/me.json').parsed
+        @raw_info ||= access_token.get('/api/v1/me.json').parsed['me']
       end
     end
   end

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

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+module Roqua
+  module CoreApi
+    module Models
+      describe Person do
+        let(:valid_person) { Person.new }
+
+        describe '#new' do
+          subject { Person.new firstname: 'first', lastname: 'last' }
+          it 'accepts a hash of attributes' do
+            expect(subject.firstname).to eq 'first'
+          end
+        end
+
+        describe '#assign_attributes' do
+          subject { Person.new firstname: 'first', lastname: 'last' }
+          it 'accepts a hash of attributes' do
+            subject.assign_attributes(firstname: 'new')
+            expect(subject.firstname).to eq 'new'
+          end
+        end
+
+        describe '#role' do
+          it 'allows values: professional patient parent' do
+            %w( professional patient parent ).each do |role|
+              valid_person.role = role
+              expect(valid_person.valid?).to be_truthy
+            end
+          end
+          it 'does not allow other values' do
+            valid_person.role = 'foobar'
+            expect(valid_person.valid?).to be_falsy
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -17,6 +17,11 @@ describe AuthSession do
       ENV['CORE_HOST'] = orginal_env_core_host
       expect(session.core_host).to eq('some_env_core_host')
     end
+
+    it 'defaults the timeout to 5 seconds' do
+      session = AuthSession.new
+      expect(session.default_timeout).to eq 5
+    end
   end
 
   describe '#get' do
@@ -26,7 +31,8 @@ describe AuthSession do
       expect(HTTParty).to receive(:get).with('http://core.dev/api/v1/some_path.json',
                                              query: {some: 'param'},
                                              headers: {some: 'header'},
-                                             basic_auth: {username: 'some_username', password: 'some_password'})
+                                             basic_auth: {username: 'some_username', password: 'some_password'},
+                                             timeout: 5)
                                        .and_return(response)
       session.get '/some_path', some: 'param'
     end

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

@@ -36,7 +36,8 @@ describe OAuthSession do
       expect(HTTParty).to receive(:get).with(an_instance_of(String),
                                              headers: {"Authorization" => "Bearer some_access_token"},
                                              query: {},
-                                             basic_auth: nil).and_return(response)
+                                             basic_auth: nil,
+                                             timeout: 5).and_return(response)
       session.get 'some_path'
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-core-api
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,17 +163,19 @@ files:
 - lib/roqua/core_api.rb
 - lib/roqua/core_api/create_dossier.rb
 - lib/roqua/core_api/create_dossier_group.rb
-- lib/roqua/core_api/me.rb
 - lib/roqua/core_api/models.rb
 - lib/roqua/core_api/models/dossier.rb
 - lib/roqua/core_api/models/dossier_group.rb
 - lib/roqua/core_api/models/person.rb
+- lib/roqua/core_api/people.rb
+- lib/roqua/core_api/person.rb
 - lib/roqua/core_api/send_email_to.rb
 - lib/roqua/core_api/send_invite_email.rb
 - lib/roqua/core_api/sessions.rb
 - lib/roqua/core_api/sessions/auth_session.rb
 - lib/roqua/core_api/sessions/basic_auth_session.rb
 - lib/roqua/core_api/sessions/oauth_session.rb
+- lib/roqua/core_api/update_person.rb
 - lib/roqua/core_api/version.rb
 - lib/roqua/omniauth/rails_initializer.rb
 - lib/roqua/omniauth/strategies/doorkeeper.rb
@@ -163,7 +185,7 @@ files:
 - spec/fabricators/oauth_session_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/me_spec.rb
+- spec/lib/roqua/core_api/models/person_spec.rb
 - spec/lib/roqua/core_api/send_email_to_spec.rb
 - spec/lib/roqua/core_api/send_invite_email_spec.rb
 - spec/lib/roqua/core_api/sessions/auth_session_spec.rb
@@ -201,7 +223,7 @@ test_files:
 - spec/fabricators/oauth_session_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/me_spec.rb
+- spec/lib/roqua/core_api/models/person_spec.rb
 - spec/lib/roqua/core_api/send_email_to_spec.rb
 - spec/lib/roqua/core_api/send_invite_email_spec.rb
 - spec/lib/roqua/core_api/sessions/auth_session_spec.rb

data/lib/roqua/core_api/me.rb

@@ -1,12 +0,0 @@
-module Roqua
-  module CoreApi
-    # @api private
-    class Me < ActiveInteraction::Base
-      model :session, class: Sessions::OAuthSession
-
-      def execute
-        session.get('/me')['me']
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe Me do
-  let(:session) { Fabricate :oauth_session }
-
-  it 'performs a get on the /me api path' do
-    expect(session).to receive(:get).with('/me').and_return({})
-    Me.run!(session: session)
-  end
-
-  it 'returns the me entry from the response' do
-    allow(session).to receive(:get).with('/me').and_return 'me' => 'some_info'
-    expect(Me.run!(session: session)).to eq('some_info')
-  end
-end