fellowshipone 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 62cb24583d770d51d4bbcaa1da51bd4b3385d99a
-  data.tar.gz: 0857cfb2ce47912d9459c0761c827d5e99245902
+SHA256:
+  metadata.gz: c7b6892a399d21c72712f35fb4b780fc5f0a67375b53dfcb0ed212c6d826c72b
+  data.tar.gz: b9ce0b52ad3365cf93ad0e839fb6ff4b23de93a7365b4db0f4f346f69a3e7ff0
 SHA512:
-  metadata.gz: a5aa25ee6e43cc373d013907147fd1644a2f29bf3075c9ae09d723235372977d7d4f98d9f49796862a9a2e88f7e9eb195ebed9e31627a01c684a261c2094663c
-  data.tar.gz: a06e43e12c702a214e8fd7932f70cc991af8818eb1a30d4a9f42584d2bc8f9c3be7407e5f5999dfde10cc85889bbfb1b4637c006628c293abecf26c858434421
+  metadata.gz: f4fc4e55888f426e7cc6335f8cb3a73f47d6c992b8101b315f758b1efffc8505fa2ac9495316c9c58017d70e17d483eb7ccaf676a4c788b331f75aff29d314cc
+  data.tar.gz: 89638f38f54f34d29da9758a846a6f30de15c795c161a5665247f029ca5ba3a5b2ebc7f8609a5fe370df7f816b312403222f30314ef5442272fadba9adb6f883

data/Gemfile.lock

@@ -1,29 +1,33 @@
 PATH
   remote: .
   specs:
-    fellowshipone (1.3.0)
+    fellowshipone (2.3.0)
       addressable
       faraday
       faraday_middleware
       hashie
       json
+      oauth
       simple_oauth
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    faraday (0.9.2)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (3.4.3)
-    json (1.8.3)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    hashie (4.1.0)
+    json (2.3.1)
     minitest (5.5.1)
-    multipart-post (2.0.0)
-    rake (10.4.2)
+    multipart-post (2.1.1)
+    oauth (0.5.6)
+    public_suffix (4.0.6)
+    rake (12.3.3)
     safe_yaml (1.0.4)
     simple_oauth (0.3.1)
     vcr (2.9.3)
@@ -43,4 +47,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.6
+   2.1.4

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

@@ -1,8 +1,8 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name              = 'fellowshipone'
-  s.version           = '2.0.0'
+  s.version           = '3.0.0'
   s.authors           = ['Taylor Brooks']
   s.email             = ['tbrooks@gmail.com']
   s.homepage          = 'https://github.com/taylorbrooks/fellowshipone'
@@ -11,21 +11,22 @@ Gem::Specification.new do |s|
   s.description = 'Ruby gem/plugin to interact with the FellowshipOne API (https://developer.fellowshipone.com/). Checkout the project on github for more detail.'
   s.license = 'MIT'
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "vcr"
-  s.add_development_dependency "webmock"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'vcr'
+  s.add_development_dependency 'webmock'
 
-  s.add_runtime_dependency "faraday"
-  s.add_runtime_dependency "faraday_middleware"
-  s.add_runtime_dependency "simple_oauth"
-  s.add_runtime_dependency "hashie"
-  s.add_runtime_dependency "json"
-  s.add_runtime_dependency "addressable"
+  s.add_runtime_dependency 'addressable'
+  s.add_runtime_dependency 'faraday'
+  s.add_runtime_dependency 'faraday_middleware'
+  s.add_runtime_dependency 'hashie'
+  s.add_runtime_dependency 'json'
+  s.add_runtime_dependency 'oauth'
+  s.add_runtime_dependency 'simple_oauth'
 
   s.files         = `git ls-files`.split("\n").delete_if { |f| !(f =~ /^examples/).nil? }
   s.test_files    = `git ls-files -- {test,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 end

data/lib/fellowshipone/client.rb

@@ -26,36 +26,24 @@ module Fellowshipone
       @logger          = logger
     end
 
-    def get(path, options={})
-      connection.get do |req|
-        req.url(path, options)
-      end.body
+    def get(path, options = {})
+      connection.get(path, options).body
     end
 
-    def post(path, req_body)
-      connection.post do |req|
-        req.url(path)
-        req.body = req_body
-      end.body
+    def post(path, options = {})
+      connection.post(path, options).body
     end
 
-    def put(path, req_body)
-      connection.put do |req|
-        req.url path
-        req.body = req_body
-      end
+    def put(path, options = {})
+      connection.put(path, options).body
     end
 
     def delete(path, options = {})
-      connection.delete do |req|
-        req.url path
-      end.body
+      connection.delete(path, options).body
     end
 
     def save
-      connection.put do |req|
-        req.url path
-      end.body
+      connection.put(path, {}).body
     end
 
     private
@@ -66,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/connection.rb

@@ -0,0 +1,18 @@
+require 'oauth'
+
+module Fellowshipone
+  class Connection
+    def self.connect(church_code:, consumer_key:, consumer_secret:, callback_url:)
+      consumer = OAuth::Consumer.new(
+        consumer_key,
+        consumer_secret,
+        site: "https://#{church_code}.fellowshiponeapi.com",
+        request_token_path: '/v1/Tokens/RequestToken',
+        authorize_path:     '/v1/PortalUser/Login',
+        access_token_path:  '/v1/Tokens/AccessToken'
+      )
+
+      consumer.get_request_token(oauth_callback: callback_url)
+    end
+  end
+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/resources/fund.rb

@@ -12,7 +12,8 @@ module Fellowshipone
       end
 
       def subfunds(fund_id)
-        get("/giving/v1/funds/#{fund_id}/subfunds")
+        response = get("/giving/v1/funds/#{fund_id}/subfunds")
+        Fellowshipone::SubFund.format(response)
       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/responses/fund.rb

@@ -1,8 +1,7 @@
 module Fellowshipone
   class Fund
-
     def self.format(res)
-      response = res["funds"]["fund"]
+      response = res['funds']['fund']
       if response.is_a?(Array)
         response.map{|fund| format_fund(fund) }
       else

data/lib/fellowshipone/responses/sub_fund.rb

@@ -0,0 +1,22 @@
+module Fellowshipone
+  class SubFund
+    def self.format(res)
+      return nil if res['subFunds'].nil?
+
+      response = res['subFunds']['subFund']
+
+      if response.is_a?(Array)
+        response.map{|fund| format_fund(fund) }
+      else
+        format_fund(response)
+      end
+    end
+
+    def self.format_fund(fund)
+      OpenStruct.new(
+        id:   fund['@id'],
+        name: fund['name'],
+      )
+    end
+  end
+end

data/lib/fellowshipone.rb

@@ -1 +1,3 @@
-require_relative 'fellowshipone/client.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.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_oauth
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -180,6 +194,8 @@ files:
 - 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
@@ -188,6 +204,7 @@ files:
 - lib/fellowshipone/resources/pledge_drive.rb
 - lib/fellowshipone/responses/contribution.rb
 - lib/fellowshipone/responses/fund.rb
+- lib/fellowshipone/responses/sub_fund.rb
 - test/person/person_test.rb
 - test/test_helper.rb
 - tester.rb
@@ -210,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem/plugin to interact with the FellowshipOne API (https://developer.fellowshipone.com/).