plenty_client 0.0.2 → 0.0.3

data/lib/plenty_client/item_set/config.rb

@@ -1,8 +1,9 @@
 module PlentyClient
   module ItemSet
     class Config
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
+
       FIND_ITEM_SET_CONFIGS   = '/item_sets/{itemSetId}/config'.freeze
       UPDATE_ITEM_SET_CONFIGS = '/item_sets/{itemSetId}/config'.freeze
 

data/lib/plenty_client/order.rb

@@ -1,7 +1,7 @@
 module PlentyClient
   module Order
-    extend PlentyClient::Endpoint
-    extend PlentyClient::Request
+    include PlentyClient::Endpoint
+    include PlentyClient::Request
 
     CREATE_ORDER                = '/orders'.freeze
     LIST_ORDERS                 = '/orders'.freeze
@@ -23,7 +23,8 @@ module PlentyClient
       def list_contacts_orders(contact_id, headers = {}, &block)
         get(build_endpoint(LIST_CONTACTS_ORDERS, contact: contact_id), headers, &block)
       end
-      def list_contacts_orders(order_id, headers = {}, &block)
+
+      def list_package_numbers(order_id, headers = {}, &block)
         get(build_endpoint(LIST_ORDERS_PACKAGE_NUMBERS, order: order_id), headers, &block)
       end
 
@@ -35,7 +36,7 @@ module PlentyClient
         put(build_endpoint(UPDATE_ORDER, order: order_id), body)
       end
 
-      def delete(order_id, body = {})
+      def destroy(order_id, body = {})
         delete(build_endpoint(DELETE_ORDER, order: order_id), body)
       end
     end

data/lib/plenty_client/order/contact_wish.rb

@@ -1,8 +1,8 @@
 module PlentyClient
   module Order
     module ContactWish
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
       FIND_ORDER_COTACT_WISH = '/orders/{orderId}/contactWish'.freeze
 
@@ -14,4 +14,3 @@ module PlentyClient
     end
   end
 end
-

data/lib/plenty_client/order/coupon_code.rb

@@ -1,19 +1,17 @@
 module PlentyClient
   module Order
     module CouponCode
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
-      UPDATE_COUPON_CODE  = '/orders/{orderId}/coupons/{coupon}'.freeze
+      UPDATE_COUPON_CODE = '/orders/{orderId}/coupons/{coupon}'.freeze
 
       class << self
         def update(order_id, coupon_string, headers = {}, &block)
-          post(build_endpoint(UPDATE_COUPON_CODE,
-                              order: order_id,
-                              coupon_string: coupon_string), headers, &block)
+          post(build_endpoint(UPDATE_COUPON_CODE, order: order_id, coupon_string: coupon_string),
+               headers, &block)
         end
       end
     end
   end
 end
-

data/lib/plenty_client/order/coupon_code/contact.rb

@@ -2,19 +2,17 @@ module PlentyClient
   module Order
     module CouponCode
       class Contact
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
-        LIST_COUPON_CONTACTS  = '/orders/coupons/codes/contacts/{contactId}'.freeze
+        LIST_COUPON_CONTACTS = '/orders/coupons/codes/contacts/{contactId}'.freeze
 
         class << self
           def update(contact_id, headers = {}, &block)
-            post(build_endpoint(LIST_COUPON_CONTACTS,
-                                contact: contact_id), headers, &block)
+            post(build_endpoint(LIST_COUPON_CONTACTS, contact: contact_id), headers, &block)
           end
         end
       end
     end
   end
 end
-

data/lib/plenty_client/order/coupon_code/validation.rb

@@ -2,19 +2,17 @@ module PlentyClient
   module Order
     module CouponCode
       class Validation
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
-        VALIDATE_COUPON  = '/orders/coupons/codes/{coupon}'.freeze
+        VALIDATE_COUPON = '/orders/coupons/codes/{coupon}'.freeze
 
         class << self
           def update(coupon_string, headers = {}, &block)
-            post(build_endpoint(VALIDATE_COUPON,
-                                coupon_string: coupon_string), headers, &block)
+            post(build_endpoint(VALIDATE_COUPON, coupon_string: coupon_string), headers, &block)
           end
         end
       end
     end
   end
 end
-

data/lib/plenty_client/order/currency.rb

@@ -1,8 +1,8 @@
 module PlentyClient
   module Order
     class Currency
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
       LIST_CURRENCIES             = '/orders/currencies'.freeze
       FIND_CURRENCY_ISO           = '/orders/currencies/{currencyIso}'.freeze
@@ -29,4 +29,3 @@ module PlentyClient
     end
   end
 end
-

data/lib/plenty_client/order/date.rb

@@ -1,8 +1,8 @@
 module PlentyClient
   module Order
     class Date
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
       LIST_ORDER_DATE_TYPE_NAMES  = '/orders/dates/types/{typeId}/names'.freeze
       FIND_ORDER_DATE_TYPE_NAME   = '/orders/dates/types/{typeId}/names/{lang}'.freeze
@@ -18,7 +18,7 @@ module PlentyClient
           get(build_endpoint(FIND_ORDER_DATE_TYPE_NAME, type: type_id, lang: lang), headers, &block)
         end
 
-        def list(currency_iso, headers = {}, &block)
+        def list(order_id, headers = {}, &block)
           get(build_endpoint(LIST_ORDER_DATES, order: order_id), headers, &block)
         end
 
@@ -29,4 +29,3 @@ module PlentyClient
     end
   end
 end
-

data/lib/plenty_client/order/item.rb

@@ -1,13 +1,13 @@
 module PlentyClient
   module Order
     module Item
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
       DELETE_ORDERS_ORDER_ITEM = '/orders/{orderId}/items/{orderItemId}'.freeze
 
       class << self
-        def delete(order_id, order_item_id)
+        def destroy(order_id, order_item_id)
           delete(build_endpoint(DELETE_ORDERS_ORDER_ITEM,
                                 order: order_id,
                                 order_item: order_item_id))

data/lib/plenty_client/order/item/date.rb

@@ -2,8 +2,8 @@ module PlentyClient
   module Order
     module Item
       class Date
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         # get /orders/items/{orderItemId}/dates
         # get /orders/items/{orderItemId}/dates/{typeId}

data/lib/plenty_client/order/item/property.rb

@@ -2,8 +2,8 @@ module PlentyClient
   module Order
     module Item
       class Property
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         # get /orders/items/{orderItemId}/properties
         # get /orders/items/{orderItemId}/properties/{typeId}

data/lib/plenty_client/order/item/serial_number.rb

@@ -2,12 +2,12 @@ module PlentyClient
   module Order
     module Item
       class SerialNumber
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         LIST_SERIAL_NUMBERS             = '/orders/{orderId}/items/serialNumbers'.freeze
         LIST_ORDER_ITEM_SERIAL_NUMBERS  = '/orders/{orderId}/items/{orderItemId}/serialNumbers'.freeze
-      
+
         class << self
           def list(order_id, headers = {}, &block)
             get(build_endpoint(LIST_SERIAL_NUMBERS, order: order_id), headers, &block)

data/lib/plenty_client/order/property.rb

@@ -1,8 +1,8 @@
 module PlentyClient
   module Order
     class Property
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
       # get /rest/orders/{orderId}/properties/{typeId?}
       # post /rest/orders/{orderId}/properties
@@ -18,4 +18,3 @@ module PlentyClient
     end
   end
 end
-

data/lib/plenty_client/order/referrer.rb

@@ -1,8 +1,8 @@
 module PlentyClient
   module Order
     class Referrer
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
       LIST_REFERRERS        = '/orders/referrers'.freeze
       CREATE_ORDER_REFERRER = '/orders/referrers/{parentReferrerId}'.freeze
@@ -19,4 +19,3 @@ module PlentyClient
     end
   end
 end
-

data/lib/plenty_client/order/shipping.rb

@@ -1,12 +1,11 @@
 module PlentyClient
   module Order
     module Shipping
-      extend PlentyClient::Endpoint
-      extend PlentyClient::Request
+      include PlentyClient::Endpoint
+      include PlentyClient::Request
 
       class << self
       end
     end
   end
 end
-

data/lib/plenty_client/order/shipping/country.rb

@@ -2,8 +2,8 @@ module PlentyClient
   module Order
     module Shipping
       class Country
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         LIST_SHIPPING_COUNTRIES = '/orders/shipping/countries'.freeze
 

data/lib/plenty_client/order/shipping/information.rb

@@ -2,8 +2,8 @@ module PlentyClient
   module Order
     module Shipping
       class Information
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         BASE_ORDERS_SHIPPING_INFORMATION_PATH = '/orders/{orderId}/shipping'.freeze
 
@@ -34,7 +34,7 @@ module PlentyClient
                                order: order_id), body)
           end
 
-          def delete(order_id, body = {})
+          def destroy(order_id, body = {})
             delete(build_endpoint("#{BASE_ORDERS_SHIPPING_INFORMATION_PATH}#{DELETE_ORDER_SHIPPING_INFORMATION}",
                                   order: order_id), body)
           end

data/lib/plenty_client/order/shipping/package.rb

@@ -2,8 +2,8 @@ module PlentyClient
   module Order
     module Shipping
       class Package
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         BASE_ORDERS_SHIPPING_PATH = '/orders/{orderId}/shipping'.freeze
 
