betsy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba97ebe9949b2fa6512f323b2ff4e9214e26bee642afbec58fb83bb2f16af83
-  data.tar.gz: fbfdb2302982e26ec76e0f205c14d2a70929befa5813d99bdd54c9eb70e50cd7
+  metadata.gz: be84657637faf15358471454761e8f48181ce8907741f64120ce17837d777119
+  data.tar.gz: f7b0948911a4271e09423591f7bd55e6be04612c5502c32bc2cb9d2713bd279f
 SHA512:
-  metadata.gz: 630d6f49d34e9f1e7b66cf3e369442c2b28884c23db693a31174b1442838f37eeb134e8937cca8ea018ee6397d9f74c3db444e9aff6f0feb547491e22626145e
-  data.tar.gz: 7d420367b78b8313a940e31c9d878d416e5469cb7d0fad91f85552fdabce0ef293d591131ace10ef36032d5327dbb3b74127eff5f799a4c8fbb9a5893eabf53f
+  metadata.gz: e34859ed8deb1e858c2284c2a0691d4a5ddaa09e6efa2b1a867f58956cb73456161285356603500ecd287d15455667e82422f77ec01c2aa2138296a61327510e
+  data.tar.gz: 75120021566c48ece0adf0ca7abf44b61efb9903d77a950fcac75383eb9ad2a985a8a496a2f50665f18fdecbefc9611ce3efb81a497bf8114015ac04438863cc

data/.ruby-version

@@ -0,0 +1 @@
+3.0.4

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.3.0] - 2026-05-14
+
+### Breaking changes
+
+- The account model (default `EtsyAccount`) must now implement a `token_expired?` instance method. If you ran the install generator in v0.2.x, you need to add this method manually. See the [migration guide](#migrating-from-v02x-to-v03x) in the README.
+
+### Changed
+
+- Token expiration checking now delegates to `token_expired?` on the account model instead of using inline logic in the gem
+- Replaced Faraday with Ruby's stdlib `Net::HTTP`, removing the only external runtime dependency
+- Declared `activesupport` as an explicit runtime dependency (was previously undeclared)
+
+### Fixed
+
+- Fixed `TypeError` crash in `check_token_expiration` when `expires_in` or `last_token_refresh` is nil
+- Failed token refresh responses no longer save nil credentials back to the account
+
 ## [0.2.0] - 2021-05-04
 
 - Initial release

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    betsy (0.1.0)
-      faraday (= 1.5.1)
+    betsy (0.3.0)
+      activesupport (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -83,23 +83,6 @@ GEM
     diff-lcs (1.4.4)
     docile (1.4.0)
     erubi (1.10.0)
-    faraday (1.5.1)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
     globalid (0.5.2)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
@@ -115,9 +98,8 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.0)
     minitest (5.14.4)
-    multipart-post (2.1.1)
     nio4r (2.5.8)
-    nokogiri (1.12.2-x86_64-linux)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.2.0)
@@ -185,7 +167,6 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -234,4 +215,4 @@ DEPENDENCIES
   webmock (~> 3.13.0)
 
 BUNDLED WITH
-   2.2.17
+   2.2.33

data/README.md

@@ -66,6 +66,32 @@ Betsy::UserAddress.get_user_addresses(etsy_account: EtsyAccount.first)
 
 By default, Betsy handles the refreshing of authentication tokens for you.
 
+## Migrating from v0.2.x to v0.3.x
+
+### Account model requires `token_expired?`
+
+In v0.3.0, the token expiration check was moved out of the gem and into your account model. You need to add a `token_expired?` method to your `EtsyAccount` model (or whatever model you configured via `Betsy.account_model`):
+
+```ruby
+class EtsyAccount < ApplicationRecord
+  def token_expired?
+    last_token_refresh.nil? || expires_in.nil? || last_token_refresh + expires_in <= DateTime.now
+  end
+end
+```
+
+This gives you full control over the expiration logic. For example, you could add a buffer to refresh tokens early:
+
+```ruby
+def token_expired?
+  last_token_refresh.nil? || expires_in.nil? || last_token_refresh + expires_in - 5.minutes <= DateTime.now
+end
+```
+
+### Faraday removed
+
+Betsy no longer depends on Faraday. It uses Ruby's built-in `Net::HTTP` instead. If your app was relying on Betsy to pull in Faraday, you'll need to add it to your own Gemfile.
+
 ## License
 
 The gem is available as open-source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/betsy.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("webmock", "~> 3.13.0")
   spec.add_development_dependency("coveralls")
 
-  spec.add_dependency("faraday", "1.5.1")
+  spec.add_dependency("activesupport", ">= 5.0")
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/betsy/model.rb

@@ -9,22 +9,52 @@ module Betsy
         end
       end
 
