restforce 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6856a7534599d3903698a710a379d2af99866a80
-  data.tar.gz: 1d888bc1f8d088abd95361718b131b2111f7c693
+  metadata.gz: 5c96509bc04d200ffecb44942433ace9c40127ea
+  data.tar.gz: 71f6f9c56bb1834a9579efc527a11a40219a5268
 SHA512:
-  metadata.gz: 98686516419562bc5ac3c2ca2748197d642373c5a508fc937921a00cfbec34ab835af2813acce8d95bd0595a8228a3b9fe26374d116f179bc0c9bfc70058f2db
-  data.tar.gz: d67b50a3bc94beed337823ea61abb4e196ce0cd0eaa1c57818ff1e6791cb78737ac4554e28e16e6628d80dfec84c4732bba6e590b08d0ffb9d6f5afecf8cffea
+  metadata.gz: 52a228602bf185b74729c4b1b4655a1d1bf4752d094d14ca6d9fb582d9127a6f860e6638db1f23d9212db960abf74934cc418d859b2ce919ff0cd05539a78748
+  data.tar.gz: 1a2bd510e619a82f7912ec854c74f6cd595b1aa170ea1f0ab8bafe58c3ce8e76f99bc04294e5e4b33489f0a35a136ddc55dfae7ad6b8ca6dff504467bf52f33c

data/.travis.yml

@@ -11,3 +11,4 @@ gemfile:
 script:
   - bundle exec rubocop
   - bundle exec rspec spec
+sudo: false

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.0 (Mar 16, 2016)
+
+* Raise a `Faraday::Error::ClientError` for `300` responses triggered by a conflicting external ID, providing access to the response, which contains an array of the conflicting IDs (@timrogers, @michaelminter)
+* Improve the consistency of `Faraday::Error::ClientError`s raised, so they all have a message with the same format (@timrogers)
+
 ## 2.1.3 (Mar 9, 2016)
 
 * Raise a `Restforce::ServerError` when Salesforce responds with a `500` due to an internal error (@greysteil)

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the maintainer, Tim Rogers, at <me@timrogers.co.uk>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/CONTRIBUTING.md

@@ -0,0 +1,37 @@
+# Contributing
+
+We love pull requests from everyone. By participating in this project, you
+agree to abide by our [code of conduct](https://github.com/ejholmes/restforce/blob/master/CODE_OF_CONDUCT.md).
+
+Fork, then clone the repo:
+
+    git clone git@github.com:ejholmes/restforce.git
+
+Set up your machine:
+
+    script/bootstrap
+
+Play with the library by starting a console:
+
+    script/console
+
+Make sure the tests pass:
+
+    script/test
+
+Make your change. Add tests for your change. Make the tests pass:
+
+    script/test
+
+Push to your fork and [submit a pull request](https://github.com/ejholmes/restforce/compare/).
+
+At this point you're waiting on us. We like to at least comment on pull requests
+within a few days. We may suggest
+some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted:
+
+* Write tests.
+* Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+*Adapted from [factory_girl_rails's CONTRIBUTING.md](https://github.com/thoughtbot/factory_girl_rails/blob/master/CONTRIBUTING.md).*

data/README.md

@@ -21,7 +21,7 @@ Features include:
 * Support for dependent picklists.
 * Support for decoding [Force.com Canvas](http://www.salesforce.com/us/developer/docs/platform_connectpre/canvas_framework.pdf) signed requests. (NEW!)
 
-[Documentation](http://rubydoc.info/gems/restforce/frames) | [Changelog](https://github.com/ejholmes/restforce/tree/master/CHANGELOG.md)
+[Official Website](http://restforce.org/) | [Documentation](http://rubydoc.info/gems/restforce/frames) | [Changelog](https://github.com/ejholmes/restforce/tree/master/CHANGELOG.md)
 
 ## Installation
 
@@ -590,38 +590,14 @@ If you need a full Active Record experience, may be you can use
 Restforce and adds Associations, Query Building (like AREL), Validations and
 Callbacks.
 
-## Development
-
-If you want to hack on Restforce locally, we try to make [bootstrapping the project](http://wynnnetherland.com/linked/2013012801/bootstrapping-consistency) as painless as possible. Just clone and run:
-
-```bash
-$ script/bootstrap
-```
-
-This will install project dependencies and get you up and running. If you want to run a Ruby console to poke on Restforce, you can crank one up with:
-
-```bash
-$ script/console
-```
-
-In order to run the specs, use:
-
-```bash
-$ script/test
-```
-
-Alternatively, use Guard which will run the specs on file changes:
-
-```bash
-$ script/guard
-```
+## Contributing
 
-Using the scripts in `./script` instead of `bundle exec rspec`, `bundle console`, etc. ensures your dependencies are up-to-date.
+We welcome all contributions - they help us make Restforce the best gem possible.
 
-## Contributing
+See our [CONTRIBUTING.md](https://github.com/ejholmes/restforce/blob/master/CONTRIBUTING.md) file for help with getting set up to work on the project locally.
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create your Pull Request

data/lib/restforce/concerns/api.rb

@@ -315,7 +315,8 @@ module Restforce
       #
       # Returns true if the record was found and updated.
       # Returns the Id of the newly created record if the record was created.
-      # Returns false if something bad happens.
+      # Returns false if something bad happens (for example if the external ID matches
+      # multiple resources).
       def upsert(*args)
         upsert!(*args)
       rescue *exceptions
@@ -335,7 +336,9 @@ module Restforce
       #
       # Returns true if the record was found and updated.
       # Returns the Id of the newly created record if the record was created.
-      # Raises an exception if an error is returned from Salesforce.
+      # Raises an exception if an error is returned from Salesforce, including the 300
+      # error returned if the external ID provided matches multiple records (in which
+      # case the conflicting IDs can be found by looking at the response on the error)
       def upsert!(sobject, field, attrs)
         external_id = attrs.
           fetch(attrs.keys.find { |k, v| k.to_s.downcase == field.to_s.downcase }, nil)

data/lib/restforce/middleware/raise_error.rb

@@ -3,12 +3,16 @@ module Restforce
     def on_complete(env)
       @env = env
       case env[:status]
-      when 404
-        raise Faraday::Error::ResourceNotFound, message
+      when 300
+        raise Faraday::Error::ClientError.new("300: The external ID provided matches " \
+                                              "more than one record",
+                                              response_values)
       when 401
         raise Restforce::UnauthorizedError, message
+      when 404
+        raise Faraday::Error::ResourceNotFound, message
       when 413
-        raise Faraday::Error::ClientError.new("HTTP 413 - Request Entity Too Large",
+        raise Faraday::Error::ClientError.new("413: Request Entity Too Large",
                                               response_values)
       when 400...600
         raise Faraday::Error::ClientError.new(message, response_values)

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = '2.1.3'
+  VERSION = '2.2.0'
 end

data/restforce.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["eric@ejholmes.net", "tim@gocardless.com"]
   gem.description   = %q{A lightweight ruby client for the Salesforce REST API.}
   gem.summary       = %q{A lightweight ruby client for the Salesforce REST API.}
-  gem.homepage      = "https://github.com/ejholmes/restforce"
+  gem.homepage      = "http://restforce.org/"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)

data/spec/unit/middleware/raise_error_spec.rb

@@ -17,6 +17,15 @@ describe Restforce::Middleware::RaiseError do
       end
     end
 
+    context 'when the status code is 300' do
+      let(:status) { 300 }
+
+      it "raises an error" do
+        expect { on_complete }.to raise_error Faraday::Error::ClientError,
+                                              /300: The external ID provided/
+      end
+    end
+
     context 'when the status code is 400' do
       let(:status) { 400 }
 
@@ -40,7 +49,7 @@ describe Restforce::Middleware::RaiseError do
 
       it "raises an error" do
         expect { on_complete }.to raise_error Faraday::Error::ClientError,
-                                              'HTTP 413 - Request Entity Too Large'
+                                              '413: Request Entity Too Large'
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Eric J. Holmes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -162,6 +162,8 @@ files:
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.travis
 - Guardfile
@@ -276,7 +278,7 @@ files:
 - spec/unit/signed_request_spec.rb
 - spec/unit/sobject_spec.rb
 - spec/unit/tooling/client_spec.rb
-homepage: https://github.com/ejholmes/restforce
+homepage: http://restforce.org/
 licenses:
 - MIT
 metadata: {}