microcms-ruby-sdk 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7981b7722c57e9c32a2ca0681228addc23c92576c8ade1259874de877bbeb5c1
-  data.tar.gz: c5cf56769dca274a7fffb90e73f6c9814ca8570288e24e9a00fdc0e6eb349b1e
+  metadata.gz: 2ac22f7433f5c15562d37eb291ab04297082a36b02fe34b14206f578fdd8a6cb
+  data.tar.gz: 5411bed835d189ca46f280fada06bb7b25a2eb937d0fda8d478be9b52fe43560
 SHA512:
-  metadata.gz: e5265db69895b973b8f877017b108c59ab854ed3699de6fa13f158d36f2e401f14180495575c8b7efd28ff50b26ba05194d8535e081b6bde52b7124890dec824
-  data.tar.gz: 2ee9017853f3803eb9ef9c2672457b21b18a9a92bacf41ea5d2e7b514f24eaf866e8d5435b2a43f80e3299ef4f4e7e0257c15503f77e004012a1bf027e13891c
+  metadata.gz: 294a44d8524dadb0389169bbb0022055dbfd94c53da7f99c74c37c8f88baa64192bb56f08a8b8c0915cad6297ac56c470ed2ba4de609d87320b7146fc9b5da6e
+  data.tar.gz: d0fb8d0095703342ddaa6145483691669c54f69f59a1a8446112bb353e0f28251bb6368f48b73e4d559a81d28e25f2cf702b51f5e93d6663963ea7fe65b8aaa5

data/lib/microcms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicroCMS
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/microcms.rb

@@ -20,8 +20,67 @@ module MicroCMS
     end
   end
 
+  # HttpUtil
+  module HttpUtil
+    def send_http_request(method, endpoint, path, query = nil, body = nil)
+      uri = build_uri(endpoint, path, query)
+      http = build_http(uri)
+      req = build_request(method, uri, body)
+      res = http.request(req)
+
+      raise APIError.new(status_code: res.code.to_i, body: res.body) if res.code.to_i >= 400
+
+      JSON.parse(res.body, object_class: OpenStruct) if res.header['Content-Type'].include?('application/json') # rubocop:disable Style/OpenStructUse
+    end
+
+    private
+
+    def get_request_class(method)
+      {
+        GET: Net::HTTP::Get,
+        POST: Net::HTTP::Post,
+        PUT: Net::HTTP::Put,
+        PATCH: Net::HTTP::Patch,
+        DELETE: Net::HTTP::Delete
+      }[method]
+    end
+
+    def build_request(method, uri, body)
+      req = get_request_class(method.to_sym).new(uri.request_uri)
+      req['X-MICROCMS-API-KEY'] = @api_key
+      if body
+        req['Content-Type'] = 'application/json'
+        req.body = JSON.dump(body)
+      end
+
+      req
+    end
+
+    def build_uri(endpoint, path, query)
+      origin = "https://#{@service_domain}.microcms.io"
+      path_with_id = path ? "/api/v1/#{endpoint}/#{path}" : "/api/v1/#{endpoint}"
+      encoded_query =
+        if !query || query.size.zero?
+          ''
+        else
+          "?#{URI.encode_www_form(query)}"
+        end
+
+      URI.parse("#{origin}#{path_with_id}#{encoded_query}")
+    end
+
+    def build_http(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      http
+    end
+  end
+
   # Client
   class Client
+    include HttpUtil
+
     def initialize(service_domain, api_key)
       @service_domain = service_domain
       @api_key = api_key
@@ -68,6 +127,7 @@ module MicroCMS
 
     private
 
+    # rubocop:disable Style/MethodLength
     def build_query(option)
       {
         draftKey: option[:draftKey],
@@ -77,9 +137,11 @@ module MicroCMS
         q: option[:q],
         fields: option[:fields] ? option[:fields].join(',') : nil,
         filters: option[:filters],
-        depth: option[:depth]
+        depth: option[:depth],
+        ids: option[:ids] ? option[:ids].join(',') : nil
       }.select { |_key, value| value }
     end
+    # rubocop:enable Style/MethodLength
 
     def put(endpoint, content, option = {})
       body = content.reject { |key, _value| key == :id }
@@ -89,58 +151,6 @@ module MicroCMS
     def post(endpoint, content, option = {})
       send_http_request('POST', endpoint, nil, option, content)
     end
-
-    def send_http_request(method, endpoint, path, query = nil, body = nil)
-      uri = build_uri(endpoint, path, query)
-      http = build_http(uri)
-      req = build_request(method, uri, body)
-      res = http.request(req)
-
-      raise APIError.new(status_code: res.code.to_i, body: res.body) if res.code.to_i >= 400
-
-      JSON.parse(res.body, object_class: OpenStruct) if res.header['Content-Type'].include?('application/json') # rubocop:disable Style/OpenStructUse
-    end
-
-    def get_request_class(method)
-      {
-        GET: Net::HTTP::Get,
-        POST: Net::HTTP::Post,
-        PUT: Net::HTTP::Put,
-        PATCH: Net::HTTP::Patch,
-        DELETE: Net::HTTP::Delete
-      }[method]
-    end
-
-    def build_request(method, uri, body)
-      req = get_request_class(method.to_sym).new(uri.request_uri)
-      req['X-MICROCMS-API-KEY'] = @api_key
-      if body
-        req['Content-Type'] = 'application/json'
-        req.body = JSON.dump(body)
-      end
-
-      req
-    end
-
-    def build_uri(endpoint, path, query)
-      origin = "https://#{@service_domain}.microcms.io"
-      path_with_id = path ? "/api/v1/#{endpoint}/#{path}" : "/api/v1/#{endpoint}"
-      encoded_query =
-        if !query || query.size.zero?
-          ''
-        else
-          "?#{URI.encode_www_form(query)}"
-        end
-
-      URI.parse("#{origin}#{path_with_id}#{encoded_query}")
-    end
-
-    def build_http(uri)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-
-      http
-    end
   end
 
   # APIError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: microcms-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - microCMS
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies: []
 description: microCMS Ruby SDK
 email: