arctic-vendor 0.2.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c35888a69388854e55aeb41044e86f0d253bfc641b27c0ccdc8adafdfe11175
-  data.tar.gz: 7e5a474dd62488a6f7c164e5b14a39f2e1497d95d198fac0bd74027f284eaf68
+  metadata.gz: 05635e7489082f52c9eae52ca87fe80b6ab52088d9bec08b2307c97aa2f290e3
+  data.tar.gz: 4487c41c01720ff83bbcaa93244d926f9d88d5780f34c1c0974505e87aa6a364
 SHA512:
-  metadata.gz: 555a66bc09875998d978d5f456ae6d1362a93bdceb7e5cb50d871b8f5e18f9cdd607f9e899523f0c3bb6cce856c88456f0685f13a33361969e5f5c91ec2c49e1
-  data.tar.gz: 287cf6d8345aed3828442774c887e04cda17da8782694eb8f47cd998e612cb6d438e3af430d0e0a03b1d8c48f877e3614fd2869e4cd694814a8c572caa90b212
+  metadata.gz: 1b07dfd68ee2df32d7aab75385f69b3ec16befd8621030be5017c2844ad5646f4f11cd6c8bc0b4f87536e272afa6c64327ee601049c72cf40d5d2d3280629801
+  data.tar.gz: 9ab9a0a28d01b1344c16956ffe75aade1522157407da2dc07562325505276d9673f29390d2939bcc7781c448baa948376bf0af60418e4386bee3759a48853bbb

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+### 1.0.0
+
+* Remove a number of superfluous endpoints
+* Remove need for account_id
+* Rename some existing endpoints
+* Remove Product objetc. Use POR hashes
+* Add call to update when the shop was last collected after each collection cycle
+
+### 0.2.5
+
+* Add latest_only key to distribute_products
+* Added api method for adding orders to the Core API
+
 ### 0.2.1
 
 * Added Arctic::Vendor::API#list_products method to allow vendors to retrieve products from the Core API - Emil Kampp <emil@youwe.dk>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arctic-vendor (0.2.3)
+    arctic-vendor (1.0.0)
       activesupport (~> 5.2)
       faraday (~> 0.14)
 

data/lib/arctic/vendor/api.rb

@@ -2,79 +2,87 @@ require 'faraday'
 require 'json'
 require 'active_support/all'
 
-require_relative 'product'
-
 module Arctic
   module Vendor
     class API
-      attr_reader :token, :connection
+      attr_reader :vendor_id, :token, :connection
 
       def initialize(**options)
-        api_token = options.fetch(:token, ENV.fetch('ARCTIC_CORE_API_TOKEN'))
+        @vendor_id = options.fetch(:vendor_id, ENV.fetch('VENDOR_ID'))
+
+        @token = options.fetch(:token, ENV.fetch('ARCTIC_CORE_API_TOKEN'))
+
         api_url = options.fetch(:url,
           ENV.fetch('ARCTIC_CORE_API_URL',
             'http://localhost:5000/v1/vendors'))
 
-        @token = api_token
         headers = {
-          Authorization: "Vendor #{token}",
           'Content-Type': 'application/json',
           Accept: 'application/json',
         }
-        @connection = Faraday.new url: api_url.chomp('/'), headers: headers
-      end
 
-      # List the current accounts available to the vendor
-      def list_accounts
-        make_request :get, 'accounts'
-      end
-
-      # Show details about a single account
-      def show_account(account_id)
-        make_request :get, "accounts/#{account_id}"
+        @connection = Faraday.new url: api_url.chomp('/'), headers: headers do |conn|
+          conn.basic_auth(vendor_id, token)
+          conn.adapter Faraday.default_adapter
+        end
       end
 
       # List shops for a single account
-      def list_shops(account_id)
-        make_request :get, "accounts/#{account_id}/shops"
+      def list_shops
+        make_request :get, "shops"
       end
 
       # Send products to the Core API
-      def send_products(account_id, shop_id, products)
-        products.tap do |px|
-          make_batch_request :post, "accounts/#{account_id}/shops/#{shop_id}/products", body: px
+      def send_products(shop_id, products)
+        Arctic::Vendor.threaded(products.dup) do |prod|
+          begin
+            make_request :post, "shops/#{shop_id}/products", body: prod
+          rescue => e
+            Arctic.logger.error "Failed to send product (#{e.class}): #{e.message} -- #{prod}"
+          end
         end
+        make_request :put, "shops/#{shop_id}", params: { collected_at: Time.now.to_s(:db) }
+        products
       end
 
-      # Retrieve products from the Core API
-      def list_products(account_id, shop_id, **params)
-        make_paginated_request(:get, "accounts/#{account_id}/shops/#{shop_id}/products", params: params) do |products|
-          yield products.collect { |prod| Arctic::Vendor::Product.new account_id, shop_id, prod, self }
+      # Send products to the Core API
+      def send_currencies(shop_id, currencies)
+        Arctic::Vendor.threaded(currencies.dup) do |curr|
+          begin
+            make_request :put, "shops/#{shop_id}/currencies", body: curr
+          rescue => e
+            Arctic.logger.error "Failed to send currency (#{e.class}): #{e.message} -- #{curr}"
+          end
         end
+        currencies
       end
 
-      def get_product(account_id, shop_id, product_id)
-        product_id = URI.escape product_id
-        make_request :get, "accounts/#{account_id}/shops/#{shop_id}/products/#{product_id}"
+      # Retrieve products from the Core API
+      def list_products(shop_id, **params)
+        params[:per_page] = params.delete(:batch_size) || 100
+        make_paginated_request(:get, "shops/#{shop_id}/products", params: params) do |products|
+          yield products
+        end
       end
 
       # Marks the shop as synchronized by the vendor
