schwab_rb 0.3.2 → 0.3.4

data/lib/schwab_rb/auth/token.rb

@@ -1,24 +1,28 @@
-module SchwabRb::Auth
-  class Token
-    def initialize(
-      token: nil,
-      expires_in: nil,
-      token_type: "Bearer",
-      scope: nil,
-      refresh_token: nil,
-      id_token: nil,
-      expires_at: nil
-    )
-      @token = token
-      @expires_in = expires_in
-      @token_type = token_type
-      @scope = scope
-      @refresh_token = refresh_token
-      @id_token = id_token
-      @expires_at = expires_at
-    end
+# frozen_string_literal: true
+
+module SchwabRb
+  module Auth
+    class Token
+      def initialize(
+        token: nil,
+        expires_in: nil,
+        token_type: "Bearer",
+        scope: nil,
+        refresh_token: nil,
+        id_token: nil,
+        expires_at: nil
+      )
+        @token = token
+        @expires_in = expires_in
+        @token_type = token_type
+        @scope = scope
+        @refresh_token = refresh_token
+        @id_token = id_token
+        @expires_at = expires_at
+      end
 
-    attr_reader :token, :expires_in, :token_type, :scope,
-                :refresh_token, :id_token, :expires_at
+      attr_reader :token, :expires_in, :token_type, :scope,
+                  :refresh_token, :id_token, :expires_at
+    end
   end
 end

data/lib/schwab_rb/auth/token_manager.rb

@@ -1,103 +1,107 @@
+# frozen_string_literal: true
+
 require "oauth2"
 require "json"
 
-module SchwabRb::Auth
-  class TokenManager
-    class << self
-      def from_file(token_path)
-        token_data = JSON.parse(File.read(token_path))
-        token = SchwabRb::Auth::Token.new(
-          token: token_data["token"]["access_token"],
-          expires_in: token_data["token"]["expires_in"],
-          token_type: token_data["token"]["token_type"],
-          scope: token_data["token"]["scope"],
-          refresh_token: token_data["token"]["refresh_token"],
-          id_token: token_data["token"]["id_token"],
-          expires_at: token_data["token"]["expires_at"]
-        )
+module SchwabRb
+  module Auth
+    class TokenManager
+      class << self
+        def from_file(token_path)
+          token_data = JSON.parse(File.read(token_path))
+          token = SchwabRb::Auth::Token.new(
+            token: token_data["token"]["access_token"],
+            expires_in: token_data["token"]["expires_in"],
+            token_type: token_data["token"]["token_type"],
+            scope: token_data["token"]["scope"],
+            refresh_token: token_data["token"]["refresh_token"],
+            id_token: token_data["token"]["id_token"],
+            expires_at: token_data["token"]["expires_at"]
+          )
 
-        TokenManager.new(token, token_data["timestamp"], token_path: token_path)
-      end
+          TokenManager.new(token, token_data["timestamp"], token_path: token_path)
+        end
 
-      def from_oauth2_token(oauth2_token, timestamp, token_path: SchwabRb::Constants::DEFAULT_TOKEN_PATH)
-        token = SchwabRb::Auth::Token.new(
-          token: oauth2_token.token,
-          expires_in: oauth2_token.expires_in,
-          token_type: oauth2_token.params["token_type"] || "Bearer",
-          scope: oauth2_token.params["scope"],
-          refresh_token: oauth2_token.refresh_token,
-          id_token: oauth2_token.params["id_token"],
-          expires_at: oauth2_token.expires_at
-        )
+        def from_oauth2_token(oauth2_token, timestamp, token_path: SchwabRb::Constants::DEFAULT_TOKEN_PATH)
+          token = SchwabRb::Auth::Token.new(
+            token: oauth2_token.token,
+            expires_in: oauth2_token.expires_in,
+            token_type: oauth2_token.params["token_type"] || "Bearer",
+            scope: oauth2_token.params["scope"],
+            refresh_token: oauth2_token.refresh_token,
+            id_token: oauth2_token.params["id_token"],
+            expires_at: oauth2_token.expires_at
+          )
 
-        TokenManager.new(token, timestamp, token_path: token_path)
+          TokenManager.new(token, timestamp, token_path: token_path)
+        end
       end
-    end
 
-    def initialize(token, timestamp, token_path: SchwabRb::Constants::DEFAULT_TOKEN_PATH)
-      @token = token
-      @timestamp = timestamp
-      @token_path = token_path
-    end
+      def initialize(token, timestamp, token_path: SchwabRb::Constants::DEFAULT_TOKEN_PATH)
+        @token = token
+        @timestamp = timestamp
+        @token_path = token_path
+      end
 
