futureshop 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba3e1d77af05a3e3f36f22eb07fd0ee0c6126b13ce951c47c58515c890c705d
-  data.tar.gz: 100d20afab4bb4199d3080ab13fd0fb6e39968257c5aa267cfaaf1f6321b0cbc
+  metadata.gz: e7656d0cc9f40144256020b14e6f45bf161851ec1b3487901662efb8c741f869
+  data.tar.gz: f3b18e8fd1bb8ad58c10c42216ff219123fde61e869827ed31876ecc1b9ebdfb
 SHA512:
-  metadata.gz: 7903e9fde5a94044374daf982a57b7d834f4d8f9047619cf26d144e490ba834b1ebace0e5292731323ebb891adbaf2e9375fdaadf6158aa4d904f2a85cfb8407
-  data.tar.gz: 2fed2130ba08408186997df4a6277123c2f6bc52c35eba17503a1076f18f4d6336777e83aa5876684b965378e34f4d107c34a995d702b9006645ce0f56d852ab
+  metadata.gz: 77627e2b9030c438e1b4891a1957129bbd9ab027fcebf97b85e041f52fd19602711a2a85f58555ea7e93cb7ff8d3016672db7a5dcf254fef92bcd6e1d45808ae
+  data.tar.gz: bf8ec9076b7ed937d41e0ee67823f47f2100008d209f51a47ff78eb76ae13a33f65d54169ead5f9e854a6eab54112be746645d731138a5b0eb68364d298b1f90

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [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,55 +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
+  Futureshop.orders(**options)
 end
 
 def client

data/lib/futureshop.rb

@@ -3,5 +3,94 @@ 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_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_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
+                  else
+                    values << value
+                  end
+                }
+              end
+            end
+          end
+        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

data/lib/futureshop/version.rb

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

metadata

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