aladtec 0.2.0 → 0.3.0

data/lib/aladtec/scheduled_now.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'dry-initializer'
+
+module Aladtec
+  # ScheduledNow
+  class ScheduledNow
+    extend Dry::Initializer
+
+    option :schedule_id, as: :id
+    option :positions, [] do
+      option :position_id, proc(&:to_i), as: :id
+      option :member_id, proc(&:to_i)
+    end
+
+    def self.new(params)
+      super params.transform_keys(&:to_sym)
+    end
+  end
+end

data/lib/aladtec/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aladtec
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'
 end

data/spec/aladtec/aladtec_spec.rb

@@ -1,7 +1,24 @@
-require_relative File.join('..','spec_helper')
+# frozen_string_literal: true
+
+require_relative File.join('..', 'spec_helper')
 
 describe Aladtec do
   it 'should have a version' do
     expect(Aladtec::VERSION).not_to be_nil
   end
+
+  describe '.configure' do
+    Aladtec.settings.each do |key|
+      it "should set the #{key}" do
+        Aladtec.configure do |config|
+          config.public_send("#{key}=", key)
+        end
+        expect(Aladtec.config.public_send(key)).to eq(key)
+      end
+    end
+
+    after(:each) do
+      Aladtec.reset_config
+    end
+  end
 end

data/spec/aladtec/client_spec.rb

@@ -1,158 +1,146 @@
-require_relative File.join('..','spec_helper')
+# frozen_string_literal: true
 
-describe Aladtec::Client do
-  let(:valid_keys) do
-    Aladtec::Configuration::VALID_CONFIG_KEYS
-  end
-
-  describe "#auth" do
-    let(:auth) { subject.auth("user", "pass") }
-    before(:each) do
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "authenticateMember"})).
-              to_return(body: fixture('authenticate_member.xml'))
-    end
+require_relative File.join('..', 'spec_helper')
 
-    it "returns an authentication object" do
-      expect(auth).to be_success
-    end
-
-  end
+describe Aladtec::Client do
+  let(:start_time) { Time.now.strftime('%FT%R') }
+  let(:end_time) { (Time.now + 60 * 60 * 24).strftime('%FT%R') }
 
-  describe "#members" do
+  describe '#members' do
     let(:members) { subject.members }
     before(:each) do
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "getMembers"})).
-              to_return(body: fixture('get_members.xml'))
+      stub_request(:get, 'https://secure.aladtec.com/example/api/members')
+        .with(query: { include_attributes: true })
+        .to_return(body: fixture('members.json'),
+                   headers: { 'Content-Type': 'application/json' })
     end
-    it "returns a list of members" do
-      expect(members.length).to eq(3)
+    it 'returns a list of members' do
+      expect(members.length).to eq(2)
     end
 
-    let(:john) { members.first }
-    it "returns members with names" do
-      expect(john.name).to eq("John Anderson")
+    let(:ed) { members.first }
+    it 'returns members with names' do
+      expect(ed.name).to eq('Ed Mercer')
     end
-    it "returns members with ids" do
-      expect(john.id).to eq(32)
+    it 'returns members with ids' do
+      expect(ed.id).to eq(42)
     end
   end
 
-  describe "#events" do
-    let(:events) { subject.events(begin_date: Date.today)}
+  describe '#events' do
+    let(:events) { subject.events(begin_time: start_time, end_time: end_time) }
     before(:each) do
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "getEvents"})).
-              to_return(body: fixture('get_events.xml'))
+      stub_request(:get, 'https://secure.aladtec.com/example/api/events')
+        .with(query: { range_start: start_time, range_stop: end_time })
+        .to_return(body: fixture('events.json'),
+                   headers: { 'Content-Type': 'application/json' })
     end
-    it "returns a list of events" do
-      expect(events.length).to eq(2)
+    it 'returns a list of events' do
+      expect(events.length).to eq(3)
     end
 
     let(:event) { events.first }