-    attr_reader :token, :timestamp, :token_path
-
-    def refresh_token(client)
-      new_token = client.session.refresh!
-
-      @token = SchwabRb::Auth::Token.new(
-        token: new_token.token,
-        expires_in: new_token.expires_in,
-        token_type: new_token.params["token_type"] || "Bearer",
-        scope: new_token.params["scope"],
-        refresh_token: new_token.refresh_token,
-        id_token: new_token.params["id_token"],
-        expires_at: new_token.expires_at
-      )
-      @timestamp = Time.now.to_i
-
-      to_file
-
-      oauth = OAuth2::Client.new(
-        client.api_key,
-        client.app_secret,
-        site: SchwabRb::Constants::SCHWAB_BASE_URL,
-        token_url: "/v1/oauth/token"
-      )
-
-      OAuth2::AccessToken.new(
-        oauth,
-        token.token,
-        refresh_token: token.refresh_token,
-        expires_at: token.expires_at
-      )
-    end
+      attr_reader :token, :timestamp, :token_path
 
-    def to_file
-      File.write(token_path, to_json)
-    end
+      def refresh_token(client)
+        new_token = client.session.refresh!
 
-    def token_age
-      Time.now.to_i - timestamp
-    end
+        @token = SchwabRb::Auth::Token.new(
+          token: new_token.token,
+          expires_in: new_token.expires_in,
+          token_type: new_token.params["token_type"] || "Bearer",
+          scope: new_token.params["scope"],
+          refresh_token: new_token.refresh_token,
+          id_token: new_token.params["id_token"],
+          expires_at: new_token.expires_at
+        )
+        @timestamp = Time.now.to_i
+
+        to_file
 