@@ -37,13 +37,13 @@ module PlentyClient
                                shipping_package: package_id), body)
           end
 
-          def delete(order_id, package_id, body = {})
+          def destroy(order_id, package_id, body = {})
             delete(build_endpoint("#{BASE_ORDERS_SHIPPING_PATH}#{DELETE_ORDER_SHIPPING_PACKAGE}",
                                   order: order_id,
                                   shipping_package: package_id), body)
           end
 
-          def delete_all(order_id, body = {})
+          def destroy_all(order_id, body = {})
             delete(build_endpoint("#{BASE_ORDERS_SHIPPING_PATH}#{DELETE_ORDER_SHIPPING_PACKAGES}",
                                   order: order_id), body)
           end

data/lib/plenty_client/order/shipping/profile.rb

@@ -2,8 +2,8 @@ module PlentyClient
   module Order
     module Shipping
       class Profile
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         LIST_SHIPPING_PRESET  = '/orders/shipping/presets'.freeze
         FIND_SHIPPING_PRESETS = '/orders/shipping/presets/{presetId}'.freeze

data/lib/plenty_client/order/shipping/service_provider.rb

@@ -2,8 +2,8 @@ module PlentyClient
   module Order
     module Shipping
       class ServiceProvider
-        extend PlentyClient::Endpoint
-        extend PlentyClient::Request
+        include PlentyClient::Endpoint
+        include PlentyClient::Request
 
         BASE_ORDERS_SHIPPING_SERVICE_PROVIDER_PATH = '/orders/shipping'.freeze
 

data/lib/plenty_client/request.rb

@@ -1,125 +1,148 @@
 require 'curl'
 module PlentyClient
   module Request
-    def request(http_method, path, params = {})
-      return false if http_method.nil? || path.nil?
-      return false unless %w(post put patch delete get).include?(http_method.to_s)
-
-      login if PlentyClient::Config.access_token.nil?
-      start_time = Time.now
-      response = perform(http_method, path, params)
-      body = parse_body(response, http_method, path, params)
-      log_output(http_method, base_url(path), params, time_diff_ms(start_time, Time.now)) if PlentyClient::Config.log
-      body
-    end
+    module ClassMethods
+      def request(http_method, path, params = {})
+        return false if http_method.nil? || path.nil?
+        return false unless %w[post put patch delete get].include?(http_method.to_s)
 
-    def post(path, body = {})
-      request(:post, path, body)
-    end
+        if PlentyClient::Config.access_token.nil? || time_diff_ms(Time.now, PlentyClient::Config.expiry_date).negative?
+          login_check
+        end
+        start_time = Time.now
+        response = perform(http_method, path, params)
+        body = parse_body(response, http_method, path, params)
+        log_output(http_method, base_url(path), params, time_diff_ms(start_time, Time.now)) if PlentyClient::Config.log
+        body
+      end
 
-    def put(path, body = {})
-      request(:put, path, body)
-    end
+      def post(path, body = {})
+        request(:post, path, body)
+      end
 
-    def patch(path, body = {})
-      request(:patch, path, body)
-    end
+      def put(path, body = {})
+        request(:put, path, body)
+      end
 
-    def delete(path, body = {})
-      request(:delete, path, body)
-    end
+      def patch(path, body = {})
+        request(:patch, path, body)
+      end
 
-    def get(path, params = {}, &block)
-      page = 1
-      rval_array = []
-      if block_given?
-        loop do
-          response = request(:get, path, params.merge(page: page))
-          yield response['entries'] if block_given?
-          page += 1
-          break if response['isLastPage'] == true
+      def delete(path, body = {})
+        request(:delete, path, body)
+      end
+
+      def get(path, params = {}, &block)
+        page = 1
+        rval_array = []
+        if block_given?
+          loop do
+            response = request(:get, path, params.merge(page: page))
+            yield response['entries'] if block_given?
+            page += 1
+            break if response['isLastPage'] == true
+          end
+        else
+          rval_array = request(:get, path, params.merge(page: page))
         end
-      else
-        rval_array << request(:get, path, params.merge(page: page))
+        return rval_array.flatten if rval_array.is_a?(Array)
+        rval_array
       end
-      rval_array.flatten
-    end
 
-    private
+      private
 
-    def login
-      response = perform(:post, "/login?username=#{PlentyClient::Config.api_user}" \
-                                "&password=#{PlentyClient::Config.api_password}")
-      result = parse_body(response, :post, 'login')
-      PlentyClient::Config.access_token  = result['accessToken']
-      PlentyClient::Config.refresh_token = result['refreshToken']
-    end
+      def login_check
+        url = "/login?username=#{PlentyClient::Config.api_user}&password=#{PlentyClient::Config.api_password}"
+        response = perform(:post, url)
+        result = parse_body(response, :post, 'login')
+        PlentyClient::Config.access_token  = result['accessToken']
+        PlentyClient::Config.refresh_token = result['refreshToken']
+        PlentyClient::Config.expiry_date   = Time.now + result['expiresIn']
+      end
 
