futureshop 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba3e1d77af05a3e3f36f22eb07fd0ee0c6126b13ce951c47c58515c890c705d
-  data.tar.gz: 100d20afab4bb4199d3080ab13fd0fb6e39968257c5aa267cfaaf1f6321b0cbc
+  metadata.gz: 98c8d7b64e6c87c143bf69d49a3ca20c480b7bf07086fdf8c5fa45f1ede4b33a
+  data.tar.gz: b18b15af5c1790f11137305848888744bb88c3248b2aa9e2bc432584ba4e493f
 SHA512:
-  metadata.gz: 7903e9fde5a94044374daf982a57b7d834f4d8f9047619cf26d144e490ba834b1ebace0e5292731323ebb891adbaf2e9375fdaadf6158aa4d904f2a85cfb8407
-  data.tar.gz: 2fed2130ba08408186997df4a6277123c2f6bc52c35eba17503a1076f18f4d6336777e83aa5876684b965378e34f4d107c34a995d702b9006645ce0f56d852ab
+  metadata.gz: 40b81c3cd65ef881c8a14d8eb3120351c184e4971d893acb76dde46defb187a85527ffc85c4b01552751c8b1b640dbc6c8c3951877203645a1890ccd9124e7ec
+  data.tar.gz: fbedd017cec85d9fbb717d556a7727d47672a0c91611a14f62b93452e4bcb2a3ea0fb9c5a26c7cf56366740fc85b8e9cfc530811d9dfcad3f43189dcaa55010b

data/.gitlab-ci.yml

@@ -4,6 +4,6 @@ before_script:
   - gem install bundler -v 2.2.21
   - bundle install
 
-example_job:
+test:
   script:
     - bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.1.4] - 2021-10-11
+
+- Handle order's couponList field, which was introduced on 2021-09-29
+
+## [0.1.3] - 2021-08-25
+
+- Fix option passing
+- Fix handling of nextUrl
+
+## [0.1.2] - 2021-08-06
+
+- Fix command-line option name
+
+## [0.1.1] - 2021-08-05
+
+- Fix CSV conversion for optionPriceList and optionList
+
 ## [0.1.0] - 2021-07-04
 
 - Initial release

data/exe/futureshop

@@ -40,82 +40,7 @@ def orders(global_options, argv)
     opt.on "--order-date-start=DATE", Time
     opt.on "--order-date-end=DATE", Time
   })
-  require "csv" if options[:format] == "csv"
-
-  client.each_order(order_date_start: options[:"order-date-start"], order_date_end: options[:"order-date-end"]).with_index do |row, index|
-    sleep 1 # FIXME: Delegate to client
-    order = client.order(row["orderNo"])
-    case options[:format]
-    when "json"
-      puts order.to_json
-    when "csv"
-      headers = []
-      CSV $stdout do |csv|
-        if index == 0
-          csv << aggregate_headers(order)
-        end
-        raise "Multiple shipmentList. orderNo: #{order["orderNo"]}" if order["shipmentList"].length > 1
-        order["shipmentList"].each do |shipment|
-          shipment["productList"].each do |product|
-            csv << order.each_value.with_object([]) {|value, values|
-              case value
-              when Hash
-                value.each_value do |v|
-                  values << v
-                end
-              when Array
-                # only shipmentList is an Array and its length is 0
-                shipment.each_value do |v|
-                  case v
-                  when Hash
-                    v.each_value do |ov|
-                      values << ov
-                    end
-                  when Array
-                    product.each_value do |v|
-                      v = v.join("/") if v.kind_of? Array
-                      values << v
-                    end
-                  else
-                    values << v
-                  end
-                end
-              else
-                values << value
-              end
-            }
-          end
-        end
-      end
-    end
-  end
-end
-
-def client
-  Futureshop::Client.new(
-    shop_key: ENV["FUTURESHOP_SHOP_KEY"],
-    client_id: ENV["FUTURESHOP_CLIENT_ID"],
-    client_secret: ENV["FUTURESHOP_CLIENT_SECRET"],
-    api_domain: ENV["FUTURESHOP_API_DOMAIN"]
-  )
-end
-
-def aggregate_headers(obj, headers = [])
-  obj.each_pair do |key, value|
-    unless %w[buyerInfo addressInfo shippingInfo shipmentList productList].include? key
-      headers << key
-    end
-    case value
-    when Hash
-      headers.concat aggregate_headers(value).collect {|header| "#{key}.#{header}"}
-    when Array
-      sample = value[0]
-      if sample
-        headers.concat aggregate_headers(sample).collect {|header| "#{key}.#{header}"}
-      end
-    end
-  end
-  headers
+  Futureshop.orders(order_date_start: options[:"order-date-start"], order_date_end: options[:"order-date-end"], format: options[:format])
 end
 
 main ARGV

data/lib/futureshop/client.rb

@@ -42,10 +42,7 @@ module Futureshop
       }
     end
 
