futureshop 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2fd23ed1fbea603b0fb85215daf907df8452b0e33af3224ff368101f3a69dd
-  data.tar.gz: 3552f0d56f12cbfc5338b62f673e6c99b4ddda9d81216a9a1afcf9523b8a266e
+  metadata.gz: a772346e853a3e3270613fdfdb1b80d7c1b8d6f56036a3894fb896755a2c9221
+  data.tar.gz: e269cdf0e96e9ff4223def8c5629c1db17c3c28316a676aee7a6f8d1773eee9d
 SHA512:
-  metadata.gz: 88c85c2e8a2be55b4f937a4b6052241b740c0c16b3e57b1597cc42afa63e503013aff67111527297c3cb22fe5760cc399d06e6bf2a9b620dccd8e016ec789b2d
-  data.tar.gz: f0b1c12f981157dafb3ee4fd5e086675ae9de82dc0083cced20742aa881fe67285071e8248fa68fb69067b7f1cdb401d8dabf72dfc2233d973e83f253d73b046
+  metadata.gz: be1565f81d78c145a809516074f699e8a3e101c16a273bd43027cefb44ba8dba661341019e3f2847b27e4d10f252c39b6e4c4f60e695ba232286fa0276448eaf
+  data.tar.gz: 7f0ba7fed584633bc70e8ed473d3521e2b377d8bda331274b6356960e71227c7861aa034cf504d7148b5d5dc1bf3900d32cc55287e290f642bc46e54b4fd0f24

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,10 @@
 ## [Unreleased]
 
+## [0.1.3] - 2021-08-25
+
+- Fix option passing
+- Fix handling of nextUrl
+
 ## [0.1.2] - 2021-08-06
 
 - Fix command-line option name

data/exe/futureshop

@@ -40,34 +40,7 @@ def orders(global_options, argv)
     opt.on "--order-date-start=DATE", Time
     opt.on "--order-date-end=DATE", Time
   })
-  Futureshop.orders(order_date_start: options["order-date-start"], order_date_end: options["order-date-end"], format: options["format"])
-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.2"
+  VERSION = "0.1.3"
 end

data/lib/futureshop.rb

@@ -60,6 +60,8 @@ module Futureshop
               end
             end
           end
+        else
+          raise RuntimeError("unsupported format: #{format}")
         end
       end
     end

metadata

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