payload-api 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5783328f0a31aea836478841802815c16aaef86b22ff101c698b61603f1437cd
-  data.tar.gz: 4e606c81caaec76f7410e7e29c55c77261ae28b2c5b69c9191b62eb297a82d3f
+  metadata.gz: 74d5e99e6b4b79f89e876de732d0b202c52652091467f975de5d91aedc7c1b2b
+  data.tar.gz: beed06286c333c72bb34841414e394e2dd15b971f3dbff5bb5e12141611eac91
 SHA512:
-  metadata.gz: 5aa4c8bbc4bb6a15feb4473378289b1f9d7c7ea510cca774a77cce4fcc3cd30a7aece820aaabfa5f24c54dd6fc3f09bf9f146955f5e1b05975947f04d1870fc8
-  data.tar.gz: 5e7ded315bac9487390cdaa23b18a59770f5f1b3eb1896f99d6a33e270bb3c0906b40e0df22dc58b37c45000564bb78c9def03ff36ecdac909c0667492d83fc7
+  metadata.gz: '009d5bd388d06f3ddff528ac3a7ddb46ee211d1094733bbe096ec4044706f1e1757fb2b064532fe40517e53e5f6eef694b18862b154221869d9fff868386371c'
+  data.tar.gz: 646a54524964916d4f9f405e01db6496b33247d1f4af22f6604dc050d543bf1850c983cf01a8a88e43bf1ea250365495a1252e981ef58c3a4f3c8891a48ed085

data/.github/workflows/ruby-app.yml

@@ -0,0 +1,25 @@
+name: RSpec Tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0.1
+
+    - name: Run RSpec tests
+      run: |
+        gem install rspec
+        rspec spec

data/lib/payload/arm/object.rb

@@ -1,39 +1,92 @@
 require "payload/arm/request"
 
 module Payload
+	class ARMObjectWrapper
+		@cls
+		@session
+
+		def initialize(cls, session)
+			@cls = cls
+			@session = session
+		end
+
+		def new(data)
+			return @cls.new(data)
+		end
+
+		def all()
+			return @cls.all(:session => @session)
+		end
+
+		def filter_by(*args, **data)
+			return @cls.filter_by(*args, **data, :session => @session)
+		end
+
+		def create(*args, **data)
+			return @cls.create(*args, **data, :session => @session)
+		end
+
+		def get(id)
+			return @cls.get(id, :session => @session)
+		end
+
+	end
+
 	class ARMObject
 		@poly = nil
 		@data = nil
 		@@cache = {}
+		@session = nil
 
 		class << self
-			attr_reader :spec, :poly, :data
+			attr_reader :spec, :poly, :data, :session
 		end
 
-		def initialize(data)
+		def initialize(data, session = nil)
 			self.set_data(data)
 		end
 
-		def self.new(data)
-			if data.key?('id') and @@cache.key?(data['id'])
-				@@cache[data['id']].set_data(data)
-				return @@cache[data['id']]
+		def self.new(data, session = nil)
+
+			session = session || Payload::Session.new(Payload::api_key, Payload::api_url)
+			session_key = session.object_id
+
+			if !@@cache.key?(session_key)
+				@@cache[session_key] = {}
+			end
+
+			session_cache = @@cache[session_key]
+
+			id = data.key?(:id) ? data[:id] : data.key?('id') ? data['id'] : nil
+			if id && session_cache.key?(id)
+				session_cache[id].set_data(data)
+				return session_cache[id]
 			else
 				inst = super
-				if data.key?('id') and not data['id'].nil? and not data['id'].empty?
-					@@cache[data['id']] = inst
+				inst.set_session(session)
+				inst.set_data(data)
+				if id
+					session_cache[id] = inst
 				end
 
 				return inst
 			end
 		end
 
+		def session
+			@session
+		end
+
+		def set_session(session)
+			@session = session
+		end
+
 		def data
 			@data
 		end
 
 		def set_data(data)
-			@data = data
+			@data = data.transform_keys { |key| key.to_s }
 		end
 
 		def method_missing(name, *args)
@@ -49,37 +102,61 @@ module Payload
 			return @data[key]
 		end
 
+		def _get_request()
+			return Payload::ARMRequest.new(self.class, @session)
+		end
+
+		def self._get_request(session=nil)
+			return Payload::ARMRequest.new(self, session)
+		end
+
 		def self.select(*args, **data)
-			return Payload::ARMRequest.new(self).select(*args, **data)
+			return self._get_request().select(*args, **data)
 		end
 
 		def self.filter_by(*args, **data)
