Merge branch '2-stable' of github.com:ruckus/quickbooks-ruby into 2-s…

…table
ruckus · Jul 12, 2023 · 62f7d1f · 62f7d1f
2 parents 7bed060 + b6ef0a8
commit 62f7d1f
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,18 +4,25 @@ on: [push, pull_request]
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1", ruby-head]
-        env:
-          - FARADAY_VERSION: "~> 2.0"
-          - FARADAY_VERSION: "~> 1.0"
-
-    env: ${{ matrix.env }}
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+          - "ruby-head"
+          - "jruby-9.3"
+          - "jruby-9.4"
+          - "jruby-head"
+        faraday:
+          - "~> 1.0"
+          - "~> 2.0"
+    env:
+      FARADAY_VERSION: ${{ matrix.faraday }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,5 @@
 source 'http://rubygems.org'
 
-ruby RUBY_VERSION
-
 gem 'pry'
 
 gemspec

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,15 +1,18 @@
-## 2.0.2 (2023-07-12)
+## 2.0.3 (2023-07-12)
 
 cherry-picked `Fintechqb 1967 enable service level logging` from master
 
+## 2.0.2 (2022-12-28)
+
+* Update dependency on `faraday-gzip` to support JRuby (#594)
+
 ## 2.0.1 (2022-12-27)
 
 Faraday Versions (#593)
 * Test against Faraday 1.x and 2.x
 * Faraday 1.x support for Quickbooks::Service::AccessToken#disconnect
 
-Thanks @jaredmoody and @ ashkulz
-
+Thanks @jaredmoody and @ashkulz
 
 ## 2.0 (2022-11-10)
 

diff --git a/README.md b/README.md
@@ -119,6 +119,8 @@ def oauth_callback
 end
 ```
 
+Your Redirect URI needs to be publicly accessible. If you are still in development and running everything via `localhost` you will need to use a tool like [Ngrok](https://ngrok.com/product/secure-tunnels) to expose your localhost to a public URL with HTTPS.
+
 Most likely you will want to persist the OAuth access credentials so that users don't need to re-authorize your application in every session.
 
 An example database table could have fields likes:

diff --git a/lib/quickbooks/version.rb b/lib/quickbooks/version.rb
@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 
 end
diff --git a/quickbooks-ruby.gemspec b/quickbooks-ruby.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'multipart-post' # promiscuous mode
   gem.add_dependency 'faraday', '< 3.0'
   gem.add_dependency 'faraday-multipart', '~> 1.0'
-  gem.add_dependency 'faraday-gzip', '~> 0.1'
+  gem.add_dependency 'faraday-gzip', '~> 1.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'simplecov'

diff --git a/spec/fixtures/tax_agency.xml b/spec/fixtures/tax_agency.xml
@@ -5,7 +5,7 @@
         <CreateTime>2013-12-11T10:59:51-08:00</CreateTime>
         <LastUpdatedTime>2013-12-11T10:59:51-08:00</LastUpdatedTime>
     </MetaData>
-    <DisplayName>First TaxAgency</Name>
-    <TaxTrackedOnPurchases>false</Description>
-    <TaxTrackedOnSales>true</Active>
+    <DisplayName>First TaxAgency</DisplayName>
+    <TaxTrackedOnPurchases>false</TaxTrackedOnPurchases>
+    <TaxTrackedOnSales>true</TaxTrackedOnSales>
 </TaxAgency>
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,6 +119,8 @@ def oauth_callback @@
     end
     ```
+    Your Redirect URI needs to be publicly accessible. If you are still in development and running everything via `localhost` you will need to use a tool like [Ngrok](https://ngrok.com/product/secure-tunnels) to expose your localhost to a public URL with HTTPS.
     Most likely you will want to persist the OAuth access credentials so that users don't need to re-authorize your application in every session.
     An example database table could have fields likes:
@@ Expand Down @@