-    def perform(http_method, path, params = {})
-      case http_method.to_s.downcase
-      when 'get'
-        Curl.get(base_url(path), params) do |curl|
-          curl_options(curl)
+      def perform(http_method, path, params = {})
+        case http_method.to_s.downcase
+        when 'get'
+          Curl.get(base_url(path), params) do |curl|
+            curl_options(curl)
+          end
+        when 'post'
+          Curl.post(base_url(path), params.to_json) do |curl|
+            curl_options(curl)
+          end
+        when 'put'
+          Curl.put(base_url(path), params.to_json) do |curl|
+            curl_options(curl)
+          end
+        when 'delete'
+          Curl.delete(base_url(path), params) do |curl|
+            curl_options(curl)
+          end
+        when 'patch'
+          Curl.patch(base_url(path), params.to_json) do |curl|
+            curl_options(curl)
+          end
         end
-      when 'post'
-        Curl.post(base_url(path), params) do |curl|
-          curl_options(curl)
-        end
-      when 'put'
-        Curl.put(base_url(path), params) do |curl|
-          curl_options(curl)
-        end
-      when 'delete'
-        Curl.delete(base_url(path), params) do |curl|
-          curl_options(curl)
-        end
-      when 'patch'
-        Curl.patch(base_url(path), params) do |curl|
-          curl_options(curl)
+      end
+
+      def curl_options(curl)
+        curl.headers['Content-type'] = 'application/json'
+        unless PlentyClient::Config.access_token.nil?
+          curl.headers['Authorization'] = "Bearer #{PlentyClient::Config.access_token}"
         end
+        curl.headers['Accept'] = 'application/x.plentymarkets.v1+json'
+        curl
       end
-    end
 
-    def curl_options(curl)
-      curl.headers['Content-type'] = 'application/json'
-      unless PlentyClient::Config.access_token.nil?
-        curl.headers['Authorization'] = "Bearer #{PlentyClient::Config.access_token}"
+      def base_url(path)
+        uri = URI(PlentyClient::Config.site_url)
+        url = "#{uri.scheme}://#{uri.host}/rest"
+        url += path.start_with?('/') ? path : "/#{path}"
+        url
       end
-      curl.headers['Accept'] = 'application/x.plentymarkets.v1+json'
-      curl
-    end
 
-    def base_url(path)
-      uri = URI(PlentyClient::Config.site_url)
-      url = "#{uri.scheme}://#{uri.host}/rest"
-      url += path.start_with?('/') ? path : "/#{path}"
-      url
-    end
+      def parse_body(response, http_method, rest_path, params = {})
+        result = JSON.parse(response.body)
+        errors = error_check(result)
+        unless errors.blank?
+          raise PlentyClient::ResponseError, [*errors].join(', ')
+          log_output(http_method, path, params, '')
+        end
+        result
+      end
 
-    def login_required?(path)
-      return false if defined?(Rails) && Rails.env == 'testing'
-      return true unless path.include?('login')
-      false
-    end
+      def log_output(http_method, path, params, duration)
+        puts [Time.now, "#{duration} ms", http_method.upcase, path, params].join(' # ')
+      end
 
-    def parse_body(response, http_method, rest_path, params = {})
-      result = JSON.parse(response.body)
-      raise InvalidResponseException.new(http_method, rest_path, params) if result.nil?
-      result
-    end
+      def time_diff_ms(start, finish)
+        ((finish - start) * 1000.0).round(2)
+      end
 
-    def log_output(http_method, path, params, duration)
-      puts [Time.now, "#{duration} ms", http_method.upcase, path, params].join(' # ')
-    end
+      def error_check(response)
+        rval = []
+        return rval if response.blank?
+        if response.is_a?(Array) && response.first.key?('error')
+          response.each do |res|
+            rval << extract_message(res)
+          end
+        elsif response.is_a?(Hash) && response.key?('error')
+          rval << extract_message(response)
+        end
+        rval
+      end
 
-    def time_diff_ms(start, finish)
-      ((finish - start) * 1000.0).round(2)
+      def extract_message(response)
+        if response.key?('validation_errors') && !response['validation_errors'].blank?
+          response['validation_errors'].values.flatten.join(', ')
+        else
+          response['error']['message']
+        end
+      end
     end
-  end
-end
 
-class InvalidResponseException < StandardError
-  def initialize(http_method, rest_path, params)
-    super("The response was null. http_Method: #{http_method}, Path: #{rest_path}, options: #{params}")
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
   end
 end