-			return Payload::ARMRequest.new(self).filter_by(*args, **data)
+			session = data[:session]
+			data.delete(:session)
+			return self._get_request(session).filter_by(*args, **data)
 		end
 
 		def self.create(*args, **data)
+			session = data[:session]
+			data.delete(:session)
 			if args.length != 0
-				return Payload::ARMRequest.new(self).create(args[0])
+				return self._get_request(session).create(args[0])
 			else
-				return Payload::ARMRequest.new(self).create(data)
+				return self._get_request(session).create(data)
 			end
 		end
 
-		def self.get(id)
-			return Payload::ARMRequest.new(self).get(id)
+		def self.get(id, session: nil)
+			return self._get_request(session).get(id)
 		end
 
 		def self.delete(objects)
-			return Payload::ARMRequest.new(self).delete(objects)
+			return self._get_request().delete_all(objects)
+		end
+
+		def self.all(session: nil)
+			return self._get_request(session).all()
 		end
 
 		def update(**update)
-			return Payload::ARMRequest.new(self.class)._request('Put', id: self.id, json: update)
+			return _get_request()._request('Put', id: self.id, json: update)
 		end
 
 		def delete()
-			return Payload::ARMRequest.new(self.class)._request('Delete', id: self.id)
+			return _get_request()._request('Delete', id: self.id)
+		end
+
+		def to_json(*args)
+			serialized = {}
+			if self.class.poly
+				serialized.merge!(self.class.poly)
+			end
+			serialized.merge!(@data)
+			return serialized.to_json(*args)
 		end
 	end
 end
-

data/lib/payload/arm/request.rb

@@ -8,24 +8,20 @@ module Payload
 	class ARMRequest
 		@cls = nil
 
-		def initialize(cls=nil)
+		def initialize(cls=nil, session=nil)
 			@cls = cls
-			@selected_fields = ''
+			@session = session || Payload::Session.new(Payload::api_key, Payload::api_url)
 			@filters = {}
 		end
 
 		def select(*args, **data)
-			if @cls.poly
-				data = data.merge(@cls.poly)
-			end
-	
-			@selected_fields = args.join(',')
-	
+			@filters['fields'] = args.map {|a| a.strip }.join(',')
+
 			return self
 		end
 
 		def filter_by(*args, **data)
-			if @cls.poly
+			if !@cls.nil? && @cls.poly
 				data = data.merge(@cls.poly)
 			end
 
@@ -51,9 +47,49 @@ module Payload
 				._request('Put', json: updates)
 		end
 
-		def delete(objects)
-			deletes = objects.map {|o| o.id }.join('|')
-			return self.filter_by(mode: 'query', id: deletes)
+		def update_all(updates)
+			updates.map do |obj, update|
+				if obj.kind_of?(ARMObject)
+					if @cls and not obj.instance_of?(@cls)
+						throw "All objects must be of the same type"
+					end
+
+					@cls = obj.class
+				end
+			end
+
+			updates = {
+				object: 'list',
+				values: updates.map do |obj, update|
+					update['id'] = obj.id
+					update
+				end
+			}
+
+			return self._request('Put', json: updates)
+		end
+
+		def delete_all(objects)
+			deletes = objects.map do |obj|
+				if obj.kind_of?(ARMObject)
+					if @cls and not obj.instance_of?(@cls)
+						throw "All objects must be of the same type"
+					end
+
+					@cls = obj.class
+					obj = { id: obj.id }
+				end
+
+				obj
+			end
+
+			data = { object: 'list', values: deletes }
+
+			return self._request('Delete', json: data)
+		end
+
+		def delete()
+			return self.filter_by(mode: 'query')
 				._request('Delete')
 		end
 
@@ -86,26 +122,30 @@ module Payload
 			return self._request('Post', json: data)
 		end
 
-		def _request(method, id: nil, json: nil)
-
-			# Update @filters['fields'] with @selected_fields
-			fields_list = []
-			fields_list << @filters['fields'] if @filters['fields'] && !@filters['fields'].empty?
-			fields_list << @selected_fields if @selected_fields && !@selected_fields.empty?
-			@filters['fields'] = fields_list.join(',') if fields_list.any?
-			@filters['fields'] ||= '*'
+		def _execute_request(http, request)
+			http.request(request)
+		end
 
-			if @cls.spec.key?("endpoint")
-				endpoint = @cls.spec["endpoint"]
+		def _request(method, id: nil, json: nil)
+			if !@cls.nil?
+				if @cls.spec.key?("endpoint")
+					endpoint = @cls.spec["endpoint"]
+				else
+					endpoint = "/"+@cls.spec["object"]+"s"
+				end
 			else
