timedoctor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f001d7dff95468e48afdcd400137316259db0879011926b82303ee0121f79a7c
-  data.tar.gz: f36f2d190fb846a05673d7b99db8a3d4f4874682c503b6e8aada23c550dc5265
+  metadata.gz: 18ec15218465099f9b2dc4ecaea38ee6865185ec641f2993f98d5a4ad13c4bb9
+  data.tar.gz: f689d43de75653e747524abd2f7937a134917882c44638c76ba24314d013ce06
 SHA512:
-  metadata.gz: 2dc32f33dd81c6d8f2a95229a4da8bf1d7648d715f8ff3417cb2c1704a6a7b38ef8e09ee10371ac5d23d8cac4fff6d8d50324b65d7db412075f529ad8d6f4714
-  data.tar.gz: a76fe0fe980c5a055bf5fa79e2d586ead6a69ec153032dd78403d08a7f10b36196885eecdfebfd98bf1c76668179a43e25e0df736f880a277e9e7d9786f9fe3d
+  metadata.gz: 7ed21cca98983b5edfc5178e9dff3f352dbe0e3c1cfa56edadc1f3c78d354a9e097ee8b9c68c6f80669949794526a99481dc7ed3146b2c3749c380b57abc1d0c
+  data.tar.gz: d4ac18f10dffc9a22687493a7b8dca406a0a3b2992dd3cb72696d8e2730ac28824458f429cff602a05c158d62d3527fd3bf2e2ddcdfd0915dcb8a7f24ebf78a4

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+timedoctor-*.gem

data/.rubocop.yml

@@ -13,4 +13,7 @@ Metrics/MethodLength:
 
 Lint/ScriptPermission:
   Exclude:
-    - bin/console
+    - bin/console
+
+Metrics/AbcSize:
+  Max: 20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    timedoctor (0.1.0)
+    timedoctor (0.2.0)
       faraday (~> 0.15.0)
 
 GEM
@@ -18,7 +18,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.3.0)
-    faraday (0.15.0)
+    faraday (0.15.1)
       multipart-post (>= 1.2, < 3)
     hashdiff (0.3.7)
     json (2.1.0)

data/bin/console

@@ -3,8 +3,6 @@
 require 'bundler/setup'
 require 'timedoctor'
 
-require 'date'
-
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
@@ -14,21 +12,35 @@ require 'date'
 
 # require 'irb'
 # IRB.start(__FILE__)
-
-
-TimeDoctor::Config.configure do |conf|
-  conf.client_id     = '1091_4hnloyc6pqqscckokws808o8soocko4c44owwws404g8k4sgos'
-  conf.client_secret = '7wvmks0khckcw40s00cssg4w8s404o8g0g8k00cgo8kow0cow'
-
-  conf.on_token_refresh = lambda do |data, _payload|
-    p 'REFRESH'
-    p data[:access_token], data[:refresh_token]
-  end
-end
-
-client = TimeDoctor::Client.new access_token: 'MjQ5NDUzYTlhZGJjMDc0OGZlNTQwZjJkY2RmZGYwMjM0OWIxNmIwMmJhMWQ1YWZlZWM0NzRjNjI2NjIwNDk4YQ',
-                                refresh_token: 'YmUxOTFjNjE1Njc0YzRmNDYyZGIzZDZlYzFmZWU0MzViNDBmNjIwNDI1NGVhNGQ3ZThkNTNjOTIwNmZkNzNjNA'
-
-p client.companies.list[:user][:full_name]
-
-# TimeDoctor::Client.new('token')
+#
+# config = {
+#   client_id: '1091_4hnloyc6pqqscckokws808o8soocko4c44owwws404g8k4sgos',
+#   client_secret: '7wvmks0khckcw40s00cssg4w8s404o8g0g8k00cgo8kow0cow',
+#
+#   access_token:
+# "Y2ZkMGY5OTA1NGI3NmJjZTZlYWJlYjczNGM4N2E2NTYwZjFmNzhjZGVhMGY3ZmU0MTIyZjQ5NTNkOGIzYWI3ZA",
+#   refresh_token:
+# "ZmM3OTg1NjZmYjgwYmZlYzM2NzAwMjFlZmFhZmU4MDk1Y2ZhZWNlYjMyYTg0NzlmMzRmNzBiOWM5NTUxNjY4MA",
+#   user_id: 1188995,
+#   company_id: 587525,
+#
+#   on_token_refresh: ->(data, conf) do
+#     p 'SUCCESS'
+#
+#     p data
+#
+#     conf[:access_token]  = data[:access_token]
+#     conf[:refresh_token] = data[:refresh_token]
+#   end,
+#
+#   on_token_refresh_error: ->(data, conf) { p "FAILURE" }
+# }
+#
+# client = TimeDoctor::Client.new(config)
+#
+# # p client.companies.list
+#
+# # worker =  client.instance_variable_get(:@worker)
+# # p config =  client.instance_variable_get(:@config).inspect
+# #
+# TimeDoctor::Token.refresh(config)

data/lib/timedoctor.rb

@@ -6,4 +6,3 @@ require 'timedoctor/exceptions'
 require 'timedoctor/config'
 require 'timedoctor/worker'
 require 'timedoctor/token'
-require 'timedoctor/payload'

data/lib/timedoctor/client.rb

@@ -14,12 +14,9 @@ module TimeDoctor
   class Client
     CORE = TimeDoctor::Core
 
-    attr_reader :payload
-
-    def initialize(payload = {})
-      raise EmptyAccessToken unless payload[:access_token]
-      @payload = Payload.new(payload)
-      @worker = Worker.new(@payload)
+    def initialize(config = {})
+      @config = Config.new(config)
+      @worker = Worker.new(@config)
     end
 
     def absent_and_late

data/lib/timedoctor/config.rb

@@ -5,11 +5,27 @@ module TimeDoctor
     class << self
       def configure(options = {}, &blk)
         @config = OpenStruct.new(options)
-        instance_exec(@config, &blk) if block_given?
+
+        config[:on_token_authorize] ||= lambda do |_data, _conf|
+        end
+
+        config[:on_token_authorize_error] ||= lambda do |data, _conf|
+          raise UnauthorizedError, data
+        end
+
+        config[:on_token_refresh] ||= lambda do |_data, _conf|
+        end
+
+        config[:on_token_refresh_error] ||= lambda do |data, _conf|
+          raise UnauthorizedError, data
+        end
+
+        instance_exec(config, &blk) if block_given?
+        config
       end
 
       def config
-        @config ||= OpenStruct.new
+        @config || configure
       end
 
       def [](key)
@@ -24,5 +40,28 @@ module TimeDoctor
         config.to_h
       end
     end
+
+    def initialize(options)
+      @config = OpenStruct.new(options)
+    end
+
+    def config
+      @config ||= OpenStruct.new
+    end
+
+    def [](key)
+      config[key] || Config[key]
+    end
+
+    def []=(key, value)
+      config[key] = value
+    end
+
+    def inspect
+      {
+        local: @config.to_h,
+        global: Config.inspect
+      }
+    end
   end
 end

data/lib/timedoctor/exceptions.rb

@@ -28,11 +28,15 @@ module TimeDoctor
     end
   end
 
-  class UnauthorizedError < TimeDoctorError; end
+  class UnauthorizedError < StandardError
+    def initialize(data)
+      @message = data
+    end
 
-  class UnknownError < TimeDoctorError; end
+    attr_reader :message
+  end
 
-  class InvalidRefreshTokenError < TimeDoctorError; end
+  class UnknownError < TimeDoctorError; end
 
   class EmptyAccessToken < StandardError
     attr_reader :message

data/lib/timedoctor/token.rb

@@ -3,42 +3,49 @@ module TimeDoctor
     class << self
       ENTRY = 'https://webapi.timedoctor.com/oauth/v2/token'.freeze
 
-      def authorize(payload)
-        payload = Payload.new(payload)
-
+      def authorize(config)
         response = Faraday.get ENTRY,
