when-i-work 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57220311944a37896ad65038251c3a9a699802b
-  data.tar.gz: 5ea8f6d27df0918ee1894e5cc4921af680cfcdef
+  metadata.gz: c03cba8607c9af712614d7166cf0afea2e94233c
+  data.tar.gz: c04241572ebe7b4ecb8ebc8091f1a4f598ffb1e0
 SHA512:
-  metadata.gz: cb5aef9fe17336ed5520bf6dc5f222a27b9f86e56017a8164cb17881ddfa2944f1bc11cb5baa0e4946773c85406a3f8397eac8844f5e98f9ecee174bb5c939c4
-  data.tar.gz: 5c39464bed10da1a9b22e25d218aa0f7d5eab7a10d4f1d31053fc701ffc0e18443a26541bb8f6db8bb0d6019c62af92ee00b7c14ec1715b1e8f743851cd769af
+  metadata.gz: 60cd6c7c53eae30036bd8c17e8191ca2f07bb115974232cadd2ace783d7fd6219d1820b058708e558d9d66db6c8b54977e8ebb7827b5ab87aa6e1a8ced5605c0
+  data.tar.gz: 52f211b2e53dc97e5c888f3a7919613cbec095f060a91a3faae8b8f687b44da4668e86673cc6c8b918bde8dc702b85ad3b5b75bbff00c3da12b749a3ecb65e13

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.0

data/lib/when-i-work.rb

@@ -9,23 +9,29 @@ require_relative 'when-i-work/shift'
 
 module WhenIWork
   class << self
-    attr_accessor :token
+    attr_accessor :username, :password, :api_key, :token
 
     def api_url
       "https://api.wheniwork.com/2/"
     end
 
     def configure(username, password, api_key)
-      @token = Authentication.login(username, password, api_key)
+      self.username = username
+      self.password = password
+      self.api_key = api_key
     end
 
-    def client
+    def client(options = {})
+      unless options[:skip_authentication]
+        self.token ||= Authentication.login(username, password, api_key)
+      end
+
       Faraday.new(url: api_url) do |faraday|
         #faraday.response :detailed_logger
         faraday.request :json
         faraday.response :json, :content_type => /\bjson$/
         faraday.adapter Faraday.default_adapter
-        faraday.headers = { 'W-Token' => @token } if @token
+        faraday.headers = { 'W-Token' => self.token } if self.token
       end
     end
 

data/lib/when-i-work/authentication.rb

@@ -4,14 +4,13 @@ module WhenIWork
     class << self
 
       def login(username, password, api_key)
+        client = client(skip_authentication: true)
         response = client.post 'login' do |request|
           request.body = { username: username, password: password, key: api_key }
         end    
 
         if response.success? && response.body['token']
           response.body['token']
-        else
-          raise Error::AuthenticationFailedError
         end
       end
 

data/lib/when-i-work/resource.rb

@@ -1,7 +1,7 @@
 module WhenIWork
   class Resource
-    def self.client
-      WhenIWork.client
+    def self.client(options = {})
+      WhenIWork.client(options)
     end
   end
 end

data/lib/when-i-work/shift.rb

@@ -1,7 +1,7 @@
 module WhenIWork
   class Shift < Resource
     def self.all(options = {})
-      client.get 'shifts', options
+      client.get('shifts', options).body
     end
   end
 end

data/spec/resources/shift_spec.rb

@@ -1,16 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe WhenIWork::Shift do
+  before { authenticate }
   describe "GET shifts" do
     it "gets shifts" do
-      VCR.use_cassette("authenticate", match_requests_on: [:headers]) do
-        response = WhenIWork.configure(ENV['WHENIWORK_USERNAME'], ENV['WHENIWORK_PASSWORD'], ENV['WHENIWORK_API_KEY'])
-        expect(response).to_not be_nil
-      end
-
       VCR.use_cassette("shifts", match_requests_on: [:headers]) do
         response = WhenIWork::Shift.all
-        expect(response.body).to include('start', 'end', 'shifts')
+        expect(response).to include('start', 'end', 'shifts')
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,6 +8,10 @@ module SimpleCov::Configuration
   end
 end
 
+def authenticate
+  WhenIWork.configure(ENV['WHENIWORK_USERNAME'], ENV['WHENIWORK_PASSWORD'], ENV['WHENIWORK_API_KEY'])
+end
+
 SimpleCov.configure do
   clean_filters
   load_adapter 'test_frameworks'

data/when-i-work.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: when-i-work 0.2.0 ruby lib
+# stub: when-i-work 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "when-i-work"
-  s.version = "0.2.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: when-i-work
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ingmaras Keleras