schwab_rb 0.3.11 → 0.4.0

data/lib/schwab_rb/orders/order.rb

@@ -27,8 +27,6 @@ module SchwabRb
     end
 
     module Types
-      # Execute the order immediately at the best-available price.
-      # More Info <https://www.investopedia.com/terms/m/marketorder.asp>
       MARKET = "MARKET"
       LIMIT = "LIMIT"
       STOP = "STOP"
@@ -45,6 +43,18 @@ module SchwabRb
       LIMIT_ON_CLOSE = "LIMIT_ON_CLOSE"
     end
 
+    module OrderStrategyTypes
+      SINGLE = "SINGLE"
+      CANCEL = "CANCEL"
+      RECALL = "RECALL"
+      PAIR = "PAIR"
+      FLATTEN = "FLATTEN"
+      TWO_DAY_SWAP = "TWO_DAY_SWAP"
+      BLAST_ALL = "BLAST_ALL"
+      OCO = "OCO"
+      TRIGGER = "TRIGGER"
+    end
+
     module ComplexOrderStrategyTypes
       # Explicit order strategies for executing multi-leg options orders.
 
@@ -75,5 +85,38 @@ module SchwabRb
       # A custom multi-leg order strategy.
       CUSTOM = "CUSTOM"
     end
+
+    ALL_ORDER_STRATEGY_TYPES = [
+      OrderStrategyTypes::SINGLE,
+      OrderStrategyTypes::CANCEL,
+      OrderStrategyTypes::RECALL,
+      OrderStrategyTypes::PAIR,
+      OrderStrategyTypes::FLATTEN,
+      OrderStrategyTypes::TWO_DAY_SWAP,
+      OrderStrategyTypes::BLAST_ALL,
+      OrderStrategyTypes::OCO,
+      OrderStrategyTypes::TRIGGER,
+      ComplexOrderStrategyTypes::NONE,
+      ComplexOrderStrategyTypes::COVERED,
+      ComplexOrderStrategyTypes::VERTICAL,
+      ComplexOrderStrategyTypes::BACK_RATIO,
+      ComplexOrderStrategyTypes::CALENDAR,
+      ComplexOrderStrategyTypes::DIAGONAL,
+      ComplexOrderStrategyTypes::STRADDLE,
+      ComplexOrderStrategyTypes::STRANGLE,
+      ComplexOrderStrategyTypes::COLLAR_SYNTHETIC,
+      ComplexOrderStrategyTypes::BUTTERFLY,
+      ComplexOrderStrategyTypes::CONDOR,
+      ComplexOrderStrategyTypes::IRON_CONDOR,
+      ComplexOrderStrategyTypes::VERTICAL_ROLL,
+      ComplexOrderStrategyTypes::COLLAR_WITH_STOCK,
+      ComplexOrderStrategyTypes::DOUBLE_DIAGONAL,
+      ComplexOrderStrategyTypes::UNBALANCED_BUTTERFLY,
+      ComplexOrderStrategyTypes::UNBALANCED_CONDOR,
+      ComplexOrderStrategyTypes::UNBALANCED_IRON_CONDOR,
+      ComplexOrderStrategyTypes::UNBALANCED_VERTICAL_ROLL,
+      ComplexOrderStrategyTypes::MUTUAL_FUND_SWAP,
+      ComplexOrderStrategyTypes::CUSTOM
+    ].freeze
   end
 end

data/lib/schwab_rb/orders/order_factory.rb

@@ -1,46 +1,57 @@
 # frozen_string_literal: true
 
-require_relative 'iron_condor_order'
-require_relative 'vertical_order'
-require_relative 'single_order'
+require_relative "iron_condor_order"
+require_relative "vertical_order"
+require_relative "single_order"
+require_relative "oco_order"
+require_relative "order"
 
 module SchwabRb
   module Orders
     class OrderFactory
       class << self
         def build(**options)
-          case options[:strategy_type] || 'none'
-          when 'ironcondor'
+          case options[:strategy_type] || "none"
+          when SchwabRb::Order::ComplexOrderStrategyTypes::IRON_CONDOR
             IronCondorOrder.build(
               put_short_symbol: options[:put_short_symbol],
               put_long_symbol: options[:put_long_symbol],
               call_short_symbol: options[:call_short_symbol],
               call_long_symbol: options[:call_long_symbol],
               price: options[:price],
-              account_number: options[:account_number],
+              stop_price: options[:stop_price],
+              duration: options[:duration] || SchwabRb::Orders::Duration::DAY,
               credit_debit: options[:credit_debit] || :credit,
               order_instruction: options[:order_instruction] || :open,
               quantity: options[:quantity] || 1
             )
