aladtec 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e687432d0c3fdf944414f149f28dbddd226255191cf192240a6f5ba244f9077
-  data.tar.gz: a8bd333f2c39f0ed0d88fcabe7127488f80b09f5d349a4118412936c145bdfac
+  metadata.gz: 58c7d99e528d980f7de92a4ba20e6e795d4a6d0fa0e5a2fde093136118844325
+  data.tar.gz: 1cef98df4ff014b2d317e11dacddf121f5b8c87165ab9d63c92944ffdda10eaf
 SHA512:
-  metadata.gz: '011149c9cf0f94c581135fbb1c2f0e1aa2e4ea05fcb97c03e4eb7008c9ffe68b7f80750618a71b7503599e9543483ff6ffc431e19a0360a5e21b93f7ee6305fa'
-  data.tar.gz: '0293445a0e145bbd54ca1db4a138feafb3d68ebf2e19559de880988f2afc7fded9a7ca66284090c79795ad3fb0d17f7894a9897e6f9f05cb8b6ad610c8f46730'
+  metadata.gz: dfa179a7edf38f090f83c7c37921eaa127e0e29987cc4f06ee535852dfa16da0201e8e8a87be93ff7fc09c0777d5a33d04556053031721ebf91574a2ba1edea7
+  data.tar.gz: cc20798aee7902d02ea43ab81e717d0f946a4a0328eb811049d681c30f440c7c49b419adc3f403bee9317234a2a55b17d2cc4ce8e9442c78f993aa9208f4f145

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+
+# 0.3.1
+- Fix for dry-configurable 0.11 config#update does not return self
+
 # 0.3.0
 - Updated to JSON api
 - Added http dependency

data/README.md

@@ -24,8 +24,8 @@ Or install it yourself as:
 Configure the gem with your credentials:
 
     Aladtec.configure do |config|
-      config.acc_key = ENV['ALADTEC_ACC_KEY']
-      config.acc_id = ENV['ALADTEC_ACC_ID']
+      config.client_id = ENV['ALADTEC_CLIENT_ID']
+      config.client_secret = ENV['ALADTEC_CLIENT_SECRET']
       config.endpoint = ENV['ALADTEC_ENDPOINT']
     end
 
@@ -36,12 +36,20 @@ Get members
 
 Get events
 
-    client.events(begin_date: Date.today)
+    client.events(begin_time: Time.now, end_time: Time.now + 60 * 60 * 24)
 
 Get schedules
 
     client.schedules
 
+Get scheduled time ranges
+
+    client.scheduled_range(begin_time: Time.new(2019,10,1), end_time: Time.new(2019,10,31))
+
+Get members scheduled now
+
+    client.scheduled_now
+
 Refer to the [documentation](http://www.rubydoc.info/github/travisdahlke/aladtec) for more detailed usage.
 
 ## Contributing

data/aladtec.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/travisdahlke/aladtec'
   spec.license       = 'MIT'
 
+  spec.required_ruby_version = '> 2.5'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/lib/aladtec/client.rb

@@ -13,7 +13,9 @@ module Aladtec
   class Client
     attr_reader :config
     def initialize(args = {})
-      @config = Aladtec.config.dup.update(args)
+      @config = Aladtec.config.dup.tap do |c|
+        c.update(args)
+      end
     end
 
     def configure
@@ -21,6 +23,9 @@ module Aladtec
     end
 
     def authenticate
+      if config.client_id.nil? || config.client_secret.nil? 
+        raise Aladtec::Error, 'client_id and client_secret are required'
+      end
       body = { grant_type: 'client_credentials', client_id: config.client_id,
                client_secret: config.client_secret }
       response = HTTP.post(URI.join(config.endpoint, 'oauth/token'), json: body)
@@ -72,7 +77,6 @@ module Aladtec
     # options - The Hash options used to refine the selection (default: {}):
     #           :begin_time - The begin time to return events for (required).
     #           :end_time   - The end time to return events for (required).
-    #           :sch        - Array of schedule ids to fetch
     def scheduled_range(options = {})
       bt = options.fetch(:begin_time) do
         raise ArgumentError, 'You must supply a :begin_time!'
@@ -80,7 +84,6 @@ module Aladtec
       et = options.fetch(:end_time) do
         raise ArgumentError, 'You must supply an :end_time!'
       end
-      # sch = Array(options.fetch(:sch, "all")).join(",")
       scheduled_time = request('scheduled-time', range_start: format_time(bt),
                                                  range_stop: format_time(et))
       scheduled_time.values.flatten.map { |range| Range.new(range) }
@@ -89,6 +92,9 @@ module Aladtec
     private
 
     def request(path, options = {})
+      if auth_expired? && !authenticate
+        raise Aladtec::Error, 'authentication failed'
+      end
       res = HTTP[user_agent: config.user_agent]
             .auth("Bearer #{@auth_token}")
             .get(URI.join(config.endpoint, path), params: options)
@@ -100,5 +106,9 @@ module Aladtec
     def format_time(time)
       (time.is_a?(Time) ? time : Time.parse(time)).strftime('%FT%R')
     end
+
+    def auth_expired?
+      !@auth_token || !@auth_expiration || Time.now >= @auth_expiration
+    end
   end
 end

data/lib/aladtec/version.rb

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

data/spec/aladtec/client_spec.rb

@@ -5,6 +5,18 @@ 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(:client_id) { 'foo' }
+  let(:client_secret) { 'bar' }
+
+  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,
+                  headers: { 'Content-Type': 'application/json' })
+  end
 
   describe '#members' do
     let(:members) { subject.members }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aladtec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Travis Dahlke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,16 +166,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Client library for the Aladtec API