app_store_connect 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c441ea7e16744eee415f8b65fb1389436e28e1880a3b4687d60d67ed4e3388
-  data.tar.gz: dc044031de07e8c2d7c5a543e5613a609d73d4fdfa753a3db71fec4370903b60
+  metadata.gz: 6bece2d6691fbb4f254b53de5001324dfe4d10840c8c0cf82a073f0260bde177
+  data.tar.gz: d45d001147d7694579c6c838a52fa376607d83cb82b82bc2481193f763cf4ed7
 SHA512:
-  metadata.gz: b1361415a42d7ca66c345a6c43d97cf4d684c5f6b3aded20b148aeb1c769ceb58ae4a13a72b1a3fa8b9a228ac03158a47d952431d763450659c3595db750cae4
-  data.tar.gz: 3672cc89f06df46185e84577309f9f5817f88e62bfe7b168a5eb67dabc9097361692627133719bab761a91ba8b3f4f1f5a9cb28e3c3c82340f7640a8b6253555
+  metadata.gz: 0e9cff4c10632c74fa8bc63a04b3cd24af7be3ee04bc0d9914da6e0fae3d421a6a802d429c7adc43ad1c8cf20761c296575041e73c78ab38ee2aa2bb0c4cf0b7
+  data.tar.gz: 8301b52487821ab284c8f0c6ccbdd87b1fc3361337239aec2569da1ae4bc8a9f894ebdda28bb849a2ad42403ab840f7586f19c012ef156c6cc611db48333379a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_store_connect (0.6.0)
+    app_store_connect (0.7.0)
       activesupport (~> 5.2.3)
       httparty (~> 0.16)
       jwt (~> 2.1)

data/README.md

@@ -23,15 +23,17 @@ Or install it yourself as:
 ## Usage
 
 ```ruby 
-client = AppStoreConnect::Client.new(
+AppStoreConnect.config = {
   issuer_id: issuer_id,
   key_id: key_id,
   private_key: private_key
-)
+}
 
-client.apps 
-client.app('1234')
-client.builds('1234')
+app_store_connect = AppStoreConnect::Client.new
+
+app_store_connect.apps 
+app_store_connect.app('1234')
+app_store_connect.builds('1234')
 ```
 
 ## Development

data/bin/console

@@ -5,4 +5,4 @@ require 'bundler/setup'
 require 'app_store_connect'
 require 'pry'
 
-Pry.start
+Pry.start(AppStoreConnect::Client.new)

data/lib/app_store_connect/bundle_id_create_request.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
-require_relative './bundle_id_create_request/data'
-
 module AppStoreConnect
-  class BundleIdCreateRequest
-    attr_reader :data
-
-    def initialize(*args)
-      @data = Data.new(*args)
-    end
+  class BundleIdCreateRequest < CreateRequest
+    data do
+      type 'bundleIds'
 
-    def to_h
-      {
-        data: data.to_h
-      }
+      attributes do
+        property :identifier, required: true
+        property :name, required: true
+        property :platform, required: true
+        property :seed_id
+      end
     end
   end
 end

data/lib/app_store_connect/client.rb

@@ -2,75 +2,131 @@
 
 require 'active_support/all'
 
+require 'app_store_connect/web_service_endpoint'
+
 module AppStoreConnect
-  class Client
-    ENDPOINT = 'https://api.appstoreconnect.apple.com/v1'
+  class Client # rubocop:disable Metrics/ClassLength
+    def initialize(**kwargs)
+      @options = options(**kwargs)
 
-    def initialize(key_id:, issuer_id:, private_key:)
       @authorization = Authorization.new(
-        private_key: private_key,
-        key_id: key_id,
-        issuer_id: issuer_id
+        private_key: @options[:private_key],
+        key_id: @options[:key_id],
+        issuer_id: @options[:issuer_id]
       )
+      @web_service_endpoints_by_name ||= begin
+        AppStoreConnect::Config::API['web_service_endpoints'].dup.map do |config|
+          [config.fetch('alias').to_sym, WebServiceEndpoint.new(**config.deep_symbolize_keys)]
+        end.to_h
+      end
     end
 