-          when 'vertical'  # call or put spreads
+          when SchwabRb::Order::ComplexOrderStrategyTypes::VERTICAL # call or put spreads
             VerticalOrder.build(
               short_leg_symbol: options[:short_leg_symbol],
               long_leg_symbol: options[:long_leg_symbol],
               price: options[:price],
-              account_number: options[:account_number],
+              stop_price: options[:stop_price],
+              order_type: options[:order_type],
+              duration: options[:duration] || SchwabRb::Orders::Duration::DAY,
               credit_debit: options[:credit_debit] || :credit,
               order_instruction: options[:order_instruction] || :open,
               quantity: options[:quantity] || 1
             )
-          when 'single'
+          when SchwabRb::Order::OrderStrategyTypes::SINGLE
             SingleOrder.build(
               symbol: options[:symbol],
               price: options[:price],
-              account_number: options[:account_number],
+              stop_price: options[:stop_price],
+              order_type: options[:order_type],
+              duration: options[:duration] || SchwabRb::Orders::Duration::DAY,
               credit_debit: options[:credit_debit] || :credit,
               order_instruction: options[:order_instruction] || :open,
               quantity: options[:quantity] || 1
             )
+          when SchwabRb::Order::OrderStrategyTypes::OCO
+            OcoOrder.build(
+              child_order_specs: options[:child_order_specs]
+            )
           else
             raise "Unsupported trade strategy: #{options[:strategy_type] || 'none'}"
           end

data/lib/schwab_rb/orders/single_order.rb

@@ -1,20 +1,29 @@
 # frozen_string_literal: true
 
-require 'schwab_rb'
+require "schwab_rb"
 
 module SchwabRb
   module Orders
     class SingleOrder
       class << self
-        def build(symbol:, price:, account_number:, credit_debit: :credit, order_instruction: :open, quantity: 1)
+        def build(
+          symbol:,
+          price:,
+          stop_price: nil,
+          order_type: nil,
+          duration: SchwabRb::Orders::Duration::DAY,
+          credit_debit: :credit,
+          order_instruction: :open,
+          quantity: 1
+        )
           schwab_order_builder.new.tap do |builder|
-            builder.set_account_number(account_number)
-            builder.set_order_strategy_type('SINGLE')
+            builder.set_order_strategy_type(SchwabRb::Order::OrderStrategyTypes::SINGLE)
             builder.set_session(SchwabRb::Orders::Session::NORMAL)
-            builder.set_duration(SchwabRb::Orders::Duration::DAY)
-            builder.set_order_type(order_type(credit_debit))
+            builder.set_duration(duration)
+            builder.set_order_type(order_type || determine_order_type(credit_debit))
             builder.set_quantity(quantity)
             builder.set_price(price)
+            builder.set_stop_price(stop_price) if stop_price && order_type == SchwabRb::Order::Types::STOP_LIMIT
             builder.add_option_leg(
               leg_instruction(order_instruction, credit_debit),
               symbol,
@@ -23,7 +32,7 @@ module SchwabRb
           end
         end
 
-        def order_type(credit_debit)
+        def determine_order_type(credit_debit)
           if credit_debit == :credit
             SchwabRb::Order::Types::NET_CREDIT
           else

data/lib/schwab_rb/orders/vertical_order.rb

@@ -1,38 +1,43 @@
 # frozen_string_literal: true
 
-require 'schwab_rb'
+require "schwab_rb"
 
 module SchwabRb
   module Orders
     class VerticalOrder
       class << self
         def build(
-          short_leg_symbol:, long_leg_symbol:, price:,
-          account_number:, credit_debit: :credit, order_instruction: :open, quantity: 1
+          short_leg_symbol:, long_leg_symbol:,
+          price:,
+          stop_price: nil,
+          order_type: nil,
+          duration: SchwabRb::Orders::Duration::DAY,
+          credit_debit: :credit,
+          order_instruction: :open, quantity: 1
         )
           schwab_order_builder.new.tap do |builder|
-            builder.set_account_number(account_number)
-            builder.set_order_strategy_type('SINGLE')
+            builder.set_order_strategy_type(SchwabRb::Order::OrderStrategyTypes::SINGLE)
             builder.set_session(SchwabRb::Orders::Session::NORMAL)
-            builder.set_duration(SchwabRb::Orders::Duration::DAY)
-            builder.set_order_type(order_type(credit_debit))
+            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)
             builder.set_quantity(quantity)
             builder.set_price(price)