-    it "returns events with title" do
-      expect(event.title).to eq("Game Night")
+    it 'returns events with title' do
+      expect(event.title).to eq('EMS Monthly Meeting')
     end
 
-    it "returns events with a description" do
-      expect(event.description).to eq("Play games until the sun comes up!")
+    it 'returns events with a description' do
+      expect(event.description).to eq('open to the community')
     end
 
-    it "returns events with location" do
-      expect(event.location).to eq("Public Library")
+    it 'returns events with location' do
+      expect(event.location).to eq('EMS Station')
     end
 
-    it "returns events with begin date" do
-      expect(event.begin).to eq(Time.parse("2012-04-20"))
+    it 'returns events with begin date' do
+      expect(event.starts_at).to eq(Time.parse('2018-01-16T09:00'))
     end
 
-    it "returns events with end date" do
-      expect(event.end).to eq(Time.parse("2012-04-21 15:30:00 UTC"))
+    it 'returns events with end date' do
+      expect(event.ends_at).to eq(Time.parse('2018-01-16T11:00'))
     end
   end
 
-  describe "#schedules" do
+  describe '#schedules' do
     let(:schedules) { subject.schedules }
     before(:each) do
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "getSchedules"})).
-              to_return(body: fixture('get_schedules.xml'))
+      stub_request(:get, 'https://secure.aladtec.com/example/api/schedules')
+        .to_return(body: fixture('schedules.json'),
+                   headers: { 'Content-Type': 'application/json' })
     end
-    it "returns a list of schedules" do
-      expect(schedules.length).to eq(5)
+    it 'returns a list of schedules' do
+      expect(schedules.length).to eq(2)
     end
 
     let(:schedule) { schedules.first }
-    it "returns schedules with names" do
-      expect(schedule.name).to eq("Sample BLS - 24/48")
+    it 'returns schedules with names' do
+      expect(schedule.name).to eq('Ambulance 1')
     end
 
-    it "returns schedules with ids" do
-      expect(schedule.id).to eq(5)
+    it 'returns schedules with ids' do
+      expect(schedule.id).to eq(1)
     end
   end
 
-  describe "#scheduled_now" do
+  describe '#scheduled_now' do
     let(:schedules) { subject.scheduled_now }
     before(:each) do
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "getScheduledTimeNow"})).
-              to_return(body: fixture('get_scheduled_time_now.xml'))
+      stub_request(:get, 'https://secure.aladtec.com/example/api/scheduled-time/members-scheduled-now')
+        .to_return(body: fixture('scheduled_time_now.json'),
+                   headers: { 'Content-Type': 'application/json' })
     end
-    it "returns a list of scheduled time now" do
+    it 'returns a list of scheduled time now' do
       expect(schedules.length).to eq(2)
     end
 
     let(:schedule) { schedules.first }
-    it "returns schedules with ids" do
-      expect(schedule.id).to eq(5)
+    it 'returns schedules with ids' do
+      expect(schedule.id).to eq(1)
     end
 
-    it "returns schedules with positions" do
-      expect(schedule.positions.length).to eq(2)
+    it 'returns schedules with positions' do
+      expect(schedule.positions.length).to eq(1)
     end
   end
 
-  describe "#scheduled_range" do
-    let(:ranges) { subject.scheduled_range(begin_time: Time.now, end_time: Time.now) }
+  describe '#scheduled_range' do
+    let(:ranges) do
+      subject.scheduled_range(begin_time: start_time,
+                              end_time: end_time)
+    end
     before(:each) do
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "getScheduledTimeRanges"})).
-              to_return(body: fixture('get_scheduled_time_ranges.xml'))
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "getMembers"})).
-              to_return(body: fixture('get_members.xml'))
-      stub_request(:post, "https://secure.emsmanager.net/api/index.php").
-              with(body: hash_including({cmd: "getSchedules"})).
-              to_return(body: fixture('get_schedules.xml'))
+      stub_request(:get, 'https://secure.aladtec.com/example/api/scheduled-time')
+        .with(query: { range_start: start_time, range_stop: end_time })
+        .to_return(body: fixture('scheduled_time.json'),
+                   headers: { 'Content-Type': 'application/json' })
     end
