app_store_connect 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dce1e8e34f1223902d271ca579ae0ecef46b49e1be8a782561412bcb97f26ff
-  data.tar.gz: c8d4ac03735552d4a61dd458132adf3c611b25c40a7a99acf7d9d26c1e73eb5f
+  metadata.gz: a05ac5b04cfade9f4bd31173b13bc7ac094580f5f3bbb41f24a881bab79f49f0
+  data.tar.gz: 3407d48bc34490ab5f555ffe943962af3a83ab19b3a455d5aa0080fda40c9244
 SHA512:
-  metadata.gz: 9e4d24c27e4f26074ae86e55dddd5ab57e196ac8a098cfdb39f63c7f6d1b64b73a30d5e9ad73cc03a3fdf4d6d03eb287b5ad143ab1f26a358706ef1c78bd0924
-  data.tar.gz: 595f99a72d4997abe9bc01dae7d2bcff8b4c3d6629823eefa73d19f31841f526efacc605b0d18d06a856f9bd39d76a1df3a038b04b4b8e8c282d47f9edee3429
+  metadata.gz: 123b7f157a91802a23c04c0df89fdf490da6fa775c705baf3643ae47d88c113eacb3dc102fe1755396e9f38b31984ba62dcaf5031a497465c1361ce11c245e5c
+  data.tar.gz: 1ffa55020b42a3b55cb1a48e413eb89e5ec2851e3c457c70cec9538c6ccb2ccd26ff45c05074e4b0adf9b910f1c7ef19e86b7d9b678f859ef1b3149a1e46f7ea

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    app_store_connect (0.13.0)
-      activesupport (>= 5.1.7, <= 5.2.3)
+    app_store_connect (0.14.0)
+      activesupport
       jwt (>= 1.4, <= 2.2.1)
       mixpanel-ruby (<= 2.2.0)
 
@@ -67,7 +67,6 @@ GEM
       method_source (~> 0.9.0)
     public_suffix (3.1.1)
     rainbow (3.0.0)
-    rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -120,7 +119,6 @@ DEPENDENCIES
   factory_bot (~> 5.0.2)
   guard-rspec (~> 4.7.3)
   pry (~> 0.12)
-  rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.71.0)
   simplecov (~> 0.16.1)

data/app_store_connect.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '>= 5.1.7', '<= 5.2.3'
+  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'jwt', '>= 1.4', '<= 2.2.1'
   spec.add_runtime_dependency 'mixpanel-ruby', '<= 2.2.0'
 
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'factory_bot', '~> 5.0.2'
   spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
   spec.add_development_dependency 'pry', '~> 0.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.71.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'

data/lib/app_store_connect/client/authorization.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'jwt'
+
+module AppStoreConnect
+  class Client
+    class Authorization
+      OPTIONS = %i[key_id issuer_id private_key].freeze
+
+      AUDIENCE = 'appstoreconnect-v1'
+      ALGORITHM = 'ES256'
+
+      attr_reader(*OPTIONS)
+
+      def initialize(options)
+        @key_id = options.fetch(:key_id)
+        @issuer_id = options.fetch(:issuer_id)
+        @private_key = OpenSSL::PKey.read(options.fetch(:private_key))
+      end
+
+      def payload
+        {
+          exp: Time.now.to_i + 20 * 60,
+          iss: issuer_id,
+          aud: AUDIENCE
+        }
+      end
+
+      def header_fields
+        { kid: key_id }
+      end
+
+      def token
+        JWT.encode(payload, private_key, ALGORITHM, header_fields)
+      end
+    end
+  end
+end

data/lib/app_store_connect/client/options.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'delegate'
+
+module AppStoreConnect
+  class Client
+    class Options < SimpleDelegator
+      attr_reader :kwargs, :config, :env
+
+      ENV_REGEXP = /APP_STORE_CONNECT_(?<suffix>[A-Z_]+)/.freeze
+      private_constant :ENV_REGEXP
+
+      def initialize(kwargs)
+        @kwargs = kwargs
+        @config = build_config
+        @env = build_env
+        options = @config.merge(kwargs.merge(@env))
+
+        super(options)
+      end
+
+      private
+
+      def build_config
+        AppStoreConnect.config.dup
+      end
+
+      def build_env
+        {}.tap do |hash|
+          ENV.each do |key, value|
+            match = key.match(ENV_REGEXP)
+
+            next unless match
+
+            hash[match[:suffix].downcase.to_sym] = value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/app_store_connect/client/registry.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'delegate'
+
+module AppStoreConnect
+  class Client
+    class Registry < SimpleDelegator
+      OPTIONS = %i[schema].freeze
+
+      def initialize(options = {})
+        super(options .fetch(:schema).web_service_endpoints.map { |s| [s.alias, s] }.to_h)
+      end
+    end
+  end
+end

