tiny_appstore_connect 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494a8a5e708cbb4977b5a615695320ef043acf68d412478bd8a9d611ca4ff849
-  data.tar.gz: f3305e5be3e62211f6136f2c020d969f5f9961845e760e6aba1aba9d981a33f1
+  metadata.gz: 62e9ae341686817d57e8f0ea7833eef6be53a5a7c1e6416ffd4e81916375a61c
+  data.tar.gz: a9ad021b50df72944688a01c3c2670ace550a669de1efd9677df51af04459117
 SHA512:
-  metadata.gz: f12fc5faf9af9374bf8466cae721dd18996ab6e0752a55a88562f41063d605600046d11745342e2ccddf0319c50dd75303821935d9f8b80710d43c8b420c163f
-  data.tar.gz: 5003210e7e350583f15d2e021ad0248712abc7645092c91949259a93862be712574cc0ae4984ffda05be075fbe5c36245026303fecd993932d340ac69dd88274
+  metadata.gz: 8d9fcb1dad512e6650168ef085d0ff3b546d2f7c3e23d383349899606c935537aa49f9b7bcc4191fab213c4aadf11988b3e132b40568a39cb0148c99f38b63a8
+  data.tar.gz: c01a733a86ad47db48eaacf20c96cacb7019c60c4b6adf660385583719b26608f1a303eebd119cc131c33b6cca968f21b702802609808f7fdffb5985d254f04b

data/lib/tiny_appstore_connect/client.rb

@@ -59,8 +59,9 @@ module TinyAppstoreConnect
     end
 
     def handle_response(response)
-      response = Response.new(response, connection)
+      response = Response.new(response, self)
 
+      # It always never to be go into here, throws a 429 error.
       if (remaining = response.rate[:remaining]) && remaining.to_i.zero?
         raise RateLimitExceededError, "Request limit reached #{response.rate[:limit]}
           in the previous 60 minutes with url: #{response.request_url}"

data/lib/tiny_appstore_connect/clients/certificate.rb

@@ -15,7 +15,11 @@ class TinyAppstoreConnect::Client
 
     def distribution_certificates(**query)
       query[:filter] = {
-        certificateType: TinyAppstoreConnect::Model::Certificate::CertificateType::DISTRIBUTION,
+        certificateType: [
+          TinyAppstoreConnect::Model::Certificate::CertificateType::DISTRIBUTION,
+          TinyAppstoreConnect::Model::Certificate::CertificateType::IOS_DISTRIBUTION,
+          TinyAppstoreConnect::Model::Certificate::CertificateType::MAC_APP_DISTRIBUTION
+        ].join(',')
       }
 
       certificates(**query)

data/lib/tiny_appstore_connect/clients/device.rb

@@ -14,5 +14,9 @@ class TinyAppstoreConnect::Client
 
       get('devices', **query)
     end
+
+    def device(udid, **query)
+      get("devices/#{udid}", **query).to_model
+    end
   end
 end

data/lib/tiny_appstore_connect/models/certificate.rb

@@ -31,22 +31,44 @@ module TinyAppstoreConnect::Model
     end
 
     def team_id
-      certificate.subject
-                 .to_a
-                 .find {|n, _, _| n == 'OU'}[1]
-                 .force_encoding('UTF-8')
+      subject['OU']
     end
 
-    def certificate
-      require 'openssl'
+    def name
+      subject['O']
+    end
+
+    def full_name
+      subject['CN']
+    end
+    # def type
+    #   value = subject['CN']
+    #   if value.include?('Distribution')
+    #     return 'Distribution'
+    #   else
+    #     return ''
+    #   end
+    # end
 
-      data = [
-        '-----BEGIN CERTIFICATE-----',
-        certificate_content,
-        '-----END CERTIFICATE-----'
-      ].join("\n")
+    def subject
+      @subject ||= certificate.subject
+                              .to_a
+                              .each_with_object({}) do |(key, value, _), obj|
+                                obj[key] = value.force_encoding('UTF-8')
+                              end
+    end
+
+    def certificate
+      @certificate ||= -> () do
+        require 'openssl'
+        data = [
+          '-----BEGIN CERTIFICATE-----',
+          certificate_content,
+          '-----END CERTIFICATE-----'
+        ].join("\n")
 
-      OpenSSL::X509::Certificate.new(data)
+        OpenSSL::X509::Certificate.new(data)
+      end.call
     end
 
     def self.type

data/lib/tiny_appstore_connect/response.rb

@@ -10,14 +10,14 @@ module TinyAppstoreConnect
     # include Enumerable
     extend Forwardable
 
-    attr_reader :response, :connection
+    attr_reader :response, :client
 
-    def initialize(response, connection)
+    def initialize(response, client)
       @response = response
-      @connection = connection
+      @client = client
     end
 
-    def_delegators :@response, :status, :headers
+    def_delegators :@response, :status, :headers, :body
 
     def request_url
       @response.env.url
@@ -37,57 +37,47 @@ module TinyAppstoreConnect
       end
     end
 
-    def next_link
-      return if response.nil?
+    def next_url
+      return if body.nil?
 
-      links = response[:links] || {}
-      links[:next]
+      links = body['links'] || {}
+      links['next']
     end
 
-    # def all_pages
-    #   next_pages(count: 0)
-    # end
+    def next_page(&block)
+      url = next_url
+      return if url.nil?
+      return client.get(url) unless block_given?
 
-    # def next_pages(count: 1)
-    #   count = count.to_i
-    #   count = 0 if count <= 0
-
-    #   responses = [self]
-    #   counter = 0
-
-    #   resp = self
-    #   loop do
-    #     resp = resp.next_page
-    #     break if resp.nil?
-
-    #     responses << resp
-    #     counter += 1
-
-    #     break if counter >= count
-    #   end
+      yield(url)
+    end
 
-    #   responses
-    # end
+    def next_pages(count: 1, &block)
+      count = 0 if !count.nil? && count < 0
+      responses = [self]
+      counter = 0
 
-    # def next_url
-    #   return if response.nil?
+      resp = self
+      loop do
+        resp = resp.next_page(&block)
+        break if resp.nil?
 
-    #   links = response[:links] || {}
-    #   links[:next]
-    # end
+        responses << resp
+        counter += 1
 
-    # def next_page
-    #   return unless url = next_url
+        break if !count.nil? && counter >= count
+      end
 
-    #   Response.new(connection.get(url), connection)
-    # end
+      responses
+    end
 
-    def to_model
-      to_models.first
+    def all_pages(flatten: false, &block)
+      responses = next_pages(count: nil, &block)
+      flatten ? responses.flat_map(&:to_models) : responses
     end
 
     def to_models
-      return [] if response.nil?
+      return [] if body.nil?
 
       model_or_models = Parser.parse(response, rate)
       [model_or_models].flatten
@@ -95,7 +85,7 @@ module TinyAppstoreConnect
 
     def each(&block)
       to_models.each do |model|
-        block.call(model)
+        yield(model)
       end
     end
   end

data/lib/tiny_appstore_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TinyAppstoreConnect
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/tiny_appstore_connect.rb

@@ -10,38 +10,49 @@ module TinyAppstoreConnect
   class Error < StandardError; end
 
   class ConnectAPIError < Error
+    attr_reader :status_code, :errors
+
     class << self
       def parse(response)
-        handel_error(response.status, response.body['errors'])
+        handel_error(response)
       end
 
-      def from_errors(errors)
+      def from_errors(response)
+        status_code = response.status
+        # 403 will returns content-type with value '*/*' FUCK!
+        body = response.body.is_a?(String) ? JSON.load(response.body) : response.body
+        errors = body['errors']
         message = ["Check errors(#{errors.size}) from response:"]
         errors.each_with_index do |error, i|
           message << "#{i + 1} - [#{error['status']}] #{error['title']}: #{error['detail']} in #{error['source']}"
         end
 
-        new(message)
+        new(message, status_code, errors)
       end
 
       private
 
-      def handel_error(status_code, errors)
-        case status_code
+      def handel_error(response)
+        case response.status
         # Unauthorized
-        when 401 then InvalidUserCredentialsError.from_errors(errors)
-        # The API key in use does not allow this request
-        when 403 then ForbiddenError.from_errors(errors)
+        when 401 then InvalidUserCredentialsError.from_errors(response)
+        # The API key in use does not allow this request (API role problems)
+        when 403 then ForbiddenError.from_errors(response)
         # Not found resource
-        when 404 then NotFoundError.from_errors(errors)
+        when 404 then NotFoundError.from_errors(response)
         # Invaild request entity
-        when 409 then InvalidEntityError.from_errors(errors)
+        when 409 then InvalidEntityError.from_errors(response)
         # 429 Rate Limit Exceeded
-        when 429 then RateLimitExceededError.from_errors(errors)
-        else ConnectAPIError.from_errors(errors)
+        when 429 then RateLimitExceededError.from_errors(response)
+        else ConnectAPIError.from_errors(response)
         end
       end
     end
+
+    def initialize(message, status_code, errors)
+      @status_code, @errors = status_code, errors
+      super(message)
+    end
   end
 
   class RateLimitExceededError < ConnectAPIError; end

data/tiny_appstore_connect.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'faraday', '>= 1.10.0', '< 3.0'
-  spec.add_dependency 'jwt', '>= 1.4', '<= 2.2.1'
-  spec.add_dependency 'openssl', '>= 3.0.0', '< 4'
+  spec.add_dependency 'jwt', '>= 1.4', '< 3'
+  spec.add_dependency 'openssl', '>= 2.2.1', '< 4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_appstore_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - icyleaf
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -37,9 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,16 +47,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.2.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.2.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'