schwab_rb 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9855a77823d8f9039e402281cec2efba85bd1bdba9b7ff7404a8ad136a276631
-  data.tar.gz: fd0c1e0cc43e9c52c82e8f45fee14c919ea307b40c82195d8272ce921ca5defd
+  metadata.gz: 123cd13fd78778da2f5f2d08f9dc8f7594a07b8fcd93659bd49df3b1cd28ddb7
+  data.tar.gz: 0760e50de57a1a2d207cf1cc4744441f4a08fc2fc983859317feda22df701b15
 SHA512:
-  metadata.gz: 1cd4e54dc2eace5a02ce328762f3ffaa4f23356684716d8d4987268c63d463b4cacbd51c8f278ec42cee8a73005bacd11a150db8e78beba3e34ae84c35e9e86e
-  data.tar.gz: 0b3f8920a5fd5c6256e5a3d69da6a65d54a781e8773b0a1a8981f88418444d2ee1243060f73b5c57dc4f63f61eea14aa420fcae57a70c98d5a0c0ed02929c7dd
+  metadata.gz: bc5b094add1c5002f1a799ef41ca023b18e3857c39476c91282174640728fd7be0fe8f7de59a265cdf7c86a893a0c04dce91f7fb7551ee2818a5e371f9b1f792
+  data.tar.gz: f29fc656583df33e6ff787715713075fb0ffc094ca5ae81915fb37fca4c0dbbefa362488a687f6dcc9dd957dd65c65917b66ba98fc4401467139adf68ea03f4a

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 ## [Unreleased]
 
+## [0.6.0] - 2025-12-11
+
+### Breaking Changes
+- **OrderPreview**: Replaced `projected_commission` with `commission_and_fee` structure to match current Schwab API
+- **OrderPreview**: Commission/fee data now uses nested `commissionLegs`/`feeLegs` instead of scalar values
+- **OrderValidationResult**: Changed from `warningMessage` string to `warns` array of objects with `activity_message` and `original_severity`
+- **OrderValidationResult**: Updated `Reject` structure to match `Warn` structure
+- **BaseClient**: Methods with `return_data_objects: false` now return parsed Hash/Array instead of raw `OAuth2::Response` objects
+
+### Changed
+- Removed redundant `strike_price` attribute from option instruments
+- Removed account numbers from log messages for improved security
+
+## [0.5.0] - 2025-11-03
+
+### Added
+- Vertical Roll Orders: Support for vertical roll orders that close an existing vertical spread and open a new one in a single order
+- `VerticalRollOrder` class with 4-leg order structure for rolling positions
+- Comprehensive tests for vertical roll orders including credit rolls, debit rolls, and stop limit orders
+
+### Fixed
+- Fixed typo in `OrderFactory` (SchwabRbL → SchwabRb)
+
 ## [0.4.0] - 2025-10-19
 
 ### Added

data/doc/PLACE_ORDER_SAMPLES.md

@@ -162,7 +162,7 @@ Buy 10 shares of XYZ at a Limit price of $34.97 good for the Day. If filled, imm
 
 ## Conditional Order: One Cancels Another
 