-    def apps
-      get('apps')
+    def respond_to_missing?(method_name, include_private = false)
+      web_service_endpoint_names.include?(method_name) || super
     end
 
-    def app(id)
-      get("apps/#{id}")
-    end
+    def method_missing(method_name, *kwargs)
+      super unless web_service_endpoint_names.include?(method_name)
 
-    def builds(app_id)
-      get("apps/#{app_id}/builds")
-    end
+      web_service_endpoint = web_service_endpoint_by(name: method_name)
 
-    def build(app_id, build_id)
-      get("apps/#{app_id}/builds/#{build_id}")
+      call(web_service_endpoint, *kwargs)
     end
 
-    def invite_user(first_name:, last_name:, email:, roles:)
-      invitation = UserInvitationCreateRequest.new(first_name, last_name, email, roles)
+    private
 
-      post('userInvitations', invitation.body.to_json)
+    def web_service_endpoint_names
+      @web_service_endpoints_by_name.keys
     end
 
-    def create_bundle_id(*args)
-      request = BundleIdCreateRequest.new(*args)
+    def call(web_service_endpoint, **kwargs)
+      case web_service_endpoint.http_method
+      when :get
+        get(web_service_endpoint, **kwargs)
+      when :post
+        post(web_service_endpoint, **kwargs)
+      else
+        raise "invalid http method: #{web_service_endpoint.http_method}"
+      end
+    end
 
-      post('bundleIds', body(request))
+    def build_url(web_service_endpoint, **kwargs)
+      web_service_endpoint
+        .url
+        .gsub(/(\{(\w+)\})/) { kwargs.fetch(Regexp.last_match(2).to_sym) }
     end
 
-    def users(limit: 200)
-      get('users', query_params: { 'limit' => limit })
+    def url_parameter_names(web_service_endpoint)
+      web_service_endpoint
+        .url
+        .scan(/(\{(\w+)\})/)
+        .map { |_, n| n.to_sym }
     end
 
-    def user_invitations
-      get('userInvitations')
+    def web_service_endpoint_by(name:)
+      @web_service_endpoints_by_name[name]
     end
 
-    private
+    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 body(request)
+    def options(**kwargs)
+      AppStoreConnect.config.merge(kwargs.merge(env_options)).tap do |options|
+        %i[key_id issuer_id private_key].each do |key|
+          raise ArgumentError, "missing #{key}" unless options.keys.include?(key)
+        end
+      end
+    end
+
+    def build_body(request)
       request
-        .to_hash
+        .to_h
         .deep_transform_keys { |k| k.to_s.camelize(:lower) }
         .to_json
     end
 
-    def get(path, query_params: {})
-      response = HTTParty.get("#{ENDPOINT}/#{path}", headers: headers, query: query_params)
+    def build_query(web_service_endpoint, **kwargs)
+      query_parameters = kwargs.dup.tap do |hash|
+        url_parameter_names(web_service_endpoint).each do |name|
+          hash.delete(name.to_sym)
+        end
+      end
+
+      query_parameters.to_query
+    end
+
+    def get(web_service_endpoint, **kwargs)
+      url = build_url(web_service_endpoint, **kwargs)
+      query = build_query(web_service_endpoint, **kwargs)
+
+      response = execute(:get, url, headers: headers, query: query)
 
       response['data']
     end
 
-    def post(path, body)
-      response = HTTParty.post("#{ENDPOINT}/#{path}", headers: headers, body: body)
+    def post(web_service_endpoint, **kwargs)
+      url = build_url(web_service_endpoint, **kwargs)
+      request = "AppStoreConnect::#{web_service_endpoint.http_body_type}".constantize.new(**kwargs)
+      body = build_body(request)
+
+      response = execute(:post, url, headers: headers, body: body)
 
       response
     end
 
