trogdir_api 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c0461f30e10661b43c4d43250326dcc5c135eff
-  data.tar.gz: 9edfd9a1b18c4ed633841d2821c595ec89d75df4
+  metadata.gz: 94a2d90b3c249f0b5eecb43e9cbe7122582b9570
+  data.tar.gz: 3ac808217184e16102e5ca11555c9bd7ef7707d2
 SHA512:
-  metadata.gz: ee5b4c1468f78d401e0c55afe48a0359e5b111d3e8b17c6f9b497f37809d50e285bd2eb5a7570f3920e14fde7a141659880847e0f59563fe8d50590c604e50e9
-  data.tar.gz: a5c94365037a666d4ebc73f4836874416e96f6ea02fe98073aa09dd1359c686dbc09cb23ece5408df2d82e00dbf5572f28e9a151126a18c0acba71541009d798
+  metadata.gz: d5e189f20a678f1880920e53b5970daaa6127d94e678e9abb4af7861df9cc7ffba8fdbc4abf15126657333064b95696f03fe18430317d3d2f435492db30ce1f1
+  data.tar.gz: 0d4cd9d6477690cbaf5889100bb2b14417f260922ccb395a4e24c13fe08cfd8b72ca3d16bd0ca72b000b689e2c199c9aa9b556c495c7cf8e250ddadae62ba787

data/lib/trogdir/versions/v1/addresses_api.rb

@@ -2,15 +2,20 @@ module Trogdir
   module V1
     class AddressesAPI < Grape::API
       resource :addresses do
+        before do
+          @person = Person.find_by(uuid: params[:person_id]) if params[:person_id]
+          @address = @person.addresses.find(params[:address_id]) if params[:address_id]
+        end
+
         get do
-          present Person.find_by(uuid: params[:person_id]).addresses, with: AddressEntity
+          present @person.addresses, with: AddressEntity
         end
 
         params do
           requires :address_id, type: String
         end
         get ':address_id' do
-          present Person.find_by(uuid: params[:person_id]).addresses.find(params[:address_id]), with: AddressEntity
+          present @address, with: AddressEntity
         end
 
         params do
@@ -23,7 +28,7 @@ module Trogdir
           optional :contry, type: String
         end
         post do
-          Person.find_by(uuid: params[:person_id]).addresses.create! clean_params(except: :person_id)
+          present @person.addresses.create!(clean_params(except: :person_id)), with: AddressEntity
         end
 
         params do
@@ -37,14 +42,18 @@ module Trogdir
           optional :contry, type: String
         end
         put ':address_id' do
-          Person.find_by(uuid: params[:person_id]).addresses.find(params[:address_id]).update_attributes! clean_params(except: [:person_id, :address_id])
+          @address.update_attributes! clean_params(except: [:person_id, :address_id])
+
+          present @address, with: AddressEntity
         end
 
         params do
           requires :address_id, type: String
         end
         delete ':address_id' do
-          Person.find_by(uuid: params[:person_id]).addresses.find(params[:address_id]).destroy
+          @address.destroy
+
+          present @address, with: AddressEntity
         end
       end
     end

data/lib/trogdir/versions/v1/change_syncs_api.rb

@@ -2,6 +2,14 @@ module Trogdir
   module V1
     class ChangeSyncsAPI < Grape::API
       resource :change_syncs do
+        before do
+          if params[:sync_log_id]
+            @sync_log = SyncLog.find_through_parents(params[:sync_log_id])
+
+            unauthorized! unless @sync_log.syncinator == current_syncinator
+          end
+        end
+
         desc "Return and starts change_syncs that haven't been started"
         put :start do
           syncinator = current_syncinator
@@ -20,11 +28,7 @@ module Trogdir
           requires :message, type: String
         end
         put 'error/:sync_log_id' do
-          sync_log = SyncLog.find_through_parents(params[:sync_log_id])
-
-          unauthorized! unless sync_log.syncinator == current_syncinator
-
-          current_syncinator.error! sync_log, params[:message]
+          current_syncinator.error! @sync_log, params[:message]
         end
 
         desc "Return a sync_log and mark it as succeeded"
@@ -34,11 +38,7 @@ module Trogdir
           optional :message, type: String
         end
         put 'finish/:sync_log_id' do
-          sync_log = SyncLog.find_through_parents(params[:sync_log_id])
-
-          unauthorized! unless sync_log.syncinator == current_syncinator
-
-          current_syncinator.finish! sync_log, params[:action], params[:message]
+          current_syncinator.finish! @sync_log, params[:action], params[:message]
         end
       end
     end

data/lib/trogdir/versions/v1/emails_api.rb

@@ -2,15 +2,20 @@ module Trogdir
   module V1
     class EmailsAPI < Grape::API
       resource :emails do
