patch_ruby 1.7.0 → 1.10.1

data/lib/patch_ruby/models/sdg.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v1
 Contact: developers@usepatch.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Patch
   class Sdg
@@ -36,6 +37,11 @@ module Patch
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -46,13 +52,13 @@ module Patch
       }
     end
 
-    # Set with nullable attributes.
+    # List of attributes with nullable: true
     def self.openapi_nullable
-      nullable_properties = Set.new
-
-      nullable_properties
+      Set.new([
+      ])
     end
 
+
     # Allows models with corresponding API classes to delegate API operations to those API classes
     # Exposes Model.operation_id which delegates to ModelsApi.new.operation_id
     # Eg. Order.create_order delegates to OrdersApi.new.create_order
@@ -165,7 +171,9 @@ module Patch
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -173,7 +181,7 @@ module Patch
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -185,8 +193,8 @@ module Patch
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -216,7 +224,9 @@ module Patch
           end
         end
       else # model
-        Patch.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = Patch.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -242,7 +252,7 @@ module Patch
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash

data/lib/patch_ruby/models/standard.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v1
 Contact: developers@usepatch.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module Patch
   class Standard
@@ -32,6 +33,11 @@ module Patch
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -41,13 +47,13 @@ module Patch
       }
     end
 
-    # Set with nullable attributes.
+    # List of attributes with nullable: true
     def self.openapi_nullable
-      nullable_properties = Set.new
-
-      nullable_properties
+      Set.new([
+      ])
     end
 
+
     # Allows models with corresponding API classes to delegate API operations to those API classes
     # Exposes Model.operation_id which delegates to ModelsApi.new.operation_id
     # Eg. Order.create_order delegates to OrdersApi.new.create_order
@@ -150,7 +156,9 @@ module Patch
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -158,7 +166,7 @@ module Patch
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -170,8 +178,8 @@ module Patch
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -201,7 +209,9 @@ module Patch
           end
         end
       else # model
-        Patch.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = Patch.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -227,7 +237,7 @@ module Patch
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash

data/lib/patch_ruby/version.rb

@@ -6,10 +6,10 @@
 The version of the OpenAPI document: v1
 Contact: developers@usepatch.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.2.1
 
 =end
 
 module Patch
-  VERSION = '1.7.0'
+  VERSION = '1.10.1'
 end

data/lib/patch_ruby.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v1
 Contact: developers@usepatch.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.2.1
 
 =end
 
@@ -19,9 +19,14 @@ require 'patch_ruby/configuration'
 # Models
 require 'patch_ruby/models/allocation'
 require 'patch_ruby/models/create_bitcoin_estimate_request'
+require 'patch_ruby/models/create_ethereum_estimate_request'
+require 'patch_ruby/models/create_flight_estimate_request'
 require 'patch_ruby/models/create_mass_estimate_request'
 require 'patch_ruby/models/create_order_request'
 require 'patch_ruby/models/create_preference_request'
+require 'patch_ruby/models/create_shipping_estimate_request'
+require 'patch_ruby/models/create_success_response'
+require 'patch_ruby/models/create_vehicle_estimate_request'
 require 'patch_ruby/models/error_response'
 require 'patch_ruby/models/estimate'
 require 'patch_ruby/models/estimate_list_response'

data/patch_ruby.gemspec

@@ -8,7 +8,7 @@
 The version of the OpenAPI document: v1
 Contact: developers@usepatch.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.2.1
 
 =end
 
@@ -24,11 +24,10 @@ Gem::Specification.new do |s|
   s.homepage    = "https://www.patch.io"
   s.summary     = "Ruby wrapper for the Patch API"
   s.description = "Ruby wrapper for the Patch API"
-  s.license     = 'MIT'
+  s.license     = "MIT"
   s.required_ruby_version = ">= 1.9"
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
-  s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 
@@ -36,4 +35,9 @@ Gem::Specification.new do |s|
   s.test_files    = `find spec/*`.split("\n")
   s.executables   = []
   s.require_paths = ["lib"]
+
+  # Start custom
+  s.add_development_dependency 'factory_bot', '~> 6.2'
+  # End custom
+
 end

data/spec/api_client_spec.rb

@@ -6,26 +6,47 @@
 The version of the OpenAPI document: v1
 Contact: developers@usepatch.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.2.1
 
 =end
 
