app_store_connect 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bece2d6691fbb4f254b53de5001324dfe4d10840c8c0cf82a073f0260bde177
-  data.tar.gz: d45d001147d7694579c6c838a52fa376607d83cb82b82bc2481193f763cf4ed7
+  metadata.gz: 828bfc36ad01d4b563b45842227d5a6bdb8174e5861ff697d7cf44fe208dbd0a
+  data.tar.gz: a46feefa242d7cbd7a250864b02c279cb5ccbabd8f3ec455fb4a9432f85d879c
 SHA512:
-  metadata.gz: 0e9cff4c10632c74fa8bc63a04b3cd24af7be3ee04bc0d9914da6e0fae3d421a6a802d429c7adc43ad1c8cf20761c296575041e73c78ab38ee2aa2bb0c4cf0b7
-  data.tar.gz: 8301b52487821ab284c8f0c6ccbdd87b1fc3361337239aec2569da1ae4bc8a9f894ebdda28bb849a2ad42403ab840f7586f19c012ef156c6cc611db48333379a
+  metadata.gz: 0b4e5e5be24f9b2a82bc64c75ece2b2e5f5aaa41042320216b72bf692226cbe542d4d24485220c5f9de2b05bf0b310a700f2ba8e6bf2ea51c4c13ce0229c74cf
+  data.tar.gz: bbb0c90614528a5efd338f27ac418995673f084fe6bb1892e48849d1eed836a670d4e8b85aad1c699cb33f8ccbc94969be974c61d860de41dc2a3fab8843d271

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+.DS_Store

data/Gemfile.lock

@@ -3,7 +3,6 @@ PATH
   specs:
     app_store_connect (0.7.0)
       activesupport (~> 5.2.3)
-      httparty (~> 0.16)
       jwt (~> 2.1)
 
 GEM
@@ -42,9 +41,6 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.4.0)
-    httparty (0.17.0)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
@@ -56,11 +52,7 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
     minitest (5.11.3)
-    multi_xml (0.6.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)

data/README.md

@@ -32,8 +32,8 @@ AppStoreConnect.config = {
 app_store_connect = AppStoreConnect::Client.new
 
 app_store_connect.apps 
-app_store_connect.app('1234')
-app_store_connect.builds('1234')
+app_store_connect.app(id: '1234')
+app_store_connect.builds(id: '1234')
 ```
 
 ## Development

data/app_store_connect.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '~> 5.2.3'
-  spec.add_runtime_dependency 'httparty', '~> 0.16'
   spec.add_runtime_dependency 'jwt', '~> 2.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

data/lib/app_store_connect.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'jwt'
-require 'httparty'
 
 require 'app_store_connect/authorization'
 require 'app_store_connect/parser'

data/lib/app_store_connect/client.rb

@@ -3,9 +3,10 @@
 require 'active_support/all'
 
 require 'app_store_connect/web_service_endpoint'
+require 'app_store_connect/request'
 
 module AppStoreConnect
-  class Client # rubocop:disable Metrics/ClassLength
+  class Client
     def initialize(**kwargs)
       @options = options(**kwargs)
 
@@ -40,27 +41,24 @@ module AppStoreConnect
     end
 
     def call(web_service_endpoint, **kwargs)
+      parser = proc do |response|
+        JSON.parse(response.body)
+      end
+
       case web_service_endpoint.http_method
       when :get
-        get(web_service_endpoint, **kwargs)
+        get(web_service_endpoint, **kwargs, &parser)
       when :post
-        post(web_service_endpoint, **kwargs)
+        post(web_service_endpoint, **kwargs, &parser)
       else
         raise "invalid http method: #{web_service_endpoint.http_method}"
       end
     end
 
-    def build_url(web_service_endpoint, **kwargs)
-      web_service_endpoint
-        .url
-        .gsub(/(\{(\w+)\})/) { kwargs.fetch(Regexp.last_match(2).to_sym) }
-    end
-
-    def url_parameter_names(web_service_endpoint)
-      web_service_endpoint
+    def build_uri(web_service_endpoint, **kwargs)
+      URI(web_service_endpoint
         .url
-        .scan(/(\{(\w+)\})/)
-        .map { |_, n| n.to_sym }
+        .gsub(/(\{(\w+)\})/) { kwargs.fetch(Regexp.last_match(2).to_sym) })
     end
 
     def web_service_endpoint_by(name:)
@@ -87,44 +85,38 @@ module AppStoreConnect
       end
     end
 
-    def build_body(request)
-      request
-        .to_h
-        .deep_transform_keys { |k| k.to_s.camelize(:lower) }
-        .to_json
-    end
-
-    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
+    def get(web_service_endpoint, **kwargs, &block)
+      request = Request.new(
+        kwargs: kwargs,
+        web_service_endpoint: web_service_endpoint,
+        http_method: :get,
+        uri: build_uri(web_service_endpoint, **kwargs),
+        headers: headers
+      )
 
-      query_parameters.to_query
+      request.execute(&block)
     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']
+    def http_body(web_service_endpoint, **kwargs)
+      "AppStoreConnect::#{web_service_endpoint.http_body_type}"
+        .constantize
+        .new(**kwargs)
+        .to_h
+        .deep_transform_keys { |k| k.to_s.camelize(:lower) }
+        .to_json
     end
 
-    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 post(web_service_endpoint, **kwargs, &block)
+      request = Request.new(
+        web_service_endpoint: web_service_endpoint,
+        kwargs: kwargs,
+        http_method: :post,
+        uri: build_uri(web_service_endpoint, **kwargs),
+        headers: headers,
+        http_body: http_body(web_service_endpoint, **kwargs)
+      )
 
-    def execute(http_method, url, **options)
-      HTTParty.send(http_method, url, options)
+      request.execute(&block)
     end
 
     def headers

data/lib/app_store_connect/create_request.rb

@@ -2,10 +2,12 @@
 
 module AppStoreConnect
   class CreateRequest
-    include Object::Data
+    def self.inherited(klass)
+      klass.include(Object::Data)
+    end
 
     def initialize(**kwargs)
-      @data = Data.new(kwargs)
+      @data = self.class::Data.new(kwargs)
     end
   end
 end

data/lib/app_store_connect/object/type.rb

@@ -10,8 +10,6 @@ module AppStoreConnect
       class_methods do
         def type(type)
           @type = type
-
-          const_set('TYPE', type)
         end
       end
 

data/lib/app_store_connect/request.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'net/http'
+
+module AppStoreConnect
+  attr_reader :uri
+
+  class Request
+    def initialize(**options)
+      @uri = options.fetch(:uri)
+      @options = options
+    end
+
+    def execute
+      Net::HTTP.start(uri.host, uri.port, net_http_options) do |http|
+        response = http.request(request)
+
+        yield response if block_given?
+      end
+    end
+
+    private
+
+    def web_service_endpoint
+      @options.fetch(:web_service_endpoint)
+    end
+
+    def query
+      return unless http_method == :get
+
+      kwargs.dup.tap do |hash|
+        url_parameter_names(web_service_endpoint).each do |name|
+          hash.delete(name.to_sym)
+        end
+      end.to_query
+    end
+
+    def http_method
+      @options.fetch(:http_method).to_sym
+    end
+
+    def net_http_options
+      { use_ssl: uri.scheme == 'https' }
+    end
+
+    def kwargs
+      @options.fetch(:kwargs, {})
+    end
+
+    def uri
+      @options.fetch(:uri).tap do |uri|
+        uri.query = query if http_method == :get
+      end
+    end
+
+    def headers
+      @options.fetch(:headers, {})
+    end
+
+    def body
+      return if http_method == :get
+
+      @options.fetch(:http_body)
+    end
+
+    def url_parameter_names(web_service_endpoint)
+      web_service_endpoint
+        .url
+        .scan(/(\{(\w+)\})/)
+        .map { |_, n| n.to_sym }
+    end
+
+    def request
+      case http_method
+      when :get
+        Net::HTTP::Get.new(uri, headers)
+      when :post
+        Net::HTTP::Post.new(uri, headers).tap do |request|
+          request.body = body
+        end
+      else
+        raise "unsupported http method: #{http_method}"
+      end
+    end
+  end
+end

data/lib/app_store_connect/user_invitation_create_request.rb

@@ -1,23 +1,20 @@
 # frozen_string_literal: true
 
-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
+require 'app_store_connect/create_request'
 
-    def to_h
-      body
-    end
+module AppStoreConnect
+  class UserInvitationCreateRequest < CreateRequest
+    data do
+      type 'userInvitations'
 
-    def to_s
-      body.to_json
+      attributes do
+        property :first_name, required: true
+        property :last_name, required: true
+        property :email, required: true
+        property :roles, required: true
+        property :all_apps_visible
+        property :provisioning_allowed
+      end
     end
   end
 end

data/lib/app_store_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_store_connect
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kyle Decot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.2.3
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +215,7 @@ files:
 - lib/app_store_connect/object/properties.rb
 - lib/app_store_connect/object/type.rb
 - lib/app_store_connect/parser.rb
+- lib/app_store_connect/request.rb
 - lib/app_store_connect/type.rb
 - lib/app_store_connect/type/enum.rb
 - lib/app_store_connect/user_invitation_create_request.rb