+        before do
+          @person = Person.find_by(uuid: params[:person_id]) if params[:person_id]
+          @email = @person.emails.find(params[:email_id]) if params[:email_id]
+        end
+
         get do
-          present Person.find_by(uuid: params[:person_id]).emails, with: EmailEntity
+          present @person.emails, with: EmailEntity
         end
 
         params do
           requires :email_id, type: String
         end
         get ':email_id' do
-          present Person.find_by(uuid: params[:person_id]).emails.find(params[:email_id]), with: EmailEntity
+          present @email, with: EmailEntity
         end
 
         params do
@@ -19,7 +24,7 @@ module Trogdir
           optional :primary, type: Boolean
         end
         post do
-          Person.find_by(uuid: params[:person_id]).emails.create! clean_params(except: :person_id)
+          present @person.emails.create!(clean_params(except: :person_id)), with: EmailEntity
         end
 
         params do
@@ -29,14 +34,18 @@ module Trogdir
           optional :primary, type: Boolean
         end
         put ':email_id' do
-          Person.find_by(uuid: params[:person_id]).emails.find(params[:email_id]).update_attributes! clean_params(except: [:person_id, :email_id])
+          @email.update_attributes! clean_params(except: [:person_id, :email_id])
+
+          present @email, with: EmailEntity
         end
 
         params do
           requires :email_id, type: String
         end
         delete ':email_id' do
-          Person.find_by(uuid: params[:person_id]).emails.find(params[:email_id]).destroy
+          @email.destroy
+
+          present @email, with: EmailEntity
         end
       end
     end

data/lib/trogdir/versions/v1/entities/address.rb

@@ -1,6 +1,7 @@
 module Trogdir
   module V1
     class AddressEntity < Grape::Entity
+      expose :id
       expose :type
       expose :street_1
       expose :street_2

data/lib/trogdir/versions/v1/entities/email.rb

@@ -1,6 +1,7 @@
 module Trogdir
   module V1
     class EmailEntity < Grape::Entity
+      expose :id
       expose :type
       expose :address
       expose :primary

data/lib/trogdir/versions/v1/entities/id.rb

@@ -1,6 +1,7 @@
 module Trogdir
   module V1
     class IDEntity < Grape::Entity
+      expose :id
       expose :type
       expose :identifier
     end

data/lib/trogdir/versions/v1/entities/phone.rb

@@ -1,6 +1,7 @@
 module Trogdir
   module V1
     class PhoneEntity < Grape::Entity
+      expose :id
       expose :type
       expose :number
       expose :primary

data/lib/trogdir/versions/v1/entities/photo.rb

@@ -1,6 +1,7 @@
 module Trogdir
   module V1
     class PhotoEntity < Grape::Entity
+      expose :id
       expose :type
       expose :url
       expose :height

data/lib/trogdir/versions/v1/ids_api.rb

@@ -2,8 +2,13 @@ module Trogdir
   module V1
     class IDsAPI < Grape::API
       resource :ids do
+        before do
+          @person = Person.find_by(uuid: params[:person_id])
+          @id = @person.ids.find(params[:id_id]) if params[:id_id]
+        end
+
         get do
-          present Person.find_by(uuid: params[:person_id]).ids, with: IDEntity
+          present @person.ids, with: IDEntity
         end
 
         params do
@@ -11,7 +16,7 @@ module Trogdir
           requires :id_id, type: String
         end
         get ':id_id' do
-          present Person.find_by(uuid: params[:person_id]).ids.find(params[:id_id]), with: IDEntity
+          present @id, with: IDEntity
         end
 
         params do
@@ -19,7 +24,7 @@ module Trogdir
           requires :identifier
         end
         post do
-          Person.find_by(uuid: params[:person_id]).ids.create! clean_params(except: :person_id)
+          present @person.ids.create!(clean_params(except: :person_id)), with: IDEntity
         end
 
         params do
@@ -28,14 +33,18 @@ module Trogdir
           optional :identifier
         end
         put ':id_id' do
-          Person.find_by(uuid: params[:person_id]).ids.find(params[:id_id]).update_attributes! clean_params(except: [:person_id, :id_id])
+          @id.update_attributes! clean_params(except: [:person_id, :id_id])
+
+          present @id, with: IDEntity
         end
 
         params do
           requires :id_id, type: String
         end
         delete ':id_id' do
-          Person.find_by(uuid: params[:person_id]).ids.find(params[:id_id]).destroy
+          @id.destroy
+
+          present @id, with: IDEntity
         end
       end
     end

data/lib/trogdir/versions/v1/people_api.rb

@@ -4,6 +4,10 @@ module Trogdir
       UUID_REGEXP = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
 
       resource :people do