-    def to_h
-      {
-        timestamp: timestamp,
-        token: {
-          expires_in: token.expires_in,
-          token_type: token.token_type,
-          scope: token.scope,
+        oauth = OAuth2::Client.new(
+          client.api_key,
+          client.app_secret,
+          site: SchwabRb::Constants::SCHWAB_BASE_URL,
+          token_url: "/v1/oauth/token"
+        )
+
+        OAuth2::AccessToken.new(
+          oauth,
+          token.token,
           refresh_token: token.refresh_token,
-          access_token: token.token,
-          id_token: token.id_token,
           expires_at: token.expires_at
+        )
+      end
+
+      def to_file
+        File.write(token_path, to_json)
+      end
+
+      def token_age
+        Time.now.to_i - timestamp
+      end
+
+      def to_h
+        {
+          timestamp: timestamp,
+          token: {
+            expires_in: token.expires_in,
+            token_type: token.token_type,
+            scope: token.scope,
+            refresh_token: token.refresh_token,
+            access_token: token.token,
+            id_token: token.id_token,
+            expires_at: token.expires_at
+          }
         }
-      }
-    end
+      end
 
-    def to_json(*_args)
-      to_h.to_json
+      def to_json(*_args)
+        to_h.to_json
+      end
     end
   end
 end

data/lib/schwab_rb/clients/async_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "async"
 require "async/http"
 require "json"

data/lib/schwab_rb/clients/base_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 require "json"
 require_relative "../utils/enum_enforcer"

data/lib/schwab_rb/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchwabRb
   class Configuration
     attr_accessor :logger, :log_file, :log_level, :silence_output

data/lib/schwab_rb/constants.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-module SchwabRb::Constants
-  SCHWAB_BASE_URL="https://api.schwabapi.com"
-  TOKEN_ENDPOINT="https://api.schwabapi.com/v1/oauth/token"
-  DEFAULT_TOKEN_PATH="./token.json"
+module SchwabRb
+  module Constants
+    SCHWAB_BASE_URL="https://api.schwabapi.com"
+    TOKEN_ENDPOINT="https://api.schwabapi.com/v1/oauth/token"
+    DEFAULT_TOKEN_PATH="./token.json"
+  end
 end

data/lib/schwab_rb/data_objects/account_numbers.rb

@@ -3,6 +3,7 @@
 module SchwabRb
   module DataObjects
     class AccountNumbers
+      include Enumerable
       attr_reader :accounts
 
       class << self

data/lib/schwab_rb/data_objects/market_hours.rb

@@ -230,7 +230,7 @@ module SchwabRb
         private
 
         def parse_session_periods(periods_data)
-          return nil unless periods_data && periods_data.is_a?(Array)
+          return nil unless periods_data.is_a?(Array)
 
           periods_data.map { |period_data| SessionPeriod.new(period_data) }
         end

data/lib/schwab_rb/data_objects/market_movers.rb

@@ -11,6 +11,7 @@ module SchwabRb
     end
 
     class MarketMovers
+      include Enumerable
       attr_reader :movers
 
       def initialize(movers)

data/lib/schwab_rb/data_objects/option_expiration_chain.rb

@@ -123,7 +123,7 @@ module SchwabRb
         end
 
         def expires_today?
-          @days_to_expiration == 0
+          @days_to_expiration.zero?
         end
 
         def expires_tomorrow?

data/lib/schwab_rb/data_objects/order_preview.rb

@@ -42,13 +42,13 @@ module SchwabRb
       def commission
         return 0.0 unless @projected_commission
 
-        @projected_commission.commission.to_f
+        @projected_commission.commission_value
       end
 
       def fees
         return 0.0 unless @projected_commission
 
-        @projected_commission.fee.to_f
+        @projected_commission.fee_value
       end
 
       def to_h
@@ -145,71 +145,43 @@ module SchwabRb
       end
 
       class CommissionAndFee
-        attr_reader :commission_data, :fee_data
+        attr_reader :commission, :commissions, :fee, :fees, :true_commission
 
         def initialize(attrs)
-          # Handle the flattened structure (from API)
-          if attrs[:commissions]
-            @commission_data = attrs[:commissions]
-            @fee_data = attrs[:fees] || []
-            @true_commission_data = []
-            @direct_commission = attrs[:commission]
-            @direct_fee = attrs[:fee]
-            @direct_true_commission = attrs[:trueCommission]
-          # Handle the nested structure (from test data)
-          else
-            @commission_data = attrs.dig(:commission, :commissionLegs) || []
-            @fee_data = attrs.dig(:fee, :feeLegs) || []
-            @true_commission_data = attrs.dig(:trueCommission, :commissionLegs) || []
-            @direct_commission = nil
-            @direct_fee = nil
-            @direct_true_commission = nil
-          end
+          @commission = attrs[:commission]&.to_f
+          @commissions = attrs[:commissions] || []
+          @fee = attrs[:fee]&.to_f
+          @fees = attrs[:fees] || []
+          @true_commission = attrs[:trueCommission]&.to_f
         end
 
         def commission_total
-          calculate_total_from_legs(@commission_data, "COMMISSION")
+          calculate_total_from_legs(@commissions, "COMMISSION")
         end
 
-        def commission
-          @direct_commission || format("%.2f", commission_total)
+        def commission_value
+          @commission || commission_total
         end
 
         def fee_total
-          calculate_total_from_legs(@fee_data, %w[OPT_REG_FEE INDEX_OPTION_FEE])
-        end
-
-        def fee
-          @direct_fee || format("%.2f", fee_total)
-        end
-
-        def true_commission
-          if @direct_true_commission
-            @direct_true_commission
-          elsif @true_commission_data.any?
-            # For nested structure, calculate from true commission legs
-            true_commission_total = calculate_total_from_legs(@true_commission_data, "COMMISSION")
-            format("%.2f", true_commission_total * 2)
-            else
-              format("%.2f", commission_total * 2)
-          end
+          calculate_total_from_legs(@fees, %w[OPT_REG_FEE INDEX_OPTION_FEE])
         end
 
-        def commissions
-          @commission_data
+        def fee_value
+          @fee || fee_total
         end
 
-        def fees
-          @fee_data
+        def true_commission_value
+          @true_commission || (commission_total * 2)
         end
 
         def to_h
           {
-            commission: commission,
-            fee: fee,
-            trueCommission: true_commission,
-            commissions: commissions,
-            fees: fees
+            commission: @commission,
+            fee: @fee,
+            trueCommission: @true_commission,
+            commissions: @commissions,
+            fees: @fees
           }
         end
 

data/lib/schwab_rb/data_objects/price_history.rb

@@ -137,7 +137,7 @@ module SchwabRb
         end
 
         def price_change_percent
-          return 0 if @open == 0
+          return 0 if @open.zero?
 
           ((price_change / @open) * 100).round(4)
         end

data/lib/schwab_rb/data_objects/transaction.rb

@@ -105,6 +105,14 @@ module SchwabRb
         type == "TRADE"
       end
 
+      def fees
+        transfer_items.select(&:fee?).map { |ti| ti.amount }
+      end
+
+      def commissions
+        transfer_items.select(&:commission?).map { |ti| ti.amount }
+      end
+
       def symbols
         transfer_items.map { |ti| ti.instrument.symbol }
       end