-      def synchronized(account_id, shop_id)
-        make_request :put, "accounts/#{account_id}/shops/#{shop_id}/synchronized"
+      def update_product(shop_id, sku, **params)
+        Arctic.logger.debug "Updating Product(#{sku}).."
+        make_request :patch, "shops/#{shop_id}/products/#{sku}", params: params
       end
 
-      # Marks the shop as synchronized by the vendor
-      def update_product_state(account_id, shop_id, product_id, state)
-        make_request :put, "accounts/#{account_id}/shops/#{shop_id}/products/#{product_id}/state/#{state}"
+      def update_products(shop_id, products, **params)
+        Arctic::Vendor.threaded(products) do |prod|
+          begin
+            update_product shop_id, prod.fetch('sku'), **params
+          rescue KeyError => e
+            Arctic.logger.error "Invalid product: #{e.message} -- #{prod}"
+          end
+        end
       end
 
       private
 
-        def make_batch_request(*args, **options)
-          batches = Array(options.delete(:body)).flatten.in_groups_of(1000, false)
-          Arctic::Vendor.threaded(batches) { |batch| make_request *args, **(options.merge(body: batch)) }
-        end
-
         def raw_request(method, path, body: {}, params: {})
           # Remove preceeding slash to avoid going from base url /v1 to /
           path = path.reverse.chomp('/').reverse

data/lib/arctic/vendor/vendor.rb

@@ -14,15 +14,29 @@ module Arctic
     end
     module_function :threaded
 
-    def each_shop(type: :source)
-      api.list_accounts.each do |account|
-        api.list_shops(account['id']).each do |shop|
-          yield shop, account if shop['type'] == type.to_s
-        end
+    def each_shop(type = :collection)
+      api.list_shops.with_indifferent_access[type].each do |shop|
+        yield shop
       end
     end
     module_function :each_shop
 
+    def collect_currencies(&block)
+      Arctic.logger.info "Collecting currencies from collection shop"
+
+      currencies_count = 0
+
+      seconds = time do
+        each_shop(:collection) do |shop|
+          currencies = api.send_currencies shop['id'], yield(shop)
+          currencies_count += currencies.size
+        end
+      end
+
+      Arctic.logger.info "Collected #{currencies_count} exchange rates in #{seconds} seconds."
+    end
+    module_function :collect_currencies
+
     def api(*args)
       @api ||= Arctic::Vendor::API.new(*args)
     end
@@ -38,14 +52,13 @@ module Arctic
     # Fetches all products from all shops, where this vendor is the source
     # vendor and pushes them to the Core API.
     def collect_products(&block)
-      Arctic.logger.info "Collecting products from source vendor..."
+      Arctic.logger.info "Collecting products from vendor..."
       products_count = 0
 
       seconds = time do
-        each_shop do |shop, account|
-          products = api.send_products account['id'], shop['id'], yield(shop)
+        each_shop(:collection) do |shop|
+          products = api.send_products shop['id'], yield(shop)
           products_count += products.size
-          api.synchronized account['id'], shop['id']
         end
       end
 
@@ -55,17 +68,20 @@ module Arctic
 
     # Fetches all products from the Core API and distributes them to the
     # target vendors
-    def distribute_products(batch_size: 100)
+    def distribute_products(**params)
       Arctic.logger.info "Distributing products to target vendor..."
       products_count = 0
 
+      params.reverse_merge! \
+        batch_size: 100
+
       seconds = time do
-        each_shop(type: :target) do |shop, account|
-          api.list_products(account['id'], shop['id'], per_page: batch_size) do |products|
+        each_shop(:dispersal) do |shop|
+          api.list_products(shop['id'], params) do |products|
             products_count += products.size
             yield shop, products
+            # api.update_products shop['id'], products, dispersed_at: Time.now.to_s(:db)
           end
-          api.synchronized account['id'], shop['id']
         end
       end
 

data/lib/arctic/vendor/version.rb

@@ -1,5 +1,5 @@
 module Arctic
   module Vendor
-    VERSION = "0.2.4"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arctic-vendor
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Emil Kampp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -141,7 +141,6 @@ files:
 - documentation/source/stylesheets/screen.css.scss
 - lib/arctic/vendor.rb
 - lib/arctic/vendor/api.rb
-- lib/arctic/vendor/product.rb
 - lib/arctic/vendor/uri.rb
 - lib/arctic/vendor/vendor.rb
 - lib/arctic/vendor/version.rb

data/lib/arctic/vendor/product.rb

@@ -1,47 +0,0 @@
-module Arctic
-  module Vendor
-    class Product
-      class Characteristics
-        def initialize(characteristics)
-          @characteristics = characteristics
-        end
-
-        def method_missing(name, *args)
-          @characteristics[name.to_s]
-        end
-      end
-
-      attr_reader \
-        :product_hash,
-        :sku,
-        :characteristics,
-        :api,
-        :account_id,
-        :shop_id
-
-      def initialize(account_id, shop_id, product_hash, api_instance)
-        @product_hash = product_hash
-
-        @api = api_instance
-
-        @shop_id = shop_id
-        @account_id = account_id
-
-        @sku = product_hash.fetch 'sku'
-        @characteristics = Characteristics.new product_hash.fetch 'characteristics'
-      end
-
-      def update_state(state)
-        api.update_product_state account_id, shop_id, sku, state
-      end
-
-      def method_missing(name, *args)
-        if product_hash.stringify_keys.keys.include? name.to_s
-          product_hash.stringify_keys[name.to_s]
-        else
-          super name, *args
-        end
-      end
-    end
-  end
-end