diff --git a/active_force.gemspec b/active_force.gemspec index 9ec46df..4875df9 100644 --- a/active_force.gemspec +++ b/active_force.gemspec @@ -18,11 +18,12 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.required_ruby_version = '>= 1.9.3' + spec.required_ruby_version = '>= 2.7.0' - spec.add_dependency 'active_attr', '~> 0.10.2' - spec.add_dependency 'restforce', '>= 3.0.0' - spec.add_development_dependency 'bundler', '~> 1.15.4' + spec.add_dependency 'active_attr', '~> 0.15' + spec.add_dependency 'restforce', '~> 6.2' + spec.add_development_dependency 'activesupport', '~> 5.1' + spec.add_development_dependency 'actionpack', '~> 5.1' spec.add_development_dependency 'rake', '>= 0' spec.add_development_dependency 'rspec', '>= 0' spec.add_development_dependency 'pry', '>= 0' diff --git a/lib/active_force/sobject.rb b/lib/active_force/sobject.rb index 09149d7..62ba3ce 100644 --- a/lib/active_force/sobject.rb +++ b/lib/active_force/sobject.rb @@ -75,7 +75,7 @@ def update_attributes! attributes = {} def update_attributes attributes = {} update_attributes! attributes - rescue Faraday::Error::ClientError, RecordInvalid => error + rescue Faraday::ClientError, RecordInvalid => error handle_save_error error end @@ -94,7 +94,7 @@ def create! def create create! - rescue Faraday::Error::ClientError, RecordInvalid => error + rescue Faraday::ClientError, RecordInvalid => error handle_save_error error self end @@ -123,7 +123,7 @@ def save! def save save! - rescue Faraday::Error::ClientError, RecordInvalid => error + rescue Faraday::ClientError, RecordInvalid => error handle_save_error error end diff --git a/lib/active_force/version.rb b/lib/active_force/version.rb index e5f5bd0..6610f34 100644 --- a/lib/active_force/version.rb +++ b/lib/active_force/version.rb @@ -1,3 +1,3 @@ module ActiveForce - VERSION = "0.7.2" + VERSION = "0.7.3" end diff --git a/spec/active_force/association_spec.rb b/spec/active_force/association_spec.rb index 5e45466..e01a243 100644 --- a/spec/active_force/association_spec.rb +++ b/spec/active_force/association_spec.rb @@ -22,7 +22,7 @@ expect(post).to respond_to(:comments) end - it "should return a ActiveQuery object" do + it "should return an ActiveQuery object" do expect(post.comments).to be_a ActiveForce::ActiveQuery end diff --git a/spec/active_force/callbacks_spec.rb b/spec/active_force/callbacks_spec.rb index 05582f9..477a2e1 100644 --- a/spec/active_force/callbacks_spec.rb +++ b/spec/active_force/callbacks_spec.rb @@ -8,7 +8,7 @@ end describe "save" do - it 'call action callback when save a record' do + it 'calls action callback when saving a record' do whizbanged = Whizbang.new whizbanged.save expect(whizbanged.updated_from).to eq 'Rails' diff --git a/spec/active_force/query_spec.rb b/spec/active_force/query_spec.rb index 563d196..13f8a47 100644 --- a/spec/active_force/query_spec.rb +++ b/spec/active_force/query_spec.rb @@ -32,7 +32,7 @@ expect(query.all.to_s).to eq "SELECT Id, name, etc FROM table_name" end - it "should ignore dupicated attributes in select statment" do + it "should ignore dupicated attributes in select statement" do query.fields ['Id', 'name', 'etc'] expect(query.all.to_s).to eq "SELECT Id, name, etc FROM table_name" end @@ -43,7 +43,7 @@ expect(query.where("name like '%a%'").to_s).to eq "SELECT Id, name, etc FROM table_name WHERE (name like '%a%')" end - it "should add multiples conditions to a query with parentheses" do + it "should add multiple conditions to a query with parentheses" do expect(query.where("condition1 = 1").where("condition2 = 2 OR condition3 = 3").to_s).to eq "SELECT Id, name, etc FROM table_name WHERE (condition1 = 1) AND (condition2 = 2 OR condition3 = 3)" end end @@ -81,11 +81,11 @@ end describe ".order" do - it "should add a order condition in the statment" do + it "should add an order condition in the statement" do expect(query.order("name desc").to_s).to eq "SELECT Id, name, etc FROM table_name ORDER BY name desc" end - it "should add a order condition in the statment with WHERE and LIMIT" do + it "should add an order condition in the statement with WHERE and LIMIT" do expect(query.where("condition1 = 1").order("name desc").limit(1).to_s).to eq "SELECT Id, name, etc FROM table_name WHERE (condition1 = 1) ORDER BY name desc LIMIT 1" end end @@ -97,7 +97,7 @@ join end - it 'should add another select statment on the current select' do + it 'should add another select statement on the current select' do expect(query.join(join_query).to_s).to eq 'SELECT Id, name, etc, (SELECT Id, name, etc FROM join_table_name) FROM table_name' end end diff --git a/spec/active_force/sobject_spec.rb b/spec/active_force/sobject_spec.rb index 32523c5..52dfe12 100644 --- a/spec/active_force/sobject_spec.rb +++ b/spec/active_force/sobject_spec.rb @@ -140,12 +140,12 @@ class IceCream < ActiveForce::SObject end describe 'and with a ClientError' do - let(:faraday_error){ Faraday::Error::ClientError.new('Some String') } + let(:faraday_error){ Faraday::ClientError.new('Some String') } before{ expect(client).to receive(:update!).and_raise(faraday_error) } it 'raises an error' do - expect{ instance.update!( text: 'some text', boolean: false ) }.to raise_error(Faraday::Error::ClientError) + expect{ instance.update!( text: 'some text', boolean: false ) }.to raise_error(Faraday::ClientError) end end end @@ -198,12 +198,12 @@ class IceCream < ActiveForce::SObject end describe 'and with a ClientError' do - let(:faraday_error){ Faraday::Error::ClientError.new('Some String') } + let(:faraday_error){ Faraday::ClientError.new('Some String') } before{ expect(client).to receive(:create!).and_raise(faraday_error) } it 'raises an error' do - expect{ instance.create! }.to raise_error(Faraday::Error::ClientError) + expect{ instance.create! }.to raise_error(Faraday::ClientError) end end end @@ -314,7 +314,7 @@ class IceCream < ActiveForce::SObject let(:instance){ Whizbang.new } before do - allow(instance).to receive(:create!).and_raise(Faraday::Error::ClientError.new(double)) + allow(instance).to receive(:create!).and_raise(Faraday::ClientError.new(double)) end it 'catches and logs the error' do @@ -335,12 +335,12 @@ class IceCream < ActiveForce::SObject end describe 'and with a ClientError' do - let(:faraday_error){ Faraday::Error::ClientError.new('Some String') } + let(:faraday_error){ Faraday::ClientError.new('Some String') } before{ expect(client).to receive(:create!).and_raise(faraday_error) } it 'raises an error' do - expect{ instance.save! }.to raise_error(Faraday::Error::ClientError) + expect{ instance.save! }.to raise_error(Faraday::ClientError) end end end @@ -366,7 +366,7 @@ class IceCream < ActiveForce::SObject end describe 'and with a ClientError' do - let(:faraday_error){ Faraday::Error::ClientError.new('Some String') } + let(:faraday_error){ Faraday::ClientError.new('Some String') } before{ expect(client).to receive(:create!).and_raise(faraday_error) } it 'returns false' do expect(instance.save).to eq(false)