V2 (#62)

* add product management category

* Fix namespaces

Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     beyond_api (0.24.2.pre)
       faraday (~> 1.9.0)
       faraday_middleware (~> 1.1)
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/

lib/beyond_api.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require 'zeitwerk'
 require 'faraday'
 require 'faraday_middleware'
 require 'json'
-require 'forwardeable'
+require 'forwardable'
 
 module BeyondApi
   loader = Zeitwerk::Loader.for_gem

lib/beyond_api/request.rb

@@ -5,10 +5,10 @@ class Request
     class << self
       [:get, :delete].each do |method|
         define_method(method) do |session, path, params = {}|
-          response = BeyondApi::Connection.default.send(method) do |request|
+          response = Connection.default.send(method) do |request|
             request.url(session.api_url + path)
             request.headers["Authorization"] = "Bearer #{session.access_token}" unless session.access_token.nil?
-            request.params = camelize_keys(params)
+            request.params = Utils.camelize_keys(params)
           end
 
           Response.new(response).handle
@@ -19,13 +19,13 @@ class << self
 
       [:post, :put, :patch].each do |method|
         define_method(method) do |session, path, body = {}, params = {}, content_type = 'application/json'|
-          response = BeyondApi::Connection.default.send(method) do |request|
+          response = Connection.default.send(method) do |request|
             request.url(session.api_url + path)
             request.headers["Authorization"] = "Bearer #{session.access_token}" unless session.access_token.nil?
             request.headers["Content-Type"] = content_type
-            request.params = camelize_keys(params)
+            request.params = Utils.camelize_keys(params)
 
-            request.body = camelize_keys(body).to_json
+            request.body = Utils.camelize_keys(body).to_json
           end
 
           Response.new(response).handle
@@ -34,11 +34,11 @@ class << self
     end
 
     def self.upload(session, path, file_binary, content_type, params)
-      response = BeyondApi::Connection.default.post do |request|
+      response = Connection.default.post do |request|
         request.url(session.api_url + path)
         request.headers["Authorization"] = "Bearer #{session.access_token}" unless session.access_token.nil?
         request.headers["Content-Type"] = content_type
-        request.params = camelize_keys(params)
+        request.params = Utils.camelize_keys(params)
 
         request.body = file_binary
       end
@@ -47,7 +47,7 @@ def self.upload(session, path, file_binary, content_type, params)
     end
 
     def self.token(url, params)
-      response = BeyondApi::Connection.token.post do |request|
+      response = Connection.token.post do |request|
         request.url(url)
         request.params = params
       end
@@ -56,16 +56,16 @@ def self.token(url, params)
     end
 
     def self.upload_by_form(session, path, files, params)
-      response = BeyondApi::Connection.multipart.post do |request|
+      response = Connection.multipart.post do |request|
         request.url(session.api_url + path)
         request.headers["Authorization"] = "Bearer #{session.access_token}" unless session.access_token.nil?
         request.options[:params_encoder] = Faraday::FlatParamsEncoder
 
-        request.params = camelize_keys(params)
+        request.params = Utils.camelize_keys(params)
 
         files = files.split unless files.is_a? Array
         upload_files = files.map{ |file| Faraday::FilePart.new(File.open(file),
-                                                               BeyondApi::Utils.file_content_type(file)) }
+                                                               Utils.file_content_type(file)) }
         request.body = { image: upload_files }
       end
 

lib/beyond_api/response.rb

@@ -36,12 +36,12 @@ def deep_symbolize_keys!
       body.deep_symbolize_keys!
     end
 
-    def remove_initial_underscore!
+    def remove_initial_underscore(key)
       key.starts_with?('_') ? key[1..-1] : key
     end
 
     def raise_error
-      raise BeyondApi::Error.new(body, status)
+      raise Error.new(body, status)
     end
   end
 end

lib/beyond_api/services/base_service.rb

@@ -1,13 +1,11 @@
 module BeyondApi
   class BaseService
-    include BeyondApi::Utils
-
     attr_reader :session
 
     def initialize(session)
       @session = session
 