+    def execute(http_method, url, **options)
+      HTTParty.send(http_method, url, options)
+    end
+
     def headers
       {
         'Authorization' => "Bearer #{@authorization.token}",

data/lib/app_store_connect/create_request.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module AppStoreConnect
+  class CreateRequest
+    include Object::Data
+
+    def initialize(**kwargs)
+      @data = Data.new(kwargs)
+    end
+  end
+end

data/lib/app_store_connect/object/attributes.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module AppStoreConnect
+  module Object
+    module Attributes
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def attributes(&block)
+          self::Attributes.class_eval(&block)
+        end
+      end
+
+      included do
+        attr_reader :attributes
+
+        klass = Class.new do |attributes|
+          include Object::Properties
+
+          attributes.define_method :initialize do |**kwargs|
+            self.class.properties.each do |name, options|
+              raise ArgumentError, "#{name} required" if options[:required] && !kwargs[name]
+
+              value = kwargs.fetch(name, options[:default])
+
+              instance_variable_set("@#{name}", value)
+            end
+          end
+
+          def to_h
+            {}.tap do |hash|
+              self.class.properties.keys.each do |name|
+                value = instance_variable_get("@#{name}")
+
+                hash[name] = value unless value.nil?
+              end
+            end
+          end
+        end
+
+        const_set('Attributes', klass)
+      end
+    end
+  end
+end

data/lib/app_store_connect/object/data.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module AppStoreConnect
+  module Object
+    module Data
+      extend ActiveSupport::Concern
+
+      included do
+        attr_reader :data
+
+        klass = Class.new do |data|
+          include Object::Attributes
+          include Object::Type
+
+          data.define_method :initialize do |**kwargs|
+            instance_variable_set('@attributes', data::Attributes.new(kwargs))
+          end
+
+          def to_h
+            {
+              attributes: attributes.to_h,
+              type: type
+            }
+          end
+        end
+
+        const_set('Data', klass)
+
+        def to_h
+          {
+            data: data.to_h
+          }
+        end
+      end
+
+      class_methods do
+        def data(&block)
+          self::Data.class_eval(&block)
+        end
+      end
+    end
+  end
+end

data/lib/app_store_connect/object/properties.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module AppStoreConnect
+  module Object
+    module Properties
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def properties
+          @properties ||= {}
+        end
+
+        def property(name, options = {})
+          properties[name] = options
+
+          attr_accessor name.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/app_store_connect/object/type.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module AppStoreConnect
+  module Object
+    module Type
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def type(type)
+          @type = type
+
+          const_set('TYPE', type)
+        end
+      end
+
+      included do
+        def type
+          self.class.instance_variable_get('@type')
+        end
+      end
+    end
+  end
+end

data/lib/app_store_connect/user_invitation_create_request.rb

@@ -2,12 +2,20 @@
 
 module AppStoreConnect
   class UserInvitationCreateRequest < Struct.new(:first_name, :last_name, :email, :roles)
+    def initialize(kwargs)
+      super(kwargs[:first_name], kwargs[:last_name], kwargs[:email], kwargs[:roles])
+    end
+
     def body
       { 'data' =>
         { 'type' => 'userInvitations', 'attributes' =>
           { 'firstName' => first_name, 'lastName' => last_name, 'email' => email, 'roles' => roles, 'allAppsVisible' => true, 'provisioningAllowed' => true } } }
     end
 
+    def to_h
+      body
+    end
+
     def to_s
       body.to_json
     end

data/lib/app_store_connect/version.rb

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

data/lib/app_store_connect/web_service_endpoint.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module AppStoreConnect
+  class WebServiceEndpoint
+    def initialize(**options)
+      @options = options
+    end
+
+    def http_method
+      @options[:http_method].to_sym
+    end
+
+    def http_body_type
+      @options[:http_body_type]
+    end
+
+    def url
+      @options[:url]
+    end
+  end
+end

data/lib/app_store_connect.rb

@@ -5,6 +5,12 @@ require 'httparty'
 
 require 'app_store_connect/authorization'
 require 'app_store_connect/parser'
+
+require 'app_store_connect/object/type'
+require 'app_store_connect/object/attributes'
+require 'app_store_connect/object/properties'
+require 'app_store_connect/object/data'
+require 'app_store_connect/create_request'
 require 'app_store_connect/client'
 require 'app_store_connect/bundle_id_create_request'
 require 'app_store_connect/user_invitation_create_request'
@@ -21,4 +27,12 @@ module AppStoreConnect
   Factory.register('enum', Factory::Builder::Enum)
 
   Parser.parse!(Config::API)
+
+  @config = {}
+
+  class << self
+    attr_reader :config
+
+    attr_writer :config
+  end
 end

data/lib/config/api.json

@@ -1,4 +1,48 @@
 {
+  "web_service_endpoints": [
+    {
+      "alias": "apps",
+      "http_method": "get",
+      "url": "https://api.appstoreconnect.apple.com/v1/apps"
+    },
+    {
+      "alias": "app",
+      "http_method": "get",
+      "url": "https://api.appstoreconnect.apple.com/v1/apps/{id}"
+    },
+    {
+      "alias": "builds",
+      "http_method": "get",
+      "url": "https://api.appstoreconnect.apple.com/v1/apps/{id}/builds"
+    },
+    {
+      "alias": "build",
+      "http_method": "get",
+      "url": "https://api.appstoreconnect.apple.com/v1/builds/{id}"
+    },
+    {
+      "alias": "invite_user",
+      "url": "https://api.appstoreconnect.apple.com/v1/userInvitations",
+      "http_body_type": "UserInvitationCreateRequest",
+      "http_method": "post"
+    },
+    {
+      "alias": "create_bundle_id",
+      "url": "https://api.appstoreconnect.apple.com/v1/bundleIds",
+      "http_body_type": "BundleIdCreateRequest",
+      "http_method": "post"
+    },
+    {
+      "alias": "users",
+      "url": "https://api.appstoreconnect.apple.com/v1/users",
+      "http_method": "get"
+    },
+    {
+      "alias": "user_invitations",
+      "http_method": "get",
+      "url": "https://api.appstoreconnect.apple.com/v1/userInvitations"
+    }
+  ],
   "Type": {
     "CapabilityType": {
       "type": "enum",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_store_connect
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -219,17 +219,21 @@ files:
 - lib/app_store_connect.rb
 - lib/app_store_connect/authorization.rb
 - lib/app_store_connect/bundle_id_create_request.rb
-- lib/app_store_connect/bundle_id_create_request/data.rb
-- lib/app_store_connect/bundle_id_create_request/data/attributes.rb
 - lib/app_store_connect/client.rb
 - lib/app_store_connect/config.rb
+- lib/app_store_connect/create_request.rb
 - lib/app_store_connect/factory.rb
 - lib/app_store_connect/factory/builder/enum.rb
+- lib/app_store_connect/object/attributes.rb
+- lib/app_store_connect/object/data.rb
+- lib/app_store_connect/object/properties.rb
+- lib/app_store_connect/object/type.rb
 - lib/app_store_connect/parser.rb
 - lib/app_store_connect/type.rb
 - lib/app_store_connect/type/enum.rb
 - lib/app_store_connect/user_invitation_create_request.rb
 - lib/app_store_connect/version.rb
+- lib/app_store_connect/web_service_endpoint.rb
 - lib/config/api.json
 homepage: https://github.com/kyledecot/app_store_connect
 licenses:

data/lib/app_store_connect/bundle_id_create_request/data/attributes.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module AppStoreConnect
-  class BundleIdCreateRequest
-    class Data
-      class Attributes
-        attr_accessor :identifier, :name, :platform, :seed_id
-
-        def initialize(identifier:, name:, platform:, seed_id: nil)
-          self.identifier = identifier
-          self.name = name
-          self.platform = platform
-          self.seed_id = seed_id
-        end
-
-        def to_h
-          {
-            identifier: identifier,
-            name: name,
-            platform: platform
-          }.tap do |hash|
-            hash[:seed_id] = seed_id unless seed_id.nil?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/app_store_connect/bundle_id_create_request/data.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './data/attributes'
-
-module AppStoreConnect
-  class BundleIdCreateRequest
-    class Data
-      TYPE = 'bundleIds'
-
-      attr_reader :attributes
-
-      def initialize(*args)
-        @attributes = Attributes.new(*args)
-      end
-
-      def type
-        TYPE
-      end
-
-      def to_h
-        {
-          attributes: attributes.to_h,
-          type: type
-        }
-      end
-    end
-  end
-end