+      REQUEST_CLASSES = {
+        get: Net::HTTP::Get,
+        post: Net::HTTP::Post,
+        put: Net::HTTP::Put,
+        patch: Net::HTTP::Patch,
+        delete: Net::HTTP::Delete
+      }.freeze
+
       def make_request(request_type, endpoint, options = {})
         check_token_expiration(options[:etsy_account]) if options[:etsy_account]
         headers = access_credentials(options[:etsy_account])
         options.delete(:etsy_account)
-        response = Faraday.method(request_type).call("#{BASE_ETSY_API_URL}#{endpoint}", options, headers)
+
+        uri = URI("#{BASE_ETSY_API_URL}#{endpoint}")
+
+        if [:post, :put, :patch].include?(request_type)
+          headers = headers.reverse_merge(content_type: "application/json")
+          request = REQUEST_CLASSES[request_type].new(uri)
+          request.body = options.to_json
+        else
+          uri.query = URI.encode_www_form(options) if options.any?
+          request = REQUEST_CLASSES[request_type].new(uri)
+        end
+
+        headers.each { |key, value| request[key.to_s] = value }
+
+        response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+          http.request(request)
+        end
+
         handle_response(response)
       end
 
       def check_token_expiration(etsy_account)
-        if etsy_account.last_token_refresh + etsy_account.expires_in <= DateTime.now
+        if etsy_account.token_expired?
           options = {
             grant_type: "refresh_token",
             refresh_token: etsy_account.refresh_token,
             client_id: Betsy.api_key
           }
-          response = JSON.parse(Faraday.post("https://api.etsy.com/v3/public/oauth/token", options).body)
+          response = JSON.parse(Net::HTTP.post_form(URI("https://api.etsy.com/v3/public/oauth/token"), options).body)
+
+          if response["access_token"].nil?
+            raise "Etsy token refresh failed: #{response}"
+          end
+
           etsy_account.access_token = response["access_token"]
           etsy_account.expires_in = response["expires_in"]
           etsy_account.refresh_token = response["refresh_token"]
@@ -40,12 +70,12 @@ module Betsy
       end
 
       def handle_response(response)
-        if response.status == 200
+        if response.code.to_i == 200
           return nil if response.body.empty?
           response = JSON.parse(response.body)
           build_objects(response)
         else
-          Betsy::Error.new(JSON.parse(response.body).merge!("status" => response.status))
+          Betsy::Error.new(JSON.parse(response.body).merge!("status" => response.code.to_i))
         end
       end
 

data/lib/betsy/review.rb

@@ -18,5 +18,9 @@ module Betsy
     def self.get_reviews_by_shop(shop_id, options = {})
       make_request(:get, "/v3/application/shops/#{shop_id}/reviews", options)
     end
+
+    def self.get_reviews_by_listing(listing_id, options = {})
+      make_request(:get, "/v3/application/listings/#{listing_id}/reviews", options)
+    end
   end
 end

data/lib/betsy/shop_listing.rb

@@ -52,6 +52,9 @@ module Betsy
     attribute :language
     attribute :price
     attribute :taxonomy_id
+    attribute :production_partners
+    attribute :skus
+    attribute :views
 
     # listing properties
     attribute :property_id

data/lib/betsy/shop_receipt_transaction.rb

@@ -10,6 +10,7 @@ module Betsy
     attribute :seller_user_id
     attribute :buyer_user_id
     attribute :create_timestamp
+    attribute :created_timestamp
     attribute :paid_timestamp
     attribute :shipped_timestamp
     attribute :quantity
@@ -20,9 +21,19 @@ module Betsy
     attribute :listing_id
     attribute :transaction_type
     attribute :product_id
+    attribute :sku
     attribute :price
     attribute :shipping_cost
     attribute :variations
+    attribute :product_data
+    attribute :shipping_profile_id
+    attribute :min_processing_days
+    attribute :max_processing_days
+    attribute :shipping_method
+    attribute :shipping_upgrade
+    attribute :expected_ship_date
+    attribute :buyer_coupon
+    attribute :shop_coupon
 
     def self.get_shop_receipt_transactions_by_listing(shop_id, listing_id, options = {})
       make_request(:get, "/v3/application/shops/#{shop_id}/listings/#{listing_id}/transactions", options)

data/lib/betsy/user.rb

@@ -5,23 +5,18 @@ module Betsy
     include Betsy::Model
 
     attribute :user_id
-    attribute :login_name
+    attribute :shop_id
     attribute :primary_email
     attribute :first_name
     attribute :last_name
-    attribute :create_timestamp
-    attribute :referred_by_user_id
-    attribute :use_new_inventory_endpoints
-    attribute :is_seller
-    attribute :bio
-    attribute :gender
-    attribute :birth_month
-    attribute :birth_day
-    attribute :transaction_buy_count
-    attribute :transaction_sold_count
+    attribute :image_url_75x75
 
     def self.get_user(user_id, options = {})
       make_request(:get, "/v3/application/users/#{user_id}", options)
     end