-      # raise InvalidSessionError, "Invalid session" unless session.is_a? BeyondApi::Session
+      # raise InvalidSessionError, "Invalid session" unless session.is_a? Session
       # raise InvalidSessionError, "Session api_url cannot be nil" if session.api_url.nil?
     end
 
@@ -30,7 +28,7 @@ def adjust_response(result)
     end
 
     def fetch_page(url, params = {})
-      BeyondApi::Request.get(@session, url, params)
+      Request.get(@session, url, params)
     end
 
     def fetch_pages(url, resource, params, size)

lib/beyond_api/services/checkout/shipping_zone.rb

@@ -3,7 +3,7 @@ module Checkout
     class ShippingZone < BaseService
       def all
         # TODO: iterate over all pages
-        BeyondApi::Request.get(@session, "/shipping-zones")
+        Request.get(@session, "/shipping-zones")
       end
     end
   end

lib/beyond_api/services/product_management/category.rb

@@ -2,7 +2,7 @@ module BeyondApi
   module ProductManagement
     class Category < BaseService
       def find(id)
-        BeyondApi::Request.get(@session, "/categories/#{id}")
+        Request.get(@session, "/categories/#{id}")
       end
     end
   end

lib/beyond_api/services/product_management/image.rb

@@ -2,7 +2,7 @@ module BeyondApi
   module ProductManagement
     class Image < BaseService
       def all(id)
-        BeyondApi::Request.get(@session, "/products/#{id}/images")
+        Request.get(@session, "/products/#{id}/images")
       end
     end
   end

lib/beyond_api/services/product_management/product.rb

@@ -2,12 +2,12 @@ module BeyondApi
   module ProductManagement
     class Product < BaseService
       def all(params = {})
-        # BeyondApi::Request.get(@session, "/products", params)
+        # Request.get(@session, "/products", params)
         fetch_all_pages("/products", :products, params)
       end
 
       def find(id)
-        BeyondApi::Request.get(@session, "/products/#{id}")
+        Request.get(@session, "/products/#{id}")
       end
     end
   end

lib/beyond_api/services/product_management/variation.rb

@@ -2,7 +2,7 @@ module BeyondApi
   module ProductManagement
     class Variation < BaseService
       def all(id)
-        BeyondApi::Request.get(@session, "/products/#{id}/variations")
+        Request.get(@session, "/products/#{id}/variations")
       end
     end
   end

lib/beyond_api/services/product_management/variation_image.rb

@@ -2,7 +2,7 @@ module BeyondApi
   module ProductManagement
     class VariationImage < BaseService
       def all(product_id, variation_id)
-        BeyondApi::Request.get(@session, "/products/#{product_id}/variations/#{variation_id}/images")
+        Request.get(@session, "/products/#{product_id}/variations/#{variation_id}/images")
       end
     end
   end

lib/beyond_api/services/product_view/category.rb

@@ -6,11 +6,11 @@ def all(params = {})
       end
 
       def find(id)
-        BeyondApi::Request.get(@session, "/product-view/categories/#{id}")
+        Request.get(@session, "/product-view/categories/#{id}")
       end
 
       def preview(body, params = {})