-    it "returns a list of scheduled ranges" do
-      expect(ranges.length).to eq(3)
+    it 'returns a list of scheduled ranges' do
+      expect(ranges.length).to eq(4)
     end
 
     let(:range) { ranges.first }
-    it "returns ranges with a begin time" do
-      expect(range.begin).to eq(Time.parse("2010-03-20T03:30:00Z"))
+    it 'returns ranges with a begin time' do
+      expect(range.starts_at).to eq(Time.parse('2018-05-18T07:00'))
     end
 
-    it "returns ranges with a end time" do
-      expect(range.end).to eq(Time.parse("2010-03-20T11:30:00Z"))
+    it 'returns ranges with a end time' do
+      expect(range.ends_at).to eq(Time.parse('2018-05-19T07:00'))
     end
 
-    it "returns ranges with a member id" do
-      expect(range.member.id).to eq(42)
+    it 'returns ranges with a member id' do
+      expect(range.member_id).to eq(3)
     end
 
-    it "returns ranges with a position id" do
-      expect(range.position.id).to eq(1)
+    it 'returns ranges with a position id' do
+      expect(range.position_id).to eq(50)
     end
 
-    it "returns ranges with a schedule id" do
-      expect(range.schedule.id).to eq(5)
+    it 'returns ranges with a schedule id' do
+      expect(range.schedule_id).to eq(16)
     end
   end
 
+  let(:valid_keys) { Aladtec.settings }
   context 'with module configuration' do
     before(:each) do
       Aladtec.configure do |config|
@@ -162,33 +150,32 @@ describe Aladtec::Client do
       end
     end
 
-    after(:each) do
-      Aladtec.reset
-    end
-
-    it "should inherit module configuration" do
+    it 'should inherit module configuration' do
       api = Aladtec::Client.new
       valid_keys.each do |key|
-        expect(api.public_send(key)).to eq(key)
+        expect(api.config.public_send(key)).to eq(key)
       end
     end
+
+    after(:each) do
+      Aladtec.reset_config
+    end
   end
 
   context 'with class configuration' do
     let(:config) do
       {
-        :acc_id     => 'ai',
-        :acc_key    => 'ak',
-        :endpoint   => 'ep',
-        :user_agent => 'ua',
-        :method     => 'hm',
+        client_id: 'ai',
+        client_secret: 'ak',
+        endpoint: 'ep',
+        user_agent: 'ua'
       }
     end
 
     it 'should override module configuration' do
       api = Aladtec::Client.new(config)
       valid_keys.each do |key|
-        expect(api.public_send(key)).to eq(config[key])
+        expect(api.config.public_send(key)).to eq(config[key])
       end
     end
 
@@ -196,11 +183,11 @@ describe Aladtec::Client do
       api = Aladtec::Client.new
 
       config.each do |key, value|
-        api.public_send("#{key}=", value)
+        api.config.public_send("#{key}=", value)
       end
 
       valid_keys.each do |key|
-        expect(api.send("#{key}")).to eq(config[key])
+        expect(api.config.send(key.to_s)).to eq(config[key])
       end
     end
   end

data/spec/fixtures/events.json

@@ -0,0 +1,55 @@
+{
+  "2018-01-16": [
+    {
+      "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
+    },
+    {
+      "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
+    }
+  ],
+  "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
+    }
+  ]
+}

data/spec/fixtures/members.json

@@ -0,0 +1,39 @@
+[
+  {
+    "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/spec/fixtures/scheduled_time.json

@@ -0,0 +1,54 @@
+{
+  "2018-05-18" : [
+    {
+      "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
+    },
+    {
+      "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
+    }
+  ],
+  "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
+    }
+  ]
+}