+require 'spec_helper'
+
 describe Patch::ApiClient do
   context 'initialization' do
-    context 'base_path' do
-      it "prepends a slash to base_path" do
-        Patch.configure { |c| c.base_path = 'v4/dog' }
-        expect(Patch::Configuration.default.base_path).to eq('/v4/dog')
-      end
-
-      it "doesn't prepend a slash if one is already there" do
-        Patch.configure { |c| c.base_path = '/v4/dog' }
-        expect(Patch::Configuration.default.base_path).to eq('/v4/dog')
+    context 'URL stuff' do
+      context 'host' do
+        it 'removes http from host' do
+          Patch.configure { |c| c.host = 'http://example.com' }
+          expect(Patch::Configuration.default.host).to eq('example.com')
+        end
+
+        it 'removes https from host' do
+          Patch.configure { |c| c.host = 'https://wookiee.com' }
+          expect(Patch::ApiClient.default.config.host).to eq('wookiee.com')
+        end
+
+        it 'removes trailing path from host' do
+          Patch.configure { |c| c.host = 'hobo.com/v4' }
+          expect(Patch::Configuration.default.host).to eq('hobo.com')
+        end
       end
 
-      it "ends up as a blank string if nil" do
-        Patch.configure { |c| c.base_path = nil }
-        expect(Patch::Configuration.default.base_path).to eq('')
+      context 'base_path' do
+        it "prepends a slash to base_path" do
+          Patch.configure { |c| c.base_path = 'v4/dog' }
+          expect(Patch::Configuration.default.base_path).to eq('/v4/dog')
+        end
+
+        it "doesn't prepend a slash if one is already there" do
+          Patch.configure { |c| c.base_path = '/v4/dog' }
+          expect(Patch::Configuration.default.base_path).to eq('/v4/dog')
+        end
+
+        it "ends up as a blank string if nil" do
+          Patch.configure { |c| c.base_path = nil }
+          expect(Patch::Configuration.default.base_path).to eq('')
+        end
       end
     end
   end

data/spec/configuration_spec.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v1
 Contact: developers@usepatch.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+OpenAPI Generator version: 5.2.1
 
 =end
 

data/spec/integration/estimates_spec.rb

@@ -1,10 +1,4 @@
 RSpec.describe 'Estimates Integration' do
-  before do
-    Patch.configure do |config|
-      config.access_token = ENV['SANDBOX_API_KEY']
-    end
-  end
-
   it 'supports create, retrieve and list' do
     create_estimate_response = Patch::Estimate.create_mass_estimate(mass_g: 100)
     estimate_id = create_estimate_response.data.id
@@ -33,7 +27,7 @@ RSpec.describe 'Estimates Integration' do
     )
 
     expect(flight_estimate.data.type).to eq 'flight'
-    expect(flight_estimate.data.mass_g).to eq 1_031_697
+    expect(flight_estimate.data.mass_g).to eq 1_000_622
   end
 
   it 'supports creating vehicle estimates' do
@@ -99,4 +93,37 @@ RSpec.describe 'Estimates Integration' do
     expect(bitcoin_estimate.data.type).to eq 'bitcoin'
     expect(bitcoin_estimate.data.mass_g).to be < bitcoin_estimate_2.data.mass_g
   end
+
+  it 'supports creating bitcoin estimates with a timestamp' do
+    bitcoin_estimate_1 = Patch::Estimate.create_bitcoin_estimate(
+      timestamp: '2021-06-01T20:31:18.403Z'
+    )
+
+    bitcoin_estimate_2 = Patch::Estimate.create_bitcoin_estimate(
+      timestamp: '2021-07-01T20:31:18.403Z'
+    )
+
+    expect(bitcoin_estimate_1.data.type).to eq 'bitcoin'
+    expect(bitcoin_estimate_1.data.mass_g).to be > bitcoin_estimate_2.data.mass_g # Bitcoin was emitting less in July 2021 than in June
+  end
+
+  it 'supports creating ethereum estimates with a gas amount' do
+    ethereum_estimate = Patch::Estimate.create_ethereum_estimate(
+      gas_used: 100
+    )
+
+    ethereum_estimate_2 = Patch::Estimate.create_ethereum_estimate(
+      gas_used: 1000
+    )
+
+    expect(ethereum_estimate.data.type).to eq 'ethereum'
+    expect(ethereum_estimate.data.mass_g).to be < ethereum_estimate_2.data.mass_g
+  end
+
+  it 'supports creating ethereum estimates with partial information' do
+    ethereum_estimate = Patch::Estimate.create_ethereum_estimate({ create_order: false })
+
+    expect(ethereum_estimate.data.type).to eq 'ethereum'
+    expect(ethereum_estimate.data.mass_g).to be >= 2_000
+  end
 end