+        before do
+          @person = Person.find_by(uuid: params[:person_id]) if params[:person_id]
+        end
+
         desc 'Get a list of people'
         params do
           optional :affiliation, type: String
@@ -32,7 +36,7 @@ module Trogdir
           requires :person_id, desc: 'Person ID'
         end
         get ':person_id', requirements: {person_id: UUID_REGEXP} do
-          present Person.find_by(uuid: params[:person_id]), with: PersonEntity
+          present @person, with: PersonEntity
         end
 
         desc 'Create a person'
@@ -116,10 +120,9 @@ module Trogdir
           optional :pay_type, type: Symbol
         end
         put ':person_id', requirements: {person_id: UUID_REGEXP} do
-          person = Person.find_by(uuid: params[:person_id])
-          person.update_attributes! clean_params(except: :person_id)
+          @person.update_attributes! clean_params(except: :person_id)
 
-          present person, with: PersonEntity
+          present @person, with: PersonEntity
         end
       end
     end

data/lib/trogdir/versions/v1/phones_api.rb

@@ -2,15 +2,20 @@ module Trogdir
   module V1
     class PhonesAPI < Grape::API
       resource :phones do
+        before do
+          @person = Person.find_by(uuid: params[:person_id]) if params[:person_id]
+          @phone = @person.phones.find(params[:phone_id]) if params[:phone_id]
+        end
+
         get do
-          present Person.find_by(uuid: params[:person_id]).phones, with: PhoneEntity
+          present @person.phones, with: PhoneEntity
         end
 
         params do
           requires :phone_id, type: String
         end
         get ':phone_id' do
-          present Person.find_by(uuid: params[:person_id]).phones.find(params[:phone_id]), with: PhoneEntity
+          present @phone, with: PhoneEntity
         end
 
         params do
@@ -19,7 +24,7 @@ module Trogdir
           optional :primary, type: Boolean
         end
         post do
-          Person.find_by(uuid: params[:person_id]).phones.create! clean_params(except: :person_id)
+          present @person.phones.create!(clean_params(except: :person_id)), with: PhoneEntity
         end
 
         params do
@@ -29,14 +34,18 @@ module Trogdir
           optional :primary, type: Boolean
         end
         put ':phone_id' do
-          Person.find_by(uuid: params[:person_id]).phones.find(params[:phone_id]).update_attributes! clean_params(except: [:person_id, :phone_id])
+          @phone.update_attributes! clean_params(except: [:person_id, :phone_id])
+
+          present @phone, with: PhoneEntity
         end
 
         params do
           requires :phone_id, type: String
         end
         delete ':phone_id' do
-          Person.find_by(uuid: params[:person_id]).phones.find(params[:phone_id]).destroy
+          @phone.destroy
+
+          present @phone, with: PhoneEntity
         end
       end
     end

data/lib/trogdir/versions/v1/photos_api.rb

@@ -2,15 +2,20 @@ module Trogdir
   module V1
     class PhotosAPI < Grape::API
       resource :photos do
+        before do
+          @person = Person.find_by(uuid: params[:person_id]) if params[:person_id]
+          @photo = @person.photos.find(params[:photo_id]) if params[:photo_id]
+        end
+
         get do
-          present Person.find_by(uuid: params[:person_id]).photos, with: PhotoEntity
+          present @person.photos, with: PhotoEntity
         end
 
         params do
           requires :photo_id, type: String
         end
         get ':photo_id' do
-          present Person.find_by(uuid: params[:person_id]).photos.find(params[:photo_id]), with: PhotoEntity
+          present @photo, with: PhotoEntity
         end
 
         params do
@@ -20,7 +25,7 @@ module Trogdir
           optional :width, type: Integer
         end
         post do
-          Person.find_by(uuid: params[:person_id]).photos.create! clean_params(except: :person_id)
+          present @person.photos.create!(clean_params(except: :person_id)), with: PhotoEntity
         end
 
         params do
@@ -31,14 +36,18 @@ module Trogdir
           optional :width, type: Integer
         end
         put ':photo_id' do
-          Person.find_by(uuid: params[:person_id]).photos.find(params[:photo_id]).update_attributes! clean_params(except: [:person_id, :photo_id])
+          @photo.update_attributes! clean_params(except: [:person_id, :photo_id])
+
+          present @photo, with: PhotoEntity
         end
 
         params do
           requires :photo_id, type: String
         end
         delete ':photo_id' do
-          Person.find_by(uuid: params[:person_id]).photos.find(params[:photo_id]).destroy
+          @photo.destroy
+
+          present @photo, with: PhotoEntity
         end
       end
     end

data/lib/trogdir_api/version.rb

@@ -1,3 +1,3 @@
 module TrogdirAPI
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trogdir_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth