aladtec 0.3.2 → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe187974f6bb3afdfee9fa734097e8e9aa644e3d8e6d62eb5c3aeca466e3f84
-  data.tar.gz: 31d54f6839c062dba60924565d4d42e65b4521d106dc0bcc614d61889b87cf63
+  metadata.gz: 8d1a55b6d0b8583820796f25b094c57789988fd579440f73f480a280efc0af25
+  data.tar.gz: 429c1814e23f37a940ceeb68f2b725eee25324eeec012da717a82021b8382499
 SHA512:
-  metadata.gz: 3e29cd58cef7d9a02caacc815d6db9fb8b5a4e3279c6b4530d4d7ee6851289b759539881aa2660020c00c9fd0085ba411853cabb442a32a048c52e8ddc084af6
-  data.tar.gz: 6eafb4634d7659680d1b99d305b95ed0e8e9ca46c05885c8a145d837018a88286219b1dc6c5572e97591d1b0d4056a2333648eea69403986cd649c096f662e10
+  metadata.gz: f28a90e45decd38cdd6b6fbc538deb738ffaeec8c2c32364eb69c25058e1165c1f85e355e4bcc486887a81568bec172870e9dc6b18cbe506054ee544df39320d
+  data.tar.gz: 653004a2caa4814a61092dac892f6da1d36c67cb8135d83e2b0777cc90c7226f0d874139b8114bd9962abf2a5a1e9e5f8646e14d5f2eaefefb796af714780753

data/aladtec.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'webmock'
 
-  spec.add_dependency 'dry-configurable', '~> 0.11', '>= 0.11.4'
+  spec.add_dependency 'dry-configurable', '>= 1.0.0'
   spec.add_dependency 'dry-initializer'
   spec.add_dependency 'http'
 end

data/lib/aladtec/client.rb

@@ -30,8 +30,8 @@ module Aladtec
                client_secret: config.client_secret }
       response = HTTP.post(URI.join(config.endpoint, 'oauth/token'), json: body)
       body = response.parse
-      @auth_token = body.fetch('token')
-      @auth_expiration = Time.at body.fetch('expires')
+      @auth_token = body.fetch('access_token')
+      @auth_expiration = Time.now + body.fetch('expires_in')
       response.status.success?
     end
 
@@ -47,29 +47,29 @@ module Aladtec
       ed = options.fetch(:end_time) do
         raise ArgumentError, 'You must supply a :end_time option!'
       end
-      events = request('events', range_start: format_time(bd),
-                                 range_stop: format_time(ed))
-      events.values.flatten.map { |event| Event.new(event) }
+      events = request('events', range_start_datetime: format_time(bd),
+                                 range_stop_datetime: format_time(ed))
+      events['data'].flat_map { |dates| dates['event_records'] }.map { |event| Event.new(event) }
     end
 
     # Public: Get a list of members
     #
     def members
-      res = request('members', include_attributes: true)
-      res.map { |member| Member.new(member) }
+      res = request('members')
+      res['data'].map { |member| Member.new(member) }
     end
 
     # Public: Get a list of schedules
     #
     def schedules
       res = request('schedules')
-      res.map { |schedule| Schedule.new(schedule) }
+      res['data'].map { |schedule| Schedule.new(schedule) }
     end
 
     # Public: Get list of members scheduled now
     def scheduled_now(options = {})
       res = request('scheduled-time/members-scheduled-now', options)
-      res.map { |schedule| ScheduledNow.new(schedule) }
+      res['data'].map { |schedule| ScheduledNow.new(schedule) }
     end
 
     # Public: Get list of members scheduled in a time range
@@ -84,9 +84,9 @@ module Aladtec
       et = options.fetch(:end_time) do
         raise ArgumentError, 'You must supply an :end_time!'
       end
-      scheduled_time = request('scheduled-time', range_start: format_time(bt),
-                                                 range_stop: format_time(et))
-      scheduled_time.values.flatten.map { |range| Range.new(range) }
+      scheduled_time = request('scheduled-time', range_start_datetime: format_time(bt),
+                                                 range_stop_datetime: format_time(et))
+      scheduled_time['data'].flat_map { |date| date['time_records'] }.map { |range| Range.new(range) }
     end
 
     private
@@ -104,7 +104,7 @@ module Aladtec
     end
 
     def format_time(time)
-      (time.is_a?(Time) ? time : Time.parse(time)).strftime('%FT%R')
+      (time.is_a?(Time) ? time : Time.parse(time)).strftime('%FT%T%:z')
     end
 
     def auth_expired?

data/lib/aladtec/member.rb

@@ -8,9 +8,10 @@ module Aladtec
     extend Dry::Initializer
 
     option :member_id, as: :id
-    option :name
+    option :first_name
+    option :last_name
     option :is_active
-    option :attributes, [] do
+    option :custom_attributes, [] do
       option :attribute_id, as: :id
       option :value
     end
@@ -18,5 +19,9 @@ module Aladtec
     def self.new(params)
       super **params.transform_keys(&:to_sym)
     end
+
+    def name
+      [first_name, last_name].join(' ')
+    end
   end
 end

data/lib/aladtec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aladtec
-  VERSION = '0.3.2'
+  VERSION = '1.0.0.pre'
 end

data/lib/aladtec.rb

@@ -8,7 +8,7 @@ require 'aladtec/client'
 module Aladtec
   extend Dry::Configurable
 
-  setting :endpoint, default: 'https://secure.aladtec.com/example/api/'
+  setting :endpoint, default: 'https://secure.aladtec.com/example/api/v3/'
   setting :user_agent, default: "Aladtec API Ruby Gem #{Aladtec::VERSION}"
   setting :client_id
   setting :client_secret

data/spec/aladtec/aladtec_spec.rb

@@ -8,7 +8,7 @@ describe Aladtec do
   end
 
   describe '.configure' do
-    Aladtec.settings.each do |key|
+    Aladtec.settings.keys.each do |key|
       it "should set the #{key}" do
         Aladtec.configure do |config|
           config.public_send("#{key}=", key)

data/spec/aladtec/client_spec.rb

@@ -3,47 +3,47 @@
 require_relative File.join('..', 'spec_helper')
 
 describe Aladtec::Client do
-  let(:start_time) { Time.now.strftime('%FT%R') }
-  let(:end_time) { (Time.now + 60 * 60 * 24).strftime('%FT%R') }
+  let(:start_time) { Time.now.strftime('%FT%T%:z') }
+  let(:end_time) { (Time.now + 60 * 60 * 24).strftime('%FT%T%:z') }
   let(:client_id) { 'foo' }
   let(:client_secret) { 'bar' }
+  let(:endpoint) { subject.config.endpoint }
 
   before(:each) do
     subject.configure do |config|
       config.client_id = client_id
       config.client_secret = client_secret
     end
-    stub_request(:post, 'https://secure.aladtec.com/example/api/oauth/token')
-      .to_return(body: { token: 'baz', expires: (Time.now + 3600).to_i }.to_json,
+    stub_request(:post, URI.join(endpoint, 'oauth/token'))
+      .to_return(body: { "access_token": "<string>", "token_type": "Bearer", "expires_in": 3600, "scope": "<string>" }.to_json,
                   headers: { 'Content-Type': 'application/json' })
   end
 
   describe '#members' do
     let(:members) { subject.members }
     before(:each) do
-      stub_request(:get, 'https://secure.aladtec.com/example/api/members')
-        .with(query: { include_attributes: true })
+      stub_request(:get, URI.join(endpoint, 'members'))
         .to_return(body: fixture('members.json'),
                    headers: { 'Content-Type': 'application/json' })
     end
     it 'returns a list of members' do
-      expect(members.length).to eq(2)
+      expect(members.length).to eq(1)
     end
 
     let(:ed) { members.first }
     it 'returns members with names' do
-      expect(ed.name).to eq('Ed Mercer')
+      expect(ed.name).to eq('John Smith')
     end
     it 'returns members with ids' do
-      expect(ed.id).to eq(42)
+      expect(ed.id).to eq(3)
     end
   end
 
   describe '#events' do
     let(:events) { subject.events(begin_time: start_time, end_time: end_time) }
     before(:each) do
-      stub_request(:get, 'https://secure.aladtec.com/example/api/events')
-        .with(query: { range_start: start_time, range_stop: end_time })
+      stub_request(:get, URI.join(endpoint, 'events'))
+        .with(query: { range_start_datetime: start_time, range_stop_datetime: end_time })
         .to_return(body: fixture('events.json'),
                    headers: { 'Content-Type': 'application/json' })
     end
@@ -57,7 +57,7 @@ describe Aladtec::Client do
     end
 
     it 'returns events with a description' do
-      expect(event.description).to eq('open to the community')
+      expect(event.description).to eq('Open to the community')
     end
 
     it 'returns events with location' do
@@ -65,18 +65,18 @@ describe Aladtec::Client do
     end
 
     it 'returns events with begin date' do
-      expect(event.starts_at).to eq(Time.parse('2018-01-16T09:00'))
+      expect(event.starts_at).to eq(Time.parse('2018-01-16T09:00-05:00'))
     end
 
     it 'returns events with end date' do
-      expect(event.ends_at).to eq(Time.parse('2018-01-16T11:00'))
+      expect(event.ends_at).to eq(Time.parse('2018-01-16T11:00-05:00'))
     end
   end
 
   describe '#schedules' do
     let(:schedules) { subject.schedules }
     before(:each) do
-      stub_request(:get, 'https://secure.aladtec.com/example/api/schedules')
+      stub_request(:get, URI.join(endpoint, 'schedules'))
         .to_return(body: fixture('schedules.json'),
                    headers: { 'Content-Type': 'application/json' })
     end
@@ -97,7 +97,7 @@ describe Aladtec::Client do
   describe '#scheduled_now' do
     let(:schedules) { subject.scheduled_now }
     before(:each) do
-      stub_request(:get, 'https://secure.aladtec.com/example/api/scheduled-time/members-scheduled-now')
+      stub_request(:get, URI.join(endpoint, 'scheduled-time/members-scheduled-now'))
         .to_return(body: fixture('scheduled_time_now.json'),
                    headers: { 'Content-Type': 'application/json' })
     end
@@ -121,8 +121,8 @@ describe Aladtec::Client do
                               end_time: end_time)
     end
     before(:each) do
