fellowshipone 2.2.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4e11ab742f6434a9fdbad47eb2ad76ff6a541d7
-  data.tar.gz: 0ea42375b6bdadc9d1a33eeca8dd4d9bad9ef928
+SHA256:
+  metadata.gz: c69eb8b606e665f01ab90b205c6051253817de2458b848deb38ff1c28de75073
+  data.tar.gz: 1184d6a8f2d5ccf3710f5f13940e77ef16c3c45fd1f1a79e86f174c32596e7e2
 SHA512:
-  metadata.gz: '08e01e74f88a62afacd80d646293e0dfbb626a16f106fec26d00de022fda3bd2ec60daebc39182df420dfd2beac87276d26ca5f22ad4c130dd2c9c50973fd214'
-  data.tar.gz: fd72fbf2ef5a1535486de53b524c8805e24898d09e104582325b2b22f5ad34add06312855597601dcfdda4f5a7e0f87af112f7822aa96782899e32372d160a6f
+  metadata.gz: a33038de82fbcb6cfa4f6ed9b46ab54ce4b0c2225469edb8f9b8b0f30641ea6af55ef7b1dc3d977212662186fab8fe82e4d175c75d3034cddade9d91a509d7cf
+  data.tar.gz: b796f9e3cec78268eba4fc86c2be47361b5cfff62ccbd4862235b0f5cfe88e61ddfbc34e4d857ae058911d1ccdb4a703e7048db9867a318ecb5d13e17ab342f8

data/.gitignore

@@ -1 +1,2 @@
 fellowshipone-*.gem
+Gemfile.lock

data/README.md

@@ -12,7 +12,7 @@ Installing the gem
 
 To add it to your Gemfile
 
-    gem 'fellowshipone', require: 'fellowshipone'
+    gem 'fellowshipone', '3.0.0'
 
 ## Additional resources
 
@@ -23,10 +23,9 @@ To add it to your Gemfile
 ## License
 
 This project is released under the MIT license (see LICENSE).
-
 This project is maintained by Taylor Brooks (https://github.com/taylorbrooks).
 
 
 ## Want to Contribute?
 
-If you would like to get involved in this project, then please fork the project. Make changes, add features, write some tests, and then send a pull request. 
+If you would like to get involved in this project, then please fork the project. Make changes, add features, write some tests, and then send a pull request.

data/fellowshipone.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name              = 'fellowshipone'
-  s.version           = '2.2.0'
+  s.version           = '3.0.1'
   s.authors           = ['Taylor Brooks']
   s.email             = ['tbrooks@gmail.com']
   s.homepage          = 'https://github.com/taylorbrooks/fellowshipone'

data/lib/fellowshipone/client.rb

@@ -54,6 +54,7 @@ module Fellowshipone
         connection.request  :oauth, oauth_data
         connection.response :logger if logger
         connection.use      FaradayMiddleware::Mashify
+        connection.use      FaradayMiddleware::FellowshiponeErrorHandler
         connection.response :json
         connection.adapter  Faraday.default_adapter
       end

data/lib/fellowshipone/error.rb

@@ -0,0 +1,44 @@
+module Fellowshipone
+  class Error < StandardError; end
+  class BadRequest < Error; end
+  class Forbidden < Error; end
+  class GatewayTimeout < Error; end
+  class InternalServerError < Error; end
+  class NotFound < Error; end
+  class ServiceUnavailable < Error; end
+  class Unauthorized < Error; end
+end
+
+require 'faraday'
+module FaradayMiddleware
+  class FellowshiponeErrorHandler < Faraday::Response::Middleware
+    ERROR_STATUSES = 400..600
+
+    def on_complete(env)
+      case env[:status]
+      when 400
+        raise Fellowshipone::BadRequest, error_message(env)
+      when 401
+        raise Fellowshipone::Unauthorized, error_message(env)
+      when 403
+        raise Fellowshipone::Forbidden, error_message(env)
+      when 404
+        raise Fellowshipone::NotFound, error_message(env)
+      when 500
+        raise Fellowshipone::InternalServerError, error_message(env)
+      when 503
+        raise Fellowshipone::ServiceUnavailable, error_message(env)
+      when 504
+        raise Fellowshipone::GatewayTimeout, error_message(env)
+      when ERROR_STATUSES
+        raise Fellowshipone::Error, error_message(env)
+      end
+    end
+
+    private
+
+    def error_message(env)
+      "#{env[:status]}: #{env[:url]} #{env[:body]} #{env[:reason_phrase]}"
+    end
+  end
+end

data/lib/fellowshipone/responses/contribution.rb

@@ -1,8 +1,7 @@
 module Fellowshipone
   class Contribution
-
     def self.format(res)
-      response = res["contributionReceipt"]
+      response = res['contributionReceipt']
       if response.is_a?(Array)
         response.map{|contribution| format_contribution(contribution) }
       else
@@ -12,11 +11,12 @@ module Fellowshipone
 
     def self.format_contribution(contribution)
       OpenStruct.new(
-        id:       contribution["@id"],
-        amount:   contribution["amount"],
-        fund:     contribution["fund"]["name"],
-        sub_fund: contribution["subFund"]["name"],
-        date:     contribution["receivedDate"]
+        id:       contribution['@id'],
+        amount:   contribution['amount'],
+        fund:     contribution['fund']['name'],
+        sub_fund: contribution['subFund']['name'],
+        date:     contribution['receivedDate'],
+        fund_type_id: contribution['fund']['fundTypeID']
       )
     end
   end

data/lib/fellowshipone.rb

@@ -1,2 +1,3 @@
-require_relative 'fellowshipone/client.rb'
-require_relative 'fellowshipone/connection.rb'
+require_relative 'fellowshipone/client'
+require_relative 'fellowshipone/connection'
+require_relative 'fellowshipone/error'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fellowshipone
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,13 +188,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - fellowshipone.gemspec
 - lib/fellowshipone.rb
 - lib/fellowshipone/client.rb
 - lib/fellowshipone/connection.rb
+- lib/fellowshipone/error.rb
 - lib/fellowshipone/resources/communication.rb
 - lib/fellowshipone/resources/contribution.rb
 - lib/fellowshipone/resources/fund.rb
@@ -226,8 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem/plugin to interact with the FellowshipOne API (https://developer.fellowshipone.com/).

data/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fellowshipone (1.3.0)
-      addressable
-      faraday
-      faraday_middleware
-      hashie
-      json
-      simple_oauth
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.7)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (3.4.3)
-    json (1.8.3)
-    minitest (5.5.1)
-    multipart-post (2.0.0)
-    rake (10.4.2)
-    safe_yaml (1.0.4)
-    simple_oauth (0.3.1)
-    vcr (2.9.3)
-    webmock (1.20.4)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  fellowshipone!
-  minitest
-  rake
-  vcr
-  webmock
-
-BUNDLED WITH
-   1.10.6