data/spec/integration/orders_spec.rb

@@ -1,10 +1,4 @@
 RSpec.describe 'Orders Integration' do
-  before do
-    Patch.configure do |config|
-      config.access_token = ENV['SANDBOX_API_KEY']
-    end
-  end
-
   it 'supports create, place, cancel, retrieve and list' do
     create_order_response = Patch::Order.create_order(mass_g: 100)
     order_id = create_order_response.data.id
@@ -71,15 +65,24 @@ RSpec.describe 'Orders Integration' do
     expect(order.registry_url).not_to be_empty
   end
 
-  it 'supports create with metadata' do
+  it 'supports creation with and querying by metadata' do
     metadata = { user: 'john doe' }
 
-    create_order_response = Patch::Order.create_order(mass_g: 100, metadata: metadata)
+    create_order_response =
+      Patch::Order.create_order(mass_g: 100, metadata: metadata)
 
     expect(create_order_response.success).to eq true
     expect(create_order_response.data.id).not_to be_nil
     expect(create_order_response.data.mass_g).to eq(100)
     expect(create_order_response.data.metadata).to eq(metadata)
+
+    retrieve_orders_response = Patch::Order.retrieve_orders(
+      page: 1, metadata: { user: 'john' }
+    )
+    expect(retrieve_orders_response.success).to eq true
+    expect(retrieve_orders_response.data.count).to be >= 1
+    expect(retrieve_orders_response.data.map(&:metadata))
+      .to all(have_key(:user))
   end
 
   it 'supports place and cancel for orders created via an estimate' do

data/spec/integration/preferences_spec.rb

@@ -1,10 +1,4 @@
 RSpec.describe 'Preferences Integration' do
-  before do
-    Patch.configure do |config|
-      config.access_token = ENV['SANDBOX_API_KEY']
-    end
-  end
-
   it 'supports create, delete, retrieve and list' do
     retrieve_projects_response = Patch::Project.retrieve_projects
     expect(retrieve_projects_response.data.length).not_to be_zero
@@ -13,7 +7,7 @@ RSpec.describe 'Preferences Integration' do
     begin
       create_preference_response = Patch::Preference.create_preference(project_id: project_id)
       preference_id = create_preference_response.data.id
-    rescue => Patch::ApiError
+    rescue Patch::ApiError => e
       preference_id = Patch::Preference.retrieve_preferences().data.first.id
     end
 

data/spec/integration/projects_spec.rb

@@ -1,8 +1,4 @@
 RSpec.describe 'Projects Integration' do
-  Patch.configure do |config|
-    config.access_token = ENV['SANDBOX_API_KEY']
-  end
-
   it 'supports retrieve and list' do
     page_limit = 1
     next_page = 1
@@ -43,20 +39,12 @@ RSpec.describe 'Projects Integration' do
   end
 
   describe 'returned fields' do
-    before do
-      @project = Patch::Project.retrieve_projects(page: 1).data.first
-    end
-
-    it 'returns photos' do
-      expect(@project.photos).to be_an_instance_of(Array)
-    end
-
-    it 'returns average_price_per_tonne_cents_usd' do
-      expect(@project.average_price_per_tonne_cents_usd).to be_an_instance_of(Integer)
-    end
+    it 'returns the expected fields' do
+      project = Patch::Project.retrieve_projects(page: 1).data.first
 
-    it 'returns remaining_mass_g' do
-      expect(@project.remaining_mass_g).to be_an_instance_of(Integer)
+      expect(project.photos).to be_an_instance_of(Array)
+      expect(project.average_price_per_tonne_cents_usd).to be_an_instance_of(Integer)
+      expect(project.remaining_mass_g).to be_an_instance_of(Integer)
     end
   end
 end