-      stub_request(:get, 'https://secure.aladtec.com/example/api/scheduled-time')
-        .with(query: { range_start: start_time, range_stop: end_time })
+      stub_request(:get, URI.join(endpoint, 'scheduled-time'))
+        .with(query: { range_start_datetime: start_time, range_stop_datetime: end_time })
         .to_return(body: fixture('scheduled_time.json'),
                    headers: { 'Content-Type': 'application/json' })
     end
@@ -152,7 +152,7 @@ describe Aladtec::Client do
     end
   end
 
-  let(:valid_keys) { Aladtec.settings }
+  let(:valid_keys) { Aladtec.settings.keys }
   context 'with module configuration' do
     before(:each) do
       Aladtec.configure do |config|

data/spec/fixtures/events.json

@@ -1,55 +1,57 @@
 {
-  "2018-01-16": [
+  "data": [
     {
-      "event_id": 22,
-      "title": "EMS Monthly Meeting",
-      "description": "open to the community",
-      "location": "EMS Station",
-      "start_datetime": "2018-01-16T09:00",
-      "stop_datetime": "2018-01-16T11:00",
-      "start_timestamp": "1547629200",
-      "stop_timestamp": "1547636400",
-      "extends_before": true,
-      "extends_after": false,
-      "schedules": [
-        1,
-        2
-      ],
-      "public": true
+      "daily_split_date": "2018-01-16",
+      "event_records": [
+        {
+          "event_id": 22,
+          "title": "EMS Monthly Meeting",
+          "description": "Open to the community",
+          "location": "EMS Station",
+          "start_datetime": "2018-01-16T09:00:00-05:00",
+          "stop_datetime": "2018-01-16T11:00:00-05:00",
+          "extends_before": true,
+          "extends_after": false,
+          "schedules": [
+            1,
+            2
+          ]
+        },
+        {
+          "event_id": 43,
+          "title": "Game Night",
+          "description": "Bring some games and have some fun!",
+          "location": "Event Hall",
+          "start_datetime": "2018-01-16T22:00:00-05:00",
+          "stop_datetime": "2018-01-16T00:00:00-05:00",
+          "extends_before": false,
+          "extends_after": false,
+          "schedules": [
+            2
+          ]
+        }
+      ]
     },
     {
-      "event_id": 43,
-      "title": "Game Night",
-      "description": "Bring some games and have some fun!",
-      "location": "Event Hall",
-      "start_datetime": "2018-01-16T22:00",
-      "stop_datetime": "2018-01-16T00:00",
-      "start_timestamp": "1526526000",
-      "stop_timestamp": "1526533200",
-      "extends_before": false,
-      "extends_after": false,
-      "schedules": [
-        2
-      ],
-      "public": false
+      "daily_split_date": "2018-01-17",
+      "event_records": [
+        {
+          "event_id": 43,
+          "title": "EMS Coverage for Football Game",
+          "description": "High School Football Game",
+          "location": "Ramer Field",
+          "start_datetime": "2018-01-17T18:00:00-05:00",
+          "stop_datetime": "2018-01-17T04:00:00-05:00",
+          "extends_before": false,
+          "extends_after": true,
+          "schedules": [
+            2
+          ]
+        }
+      ]
     }
   ],
-  "2018-01-17": [
-    {
-      "event_id": 43,
-      "title": "EMS Coverage for Football Game",
-      "description": "High School Football Game",
-      "location": "Ramer Field",
-      "start_datetime": "2018-01-17T18:00",
-      "stop_datetime": "2018-01-17T04:00",
-      "start_timestamp": "1547748000",
-      "stop_timestamp": "1547758800",
-      "extends_before": false,
-      "extends_after": true,
-      "schedules": [
-        2
-      ],
-      "public": false
-    }
-  ]
+  "meta": {
+    "generated_at_datetime": "2022-01-01T07:42:33-06:00"
+  }
 }

data/spec/fixtures/members.json

@@ -1,39 +1,43 @@
-[
-  {
-    "member_id": 42,
-    "is_active": true,
-    "name": "Ed Mercer",
-    "attributes": [
-      {
-        "attribute_id": 1,
-        "value": "Ed"
-      },
-      {
-        "attribute_id": 3,
-        "value": "Mercer"
-      },
-      {
-        "attribute_id": 19,
-        "value": [
-          "Morning",
-          "Evening"
-        ]
-      }
-    ]
-  },
-  {
-    "member_id": 2,
-    "is_active": false,
-    "name": "Joyner Lucas",
-    "attributes": [
-      {
-        "attribute_id": 1,
-        "value": "Joyner"
-      },
-      {
-        "attribute_id": 3,
-        "value": "Lucas"
-      }
-    ]
+{
+  "data": [
+    {
+      "member_id": 3,
+      "is_active": true,
+      "first_name": "John",
+      "last_name": "Smith",
+      "login": "johnsmith",
+      "primary_email": "jsmith@company.com",
+      "secondary_emails": [
+        "jsmith@example.com"
+      ],
+      "employee_type_id": 7,
+      "work_group_id": 5,
+      "date_hired": "2019-01-01",
+      "schedule_ids": [
+        1,
+        2
+      ],
+      "position_qualification_ids": [
+        1,
+        2,
+        3
+      ],
+      "custom_attributes": [
+        {
+          "attribute_id": 11,
+          "value": ""
+        },
+        {
+          "attribute_id": 10,
+          "value": [
+            2,
+            3
+          ]
+        }
+      ]
+    }
+  ],
+  "meta": {
+    "generated_at_datetime": "2022-01-01T07:42:33-06:00"
   }
-]
+}

data/spec/fixtures/scheduled_time.json

@@ -1,54 +1,65 @@
 {
-  "2018-05-18" : [
+  "data": [
     {
-      "member_id" : 3,
-      "schedule_id" : 16,
-      "position_id" : 50,
-      "time_type": "Regular",
-      "start_datetime" : "2018-05-18T07:00",
-      "start_timestamp" : 1526644800,
-      "stop_datetime" : "2018-05-19T07:00",
-      "stop_timestamp" : 1526731200,
-      "extends_before": true,
-      "extends_after": false
+      "daily_split_date": "2018-05-18",
+      "time_records": [
+        {
+          "member_id": 3,
+          "schedule_id": 16,
+          "position_id": 50,
+          "position_qualification_id": 1,
+          "time_type_id": 1,
+          "time_type": "Regular",
+          "start_datetime": "2018-05-18T07:00:00-05:00",
+          "stop_datetime": "2018-05-19T07:00:00-05:00",
+          "extends_before": true,
+          "extends_after": false
+        },
+        {
+          "member_id": 53,
+          "schedule_id": 16,
+          "position_id": 51,
+          "position_qualification_id": 1,
+          "time_type_id": 1,
+          "time_type": "Regular",
+          "start_datetime": "2018-05-18T07:00:00-05:00",
+          "stop_datetime": "2018-05-19T07:00:00-05:00",
+          "extends_before": false,
+          "extends_after": false
+        }
+      ]
     },
     {
-      "member_id" : 53,
-      "schedule_id" : 16,
-      "position_id" : 51,
-      "time_type": "Regular",
-      "start_datetime" : "2018-05-18T07:00",
-      "start_timestamp" : 1526644800,
-      "stop_datetime" : "2018-05-19T07:00",
-      "stop_timestamp" : 1526731200,
-      "extends_before": false,
-      "extends_after": false
+      "daily_split_date": "2018-05-19",
+      "time_records": [
+        {
+          "member_id": 52,
+          "schedule_id": 16,
+          "position_id": 50,
+          "position_qualification_id": 1,
+          "time_type_id": 1,
+          "time_type": "Regular",
+          "start_datetime": "2018-05-19T09:00:00-05:00",
+          "stop_datetime": "2018-05-19T17:00:00-05:00",
+          "extends_before": false,
+          "extends_after": true
+        },
+        {
+          "member_id": 96,
+          "schedule_id": 16,
+          "position_id": 53,
+          "position_qualification_id": 1,
+          "time_type_id": 1,
+          "time_type": "Regular",
+          "start_datetime": "2018-05-19T09:00:00-05:00",
+          "stop_datetime": "2018-05-19T17:00:00-05:00",
+          "extends_before": false,
+          "extends_after": false
+        }
+      ]
     }
   ],
-  "2018-05-19" : [
-    {
-      "member_id" : 52,
-      "schedule_id" : 16,
-      "position_id" : 50,
-      "time_type": "Regular",
-      "start_datetime" : "2018-05-19T09:00",
-      "start_timestamp" : 1526738400,
-      "stop_datetime" : "2018-05-19T17:00",
-      "stop_timestamp" : 1526767200,
-      "extends_before": false,
-      "extends_after": false
-    },
-    {
-      "member_id" : 96,
-      "schedule_id" : 16,
-      "position_id" : 53,
-      "time_type": "Regular",
-      "start_datetime" : "2018-05-19T09:00",
-      "start_timestamp" : 1526738400,
-      "stop_datetime" : "2018-05-19T17:00",
-      "stop_timestamp" : 1526767200,
-      "extends_before": false,
-      "extends_after": false
-    }
-  ]
+  "meta": {
+    "generated_at_datetime": "2022-01-01T07:42:33-06:00"
+  }
 }

data/spec/fixtures/scheduled_time_now.json

@@ -1,24 +1,29 @@
-[
-  {
-    "schedule_id": 1,
-    "positions": [
-      {
-        "position_id": 1,
-        "member_id": 42
-      }
-    ]
-  },
-  {
-    "schedule_id": 2,
-    "positions": [
-      {
-        "position_id": 3,
-        "member_id": 27
-      },
-      {
-        "position_id": 4,
-        "member_id": 22
-      }
-    ]
+{
+  "data": [
+    {
+      "schedule_id": 1,
+      "positions": [
+        {
+          "position_id": 1,
+          "member_id": 42
+        }
+      ]
+    },
+    {
+      "schedule_id": 2,
+      "positions": [
+        {
+          "position_id": 3,
+          "member_id": 27
+        },
+        {
+          "position_id": 4,
+          "member_id": 22
+        }
+      ]
+    }
+  ],
+  "meta": {
+    "generated_at_datetime": "2022-01-01T07:42:33-06:00"
   }
-]
+}

data/spec/fixtures/schedules.json

@@ -1,32 +1,47 @@
-[
-  {
-    "schedule_id": 1,
-    "name": "Ambulance 1",
-    "is_archived": false,
-    "positions": [
-      {
-        "position_id": 1,
-        "label": "Driver"
-      },
-      {
-        "position_id": 2,
-        "label": "Firefighter"
-      }
-    ]
-  },
-  {
-    "schedule_id": 2,
-    "name": "Fire Crew 1",
-    "is_archived": false,
-    "positions": [
-      {
-        "position_id": 3,
-        "label": "Slot 1"
-      },
-      {
-        "position_id": 4,
-        "label": "Slot 2"
-      }
-    ]
+{
+  "data": [
+    {
+      "schedule_id": 1,
+      "name": "Ambulance 1",
+      "is_archived": false,
+      "order": "1,",
+      "positions": [
+        {
+          "position_id": 1,
+          "position_qualification_id": 1,
+          "label": "Driver",
+          "order": 1
+        },
+        {
+          "position_id": 2,
+          "position_qualification_id": 3,
+          "label": "EMT",
+          "order": 2
+        }
+      ]
+    },
+    {
+      "schedule_id": 2,
+      "name": "Fire Crew 1",
+      "is_archived": false,
+      "order": 2,
+      "positions": [
+        {
+          "position_id": 3,
+          "position_qualification_id": 2,
+          "label": "Firefighter",
+          "order": 1
+        },
+        {
+          "position_id": 4,
+          "position_qualification_id": 2,
+          "label": "Firefighter",
+          "order": 2
+        }
+      ]
+    }
+  ],
+  "meta": {
+    "generated_at_datetime": "2022-01-01T07:42:33-06:00"
   }
-]
+}

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aladtec
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Travis Dahlke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2023-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -84,22 +84,16 @@ dependencies:
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Client library for the Aladtec API