+
+    def self.get_me(options = {})
+      make_request(:get, "/v3/application/users/me", options)
+    end
   end
 end

data/lib/betsy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Betsy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/betsy.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require "active_support"
-require "faraday"
+require "net/http"
+require "uri"
+require "json"
 
 require_relative "betsy/version"
 require_relative "betsy/model"
@@ -33,6 +35,7 @@ module Betsy
 
   mattr_accessor :api_key
   mattr_accessor :redirect_uri_base
+  mattr_accessor :account_model, default: "EtsyAccount"
 
   ALL_SCOPES = ["address_r",
     "address_w",
@@ -72,7 +75,7 @@ module Betsy
     code_verifier = generate_code_verifier
     code_challenge = Digest::SHA256.base64digest(code_verifier).tr("+/", "-_").tr("=", "")
 
-    EtsyAccount.create(state: state, code_verifier: code_verifier)
+    account_class.create(state: state, code_verifier: code_verifier)
 
     "https://www.etsy.com/oauth/connect" \
     "?response_type=code" \
@@ -85,7 +88,7 @@ module Betsy
   end
 
   def self.request_access_token(params)
-    etsy_account = EtsyAccount.find_by(state: params[:state])
+    etsy_account = account_class.find_by(state: params[:state])
     if etsy_account.present?
       options = {
         grant_type: "authorization_code",
@@ -94,7 +97,7 @@ module Betsy
         code: params[:code],
         code_verifier: etsy_account.code_verifier
       }
-      response = JSON.parse(Faraday.post("https://api.etsy.com/v3/public/oauth/token", options).body)
+      response = JSON.parse(Net::HTTP.post_form(URI("https://api.etsy.com/v3/public/oauth/token"), options).body)
       etsy_account.access_token = response["access_token"]
       etsy_account.refresh_token = response["refresh_token"]
       etsy_account.expires_in = response["expires_in"]
@@ -105,6 +108,10 @@ module Betsy
     end
   end
 
+  def self.account_class
+    @@account_class ||= account_model.constantize
+  end
+
   class << self
     private
 

data/lib/generators/betsy/install_generator.rb

@@ -11,7 +11,8 @@ module Betsy
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_betsy_model
-        template "etsy_account.rb", "app/models/etsy_account.rb"
+        model_file = Betsy.account_model.underscore
+        template "etsy_account.rb", "app/models/#{model_file}.rb"
       end
 
       def copy_betsy_migration

data/lib/generators/betsy/templates/{create_etsy_accounts.rb → create_etsy_accounts.rb.tt}

@@ -1,6 +1,6 @@
 class CreateEtsyAccounts < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :etsy_accounts do |t|
+    create_table "<%= Betsy.account_class.table_name %>" do |t|
       t.string :access_token
       t.string :refresh_token
       t.integer :expires_in

data/lib/generators/betsy/templates/etsy_account.rb.tt

@@ -0,0 +1,5 @@
+class <%= Betsy.account_model %> < ApplicationRecord
+  def token_expired?
+    last_token_refresh.nil? || expires_in.nil? || last_token_refresh + expires_in <= DateTime.now
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betsy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jace Bayless
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2026-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '5.0'
 description: This gem allows users to simply interact with the Etsy V3 API.
 email:
 - jacebayless@gmail.com
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -141,7 +142,6 @@ files:
 - Rakefile
 - app/controllers/betsy/response_listener_controller.rb
 - app/views/betsy/response_listener/etsy_response_listener.html.erb
-- betsy-0.1.0.gem
 - betsy.gemspec
 - bin/console
 - bin/setup
@@ -174,8 +174,8 @@ files:
 - lib/betsy/version.rb
 - lib/generators/betsy/install_generator.rb
 - lib/generators/betsy/templates/betsy.rb
-- lib/generators/betsy/templates/create_etsy_accounts.rb
-- lib/generators/betsy/templates/etsy_account.rb
+- lib/generators/betsy/templates/create_etsy_accounts.rb.tt
+- lib/generators/betsy/templates/etsy_account.rb.tt
 homepage: https://github.com/JaceBayless/betsy
 licenses:
 - MIT
@@ -184,7 +184,7 @@ metadata:
   homepage_uri: https://github.com/JaceBayless/betsy
   source_code_uri: https://github.com/JaceBayless/betsy
   changelog_uri: https://github.com/JaceBayless/betsy/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: A gem for the Etsy API V3
 test_files: []

data/lib/generators/betsy/templates/etsy_account.rb

@@ -1,2 +0,0 @@
-class EtsyAccount < ApplicationRecord
-end