data/lib/app_store_connect/client/usage.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'mixpanel-ruby'
+require 'securerandom'
+
+module AppStoreConnect
+  class Client
+    class Usage
+      OPTIONS = %i[analytics_enabled].freeze
+
+      MIXPANEL_PROJECT_TOKEN = '1213f2b88b9b10b13d321f4c67a55ca8'
+      private_constant :MIXPANEL_PROJECT_TOKEN
+
+      def initialize(options = {})
+        @enabled = options[:analytics_enabled].to_s == 'true'
+        @distinct_id = SecureRandom.uuid
+        @tracker = Mixpanel::Tracker.new(MIXPANEL_PROJECT_TOKEN)
+      end
+
+      def track
+        return false unless @enabled
+
+        @tracker.track(@distinct_id, 'usage')
+      end
+    end
+  end
+end

data/lib/app_store_connect/client.rb

@@ -1,30 +1,21 @@
 # frozen_string_literal: true
 
 require 'active_support/all'
-require 'mixpanel-ruby'
-require 'securerandom'
 
 require 'app_store_connect/request'
-require 'app_store_connect/authorization'
 require 'app_store_connect/schema'
+require 'app_store_connect/client/authorization'
+require 'app_store_connect/client/options'
+require 'app_store_connect/client/usage'
+require 'app_store_connect/client/registry'
 
 module AppStoreConnect
   class Client
     def initialize(**kwargs)
-      @options = options(**kwargs)
-
-      @authorization = Authorization.new(
-        private_key: @options[:private_key],
-        key_id: @options[:key_id],
-        issuer_id: @options[:issuer_id]
-      )
-      @web_service_endpoints_by_alias ||= @options
-                                          .fetch(:schema)
-                                          .web_service_endpoints
-                                          .map { |s| [s.alias, s] }
-                                          .to_h
-      @distinct_id = SecureRandom.uuid
-      @tracker = Mixpanel::Tracker.new('1213f2b88b9b10b13d321f4c67a55ca8')
+      @options = Options.new(kwargs)
+      @usage = Usage.new(@options.slice(*Usage::OPTIONS))
+      @authorization = Authorization.new(@options.slice(*Authorization::OPTIONS))
+      @registry = Registry.new(@options.slice(*Registry::OPTIONS))
     end
 
     def respond_to_missing?(method_name, include_private = false)
@@ -39,8 +30,14 @@ module AppStoreConnect
       call(web_service_endpoint, *kwargs)
     end
 
+    # :nocov:
+    def inspect
+      "#<#{self.class.name}:#{object_id}>"
+    end
+    # :nocov:
+
     def web_service_endpoint_aliases
-      @web_service_endpoints_by_alias.keys
+      @registry.keys
     end
 
     private
@@ -50,7 +47,7 @@ module AppStoreConnect
 
       request = build_request(web_service_endpoint, **kwargs)
 
-      @tracker.track(@distinct_id, web_service_endpoint.alias) if @options[:analytics_enabled]
+      @usage.track
       response = request.execute
 
       JSON.parse(response.body) if response.body
@@ -63,31 +60,7 @@ module AppStoreConnect
     end
 
     def web_service_endpoint_by(alias_sym)
-      @web_service_endpoints_by_alias[alias_sym]
-    end
-
-    def env_options
-      {}.tap do |hash|
-        ENV.each do |key, value|
-          match = key.match(/APP_STORE_CONNECT_(?<name>[A-Z_]+)/)
-
-          next unless match
-
-          hash[match[:name].downcase.to_sym] = value
-        end
-      end
-    end
-
-    def options(**kwargs)
-      defaults = {
-        analytics_enabled: true,
-        schema: Schema.new(File.join(__dir__, '../config/schema.json'))
-      }
-      AppStoreConnect.config.merge(kwargs.merge(env_options.merge(defaults))).tap do |options|
-        %i[key_id issuer_id private_key].each do |key|
-          raise ArgumentError, "missing #{key}" unless options.keys.include?(key)
-        end
-      end
+      @registry[alias_sym]
     end
 
     def http_body(web_service_endpoint, **kwargs)

data/lib/app_store_connect/request.rb

@@ -3,15 +3,13 @@
 require 'net/http'
 
 module AppStoreConnect
-  attr_reader :uri
-
-  class UnsupportedHTTPMethod < ArgumentError
-    def initialize(http_method)
-      super "Unsupported HTTP Method: #{http_method}"
+  class Request
+    class UnsupportedHTTPMethod < ArgumentError
+      def initialize(http_method)
+        super "Unsupported HTTP Method: #{http_method}"
+      end
     end
