myob-api 0.9.5 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2a697621522acb62c1242ba5ccdec10372b9e950
-  data.tar.gz: 61b3ca85bf3824c07f209bd5b164514e0dc898e2
+SHA256:
+  metadata.gz: d048710acd822da3799cfd2035da3068ad12ae6647d4c7be5475ae99ecb803b1
+  data.tar.gz: 5dc1c1a9c86d5e6ee6ad7d8c4ae85bdf5ac06e5dfc45160e5180cfec7ba491f2
 SHA512:
-  metadata.gz: d855db5829da5bf1d73b7f8a5aff3797261c8d68e93b10952c314782d6ab6b292754b1027e6b37f4fb7f2d2edc8188c3f177dff2b2ad0f4929bda0a7a5d932e5
-  data.tar.gz: d994ded4f98afc2e716fa67f7e03cdfaaccb1d6927bea7e74e5253286087bbb510a8e33efea80c904a982b3b3b1d0133346c9c98f4ea6db1e17fb9392e887e49
+  metadata.gz: c4480da3f7a18c9cd2af73dad237a2786afc426c7cf6f9bb0efed4b019152ae71962d47b726637107ab167213b403c62fd378bfad6ef61906ecf38cca39df52d
+  data.tar.gz: 45b1a46d930f711de18787d93d7585275fde4d61354de9e7cbe1de0edf196c1c3b9cd74832ac82aaad5e5ab5540b0f0d6fb2a6a00b62578d158a47519cd55d71

data/README.md

@@ -84,6 +84,8 @@ Or if you know which Company File you want to access too:
       },
     })
 