-				endpoint = "/"+@cls.spec["object"]+"s"
+				if json.is_a? Array
+					if json.all? {|obj| obj.key?("object") }
+						endpoint = json[0]["object"]+"s"
+					end
+				end
 			end
 
 			if id
 				endpoint = File.join(endpoint, id)
 			end
 
-			url = URI.join(Payload::api_url, endpoint)
+			url = URI.join(@session.api_url, endpoint)
 			url.query = URI.encode_www_form(@filters)
 
 			http = Net::HTTP.new(url.host, url.port)
@@ -115,14 +155,14 @@ module Payload
 			end
 
 			request = Net::HTTP.const_get(method).new(url.request_uri)
-			request.basic_auth(Payload::api_key, '')
+			request.basic_auth(@session.api_key, '')
 
 			if json
 				request.body = json.to_json
 				request.add_field('Content-Type', 'application/json')
 			end
 
-			response = http.request(request)
+			response = self._execute_request(http, request)
 
 			begin
 				data = JSON.parse(response.body)
@@ -141,11 +181,12 @@ module Payload
 						if cls.nil?
 							obj
 						else
-							cls.new(obj)
+							ret = cls.new(obj, @session)
+							ret
 						end
 					end
 				else
-					return Payload::get_cls(data).new(data)
+					return Payload::get_cls(data).new(data, @session)
 				end
 			else
 				for error in Payload::subclasses(Payload::PayloadError)

data/lib/payload/arm/session.rb

@@ -0,0 +1,53 @@
+require 'payload/arm/request'
+
+
+module Payload
+
+    class Session
+        attr_accessor :api_key, :api_url
+
+        def initialize(api_key, api_url=nil)
+            @api_key = api_key
+            @api_url = api_url || Payload.URL
+
+            Payload.constants.each do |c|
+                val = Payload.const_get(c)
+                if val.is_a?(Class) && val < Payload::ARMObject
+                    define_singleton_method(c) { Payload::ARMObjectWrapper.new(val, self) }
+                end
+            end
+        end
+
+        def _get_request(cls = nil)
+            return Payload::ARMRequest.new(cls, self)
+        end
+
+        def query(cls)
+            return self._get_request(cls)
+        end
+
+        def create(objects)
+            return self._get_request().create(objects)
+        end
+
+        def update(objects)
+            return self._get_request().update_all(objects)
+        end
+
+        def delete(objects)
+            return self._get_request().delete_all(objects)
+        end
+
+        def ==(other)
+            return false unless other.is_a?(Session)
+
+            # Compare the attributes for equality
+            api_key == other.api_key &&
+            api_url == other.api_url
+        end
+
+        def to_s
+            "#{api_key} @ #{api_url}"
+        end
+    end
+end

data/lib/payload/objects.rb

@@ -67,7 +67,7 @@ module Payload
 
 	class ChargeItem < ARMObject
 		@spec = { 'object' => 'line_item' }
-		@poly = { 'type' => 'charge' }
+		@poly = { 'entry_type' => 'charge' }
 	end
 
 	class PaymentItem < ARMObject
@@ -82,4 +82,8 @@ module Payload
 	class Webhook < ARMObject
 		@spec = { 'object' => 'webhook' }
 	end
+
+	class PaymentLink < ARMObject
+		@spec = { 'object' => 'payment_link' }
+	end
 end

data/lib/payload/version.rb

@@ -1,3 +1,3 @@
 module Payload
-    VERSION = '0.2.5'
+    VERSION = '0.3.0'
 end

data/lib/payload.rb

@@ -1,16 +1,47 @@
 require "payload/version"
 require "payload/objects"
+require "payload/arm/session"
 
 module Payload
 	@URL = "https://api.payload.co"
-	@api_url = @URL
-	@api_key = nil
 
 	class << self
-		attr_accessor :api_key, :api_url
+		def api_key=(value)
+			session.api_key = value
+		end
+
+		def api_key
+			session.api_key
+		end
+
+		def api_url=(value)
+			session.api_url = value
+		end
+
+		def api_url
+			session.api_url
+		end
+
+		def URL
+			@URL
+		end
+
+		private
+
+		def session
+			@session ||= Payload::Session.new(nil, @URL)
+		end
 	end
 
 	def self.create(objects)
 		return Payload::ARMRequest.new().create(objects)
 	end
+
+	def self.update(objects)
+		return Payload::ARMRequest.new().update_all(objects)
+	end
+
+	def self.delete(objects)
+		return Payload::ARMRequest.new().delete_all(objects)
+	end
 end