-  end
 
-  class Request
     def initialize(**options)
       @uri = options.fetch(:uri)
       @options = options

data/lib/app_store_connect/schema/object.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module AppStoreConnect
+  class Schema
+    class Object
+      attr_reader :type, :properties
+
+      def initialize(options)
+        @type = options.fetch(:type)
+        @properties = options.fetch(:properties)
+      end
+    end
+  end
+end

data/lib/app_store_connect/schema/type.rb

@@ -3,16 +3,13 @@
 module AppStoreConnect
   class Schema
     class Type
-      attr_reader :type, :options
+      attr_reader :type, :options, :values
 
-      def initialize(**options)
+      def initialize(options)
         @type = options[:type]
+        @values = options[:values]
         @options = options
       end
-
-      def values
-        @options[:values]
-      end
     end
   end
 end

data/lib/app_store_connect/schema/web_service_endpoint.rb

@@ -3,7 +3,7 @@
 module AppStoreConnect
   class Schema
     class WebServiceEndpoint
-      def initialize(**options)
+      def initialize(options)
         @options = options
       end
 

data/lib/app_store_connect/schema.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 require 'app_store_connect/schema/type'
+require 'app_store_connect/schema/object'
 require 'app_store_connect/schema/web_service_endpoint'
 
 module AppStoreConnect
   class Schema
-    attr_reader :types, :web_service_endpoints
+    attr_reader :types, :web_service_endpoints, :objects
 
     def initialize(path)
       schema = JSON.parse(File.read(path)).deep_symbolize_keys
       @types = schema[:types].map do |options|
-        Type.new(**options)
+        Type.new(options)
       end
-      @web_service_endpoints = schema[:web_service_endpoints].map do |s|
-        WebServiceEndpoint.new(**s)
+      @web_service_endpoints = schema[:web_service_endpoints].map do |options|
+        WebServiceEndpoint.new(options)
+      end
+      @objects = schema[:objects].map do |options|
+        Object.new(options)
       end
     end
   end

data/lib/app_store_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppStoreConnect
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/lib/app_store_connect.rb

@@ -14,7 +14,10 @@ require 'app_store_connect/user_invitation_create_request'
 require 'app_store_connect/profile_create_request'
 
 module AppStoreConnect
-  @config = {}
+  @config = {
+    analytics_enabled: true,
+    schema: Schema.new(File.join(__dir__, 'config', 'schema.json'))
+  }
 
   class << self
     attr_accessor :config

data/lib/config/schema.json

@@ -1,4 +1,5 @@
 {
+  "objects": [],
    "web_service_endpoints": [
 		{
 			"http_method": "delete",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_store_connect
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.7
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -120,20 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -226,15 +206,17 @@ files:
 - Guardfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - app_store_connect.gemspec
 - bin/console
 - bin/setup
 - lib/app_store_connect.rb
-- lib/app_store_connect/authorization.rb
 - lib/app_store_connect/bundle_id_create_request.rb
 - lib/app_store_connect/certificate_create_request.rb
 - lib/app_store_connect/client.rb
+- lib/app_store_connect/client/authorization.rb
+- lib/app_store_connect/client/options.rb
+- lib/app_store_connect/client/registry.rb
+- lib/app_store_connect/client/usage.rb
 - lib/app_store_connect/create_request.rb
 - lib/app_store_connect/device_create_request.rb
 - lib/app_store_connect/object/attributes.rb
@@ -244,6 +226,7 @@ files:
 - lib/app_store_connect/profile_create_request.rb
 - lib/app_store_connect/request.rb
 - lib/app_store_connect/schema.rb
+- lib/app_store_connect/schema/object.rb
 - lib/app_store_connect/schema/type.rb
 - lib/app_store_connect/schema/web_service_endpoint.rb
 - lib/app_store_connect/user_invitation_create_request.rb

data/Rakefile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/lib/app_store_connect/authorization.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require 'jwt'
-
-module AppStoreConnect
-  class Authorization
-    AUDIENCE = 'appstoreconnect-v1'
-    ALGORITHM = 'ES256'
-
-    attr_reader :key_id, :issuer_id, :private_key
-
-    def initialize(key_id:, issuer_id:, private_key:)
-      @key_id = key_id
-      @issuer_id = issuer_id
-      @private_key = OpenSSL::PKey.read(private_key)
-    end
-
-    def payload
-      {
-        exp: Time.now.to_i + 20 * 60,
-        iss: issuer_id,
-        aud: AUDIENCE
-      }
-    end
-
-    def header_fields
-      { kid: key_id }
-    end
-
-    def token
-      JWT.encode(payload, private_key, ALGORITHM, header_fields)
-    end
-  end
-end