+If you provide a company file, the gem will attempt to connect to MYOB to get the base API subdomain to use for future requests ([learn more](http://developer.myob.com/api/accountright/best-practice-guides/hypermedia-and-uris/)).
+
 ### API Methods
 
 #### Company Files

data/lib/myob-api.rb

@@ -7,21 +7,25 @@ require 'myob/api/models/company_file'
 require 'myob/api/models/company'
 
 require 'myob/api/models/current_user'
+require 'myob/api/models/superannuation_fund'
 
 require 'myob/api/models/contact'
 require 'myob/api/models/customer'
 require 'myob/api/models/employee'
+require 'myob/api/models/employee_payment_details'
 require 'myob/api/models/employee_payroll_details'
 require 'myob/api/models/employee_standard_pay'
 
 require 'myob/api/models/employee_payroll_advice'
 
+require 'myob/api/models/customer_payment'
 require 'myob/api/models/invoice'
 require 'myob/api/models/invoice_item'
 
 require 'myob/api/models/payroll_category'
 require 'myob/api/models/wage'
 require 'myob/api/models/entitlement'
+require 'myob/api/models/tax_table'
 
 require 'myob/api/models/timesheet'
 

data/lib/myob/api/client.rb

@@ -6,7 +6,7 @@ module Myob
     class Client
       include Myob::Api::Helpers
 
-      attr_reader :current_company_file, :client
+      attr_reader :current_company_file, :client, :current_company_file_url
 
       def initialize(options)
         Myob::Api::Model::Base.subclasses.each {|c| model(c.name.split("::").last)}
@@ -15,16 +15,17 @@ module Myob
         @consumer             = options[:consumer]
         @access_token         = options[:access_token]
         @refresh_token        = options[:refresh_token]
-        @current_company_file = options[:selected_company_file] || {}
+
         @client               = OAuth2::Client.new(@consumer[:key], @consumer[:secret], {
           :site          => 'https://secure.myob.com',
           :authorize_url => '/oauth2/account/authorize',
           :token_url     => '/oauth2/v1/authorize',
         })
 
-        if options[:company_file]
-          @current_company_file = select_company_file(options[:company_file])
-        end
+        # on client init, if we have a company file already, get the appropriate base URL for this company file from MYOB
+        provided_company_file = options[:selected_company_file] || options[:company_file]
+        select_company_file(provided_company_file) if provided_company_file
+        @current_company_file ||= {}
       end
 
       def get_access_code_url(params = {})
@@ -40,7 +41,7 @@ module Myob
       end
 
       def headers
-        token = @current_company_file[:token]
+        token = (@current_company_file || {})[:token]
         if token.nil? || token == ''
           # if token is blank assume we are using federated login - http://myobapi.tumblr.com/post/109848079164/2015-1-release-notes
           {
@@ -58,18 +59,39 @@ module Myob
         end
       end
 
+      # given some company file credentials, connect to MYOB and get the appropriate company file object.
+      # store its ID and token for auth'ing requests, and its URL to ensure we talk to the right MYOB server.
+      #
+      # `company_file` should be hash. accepted forms:
+      #
+      # {name: String, username: String, password: String}
+      # {id: String, token: String}
       def select_company_file(company_file)
-        company_file_id = (company_files.find {|file| file['Name'] == company_file[:name]} || [])['Id']
-        if company_file_id
+        # store the provided company file as an ivar so we can use it for subsequent requests
+        # we need the token from it to make the initial request to get company files
+        @current_company_file ||= company_file if company_file[:token]
+
+        selected_company_file = company_files.find {|file|
+          if company_file[:name]
+            file['Name'] == company_file[:name]
+          elsif company_file[:id]
+            file['Id'] == company_file[:id]
+          end
+        }
+
+        if selected_company_file
           token = company_file[:token]
           if (token.nil? || token == '') && !company_file[:username].nil? && company_file[:username] != '' && !company_file[:password].nil?
             # if we have been given login details, encode them into a token
             token = Base64.encode64("#{company_file[:username]}:#{company_file[:password]}")
           end
           @current_company_file = {
-            :id    => company_file_id,
+            :id    => selected_company_file['Id'],
             :token => token
           }
+          @current_company_file_url = selected_company_file['Uri']
+        else
+          @current_company_file = {}
         end
       end
 

data/lib/myob/api/helpers.rb

@@ -1,16 +1,21 @@
-class String
-  def underscore
-    self.gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").
-    downcase
-  end
-end
-
 module Myob
   module Api
+
+    module RefinedString
+      refine String do
+        def underscore
+          self.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
+        end
+      end
+    end
+
     module Helpers
+      using RefinedString
+
       def model(model_name)
         method_name = model_name.to_s.underscore
         variable_name = "@#{method_name}_model".to_sym
@@ -23,5 +28,6 @@ module Myob
         instance_variable_get(variable_name)
       end
     end
+
   end
 end

data/lib/myob/api/models/base.rb

@@ -3,7 +3,7 @@ module Myob
     module Model
       class Base
 
-        API_URL = 'https://api.myob.com/accountright/'
+        API_URL = 'https://api.myob.com/accountright/' # deprecated except for initial requests - should read from API instead - http://myobapi.tumblr.com/post/141169146113/important-update-accountright-live-cloud-api
         QUERY_OPTIONS = [:orderby, :top, :skip, :filter]
 
         def initialize(client, model_name)
@@ -61,9 +61,13 @@ module Myob
 
         def url(object = nil, params = nil)
           url = if self.model_route == ''
-            "#{API_URL}"
+            API_URL
           else
-            "#{API_URL}#{@client.current_company_file[:id]}/#{self.model_route}#{"/#{object['UID']}" if object && object['UID']}"
+            if @client && @client.current_company_file_url
+              "#{@client.current_company_file_url}/#{self.model_route}#{"/#{object['UID']}" if object && object['UID']}"
+            else
+              "#{API_URL}#{@client.current_company_file[:id]}/#{self.model_route}#{"/#{object['UID']}" if object && object['UID']}"
+            end
           end
 
           if params.is_a?(Hash)
@@ -106,7 +110,11 @@ module Myob
         end
         
         def resource_url
-          "#{API_URL}#{@client.current_company_file[:id]}/#{self.model_route}"
+          if @client && @client.current_company_file_url
+            "#{@client.current_company_file_url}/#{self.model_route}"
+          else
+            "#{API_URL}#{@client.current_company_file[:id]}/#{self.model_route}"
+          end
         end
         
         def perform_request(url)

data/lib/myob/api/models/customer_payment.rb

@@ -0,0 +1,11 @@
+module Myob
+  module Api
+    module Model
+      class CustomerPayment < Base
+        def model_route
+          'Sale/CustomerPayment'
+        end
+      end
+    end
+  end
+end

data/lib/myob/api/models/employee_payment_details.rb

@@ -0,0 +1,11 @@
+module Myob
+  module Api
+    module Model
+      class EmployeePaymentDetail < Base
+        def model_route
+          'Contact/EmployeePaymentDetails'
+        end
+      end
+    end
+  end
+end

data/lib/myob/api/models/superannuation_fund.rb

@@ -0,0 +1,11 @@
+module Myob
+  module Api
+    module Model
+      class SuperannuationFund < Base
+        def model_route
+          '/Payroll/SuperannuationFund'
+        end
+      end
+    end
+  end
+end

data/lib/myob/api/models/tax_table.rb

@@ -0,0 +1,11 @@
+module Myob
+  module Api
+    module Model
+      class TaxTable < Base
+        def model_route
+          'Payroll/PayrollCategory/TaxTable'
+        end
+      end
+    end
+  end
+end

data/lib/myob/api/version.rb

@@ -1,5 +1,5 @@
 module Myob
   module Api
-    VERSION = "0.9.5"
+    VERSION = "0.10.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myob-api
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.5
 platform: ruby
 authors:
 - David Lumley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -74,7 +74,9 @@ files:
 - lib/myob/api/models/contact.rb
 - lib/myob/api/models/current_user.rb
 - lib/myob/api/models/customer.rb
+- lib/myob/api/models/customer_payment.rb
 - lib/myob/api/models/employee.rb
+- lib/myob/api/models/employee_payment_details.rb
 - lib/myob/api/models/employee_payroll_advice.rb
 - lib/myob/api/models/employee_payroll_details.rb
 - lib/myob/api/models/employee_standard_pay.rb
@@ -83,6 +85,8 @@ files:
 - lib/myob/api/models/invoice.rb
 - lib/myob/api/models/invoice_item.rb
 - lib/myob/api/models/payroll_category.rb
+- lib/myob/api/models/superannuation_fund.rb
+- lib/myob/api/models/tax_table.rb
 - lib/myob/api/models/timesheet.rb
 - lib/myob/api/models/wage.rb
 - lib/myob/api/version.rb
@@ -91,7 +95,7 @@ homepage: https://github.com/davidlumley/myob-api
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,10 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: MYOB AccountRight Live API V2
 test_files: []
-has_rdoc: