futureshop 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c8d7b64e6c87c143bf69d49a3ca20c480b7bf07086fdf8c5fa45f1ede4b33a
-  data.tar.gz: b18b15af5c1790f11137305848888744bb88c3248b2aa9e2bc432584ba4e493f
+  metadata.gz: 149ccbc61f6f2a24a204a3e5388916d0cc88ed83a3e430139343258b35cfdc54
+  data.tar.gz: fe5ccfb36388c2a542fba637ad267ea8b2dfdf00bcce585260b8fcfb87b73c66
 SHA512:
-  metadata.gz: 40b81c3cd65ef881c8a14d8eb3120351c184e4971d893acb76dde46defb187a85527ffc85c4b01552751c8b1b640dbc6c8c3951877203645a1890ccd9124e7ec
-  data.tar.gz: fbedd017cec85d9fbb717d556a7727d47672a0c91611a14f62b93452e4bcb2a3ea0fb9c5a26c7cf56366740fc85b8e9cfc530811d9dfcad3f43189dcaa55010b
+  metadata.gz: 7c91b48060e10dbde69a59715636b256091d5107a564c184f740f385bc3c766fa7b41daf30efb7988cb7463601e1cb91c3d35af35906471f09be6f283e61e746
+  data.tar.gz: 5a897ec2722dda6fe75b7537f2a602a59cdf53c79d3db1c59d9be90e7a38f7e03cf25f7d38cdcc4c0bff51127737b889e24c9ec35dff653df79adbfd586d53be

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [0.1.7] - 2022-06-13
+
+- Remove couponList.id and couponList.name fields from orders CSV output
+
+## [0.1.6] - 2021-11-04
+
+- Change required Ruby version from 3.0.0 to 2.7.0
+- Complete command options
+
+## [0.1.5] - 2021-10-21
+
+- Add `Futureshop::Inventory` class
+- Add `inventories` subcommand
+
 ## [0.1.4] - 2021-10-11
 
 - Handle order's couponList field, which was introduced on 2021-09-29

data/README.md

@@ -21,6 +21,7 @@ Or install it yourself as:
 ## Usage
 
     futureshop orders -fcsv --order-date-start=2016-07-05 --order-date-end=2021-07-20 > orders.2021-07-20.csv
+    futureshop inventories --type=regular,preorder
 
 ## Development
 
@@ -30,4 +31,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and merge requests are welcome on GitHub at https://gitlab.com/KitaitiMakoto/futuresohp
+Bug reports and merge requests are welcome on GitHub at https://gitlab.com/KitaitiMakoto/futureshop

data/exe/futureshop

@@ -4,7 +4,7 @@ require "optparse"
 require "optparse/time"
 require "futureshop"
 
-SUPPORTED_COMMANDS = %w[orders]
+SUPPORTED_COMMANDS = %w[orders inventories]
 
 def main(argv)
   global_options = parse_global_options(argv)
@@ -14,6 +14,8 @@ def main(argv)
   case subcommand
   when "orders"
     orders global_options, argv
+  when "inventories"
+    inventories global_options, argv
   end
 end
 
@@ -27,6 +29,11 @@ end
 
 def parse_global_options(argv)
   parse_options(argv) {|opt|
+    opt.banner = "Usage:\n" + SUPPORTED_COMMANDS.collect {|command|
+      "    #{opt.program_name} [global options] #{command} [options]"
+    }.join("\n")
+    opt.version = Futureshop::VERSION
+    opt.separator "Global options:"
     opt.on "--verbose" do
       $VERBOSE = true
     end
@@ -36,11 +43,38 @@ end
 def orders(global_options, argv)
   options = {format: "json"}
   options.update(parse_options(argv) {|opt|
-    opt.on "-f", "--format=FORMAT", ["json", "csv"]
-    opt.on "--order-date-start=DATE", Time
-    opt.on "--order-date-end=DATE", Time
+    formats = %w[json csv]
+    opt.on "-f", "--format=FORMAT", ["json", "csv"], "Output format. Available: #{formats.join(', ')}"
+    opt.on "--order-date-start=YYYY-MM-DD", Time, "Retrieve orders whose date is newer than or equal to argument."
+    opt.on "--order-date-end=YYYY-MM-DD", Time, "Retrieve orders whose date is older than or equal to argument."
   })
   Futureshop.orders(order_date_start: options[:"order-date-start"], order_date_end: options[:"order-date-end"], format: options[:format])
 end
 
+def inventories(global_options, argv)
+  require "futureshop/inventory"
+
+  options = {
+    type: ["regular"],
+    product_no: [],
+    jan_code: []
+  }
+  options = options.update(parse_options(argv) {|opt|
+    opt.on "--type=TYPE", Array, "Type. Available: regular, preorder, planned, realstore"
+    opt.on "--create-date-start=DATE", Time, "Retrieve products whose registration date is newer than or equal to argument."
+    opt.on "--create-date-end=DATE", Time, "Retrieve products whose registration date is older than or equal to argument."
+    opt.on "--product-no=NUMBER", Array, "Product number."
+    opt.on "--jan-code=CODE", Array, "JAN code."
+  })
+  if options[:type]
+    unknown_types = options[:type].select {|type| ! %w[regular preorder planned realstore].include?(type)}
+    unless unknown_types.empty?
+      raise "Unknown type(s): #{unknown_types.join(', ')}"
+    end
+  end
+  Futureshop::Inventory.each types: options[:type].collect(&:to_sym), create_date_start: options[:"create-date-start"], create_date_end: options[:"create-date-end"], product_no: options[:"product-no"], jan_code: options[:"jan-code"] do |inventory|
+    puts inventory.to_json
+  end
+end
+
 main ARGV

data/futureshop.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "futureshop APIv2 client and tools"
   spec.description   = "futureshop APIv2 client and tools"
-  spec.homepage      = "https://gitlab.com/KitaitiMakoto/futuresohp"
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.homepage      = "https://gitlab.com/KitaitiMakoto/futureshop"
+  spec.required_ruby_version = ">= 2.7.0"
   spec.license       = "AGPL-3.0-or-later"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "https://gitlab.com/KitaitiMakoto/futuresohp/-/blob/main/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "https://gitlab.com/KitaitiMakoto/futureshop/-/blob/main/CHANGELOG.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/futureshop/inventory.rb

@@ -0,0 +1,51 @@
+module Futureshop
+  class Inventory
+    class << self
+      def each_batch(types: [:regular], create_date_start: nil, create_date_end: nil, product_no: [], jan_code: [])
+        params = {
+          types: types,
+          product_no: product_no,
+          jan_code: jan_code
+        }
+        params[:create_date_start] = create_date_start.strftime("%FT%T") if create_date_start
+        params[:create_date_end] = create_date_end.strftime("%FT%T") if create_date_end
+        res = client.get("/admin-api/v1/inventory", params: params)
+        yield res["productList"]
+
+        next_url = res["nextUrl"]
+        while next_url
+          sleep Client::INTERVAL
+          url = URI.parse(next_url)
+          res = client.request_by_uri(:get, url)
+          yield res["productList"]
+          next_url = res["nextUrl"]
+        end
+      end
+
+      def each(**args)
+        return enum_for(__method__, **args) unless block_given?
+
+        each_batch **args do |inventories|
+          inventories.each do |inventory|
+            yield inventory
+          end
+        end
+      end
+
+      def all(**args)
+        return each.to_a
+      end
+
+      private
+
+      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
+    end
+  end
+end

data/lib/futureshop/version.rb

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

data/lib/futureshop.rb

@@ -93,6 +93,7 @@ module Futureshop
         when Hash
           headers.concat aggregate_headers(value).collect {|header| "#{key}.#{header}"}
         when Array
+          next if key == "couponList"
           sample = value[0]
           if sample
             headers.concat aggregate_headers(sample).collect {|header| "#{key}.#{header}"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futureshop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Kitaiti Makoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,14 +73,15 @@ files:
 - futureshop.gemspec
 - lib/futureshop.rb
 - lib/futureshop/client.rb
+- lib/futureshop/inventory.rb
 - lib/futureshop/version.rb
-homepage: https://gitlab.com/KitaitiMakoto/futuresohp
+homepage: https://gitlab.com/KitaitiMakoto/futureshop
 licenses:
 - AGPL-3.0-or-later
 metadata:
-  homepage_uri: https://gitlab.com/KitaitiMakoto/futuresohp
-  source_code_uri: https://gitlab.com/KitaitiMakoto/futuresohp
-  changelog_uri: https://gitlab.com/KitaitiMakoto/futuresohp/-/blob/main/CHANGELOG.md
+  homepage_uri: https://gitlab.com/KitaitiMakoto/futureshop
+  source_code_uri: https://gitlab.com/KitaitiMakoto/futureshop
+  changelog_uri: https://gitlab.com/KitaitiMakoto/futureshop/-/blob/main/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -89,14 +90,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: futureshop APIv2 client and tools