-    def request(method, path = "/", params: {}, data: {})
-      raise "Unsupported method: #{method}" unless [:get, :post].include?(method)
-      query = params.empty? ? nil : build_query(params)
-      uri = URI::HTTPS.build(host: @api_domain, port: @port, path: path, query: query)
+    def request_by_uri(method, uri, data: {})
       request = Net::HTTP.const_get(method.capitalize).new(uri)
       headers.each_pair do |field, value|
         request[field] = value
@@ -56,6 +53,13 @@ module Futureshop
       JSON.parse(response.body)
     end
 
+    def request(method, path = "/", params: {}, data: {})
+      raise "Unsupported method: #{method}" unless [:get, :post].include?(method)
+      query = params.empty? ? nil : build_query(params)
+      uri = URI::HTTPS.build(host: @api_domain, port: @port, path: path, query: query)
+      request_by_uri(method, uri, data: data)
+    end
+
     def get(path = "/", params: {})
       request(:get, path, params: params)
     end
@@ -78,12 +82,13 @@ module Futureshop
       res = get("/admin-api/v1/shipping", params: params)
       yield res["orderList"]
 
-      nextUrl = res["nextUrl"]
-      while nextUrl
+      next_url = res["nextUrl"]
+      while next_url
         sleep INTERVAL
-        res = get(nextUrl, params: params) # TODO: check spec to see whether it's okay to pass params in this form
+        url = URI.parse(next_url)
+        res = request_by_uri(:get, url)
         yield res["orderList"]
-        nextUrl = res["nextUrl"]
+        next_url = res["nextUrl"]
       end
     end
 

data/lib/futureshop/version.rb

@@ -1,3 +1,3 @@
 module Futureshop
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

data/lib/futureshop.rb

@@ -3,5 +3,103 @@ require_relative "futureshop/client"
 
 module Futureshop
   class Error < StandardError; end
-  # Your code goes here...
+
+  class << self
+    attr_writer :client
+
+    def orders(format: "json", **options)
+      require "csv" if format == "csv"
+
+      client.each_order(**options).with_index do |row, index|
+        sleep 1 unless ENV["NO_THROTTLE"] # FIXME: Delegate to client
+        order = client.order(row["orderNo"])
+        case format
+        when "json"
+          puts order.to_json
+        when "csv"
+          headers = []
+          CSV $stdout do |csv|
+            if index == 0
+              csv << aggregate_headers(order)
+            end
+            raise "Multiple shipmentList. orderNo: #{order["orderNo"]}" if order["shipmentList"].length > 1
+            order["shipmentList"].each do |shipment|
+              shipment["productList"].each do |product|
+                csv << order.each_pair.with_object([]) {|(key, value), values|
+                  case value
+                  when Hash
+                    value.each_value do |v|
+                      values << v
+                    end
+                  when Array
+                    case key
+                    when "shipmentList"
+                      # shipmentList's length is 1
+                      shipment.each_value do |v|
+                        case v
+                        when Hash
+                          v.each_value do |ov|
+                            values << ov
+                          end
+                        when Array
+                          product.each_pair do |k, v|
+                            case k
+                            when "optionPriceList"
+                              v = v.collect {|optionPrice| "#{optionPrice['name']}:#{optionPrice['selectionName']}(#{optionPrice['price']})"}.join("/")
+                            when "optionList"
+                              v = v.collect {|option| [option["name"], option["selectionItem"]].join(":")}.join(",")
+                            end
+                            values << v
+                          end
+                        else
+                          values << v
+                        end
+                      end
+                    when "couponList"
+                      values << value.collect {|coupon| [coupon["id"], coupon["name"]].join(":")}.join("/")
+                    else
+                      raise "Unknown array field: #{key}"
+                    end
+                  else
+                    values << value
+                  end
+                }
+              end
+            end
+          end
+        else
+          raise RuntimeError("unsupported format: #{format}")
+        end
+      end
+    end
+
+    def client
+      @client ||= Futureshop::Client.new(
+        shop_key: ENV["FUTURESHOP_SHOP_KEY"],
+        client_id: ENV["FUTURESHOP_CLIENT_ID"],
+        client_secret: ENV["FUTURESHOP_CLIENT_SECRET"],
+        api_domain: ENV["FUTURESHOP_API_DOMAIN"]
+      )
+    end
+
+    private
+
+    def aggregate_headers(obj, headers = [])
+      obj.each_pair do |key, value|
+        unless %w[buyerInfo addressInfo shippingInfo shipmentList productList].include? key
+          headers << key
+        end
+        case value
+        when Hash
+          headers.concat aggregate_headers(value).collect {|header| "#{key}.#{header}"}
+        when Array
+          sample = value[0]
+          if sample
+            headers.concat aggregate_headers(sample).collect {|header| "#{key}.#{header}"}
+          end
+        end
+      end
+      headers
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futureshop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Kitaiti Makoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake