elmas 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 811521bb9a899d14a61d9cae66de40edbb39a8ea0e5b1950afa4251cf33afd73
-  data.tar.gz: bd849be962e1a9683cd76d4d9b9d99aa12ef818238cd6cbbf7b4f44184c1b9ab
+  metadata.gz: b17b89ef70b1b3a09cbef79f2fb3132b80ca5da223fc9ef12dbe7aead89d5a04
+  data.tar.gz: a18c2b4f0820792037c561238285555de12dc9b3b623e215d31ec95ac774abb4
 SHA512:
-  metadata.gz: 18830b61830ca08730fce161817b11c3b6754bf8b957f5596ea65774b7af35b639ceff5afba10dae746d52bb9940a39d2ca01ce821a57ae9ad9658f3f862a8ba
-  data.tar.gz: 4c711e2d9503a04ede952a53357e7cbb20a2d8ed2091ddeab201ca663fd197fd08b56f1b09e0a6681cbcfda61ef808e38b54cef5f3705cdedd3509631ecf9d5a
+  metadata.gz: bf45cd2c72c8024c6ae0ec447fabd04a42512f2d47cf64ca16225d8ce2934203b7c77578c68efd4e988b0c668ee39c7efa39d7c5e142738ff209ae6c2df49386
+  data.tar.gz: 8c4d887c2d65f85d1f841fa4e84a8ff2df9f367fa3214fc5077c7f45dd9d96f9c29b102a8c172287265be715dc7a21359862ce0c90b62487dccb5fc1d2a2b672

data/Changelog.md

@@ -1,3 +1,7 @@
+## 3.1.0
+- Remove deprecated methods
+- Show more insight into BadRequestExceptions
+
 ## 3.0.1
 - Change of bank_name to bank_account_holder_name
 - Readd journal because although not required, it should still be possible to set

data/lib/elmas/exception.rb

@@ -9,7 +9,11 @@ module Elmas
     end
 
     def message
-      "code #{@response.status}: #{@parsed.error_message}"
+      if @parsed.error_message.present?
+        "code #{@response.status}: #{@parsed.error_message}"
+      else
+        @response.inspect
+      end
     end
   end
 

data/lib/elmas/oauth.rb

@@ -15,30 +15,10 @@ require File.expand_path("../response", __FILE__)
 module Elmas
   # rubocop:disable Metrics/ModuleLength
   module OAuth
-    def authorize(user_name, password, options = {})
-      warn "[DEPRECATION] `authorize` is deprecated. Please implement your own authorization methods instead."
-      agent = Mechanize.new
-
-      login(agent, user_name, password, options)
-      allow_access(agent)
-
-      code = URI.unescape(agent.page.uri.query.split("=").last)
-      OauthResponse.new(get_access_token(code))
-    end
-
-    def refresh_authorization
-      warn "[DEPRECATION] `refresh_authorization` is deprecated. Please implement your own authorization methods instead."
-      OauthResponse.new(get_refresh_token(refresh_token)).tap do |response|
-        Elmas.configure do |config|
-          config.access_token = response.access_token
-          config.refresh_token = response.refresh_token
-        end
-      end
-    end
-
     def authorized?
       # Do a test call, return false if 401 or any error code
-      get("/Current/Me", no_division: true)
+      response = Elmas.get("/Current/Me", no_division: true)
+      response.results.first.present?
     rescue BadRequestException
       Elmas.error "Not yet authorized"
       return false
@@ -48,17 +28,6 @@ module Elmas
       get("/Current/Me", no_division: true).results.first.current_division
     end
 
-    def auto_authorize
-      warn "[DEPRECATION] `auto_authorize` is deprecated. Please implement your own authorization methods instead."
-      Elmas.configure do |config|
-        config.redirect_uri = ENV["REDIRECT_URI"]
-        config.client_id = ENV["CLIENT_ID"]
-        config.client_secret = ENV["CLIENT_SECRET"]
-        config.access_token = Elmas.authorize(ENV["EXACT_USER_NAME"], ENV["EXACT_PASSWORD"]).access_token
-        config.division = Elmas.authorize_division
-      end
-    end
-
     # Return URL for OAuth authorization
     def authorize_url(options = {})
       options[:response_type] ||= "code"
@@ -102,24 +71,6 @@ module Elmas
 
     private
 
-    def login(agent, user_name, password, options)
-      # Login
-      agent.get(authorize_url(options)) do |page|
-        form = page.forms.first
-        form["UserNameField"] = user_name
-        form["PasswordField"] = password
-        form.click_button
-      end
-    end
-
-    def allow_access(agent)
-      return if agent.page.uri.to_s.include?("getpostman")
-      return if agent.page.uri.to_s.include?(redirect_uri)
-      form = agent.page.form_with(id: "PublicOAuth2Form")
-      button = form.button_with(id: "AllowButton")
-      agent.submit(form, button)
-    end
-
     def authorization_params
       {
         client_id: client_id
@@ -145,9 +96,7 @@ module Elmas
       }
     end
   end
-end
 
-module Elmas
   class OauthResponse < Response
     def body
       JSON.parse(@response.body)
@@ -165,4 +114,4 @@ module Elmas
       body["refresh_token"]
     end
   end
-end
+end

data/lib/elmas/parser.rb

@@ -9,7 +9,8 @@ module Elmas
     rescue JSON::ParserError => e
       Elmas.error "There was an error parsing the response"
       Elmas.error "#{e.class}: #{e.message}"
-      @error_message = "#{e.class}: #{e.message}"
+      @parsed_json = ""
+      @error_message = ""
     end
 
     def results

data/lib/elmas/version.rb

@@ -3,8 +3,8 @@
 module Elmas
   class Version
     MAJOR = 3
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
 
     class << self
       def to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elmas
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Marthyn