-                               client_id:     payload[:client_id],
-                               client_secret: payload[:client_secret],
-                               code:          payload[:code],
-                               redirect_uri:  payload[:redirect_uri],
+                               client_id:     config[:client_id],
+                               client_secret: config[:client_secret],
+                               code:          config[:code],
+                               redirect_uri:  config[:redirect_uri],
                                grant_type:    :authorization_code,
                                _format:       :json
 
-        data = body(response)
-        payload.call(:on_token_authorize, data)
-        data
+        case response.status
+        when 200
+          data = JSON.parse(response.body, symbolize_names: true)
+          config[:access_token]  = data[:access_token]
+          config[:refresh_token] = data[:refresh_token]
+          config[:on_token_authorize].call(data, config)
+        when 400
+          data = JSON.parse(response.body, symbolize_names: true)
+          config[:on_token_authorize_error].call(data, config)
+        else
+          raise UnknownError, response
+        end
       end
 
-      def refresh(payload)
+      def refresh(config)
         response = Faraday.get ENTRY,
-                               refresh_token: payload[:refresh_token],
-                               client_id:     payload[:client_id],
-                               client_secret: payload[:client_secret],
+                               refresh_token: config[:refresh_token],
+                               client_id:     config[:client_id],
+                               client_secret: config[:client_secret],
                                grant_type:    :refresh_token,
                                _format:       :json
 
-        data = body(response)
-        payload[:access_token]  = data[:access_token]
-        payload[:refresh_token] = data[:refresh_token]
-        payload.call(:on_token_refresh, data)
-        data
-      end
-
-      private
-
-      def body(response)
-        raise UnknownError, response if response.status != 200
-        JSON.parse(response.body, symbolize_names: true)
+        case response.status
+        when 200
+          data = JSON.parse(response.body, symbolize_names: true)
+          config[:access_token]  = data[:access_token]
+          config[:refresh_token] = data[:refresh_token]
+          config[:on_token_refresh].call(data, config)
+        when 400
+          data = JSON.parse(response.body, symbolize_names: true)
+          config[:on_token_refresh_error].call(data, config)
+        else
+          raise UnknownError, response
+        end
       end
     end
   end

data/lib/timedoctor/worker.rb

@@ -2,28 +2,27 @@ module TimeDoctor
   class Worker
     ENTRY = 'https://webapi.timedoctor.com/'.freeze
 
-    attr_reader :payload
+    attr_reader :config, :conn
 
-    def initialize(payload)
-      raise EmptyAccessToken unless payload[:access_token]
+    def initialize(config)
+      raise EmptyAccessToken unless config[:access_token]
 
-      @payload = payload
-      @conn    = Faraday.new(url: ENTRY)
+      @config = config
+      @conn   = Faraday.new(url: ENTRY)
     end
 
-    def exchange(method, url, params = {}, badly = false)
-      params[:access_token] = @payload[:access_token]
+    def exchange(method, url, params = {})
+      params[:access_token] = config[:access_token]
       params[:_format]      = :json
 
-      response = @conn.public_send method, url, params
+      response = conn.public_send method, url, params
 
       case response.status
       when 200
         JSON.parse(response.body, symbolize_names: true)
       when 401
-        raise UnauthorizedError, response if badly
-        Token.refresh(@payload)
-        exchange(method, url, params, true)
+        Token.refresh(config)
+        exchange(method, url, params)
       else
         raise UnknownError, response
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module TimeDoctor
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timedoctor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Eugene Yak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -155,7 +155,6 @@ files:
 - lib/timedoctor/core/web_app.rb
 - lib/timedoctor/core/worklogs.rb
 - lib/timedoctor/exceptions.rb
-- lib/timedoctor/payload.rb
 - lib/timedoctor/token.rb
 - lib/timedoctor/worker.rb
 - lib/version.rb

data/lib/timedoctor/payload.rb

@@ -1,25 +0,0 @@
-module TimeDoctor
-  class Payload
-    attr_reader :data
-
-    def initialize(payload = {})
-      @data = payload
-    end
-
-    def [](key)
-      data[key] || Config[key]
-    end
-
-    def []=(key, value)
-      data[key] = value
-    end
-
-    def call(name, *params)
-      callback = self[name]
-      return unless callback
-
-      params = params << self
-      callback.call(*params)
-    end
-  end
-end