+            builder.set_stop_price(stop_price) if stop_price && order_type == SchwabRb::Order::Types::STOP_LIMIT
             builder.add_option_leg(
-              short_leg_instruction(order_instruction, credit_debit),
+              short_leg_instruction(order_instruction),
               short_leg_symbol,
               quantity
             )
             builder.add_option_leg(
-              long_leg_instruction(order_instruction, credit_debit),
+              long_leg_instruction(order_instruction),
               long_leg_symbol,
               quantity
             )
           end
         end
 
-        def order_type(credit_debit)
+        def determine_order_type(credit_debit)
           if credit_debit == :credit
             SchwabRb::Order::Types::NET_CREDIT
           else
@@ -40,31 +45,23 @@ module SchwabRb
           end
         end
 
-        def short_leg_instruction(order_instruction, credit_debit)
-          if order_instruction == :open && credit_debit == :credit
+        def short_leg_instruction(order_instruction)
+          if order_instruction == :open
             SchwabRb::Orders::OptionInstructions::SELL_TO_OPEN
-          elsif order_instruction == :open && credit_debit == :debit
-            SchwabRb::Orders::OptionInstructions::BUY_TO_OPEN
-          elsif order_instruction == :close && credit_debit == :credit
-            SchwabRb::Orders::OptionInstructions::SELL_TO_CLOSE
-          elsif order_instruction == :close && credit_debit == :debit
+          elsif order_instruction == :close
             SchwabRb::Orders::OptionInstructions::BUY_TO_CLOSE
           else
-            raise "Unsupported order instruction: #{order_instruction} with credit/debit: #{credit_debit}"
+            raise "Unsupported order instruction: #{order_instruction}"
           end
         end
 
-        def long_leg_instruction(order_instruction, credit_debit)
-          if order_instruction == :open && credit_debit == :credit
+        def long_leg_instruction(order_instruction)
+          if order_instruction == :open
             SchwabRb::Orders::OptionInstructions::BUY_TO_OPEN
-          elsif order_instruction == :close && credit_debit == :credit
+          elsif order_instruction == :close
             SchwabRb::Orders::OptionInstructions::SELL_TO_CLOSE
-          elsif order_instruction == :open && credit_debit == :debit
-            SchwabRb::Orders::OptionInstructions::SELL_TO_OPEN
-          elsif order_instruction == :close && credit_debit == :debit
-            SchwabRb::Orders::OptionInstructions::BUY_TO_CLOSE
           else
-            raise "Unsupported order instruction: #{order_instruction} with credit/debit: #{credit_debit}"
+            raise "Unsupported order instruction: #{order_instruction}"
           end
         end
 

data/lib/schwab_rb/version.rb

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

data/lib/schwab_rb.rb

@@ -2,6 +2,7 @@
 
 require_relative "schwab_rb/version"
 require_relative "schwab_rb/configuration"
+require_relative "schwab_rb/account_hash_manager"
 require_relative "schwab_rb/auth/token_manager"
 require_relative "schwab_rb/auth/token"
 require_relative "schwab_rb/auth/init_client_login"
@@ -47,6 +48,7 @@ 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/single_order"
+require_relative "schwab_rb/orders/oco_order"
 
 module SchwabRb
   class Error < StandardError; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: schwab_rb
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors:
 - Joseph Platta
 bindir: exe
 cert_chain: []
-date: 2025-09-08 00:00:00.000000000 Z
+date: 2025-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -202,13 +202,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- doc/ACCOUNT_MANAGEMENT.md
+- doc/PLACE_ORDER_SAMPLES.md
+- doc/QUICK_START.md
 - doc/notes/data_objects_analysis.md
 - doc/notes/data_objects_refactoring_plan.md
 - examples/fetch_account_numbers.rb
 - examples/fetch_price_history.rb
 - examples/fetch_user_preferences.rb
+- examples/place_oco_order.rb
 - lib/schwab_rb.rb
 - lib/schwab_rb/account.rb
+- lib/schwab_rb/account_hash_manager.rb
 - lib/schwab_rb/auth/auth_context.rb
 - lib/schwab_rb/auth/init_client_easy.rb
 - lib/schwab_rb/auth/init_client_login.rb
@@ -247,6 +252,7 @@ files:
 - lib/schwab_rb/orders/errors.rb
 - lib/schwab_rb/orders/instruments.rb
 - lib/schwab_rb/orders/iron_condor_order.rb
+- lib/schwab_rb/orders/oco_order.rb
 - lib/schwab_rb/orders/option_instructions.rb
 - lib/schwab_rb/orders/order.rb
 - lib/schwab_rb/orders/order_factory.rb