-  Sell 2 shares of XYZ at a Limit price of $45.97 and Sell 2 shares of XYZ with a Stop Limit order where the stop price is $37.03 and limit is $37.00. Both orders are sent at the same time. If one order fills, the other order is immediately cancelled. Both orders are good for the Day. Also known as an OCO order.
+Sell 2 shares of XYZ at a Limit price of $45.97 and Sell 2 shares of XYZ with a Stop Limit order where the stop price is $37.03 and limit is $37.00. Both orders are sent at the same time. If one order fills, the other order is immediately cancelled. Both orders are good for the Day. Also known as an OCO order.
 
 ```json
 {

data/examples/fetch_account_numbers.rb

@@ -4,19 +4,19 @@
 # Script to fetch account numbers data and save as fixture
 # Usage: ruby examples/fetch_account_numbers.rb
 
-require_relative "../lib/schwab_rb"
-require "dotenv"
-require "json"
-require "fileutils"
+require_relative '../lib/schwab_rb'
+require 'dotenv'
+require 'json'
+require 'fileutils'
 
 Dotenv.load
 
 def create_client
-  token_path = ENV["TOKEN_PATH"] || "schwab_token.json"
+  token_path = ENV['TOKEN_PATH'] || 'schwab_token.json'
   SchwabRb::Auth.init_client_easy(
-    ENV.fetch("SCHWAB_API_KEY", nil),
-    ENV.fetch("SCHWAB_APP_SECRET", nil),
-    ENV.fetch("APP_CALLBACK_URL", nil),
+    ENV['SCHWAB_API_KEY'],
+    ENV['SCHWAB_APP_SECRET'], 
+    ENV['APP_CALLBACK_URL'],
     token_path
   )
 end
@@ -24,23 +24,26 @@ end
 def fetch_account_numbers
   client = create_client
   puts "Fetching account numbers..."
-
+  
   response = client.get_account_numbers
   parsed_data = JSON.parse(response.body, symbolize_names: true)
-
+  
   # Create fixtures directory if it doesn't exist
-  fixtures_dir = File.join(__dir__, "..", "spec", "fixtures")
+  fixtures_dir = File.join(__dir__, '..', 'spec', 'fixtures')
   FileUtils.mkdir_p(fixtures_dir)
-
+  
   # Save the raw response
-  fixture_file = File.join(fixtures_dir, "account_numbers.json")
+  fixture_file = File.join(fixtures_dir, 'account_numbers.json')
   File.write(fixture_file, JSON.pretty_generate(parsed_data))
-
+  
   puts "Account numbers data saved to: #{fixture_file}"
   puts "Sample data: #{parsed_data.first(2)}"
-rescue StandardError => e
+  
+rescue => e
   puts "Error fetching account numbers: #{e.message}"
   puts e.backtrace.first(3)
 end
 
-fetch_account_numbers if __FILE__ == $PROGRAM_NAME
+if __FILE__ == $0
+  fetch_account_numbers
+end

data/examples/fetch_user_preferences.rb

@@ -4,19 +4,19 @@
 # Script to fetch user preferences data and save as fixture
 # Usage: ruby examples/fetch_user_preferences.rb
 
-require_relative "../lib/schwab_rb"
-require "dotenv"
-require "json"
-require "fileutils"
+require_relative '../lib/schwab_rb'
+require 'dotenv'
+require 'json'
+require 'fileutils'
 
 Dotenv.load
 
 def create_client
-  token_path = ENV["TOKEN_PATH"] || "schwab_token.json"
+  token_path = ENV['TOKEN_PATH'] || 'schwab_token.json'
   SchwabRb::Auth.init_client_easy(
-    ENV.fetch("SCHWAB_API_KEY", nil),
-    ENV.fetch("SCHWAB_APP_SECRET", nil),
-    ENV.fetch("APP_CALLBACK_URL", nil),
+    ENV['SCHWAB_API_KEY'],
+    ENV['SCHWAB_APP_SECRET'], 
+    ENV['APP_CALLBACK_URL'],
     token_path
   )
 end
@@ -24,23 +24,26 @@ end
 def fetch_user_preferences
   client = create_client
   puts "Fetching user preferences..."
-
+  
   response = client.get_user_preferences
   parsed_data = JSON.parse(response.body, symbolize_names: true)
-
+  
   # Create fixtures directory if it doesn't exist
-  fixtures_dir = File.join(__dir__, "..", "spec", "fixtures")
+  fixtures_dir = File.join(__dir__, '..', 'spec', 'fixtures')
   FileUtils.mkdir_p(fixtures_dir)
-
+  
   # Save the raw response
-  fixture_file = File.join(fixtures_dir, "user_preferences.json")
+  fixture_file = File.join(fixtures_dir, 'user_preferences.json')
   File.write(fixture_file, JSON.pretty_generate(parsed_data))
-
+  
   puts "User preferences data saved to: #{fixture_file}"
   puts "Sample data keys: #{parsed_data.keys.first(5)}"
-rescue StandardError => e
+  
+rescue => e
   puts "Error fetching user preferences: #{e.message}"
   puts e.backtrace.first(3)
 end
 
-fetch_user_preferences if __FILE__ == $PROGRAM_NAME
+if __FILE__ == $0
+  fetch_user_preferences
+end

data/examples/place_oco_order.rb

@@ -46,30 +46,25 @@ oco_order = SchwabRb::Orders::OrderFactory.build(
       short_leg_symbol: "SPXW  251020P06530000",
       long_leg_symbol: "SPXW  251020P06510000",
       order_type: SchwabRb::Order::Types::STOP_LIMIT,
-      price: 2.1,
-      stop_price: 2.0,
+      stop:
+      price: 0.3,
       order_instruction: :close,
       credit_debit: :debit,
-      quantity: 2
+      quantity: 1
     },
     {
       strategy_type: SchwabRb::Order::ComplexOrderStrategyTypes::VERTICAL,
       short_leg_symbol: "SPXW  251020C06770000",
       long_leg_symbol: "SPXW  251020C06790000",
       order_type: SchwabRb::Order::Types::STOP_LIMIT,
-      price: 2.1,
-      stop_price: 2.0,
+      price: 0.3,
       order_instruction: :close,
       credit_debit: :debit,
-      quantity: 2
+      quantity: 1
     }
   ]
 )
 
 built_order = oco_order.build
 
-binding.pry
-
 response = client.place_order(built_order, account_name: CURRENT_ACCT)
-
-binding.pry

data/lib/schwab_rb/account_hash_manager.rb

@@ -49,7 +49,7 @@ module SchwabRb
       if missing_accounts.any?
         missing_accounts.each do |account|
           SchwabRb::Logger.logger.warn(
-            "Account '#{account[:name]}' (#{account[:number]}) not found in API response. " \
+            "Account '#{account[:name]}' not found in API response. " \
             "This may indicate a closed account or incorrect account number in account_names.json"
           )
         end

data/lib/schwab_rb/clients/base_client.rb

@@ -56,7 +56,7 @@ module SchwabRb
       # @param account_name [String] The account name from account_names.json (takes priority)
       # @param fields [Array] Balances displayed by default, additional fields can be
       # added here by adding values from Account.fields.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       resolved_hash = resolve_account_hash(account_name: account_name, account_hash: account_hash)
 
       with_account_hash_retry(resolved_hash) do
@@ -69,12 +69,12 @@ module SchwabRb
 
         path = "/trader/v1/accounts/#{resolved_hash}"
         response = get(path, params)
+        data = JSON.parse(response.body, symbolize_names: true)
 
         if return_data_objects
-          account_data = JSON.parse(response.body, symbolize_names: true)
-          SchwabRb::DataObjects::Account.build(account_data)
+          SchwabRb::DataObjects::Account.build(data)
         else
-          response
+          data
         end
       end
     end
@@ -86,7 +86,7 @@ module SchwabRb
       #
       # @param fields [Array] Balances displayed by default, additional fields can be
       # added here by adding values from Account.fields.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       fields = convert_enum_iterable(fields, SchwabRb::Account::Statuses) if fields
@@ -96,12 +96,12 @@ module SchwabRb
 
       path = "/trader/v1/accounts"
       response = get(path, params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        accounts_data = JSON.parse(response.body, symbolize_names: true)
-        accounts_data.map { |account_data| SchwabRb::DataObjects::Account.build(account_data) }
+        data.map { |account_data| SchwabRb::DataObjects::Account.build(account_data) }
       else
-        response
+        data
       end
     end
 
@@ -109,7 +109,7 @@ module SchwabRb
       # Returns a mapping from account IDs available to this token to the
       # account hash that should be passed whenever referring to that account
       # in API calls.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       path = "/trader/v1/accounts/accountNumbers"
@@ -127,7 +127,7 @@ module SchwabRb
       if return_data_objects
         SchwabRb::DataObjects::AccountNumbers.build(account_numbers_data)
       else
-        response
+        account_numbers_data
       end
     end
 
@@ -146,7 +146,7 @@ module SchwabRb
       # @param order_id [String] The order ID.
       # @param account_hash [String] The account hash (optional if account_name provided)
       # @param account_name [String] The account name from account_names.json (takes priority)
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       resolved_hash = resolve_account_hash(account_name: account_name, account_hash: account_hash)
 
       with_account_hash_retry(resolved_hash) do
@@ -154,12 +154,12 @@ module SchwabRb
 
         path = "/trader/v1/accounts/#{resolved_hash}/orders/#{order_id}"
         response = get(path, {})
+        data = JSON.parse(response.body, symbolize_names: true)
 
         if return_data_objects
-          order_data = JSON.parse(response.body, symbolize_names: true)
-          SchwabRb::DataObjects::Order.build(order_data)
+          SchwabRb::DataObjects::Order.build(data)
         else
-          response
+          data
         end
       end
     end
@@ -197,7 +197,7 @@ module SchwabRb
       # @param from_entered_datetime [DateTime] Start of the query date range (default: 60 days ago).
       # @param to_entered_datetime [DateTime] End of the query date range (default: now).
       # @param status [String] Restrict query to orders with this status.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       resolved_hash = resolve_account_hash(account_name: account_name, account_hash: account_hash)
 
       with_account_hash_retry(resolved_hash) do
@@ -218,12 +218,12 @@ module SchwabRb
         )
 
         response = get(path, params)
+        data = JSON.parse(response.body, symbolize_names: true)
 
         if return_data_objects
-          orders_data = JSON.parse(response.body, symbolize_names: true)
-          orders_data.map { |order_data| SchwabRb::DataObjects::Order.build(order_data) }
+          data.map { |order_data| SchwabRb::DataObjects::Order.build(order_data) }
         else
-          response
+          data
         end
       end
     end
@@ -241,7 +241,7 @@ module SchwabRb
       # @param from_entered_datetime [DateTime] Start of the query date range (default: 60 days ago).
       # @param to_entered_datetime [DateTime] End of the query date range (default: now).
       # @param status [String] Restrict query to orders with this status.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       path = "/trader/v1/orders"
@@ -253,12 +253,12 @@ module SchwabRb
       )
 
       response = get(path, params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        orders_data = JSON.parse(response.body, symbolize_names: true)
-        orders_data.map { |order_data| SchwabRb::DataObjects::Order.build(order_data) }
+        data.map { |order_data| SchwabRb::DataObjects::Order.build(order_data) }
       else
-        response
+        data
       end
     end
 
@@ -312,7 +312,7 @@ module SchwabRb
       # @param account_hash [String] The account hash (optional if account_name provided)
       # @param order_spec [Hash, SchwabRb::Orders::Builder] The order specification to preview
       # @param account_name [String] The account name from account_names.json (takes priority)
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       resolved_hash = resolve_account_hash(account_name: account_name, account_hash: account_hash)
 
       with_account_hash_retry(resolved_hash) do
@@ -322,12 +322,12 @@ module SchwabRb
 
         path = "/trader/v1/accounts/#{resolved_hash}/previewOrder"
         response = post(path, order_spec)
+        data = JSON.parse(response.body, symbolize_names: true)
 
         if return_data_objects
-          preview_data = JSON.parse(response.body, symbolize_names: true)
-          SchwabRb::DataObjects::OrderPreview.build(preview_data)
+          SchwabRb::DataObjects::OrderPreview.build(data)
         else
-          response
+          data
         end
       end
     end
@@ -349,7 +349,7 @@ module SchwabRb
       # @param end_date [Date, DateTime] End date for transactions (default: now).
       # @param transaction_types [Array] List of transaction types to filter by.
       # @param symbol [String] Filter transactions by the specified symbol.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       resolved_hash = resolve_account_hash(account_name: account_name, account_hash: account_hash)
 
       with_account_hash_retry(resolved_hash) do
@@ -382,14 +382,14 @@ module SchwabRb
 
         path = "/trader/v1/accounts/#{resolved_hash}/transactions"
         response = get(path, params)
+        data = JSON.parse(response.body, symbolize_names: true)
 
         if return_data_objects
-          transactions_data = JSON.parse(response.body, symbolize_names: true)
-          transactions_data.map do |transaction_data|
+          data.map do |transaction_data|
             SchwabRb::DataObjects::Transaction.build(transaction_data)
           end
         else
-          response
+          data
         end
       end
     end
@@ -400,7 +400,7 @@ module SchwabRb
       # @param account_hash [String] The account hash (optional if account_name provided)
       # @param activity_id [String] ID of the transaction to retrieve
       # @param account_name [String] The account name from account_names.json (takes priority)
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       resolved_hash = resolve_account_hash(account_name: account_name, account_hash: account_hash)
 
       with_account_hash_retry(resolved_hash) do
@@ -408,28 +408,28 @@ module SchwabRb
 
         path = "/trader/v1/accounts/#{resolved_hash}/transactions/#{activity_id}"
         response = get(path, {})
+        data = JSON.parse(response.body, symbolize_names: true)
 
         if return_data_objects
-          transaction_data = JSON.parse(response.body, symbolize_names: true)
-          SchwabRb::DataObjects::Transaction.build(transaction_data)
+          SchwabRb::DataObjects::Transaction.build(data)
         else
-          response
+          data
         end
       end
     end
 
     def get_user_preferences(return_data_objects: true)
       # Get user preferences for the authenticated user.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
       path = "/trader/v1/userPreference"
       response = get(path, {})
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        preferences_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::UserPreferences.build(preferences_data)
+        SchwabRb::DataObjects::UserPreferences.build(data)
       else
-        response
+        data
       end
     end
 
@@ -439,19 +439,19 @@ module SchwabRb
       # @param symbol [String] Single symbol to fetch.
       # @param fields [Array] Fields to request. If unset, return all available
       #                       data (i.e., all fields). See `GetQuote::Field` for options.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       fields = convert_enum_iterable(fields, SchwabRb::Quote::Types) if fields
       params = fields ? { "fields" => fields.join(",") } : {}
       path = "/marketdata/v1/#{symbol}/quotes"
       response = get(path, params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        quote_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::QuoteFactory.build(quote_data)
+        SchwabRb::DataObjects::QuoteFactory.build(data)
       else
-        response
+        data
       end
     end
 
@@ -463,7 +463,7 @@ module SchwabRb
       # @param fields [Array] Fields to request. If unset, return all available data.
       #                       See `GetQuote::Field` for options.
       # @param indicative [Boolean] If set, fetch indicative quotes. Must be true or false.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       symbols = [symbols] if symbols.is_a?(String)
@@ -481,14 +481,14 @@ module SchwabRb
 
       path = "/marketdata/v1/quotes"
       response = get(path, params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        quotes_data = JSON.parse(response.body, symbolize_names: true)
-        quotes_data.map do |symbol, quote_data|
+        data.map do |symbol, quote_data|
           SchwabRb::DataObjects::QuoteFactory.build({ symbol => quote_data })
         end
       else
-        response
+        data
       end
     end
 
@@ -531,7 +531,7 @@ module SchwabRb
       # @param exp_month [String] Filter options by expiration month.
       # @param option_type [String] Type of options to include in the chain.
       # @param entitlement [String] Client entitlement.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
 
       refresh_token_if_needed
 
@@ -562,28 +562,28 @@ module SchwabRb
 
       path = "/marketdata/v1/chains"
       response = get(path, params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        option_chain_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::OptionChain.build(option_chain_data)
+        SchwabRb::DataObjects::OptionChain.build(data)
       else
-        response
+        data
       end
     end
 
     def get_option_expiration_chain(symbol, return_data_objects: true)
       # Get option expiration chain for a symbol.
       # @param symbol [String] The symbol for which to get option expiration dates.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
       path = "/marketdata/v1/expirationchain"
       response = get(path, { symbol: symbol })
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        expiration_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::OptionExpirationChain.build(expiration_data)
+        SchwabRb::DataObjects::OptionExpirationChain.build(data)
       else
-        response
+        data
       end
     end
 
@@ -600,7 +600,7 @@ module SchwabRb
       return_data_objects: true
     )
       # Get price history for a symbol.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       period_type = convert_enum(period_type, SchwabRb::PriceHistory::PeriodTypes) if period_type
@@ -621,12 +621,12 @@ module SchwabRb
       path = "/marketdata/v1/pricehistory"
 
       response = get(path, params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        price_history_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::PriceHistory.build(price_history_data)
+        SchwabRb::DataObjects::PriceHistory.build(data)
       else
-        response
+        data
       end
     end
 
@@ -847,12 +847,12 @@ module SchwabRb
       params["frequency"] = frequency.to_s if frequency
 
       response = get(path, params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        movers_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::MarketMoversFactory.build(movers_data)
+        SchwabRb::DataObjects::MarketMoversFactory.build(data)
       else
-        response
+        data
       end
     end
 
@@ -862,7 +862,7 @@ module SchwabRb
       # @param markets [Array, String] Markets for which to return trading hours.
       # @param date [Date] Date for which to return market hours. Accepts values up to
       #                    one year from today.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       markets = convert_enum_iterable(markets, SchwabRb::MarketHours::Markets)
@@ -871,12 +871,12 @@ module SchwabRb
       params["date"] = format_date_as_day("date", date) if date
 
       response = get("/marketdata/v1/markets", params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        market_hours_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::MarketHours.build(market_hours_data)
+        SchwabRb::DataObjects::MarketHours.build(data)
       else
-        response
+        data
       end
     end
 
@@ -887,7 +887,7 @@ module SchwabRb
       # @param symbols [String, Array] For "FUNDAMENTAL" projection, the symbols to fetch.
       #                                For other projections, a search term.
       # @param projection [String] Search mode or "FUNDAMENTAL" for instrument fundamentals.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       symbols = [symbols] unless symbols.is_a?(Array)
@@ -898,14 +898,14 @@ module SchwabRb
       }
 
       response = get("/marketdata/v1/instruments", params)
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        instruments_data = JSON.parse(response.body, symbolize_names: true)
-        instruments_data.map do |instrument_data|
+        data.map do |instrument_data|
           SchwabRb::DataObjects::Instrument.build(instrument_data)
         end
       else
-        response
+        data
       end
     end
 
@@ -913,18 +913,18 @@ module SchwabRb
       # Get instrument information for a single instrument by CUSIP.
       #
       # @param cusip [String] CUSIP of the instrument to fetch. Leading zeroes must be preserved.
-      # @param return_data_objects [Boolean] Whether to return data objects or raw JSON
+      # @param return_data_objects [Boolean] Whether to return data objects or Hash
       refresh_token_if_needed
 
       raise ArgumentError, "cusip must be passed as a string" unless cusip.is_a?(String)
 
       response = get("/marketdata/v1/instruments/#{cusip}", {})
+      data = JSON.parse(response.body, symbolize_names: true)
 
       if return_data_objects
-        instrument_data = JSON.parse(response.body, symbolize_names: true)
-        SchwabRb::DataObjects::Instrument.build(instrument_data)
+        SchwabRb::DataObjects::Instrument.build(data)
       else
-        response
+        data
       end
     end
 

data/lib/schwab_rb/data_objects/option.rb

@@ -42,7 +42,6 @@ module SchwabRb
             theoretical_option_value: data.fetch(:theoreticalOptionValue, nil),
             theoretical_volatility: data.fetch(:theoreticalVolatility, nil),
             option_deliverables_list: data.fetch(:optionDeliverablesList, nil),
-            strike_price: data.fetch(:strikePrice, nil),
             expiration_date: Date.parse(data.fetch(:expirationDate)),
             days_to_expiration: data.fetch(:daysToExpiration, nil),
             expiration_type: data.fetch(:expirationType, nil),
@@ -72,7 +71,7 @@ module SchwabRb
         close_price:, total_volume:, trade_time_in_long:,
         quote_time_in_long:, net_change:, volatility:, delta:,
         gamma:, theta:, vega:, rho:, open_interest:, time_value:,
-        theoretical_option_value:, theoretical_volatility:, option_deliverables_list:, strike_price:,
+        theoretical_option_value:, theoretical_volatility:, option_deliverables_list:,
         expiration_date:, days_to_expiration:, expiration_type:, last_trading_day:, multiplier:,
         settlement_type:, deliverable_note:, percent_change:, mark_change:, mark_percent_change:, intrinsic_value:, extrinsic_value:, option_root:, exercise_type:, high_52_week:, low_52_week:, non_standard:, in_the_money:
       )
@@ -109,7 +108,6 @@ module SchwabRb
         @theoretical_option_value = theoretical_option_value
         @theoretical_volatility = theoretical_volatility
         @option_deliverables_list = option_deliverables_list
-        @strike_price = strike_price
         @expiration_date = expiration_date
         @days_to_expiration = days_to_expiration
         @expiration_type = expiration_type
@@ -136,12 +134,16 @@ module SchwabRb
                   :close_price, :total_volume, :trade_time_in_long, :quote_time_in_long,
                   :net_change, :volatility, :delta, :gamma, :theta, :vega, :rho,
                   :open_interest, :time_value, :theoretical_option_value,
-                  :theoretical_volatility, :option_deliverables_list, :strike_price,
+                  :theoretical_volatility, :option_deliverables_list,
                   :expiration_date, :days_to_expiration, :expiration_type, :last_trading_day,
                   :multiplier, :settlement_type, :deliverable_note, :percent_change,
                   :mark_change, :mark_percent_change, :intrinsic_value, :extrinsic_value,
                   :option_root, :exercise_type, :high_52_week, :low_52_week, :non_standard,
                   :in_the_money
+
+      def strike_price
+        strike
+      end
     end
   end
 end

data/lib/schwab_rb/data_objects/order_preview.rb

@@ -6,7 +6,7 @@ module SchwabRb
   module DataObjects
     class OrderPreview
       attr_reader :order_id, :order_value, :order_strategy, :order_balance, :order_validation_result,
-                  :projected_commission
+                  :commission_and_fee
 
       class << self
         def build(data)
@@ -20,7 +20,7 @@ module SchwabRb
         @order_strategy = attrs[:orderStrategy] ? OrderStrategy.new(attrs[:orderStrategy]) : nil
         @order_balance = attrs[:orderBalance] ? OrderBalance.new(attrs[:orderBalance]) : nil
         @order_validation_result = attrs[:orderValidationResult] ? OrderValidationResult.new(attrs[:orderValidationResult]) : nil
-        @projected_commission = attrs[:projectedCommission] ? CommissionAndFee.new(attrs[:projectedCommission]) : nil
+        @commission_and_fee = attrs[:commissionAndFee] ? CommissionAndFee.new(attrs[:commissionAndFee]) : nil
       end
 
       def status
@@ -40,15 +40,15 @@ module SchwabRb
       end
 
       def commission
-        return 0.0 unless @projected_commission
+        return 0.0 unless @commission_and_fee
 
-        @projected_commission.commission_value
+        @commission_and_fee.commission
       end
 
       def fees
-        return 0.0 unless @projected_commission
+        return 0.0 unless @commission_and_fee
 
-        @projected_commission.fee_value
+        @commission_and_fee.fee
       end
 
       def to_h
@@ -58,15 +58,14 @@ module SchwabRb
           orderStrategy: @order_strategy&.to_h,
           orderBalance: @order_balance&.to_h,
           orderValidationResult: @order_validation_result&.to_h,
-          projectedCommission: @projected_commission&.to_h
+          commissionAndFee: @commission_and_fee&.to_h
         }
       end
 
       class OrderStrategy
-        attr_reader :account_number, :status, :price, :quantity, :order_type, :type, :strategy_id, :order_legs
+        attr_reader :status, :price, :quantity, :order_type, :type, :strategy_id, :order_legs
 
         def initialize(attrs)
-          @account_number = attrs[:accountNumber]
           @status = attrs[:status]
           @price = attrs[:price]
           @quantity = attrs[:quantity]
@@ -78,7 +77,6 @@ module SchwabRb
 
         def to_h
           {
-            accountNumber: @account_number,
             status: @status,
             price: @price,
             quantity: @quantity,
@@ -111,75 +109,81 @@ module SchwabRb
       end
 
       class OrderValidationResult
-        attr_reader :is_valid, :warning_message, :rejects
+        attr_reader :is_valid, :warns, :rejects
 
         def initialize(attrs)
           @is_valid = attrs[:isValid]
-          @warning_message = attrs[:warningMessage]
+          @warns = attrs[:warns]&.map { |warn| Warn.new(warn) } || []
           @rejects = attrs[:rejects]&.map { |reject| Reject.new(reject) } || []
         end
 
         def to_h
           {
             isValid: @is_valid,
-            warningMessage: @warning_message,
+            warns: @warns.map(&:to_h),
             rejects: @rejects.map(&:to_h)
           }
         end
 
+        class Warn
+          attr_reader :activity_message, :original_severity
+
+          def initialize(attrs)
+            @activity_message = attrs[:activityMessage]
+            @original_severity = attrs[:originalSeverity]
+          end
+
+          def to_h
+            {
+              activityMessage: @activity_message,
+              originalSeverity: @original_severity
+            }
+          end
+        end
+
         class Reject
-          attr_reader :reject_code, :reject_message
+          attr_reader :activity_message, :original_severity
 
           def initialize(attrs)
-            @reject_code = attrs[:rejectCode]
-            @reject_message = attrs[:rejectMessage]
+            @activity_message = attrs[:activityMessage]
+            @original_severity = attrs[:originalSeverity]
           end
 
           def to_h
             {
-              rejectCode: @reject_code,
-              rejectMessage: @reject_message
+              activityMessage: @activity_message,
+              originalSeverity: @original_severity
             }
           end
         end
       end
 
       class CommissionAndFee
-        attr_reader :commission, :commissions, :fee, :fees, :true_commission
+        attr_reader :commissions, :fees, :true_commission_legs
 
         def initialize(attrs)
-          @commission = attrs[:commission]&.to_f
-          @commissions = attrs[:commissions] || []
-          @fee = attrs[:fee]&.to_f
-          @fees = attrs[:fees] || []
-          @true_commission = attrs[:trueCommission]&.to_f
+          @commissions = attrs[:commission][:commissionLegs] || []
+          @fees = attrs[:fee][:feeLegs] || []
+          @true_commission_legs = attrs[:trueCommission][:commissionLegs] || []
         end
 
-        def commission_total
+        def commission
           calculate_total_from_legs(@commissions, "COMMISSION")
         end
 
-        def commission_value
-          @commission || commission_total
-        end
-
-        def fee_total
+        def fee
           calculate_total_from_legs(@fees, %w[OPT_REG_FEE INDEX_OPTION_FEE])
         end
 
-        def fee_value
-          @fee || fee_total
-        end
-
-        def true_commission_value
-          @true_commission || (commission_total * 2)
+        def true_commission
+          calculate_total_from_legs(@true_commission_legs, "COMMISSION")
         end
 
         def to_h
           {
-            commission: @commission,
-            fee: @fee,
-            trueCommission: @true_commission,
+            commission: commission,
+            fee: fee,
+            trueCommission: true_commission,
             commissions: @commissions,
             fees: @fees
           }

data/lib/schwab_rb/orders/order_factory.rb

@@ -2,6 +2,7 @@
 
 require_relative "iron_condor_order"
 require_relative "vertical_order"
+require_relative "vertical_roll_order"
 require_relative "single_order"
 require_relative "oco_order"
 require_relative "order"
@@ -37,6 +38,19 @@ module SchwabRb
               order_instruction: options[:order_instruction] || :open,
               quantity: options[:quantity] || 1
             )
+          when SchwabRb::Order::ComplexOrderStrategyTypes::VERTICAL_ROLL
+            VerticalRollOrder.build(
+              close_short_leg_symbol: options[:close_short_leg_symbol],
+              close_long_leg_symbol: options[:close_long_leg_symbol],
+              open_short_leg_symbol: options[:open_short_leg_symbol],
+              open_long_leg_symbol: options[:open_long_leg_symbol],
+              price: options[:price],
+              stop_price: options[:stop_price],
+              order_type: options[:order_type],
+              duration: options[:duration] || SchwabRb::Orders::Duration::DAY,
+              credit_debit: options[:credit_debit] || :credit,
+              quantity: options[:quantity] || 1
+            )
           when SchwabRb::Order::OrderStrategyTypes::SINGLE
             SingleOrder.build(
               symbol: options[:symbol],

data/lib/schwab_rb/orders/vertical_roll_order.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "schwab_rb"
+
+module SchwabRb
+  module Orders
+    class VerticalRollOrder
+      class << self
+        def build(
+          close_short_leg_symbol:,
+          close_long_leg_symbol:,
+          open_short_leg_symbol:,
+          open_long_leg_symbol:,
+          price:,
+          stop_price: nil,
+          order_type: nil,
+          duration: SchwabRb::Orders::Duration::DAY,
+          credit_debit: :credit,
+          quantity: 1
+        )
+          schwab_order_builder.new.tap do |builder|
+            builder.set_order_strategy_type(SchwabRb::Order::OrderStrategyTypes::SINGLE)
+            builder.set_session(SchwabRb::Orders::Session::NORMAL)
+            builder.set_duration(duration)
+            builder.set_order_type(order_type || determine_order_type(credit_debit))
+            builder.set_complex_order_strategy_type(SchwabRb::Order::ComplexOrderStrategyTypes::VERTICAL_ROLL)
+            builder.set_quantity(quantity)
+            builder.set_price(price)
+            builder.set_stop_price(stop_price) if stop_price && order_type == SchwabRb::Order::Types::STOP_LIMIT
+
+            # Close the existing spread (opposite instructions)
+            builder.add_option_leg(
+              SchwabRb::Orders::OptionInstructions::BUY_TO_CLOSE,
+              close_short_leg_symbol,
+              quantity
+            )
+            builder.add_option_leg(
+              SchwabRb::Orders::OptionInstructions::SELL_TO_CLOSE,
+              close_long_leg_symbol,
+              quantity
+            )
+
+            # Open the new spread
+            builder.add_option_leg(
+              SchwabRb::Orders::OptionInstructions::SELL_TO_OPEN,
+              open_short_leg_symbol,
+              quantity
+            )
+            builder.add_option_leg(
+              SchwabRb::Orders::OptionInstructions::BUY_TO_OPEN,
+              open_long_leg_symbol,
+              quantity
+            )
+          end
+        end
+
+        def determine_order_type(credit_debit)
+          if credit_debit == :credit
+            SchwabRb::Order::Types::NET_CREDIT
+          else
+            SchwabRb::Order::Types::NET_DEBIT
+          end
+        end
+
+        def schwab_order_builder
+          SchwabRb::Orders::Builder
+        end
+      end
+    end
+  end
+end

data/lib/schwab_rb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SchwabRb
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/lib/schwab_rb.rb

@@ -47,6 +47,7 @@ require_relative "schwab_rb/data_objects/market_movers"
 require_relative "schwab_rb/orders/order_factory"
 require_relative "schwab_rb/orders/iron_condor_order"
 require_relative "schwab_rb/orders/vertical_order"
+require_relative "schwab_rb/orders/vertical_roll_order"
 require_relative "schwab_rb/orders/single_order"
 require_relative "schwab_rb/orders/oco_order"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: schwab_rb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Joseph Platta
 bindir: exe
 cert_chain: []
-date: 2025-10-20 00:00:00.000000000 Z
+date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -266,6 +266,7 @@ files:
 - lib/schwab_rb/orders/stop_type.rb
 - lib/schwab_rb/orders/tax_lot_method.rb
 - lib/schwab_rb/orders/vertical_order.rb
+- lib/schwab_rb/orders/vertical_roll_order.rb
 - lib/schwab_rb/price_history.rb
 - lib/schwab_rb/quote.rb
 - lib/schwab_rb/transaction.rb