fellowshipone 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c69eb8b606e665f01ab90b205c6051253817de2458b848deb38ff1c28de75073
-  data.tar.gz: 1184d6a8f2d5ccf3710f5f13940e77ef16c3c45fd1f1a79e86f174c32596e7e2
+  metadata.gz: f65041c1559c6071155f13215045388bbe76cdcfd7927dbbef72a5e0d13d8861
+  data.tar.gz: 61e05bc05fb89f7e99f118c6ff44f62b7bc02c48e5bfc31cbd250e6822703f71
 SHA512:
-  metadata.gz: a33038de82fbcb6cfa4f6ed9b46ab54ce4b0c2225469edb8f9b8b0f30641ea6af55ef7b1dc3d977212662186fab8fe82e4d175c75d3034cddade9d91a509d7cf
-  data.tar.gz: b796f9e3cec78268eba4fc86c2be47361b5cfff62ccbd4862235b0f5cfe88e61ddfbc34e4d857ae058911d1ccdb4a703e7048db9867a318ecb5d13e17ab342f8
+  metadata.gz: 4ef3eb05566a9adecc665d0a5b70eb7b2d75146eef3bb3a0c8c742a75de6ce61c8b7b26a735969782f45d8e03c8bdfe019b288d0ea2f10f576d36395def17a4d
+  data.tar.gz: ee2769693fbfce6c467806fb60bb94c33db3b1d1fa60976a150d02732587257e8a84edc951d0582e13569e3ba4290338c541a1c1a2b3e7496eed312b7d048d2a

data/fellowshipone.gemspec

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

data/lib/fellowshipone/bingbong_hash.rb

@@ -0,0 +1,22 @@
+require 'hashie/mash'
+
+module FaradayMiddleware
+  class BingbongHash < Faraday::Middleware
+    def on_complete(env)
+      env[:body] = parse(env[:body])
+    end
+
+    private
+
+    def parse(body)
+      case body
+      when Hash
+        ::Hashie::Mash.new(body)
+      when Array
+        body.map { |item| parse(item) }
+      else
+        body
+      end
+    end
+  end
+end

data/lib/fellowshipone/bingbong_oauth.rb

@@ -0,0 +1,66 @@
+require 'simple_oauth'
+
+module FaradayMiddleware
+  class BingbongOAuth < Faraday::Middleware
+    AUTH_HEADER = 'Authorization'
+    CONTENT_TYPE = 'Content-Type'
+    TYPE_URLENCODED = 'application/x-www-form-urlencoded'
+
+    extend Forwardable
+    def_delegator :'Faraday::Utils', :parse_nested_query
+
+    def initialize(app, options)
+      super(app)
+      @options = options
+    end
+
+    def call(env)
+      env[:request_headers][AUTH_HEADER] ||= oauth_header(env).to_s if sign_request?(env)
+      @app.call(env)
+    end
+
+    def oauth_header(env)
+      SimpleOAuth::Header.new(
+        env[:method],
+        env[:url].to_s,
+        signature_params(body_params(env)),
+        oauth_options(env)
+      )
+    end
+
+    def sign_request?(env)
+      !!env[:request].fetch(:oauth, true)
+    end
+
+    def oauth_options(env)
+      if (extra = env[:request][:oauth]) && extra.is_a?(Hash) && !extra.empty?
+        @options.merge extra
+      else
+        @options
+      end
+    end
+
+    def body_params(env)
+      if include_body_params?(env)
+        if env[:body].respond_to?(:to_str)
+          parse_nested_query env[:body]
+        else
+          env[:body]
+        end
+      end || {}
+    end
+
+    def include_body_params?(env)
+      # see RFC 5849, section 3.4.1.3.1 for details
+      !(type = env[:request_headers][CONTENT_TYPE]) || (type == TYPE_URLENCODED)
+    end
+
+    def signature_params(params)
+      if params.empty?
+        params
+      else
+        params.reject { |_k, v| v.respond_to?(:content_type) }
+      end
+    end
+  end
+end

data/lib/fellowshipone/client.rb

@@ -1,5 +1,4 @@
 require 'faraday'
-require 'faraday_middleware'
 require 'simple_oauth'
 require 'json'
 
@@ -51,9 +50,9 @@ module Fellowshipone
     def connection
       Faraday.new(url: "https://#{church_code}.fellowshiponeapi.com", headers: { accept: 'application/json' }) do |connection|
         connection.request  :json
-        connection.request  :oauth, oauth_data
+        connection.use      FaradayMiddleware::BingbongOAuth, oauth_data
         connection.response :logger if logger
-        connection.use      FaradayMiddleware::Mashify
+        connection.use      FaradayMiddleware::BingbongHash
         connection.use      FaradayMiddleware::FellowshiponeErrorHandler
         connection.response :json
         connection.adapter  Faraday.default_adapter

data/lib/fellowshipone/error.rb

@@ -9,9 +9,8 @@ module Fellowshipone
   class Unauthorized < Error; end
 end
 
-require 'faraday'
 module FaradayMiddleware
-  class FellowshiponeErrorHandler < Faraday::Response::Middleware
+  class FellowshiponeErrorHandler < Faraday::Middleware
     ERROR_STATUSES = 400..600
 
     def on_complete(env)

data/lib/fellowshipone/resources/person.rb

@@ -1,3 +1,5 @@
+require 'addressable/uri'
+
 module Fellowshipone
   class Client
     module Person

data/lib/fellowshipone.rb

@@ -1,3 +1,5 @@
 require_relative 'fellowshipone/client'
 require_relative 'fellowshipone/connection'
 require_relative 'fellowshipone/error'
+require_relative 'fellowshipone/bingbong_oauth'
+require_relative 'fellowshipone/bingbong_hash'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fellowshipone
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  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: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +178,8 @@ files:
 - Rakefile
 - fellowshipone.gemspec
 - lib/fellowshipone.rb
+- lib/fellowshipone/bingbong_hash.rb
+- lib/fellowshipone/bingbong_oauth.rb
 - lib/fellowshipone/client.rb
 - lib/fellowshipone/connection.rb
 - lib/fellowshipone/error.rb