-        BeyondApi::Request.post(@session,
+        Request.post(@session,
                                 "/product-view/categories/preview",
                                 body,
                                 params)

lib/beyond_api/services/shop/address.rb

@@ -2,7 +2,7 @@ module BeyondApi
   module Shop
     class Address < BaseService
       def get
-        BeyondApi::Request.get(@session, "/shop/address")
+        Request.get(@session, "/shop/address")
       end
     end
   end

lib/beyond_api/services/shop/shop.rb

@@ -2,7 +2,7 @@ module BeyondApi
   module Shop
     class Shop < BaseService
       def details
-        BeyondApi::Request.get(@session, "/shop")
+        Request.get(@session, "/shop")
       end
     end
   end

lib/beyond_api/services/storefront/script_tag.rb

@@ -4,15 +4,15 @@ class ScriptTag < BaseService
       def all(params = {})
         params.merge!(client_id: BeyondApi.configuration.client_id) if params[:only_own]
 
-        BeyondApi::Request.get(@session, "/script-tags", params)
+        Request.get(@session, "/script-tags", params)
       end
 
       def create(script_url)
-        BeyondApi::Request.post(@session, "/script-tags", script_url:)
+        Request.post(@session, "/script-tags", script_url:)
       end
 
       def delete(id)
-        BeyondApi::Request.delete(@session, "/script-tags/#{id}")
+        Request.delete(@session, "/script-tags/#{id}")
       end
     end
   end

lib/beyond_api/session.rb

@@ -18,91 +18,91 @@ def initialize(api_url:, access_token: nil, refresh_token: nil)
     end
 
     def carts
-      BeyondApi::Carts.new(self)
+      Carts.new(self)
     end
 
     def categories_view
-      BeyondApi::CategoriesView.new(self)
+      CategoriesView.new(self)
     end
 
     def categories
-      BeyondApi::Categories.new(self)
+      Categories.new(self)
     end
 
     def checkout_settings
-      BeyondApi::CheckoutSettings.new(self)
+      CheckoutSettings.new(self)
     end
 
     def customers
-      BeyondApi::Customers.new(self)
+      Customers.new(self)
     end
 
     def newsletter_target
-      BeyondApi::NewsletterTarget.new(self)
+      NewsletterTarget.new(self)
     end
 
     def order_settings
-      BeyondApi::OrderSettings.new(self)
+      OrderSettings.new(self)
     end
 
     def orders
-      BeyondApi::Orders.new(self)
+      Orders.new(self)
     end
 
     def payment_method_definitions
-      BeyondApi::PaymentMethodDefinitions.new(self)
+      PaymentMethodDefinitions.new(self)
     end
 
     def payment_methods
-      BeyondApi::PaymentMethods.new(self)
+      PaymentMethods.new(self)
     end
 
     def pickup_options
-      BeyondApi::PickupOptions.new(self)
+      PickupOptions.new(self)
     end
 
     def product_attribute_definitions
-      BeyondApi::ProductAttributeDefinitions.new(self)
+      ProductAttributeDefinitions.new(self)
     end
 
     def products_view
-      BeyondApi::ProductsView.new(self)
+      ProductsView.new(self)
     end
 
     def products
-      BeyondApi::Products.new(self)
+      Products.new(self)
     end
 
     def script_tags
-      BeyondApi::ScriptTags.new(self)
+      ScriptTags.new(self)
     end
 
     def shipping_zones
-      BeyondApi::ShippingZones.new(self)
+      ShippingZones.new(self)
     end
 
     def shop
-      BeyondApi::Shop.new(self)
+      Shop.new(self)
     end
 
     def signers
-      BeyondApi::Signers.new(self)
+      Signers.new(self)
     end
 
     def token
-      BeyondApi::Token.new(self)
+      Token.new(self)
     end
 
     def users
-      BeyondApi::Users.new(self)
+      Users.new(self)
     end
 
     def variations
-      BeyondApi::Variations.new(self)
+      Variations.new(self)
     end
 
     def webhook_subscriptions
-      BeyondApi::WebhookSubscriptions.new(self)
+      WebhookSubscriptions.new(self)
     end
   end
 end

lib/beyond_api/token.rb

@@ -6,8 +6,6 @@ module BeyondApi
   class Token
     class InvalidSessionError < StandardError; end
 
-    include BeyondApi::Utils
-
     attr_reader :session
 
     def initialize(session)

lib/beyond_api/utils.rb

@@ -4,9 +4,7 @@
 
 module BeyondApi
   module Utils
-    extend self
-
-    def file_content_type(file_path)
+    def self.file_content_type(file_path)
       case File.extname(file_path)
       when ".png"
         "image/png"
@@ -17,7 +15,7 @@ def file_content_type(file_path)
       end
     end
 
-    def camelize_keys(hash)
+    def self.camelize_keys(hash)
       hash.deep_transform_keys { |key| key.to_s.camelize(:lower) }
     end
   end