spackle-ruby 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62488969b7e0cbd8420db57f77f1f75b7c7b0cd7e9ca246521bc01c3a91c94f0
-  data.tar.gz: ed07a041cf115c6120bdfc1940a11dc322908c95e3e10fb99842a74aa7dec32a
+  metadata.gz: 2836d3a94748b633923e713c61666b48202ec2a69e88a47e1f49f43697ac446a
+  data.tar.gz: 567c08ffaf04b62443c7e7c35de97179781834c6ad2992a7df5ac634a3c71c77
 SHA512:
-  metadata.gz: c89eb3973dbdbd7b3b72d9c83cbbd62e0d7eb06c03c84f4bd3f19978e52d3f6881a62dd4367839ba48ce1133cce0dc611be07bd6c01a5339d67f292c02be6dba
-  data.tar.gz: f26e1cb1ea3c87a9baa86b3108801bb2fd4c4775c2e1850e29d3684dfcb23c1b25d2dcc80ef94a01936179096731c01cfdecec90b8a20dc72194dae969ee4e56
+  metadata.gz: 7fa9cb1dcd0df67dde5d2466f0ddecd37c727038c018408c4473836dc1aa5ea3de9dca87e054256b412d393578027f861967a50104f7a12ac02bd4694747196d
+  data.tar.gz: a98c28187be567457ff71b9c61728aa2764cb805f950fddca6899c37b39dca4e19ee1b0db39e202c164f5ffed1a711f4a804ba471a01224bb024dadf52a26a89

data/Gemfile

@@ -9,5 +9,4 @@ gem "nokogiri", "~> 1.13"
 gem "minitest", "~> 5.18"
 gem "webmock", "~> 3.18"
 gem "stripe", "~> 8.3"
-gem "http", "~> 5.1"
-gem "connection_pool", "~> 2.4"
+gem "faraday", "~> 2.7"

data/lib/spackle/stores/edge.rb

@@ -1,43 +1,45 @@
-require 'connection_pool'
-require 'http'
+require 'faraday'
 require 'json'
 require 'logger'
 
 module Spackle
   class EdgeStore < BaseStore
     def initialize()
-      @edge = ConnectionPool.new(size: 10, timeout: 5) do
-        HTTP.persistent(Spackle.edge_base)
-      end
-
-      @api = ConnectionPool.new(size: 10, timeout: 5) do
-        HTTP.persistent(Spackle.api_base)
-      end
+      @edge = Faraday.new(
+        url: Spackle.edge_base,
+        headers: {
+          'Authorization' => "Bearer #{Spackle.api_key}",
+          'X-Spackle-Schema-Version' => Spackle.version.to_s,
+        }
+      )
+      @api = Faraday.new(
+        url: Spackle.api_base,
+        headers: {
+          'Authorization' => "Bearer #{Spackle.api_key}",
+          'X-Spackle-Schema-Version' => Spackle.version.to_s,
+        }
+      )
     end
 
     def get_customer_data(id)
-      @edge.with do |http|
-        response = http.auth("Bearer #{Spackle.api_key}").get(Spackle.edge_base + '/customers/' + id + '/state').flush
-
-        if response.code != 200
-          return fetch_state_from_api(id)
-        end
+      response = @edge.get("/customers/#{id}/state")
 
-        return JSON.parse(response.body)
+      if response.status != 200
+        return fetch_state_from_api(id)
       end
+
+      return JSON.parse(response.body)
     end
 
     def fetch_state_from_api(id)
       Util.log_warn("Customer #{id} not found. Fetching from API...")
-      @api.with do |http|
-        response = http.auth("Bearer #{Spackle.api_key}").get(Spackle.api_base + '/customers/' + id + '/state').flush
-
-        if response.code != 200
-          raise SpackleError.new "Customer #{id} not found"
-        end
+      response = @api.get(Spackle.api_base + "/customers/#{id}/state")
 
-        return JSON.parse(response.body)
+      if response.status != 200
+        raise SpackleError.new "Customer #{id} not found"
       end
+
+      return JSON.parse(response.body)
     end
   end
 end

data/spackle.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(::File.join(::File.dirname(__FILE__), "lib"))
 
 Gem::Specification.new do |s|
   s.name          = "spackle-ruby"
-  s.version       = "0.0.15"
+  s.version       = "0.0.16"
   s.summary       = "Spackle Ruby gem"
   s.description   = "Spackle is the easiest way to integrate your Ruby app with Stripe Billing. " \
                     "See https://www.spackle.so for details."
@@ -18,10 +18,9 @@ Gem::Specification.new do |s|
     "source_code_uri" => "https://github.com/spackleso/spackle-ruby",
   }
 
+  s.add_dependency "faraday", "~> 2.7"
   s.add_dependency "nokogiri", "~> 1.13"
   s.add_dependency "stripe", "~> 8.3"
-  s.add_dependency "http", "~> 5.1"
-  s.add_dependency "connection_pool", "~> 2.4"
 
   s.add_development_dependency "rake", "~> 13.0"
   s.add_development_dependency "minitest", "~> 5.18"

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: spackle-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Spackle
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-23 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: stripe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.3'
-- !ruby/object:Gem::Dependency
-  name: http
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: stripe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '8.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '8.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement