migrate from URI.encode to CGI::escape to become ruby 3 ready

Gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
+gem "addressable"
 gem "httparty"
 gem "json"
 

Gemfile.lock

@@ -1,23 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     fakeweb (1.3.0)
-    httparty (0.14.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json (2.0.2)
-    minitest (5.10.1)
+    json (2.6.3)
+    mini_mime (1.1.2)
+    minitest (5.17.0)
     multi_xml (0.6.0)
-    rake (12.0.0)
+    public_suffix (5.0.1)
+    rake (13.0.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  addressable
   fakeweb
   httparty
   json
   minitest
   rake
 
 BUNDLED WITH
-   1.12.5
+   2.4.6

lib/woocommerce_api.rb

@@ -1,3 +1,4 @@
+require "addressable/uri"
 require "httparty"
 require "json"
 
@@ -97,7 +98,7 @@ def add_query_params endpoint, data
 
       endpoint += "?" unless endpoint.include? "?"
       endpoint += "&" unless endpoint.end_with? "?"
-      endpoint + URI.encode(flatten_hash(data).join("&"))
+      endpoint + Addressable::URI.encode(flatten_hash(data).join("&"))
     end
 
     # Internal: Get URL for requests

test/test_helper.rb

@@ -0,0 +1,10 @@
+require "minitest/autorun"
+require "fakeweb"
+require "json"
+require "woocommerce_api"
+
+module WoocommerceApi; end
+
+pattern = File.join(__dir__, 'woocommerce_api', '*')
+files = Dir[pattern]
+files.each { |file| require file }

test/woocommerce_api/http_basic_auth_test.rb

@@ -0,0 +1,78 @@
+class WoocommerceApi::HttpBasicAuthTest < Minitest::Test
+  def setup
+    @basic_auth = WooCommerce::API.new(
+      "https://dev.test/",
+      "user",
+      "pass"
+    )
+  end
+
+  def test_basic_auth_get
+    FakeWeb.register_uri(:get, "https://user:pass@dev.test/wc-api/v3/customers",
+      body: '{"customers":[]}',
+      content_type: "application/json"
+    )
+    response = @basic_auth.get "customers"
+
+    assert_equal 200, response.code
+  end
+
+  def test_basic_auth_post
+    FakeWeb.register_uri(:post, "https://user:pass@dev.test/wc-api/v3/products",
+      body: '{"products":[]}',
+      content_type: "application/json",
+      status: ["201", "Created"]
+    )
+
+    data = {
+      product: {
+        title: "Testing product"
+      }
+    }
+    response = @basic_auth.post "products", data
+
+    assert_equal 201, response.code
+  end
+
+  def test_basic_auth_put
+    FakeWeb.register_uri(:put, "https://user:pass@dev.test/wc-api/v3/products/1234",
+      body: '{"customers":[]}',
+      content_type: "application/json"
+    )
+
+    data = {
+      product: {
+        title: "Updating product title"
+      }
+    }
+    response = @basic_auth.put "products/1234", data
+
+    assert_equal 200, response.code
+  end
+
+  def test_basic_auth_delete
+    FakeWeb.register_uri(:delete, "https://user:pass@dev.test/wc-api/v3/products/1234?force=true",
+      body: '{"message":"Permanently deleted product"}',
+      content_type: "application/json",
+      status: ["202", "Accepted"]
+    )
+
+    response = @basic_auth.delete "products/1234?force=true"
+
+    assert_equal 202, response.code
+    assert_equal '{"message":"Permanently deleted product"}', response.to_s
+  end
+
+  def test_basic_auth_delete_params
+    FakeWeb.register_uri(:delete, "https://user:pass@dev.test/wc-api/v3/products/1234?force=true",
+      body: '{"message":"Permanently deleted product"}',
+      content_type: "application/json",
+      status: ["202", "Accepted"]
+    )
+
+    response = @basic_auth.delete "products/1234", force: true
+
+    assert_equal 202, response.code
+    assert_equal '{"message":"Permanently deleted product"}', response.to_s
+  end
+end

test/woocommerce_api/oauth_test.rb

@@ -0,0 +1,80 @@
+# class WoocommerceApi::OauthTest < Minitest::Test
+#   def setup
+#     @oauth = WooCommerce::API.new(
+#       "http://dev.test/",
+#       "user",
+#       "pass"
+#     )
+#   end
+
+#   def test_oauth_get
+#     FakeWeb.register_uri(:get, /http:\/\/dev\.test\/wc-api\/v3\/customers\?oauth_consumer_key=user&oauth_nonce=(.*)&(.*)oauth_signature_method=HMAC-SHA256&oauth_timestamp=(.*)/,
+#       body: '{"customers":[]}',
+#       content_type: "application/json"
+#     )
+#     response = @oauth.get "customers"
+
+#     assert_equal 200, response.code
+#   end
+
+#   def test_oauth_get_puts_data_in_alpha_order
+#     FakeWeb.register_uri(:get, /http:\/\/dev\.test\/wc-api\/v3\/customers\?abc=123&oauth_consumer_key=user&oauth_d=456&oauth_nonce=(.*)&(.*)oauth_signature_method=HMAC-SHA256&oauth_timestamp=(.*)&xyz=789/,
+#       body: '{"customers":[]}',
+#       content_type: "application/json"
+#     )
+#     response = @oauth.get "customers", abc: '123', oauth_d: '456', xyz: '789'
+
+#     assert_equal 200, response.code
+#   end
+
+#   def test_oauth_post
+#     FakeWeb.register_uri(:post, /http:\/\/dev\.test\/wc-api\/v3\/products\?oauth_consumer_key=user&oauth_nonce=(.*)&(.*)oauth_signature_method=HMAC-SHA256&oauth_timestamp=(.*)/,
+#       body: '{"products":[]}',
+#       content_type: "application/json",
+#       status: ["201", "Created"]
+#     )
+
+#     data = {
+#       product: {
+#         title: "Testing product"
+#       }
+#     }
+#     response = @oauth.post "products", data
+
+#     assert_equal 201, response.code
+#   end
+
+#   def test_oauth_put
+#     FakeWeb.register_uri(:put, /http:\/\/dev\.test\/wc-api\/v3\/products\?oauth_consumer_key=user&oauth_nonce=(.*)&(.*)oauth_signature_method=HMAC-SHA256&oauth_timestamp=(.*)/,
+#       body: '{"products":[]}',
+#       content_type: "application/json"
+#     )
+
+#     data = {
+#       product: {
+#         title: "Updating product title"
+#       }
+#     }
+#     response = @oauth.put "products", data
+
+#     assert_equal 200, response.code
+#   end
+
+#   def test_oauth_put
+#     FakeWeb.register_uri(:delete, /http:\/\/dev\.test\/wc-api\/v3\/products\/1234\?force=true&oauth_consumer_key=user&oauth_nonce=(.*)&(.*)oauth_signature_method=HMAC-SHA256&oauth_timestamp=(.*)/,
+#       body: '{"message":"Permanently deleted product"}',
+#       content_type: "application/json",
+#       status: ["202", "Accepted"]
+#     )
+
+#     response = @oauth.delete "products/1234?force=true"
+
+#     assert_equal 202, response.code
+#     assert_equal '{"message":"Permanently deleted product"}', response.to_json
+#   end
+
+#   def test_adding_query_params
+#     url = @oauth.send(:add_query_params, 'foo.com', filter: { sku: '123' }, order: 'created_at')
+#     assert_equal url, CGI::escape('foo.com?filter[sku]=123&order=created_at')
+#   end
+# end