iron_warbler 2.0.7.42 → 2.0.7.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63cc89c7ffba2eebf079f6470e3d7346d7fae502a5789e3822210ddb747fc3e1
-  data.tar.gz: faf3977f0f75b27653d9112c6ee993627a8a465aacb904866d5e047253989aa8
+  metadata.gz: 2b6eb4da8444c595a5279fbe6242f4bf503313f4e7d01bb0b844a1e45db0caa5
+  data.tar.gz: 7b14b6fd526ed9016b6264470e170442ec852179f175c942e8b437f1af9f103f
 SHA512:
-  metadata.gz: d7a17720e26f3226831d9381f91aa6202ae19be883d28c4b98210280c9afbda233550a0217d60212091d15b53ab708d636e62a953d21d04b5acc0c3dc31d0229
-  data.tar.gz: 9e9ce2229a98c994619f8b3a6f3134babf1acbf9c709d8a9a19d21c60c8d19da96e893aa7c571b074019402b3479bf903fbbd89c25ede452b17d51794b374fff
+  metadata.gz: d7ef0a066c968de0c6d4c7285888e09306bebd3c2c09c9153c4e746e4d5a322b7f8d873de39d9f4b753bf605d8f29ff5f5128009f5be21427c6f1e40ca698b55
+  data.tar.gz: 6edb134dd367a3983abfb675032659b25b905b180e7bacee1cf53597d1a120731b236449eb2077e4b7421dbf74cf8870ddbff9b08bc57a91bc8dc6fd834d2a07

data/app/assets/stylesheets/iron_warbler/utils.scss

@@ -5,28 +5,28 @@
 //   // content: '[LONG]';
 // }
 .long-or-short-item,
-.long-or-short-container .is_long,
-.long-or-short-container .is_short {
+.long-or-short-container .is-long,
+.long-or-short-container .is-short {
   display: flex;
   flex-direction: column;
 }
 
-.long-or-short-container .is_long,
-.is_long .long-or-short-item {
+.long-or-short-container .is-long,
+.is-long .long-or-short-item {
   border-left: 3px solid var(--iro-color-long);
   padding-left: 5px;
 }
-.long-or-short-container .is_short,
-.is_short .long-or-short-item {
+.long-or-short-container .is-short,
+.is-short .long-or-short-item {
   border-left: 3px solid var(--iro-color-short);
   padding-left: 5px;
 }
 
-.is_short .long-or-short-item::before {
+.is-short .long-or-short-item::before {
   // content: '[SHORT]';
 }
-.is_short .long-or-short-item,
-.long-or-short-container .is_short {
+.is-short .long-or-short-item,
+.long-or-short-container .is-short {
   flex-direction: column-reverse;
 }
 

data/app/controllers/iro/positions_controller.rb

@@ -38,6 +38,7 @@ class Iro::PositionsController < Iro::ApplicationController
 
   def new
     strategy    = Iro::Strategy.find params[:position][:strategy_id]
+
     @position   = strategy.next_position
     @position ||= Iro::Position.new( params[:position].permit!.merge({
       status:   Iro::Position::STATUS_PROPOSED,

data/app/controllers/iro/purses_controller.rb

@@ -36,7 +36,9 @@ class Iro::PursesController < Iro::ApplicationController
     authorize! :show, @purse
 
 
-    @positions = @purse.positions.where( status: 'active' ).includes( :strategy
+    @positions = @purse.positions(
+      ).where( status: 'active'
+      ).includes( :strategy
       ).order( expires_on: :asc, ticker: :desc, long_or_short: :asc, inner_strike: :asc )
 
 

data/app/controllers/iro/strategies_controller.rb

@@ -7,13 +7,18 @@ class Iro::StrategiesController < Iro::ApplicationController
     @strategy = Iro::Strategy.new params[:strategy].permit!
     authorize! :create, @strategy
 
+    if @strategy[:kind] == Iro::Strategy::KIND_WHEEL
+      @strategy.long_or_short   = Iro::Strategy::LONG
+      @strategy.credit_or_debit = Iro::Strategy::DEBIT
+    end
+
     if @strategy.save
       flash_notice @strategy
+      redirect_to action: :index
     else
       flash_alert @strategy
+      render action: 'new'
     end
-
-    redirect_to action: :index
   end
 
   def destroy
@@ -37,7 +42,7 @@ class Iro::StrategiesController < Iro::ApplicationController
   end
 
   def new
-    @strategy = Iro::Strategy.new
+    @strategy = Iro::Strategy.new({ kind: params[:kind] })
     authorize! :new, @posision
   end
 

data/app/mailers/iro/alert_mailer.rb

@@ -6,7 +6,7 @@ class Iro::AlertMailer < ActionMailer::Base
   def stock_alert id
     @alert = Iro::Alert.find id
     mail( to: 'victor@piousbox.com',
-     subject: 'Iro::AlertMailer#stock_alert' )
+     subject: "#{Time.now.to_date} Iro::AlertMailer#stock_alert" )
   end
 
 end

data/app/views/iro/positions/_form.haml

@@ -1,7 +1,7 @@
 
 - long_or_short = position.long_or_short || position.strategy&.long_or_short || params[:long_or_short]
 
-.positions--form{ class: params[:long_or_short] || long_or_short }
+.positions--form{ class: "is-#{long_or_short}" }
   = form_for position do |f|
     .actions
       = f.submit

data/app/views/iro/positions/{_gameui_long_debit_call_spread.haml-trash → _gameui_spread.haml}

@@ -1,17 +1,18 @@
 
--##
--## same for long and short debit spreads
--##
-
 - pos   = position
 - stock = pos.stock
 - nearest_strike = stock.last.round
 - u = pos.purse.unit # pixels per dollar
 
+-#
+-# 2024-07-30 I have not verified any of this - copied from long_debit_call_spread.
+-#
+
 .collapse-expand.d-flex{ id: "gameui-pos-#{pos.id}" }
   [<>]
   .maxwidth= render "/iro/positions/header", pos: pos
 .a
+  - puts! pos, 'pos'
   = render "/iro/positions/header_#{pos.strategy.kind}", pos: pos
   .StockCoordinatesW
     .StockCoordinates{ style: "height: #{pos.q() *pos.purse.height}px " }
@@ -21,20 +22,20 @@
         .label Last: #{pp_amount stock.last}
         .c
 
-        - left  = "#{ ( pos.outer.strike - stock.last ) * u}px"
-        - width = "#{ ( pos.inner.strike - pos.outer.strike ) * u}px"
+        - left  = "#{ ( pos.outer.strike - stock.last ).abs() *-1*u}px"
+        - width = "#{ ( pos.inner.strike - pos.outer.strike ).abs() *u}px"
         .PositionW{ class: pos.strategy.kind, style: "left: #{left}; width: #{width}; " }
           .Position
             .MaxGain{ style: "width: #{pos.max_gain * u}px" }
             .RollGuide
 
             - if pos.net_amount >= 0
-              .Net.NetPositive{ style: "width: #{ (pos.net_amount / 100) * u }px; right: 0" }
+              .Net.NetPositive{ style: "width: #{ (pos.net_amount) * u }px; right: 0" }
                 .label
                   net
                   = pp_amount pos.net_amount
             - else
-              .Net.NetNegative{ style: "width: #{ (-1 * pos.net_amount / 100) * u }px; left: 100%" }
+              .Net.NetNegative{ style: "width: #{ (-1 * pos.net_amount) * u }px; left: 100%" }
                 .label
                   net
                   = pp_amount pos.net_amount

data/app/views/iro/positions/_header_spread.haml

@@ -0,0 +1,12 @@
+
+- collapse_key ||= pos.id
+%i.fa.fa-expand.collapse-expand.floaty-collapse{ id: "gameui-pos-detail-#{collapse_key}" }
+.maxwidth
+  %ul.m-0.p-0
+    - if !pos.persisted?
+      %li <b>expires_on:</b> #{pos.expires_on}
+      %li <b>inner_strike:</b> #{pp_amount pos.inner_strike}
+      %li <b>next_gain_loss_amount:</b> #{pp_amount pos.next_gain_loss_amount}
+
+    %li <b>begin_inner_price:</b> #{pp_amount pos.inner.begin_price}
+    %li <b>Net:</b> #{pp_amount pos.net_amount} &nbsp; <i>#{pp_percent pos.net_percent}</i>

data/app/views/iro/positions/_new.haml

@@ -7,6 +7,10 @@
       .formrow-v1
         .label +Position
 
+        .d-flex.flex-column
+          %label Stock
+          = f.select :stock_id, options_for_select(@stocks_list)
+
         .d-flex.flex-column
           %label Strategy
           = f.select :strategy_id, options_for_select(@strategies_list)

data/app/views/iro/positions/done/_gameui_short_debit_put_spread.haml

@@ -0,0 +1 @@
+app/views/iro/positions/done/_gameui_long_debit_call_spread.haml

data/app/views/iro/positions/done/_header_short_debit_put_spread.haml

@@ -0,0 +1 @@
+app/views/iro/positions/done/_header_long_debit_call_spread.haml

data/app/views/iro/purses/_form.haml

@@ -2,9 +2,9 @@
 .iro-purses--form
   = form_for purse do |f|
     .flex-row
-      .field
-        %label stock
-        = f.select :stock_id, options_for_select( @stocks_list, selected: purse.stock_id )
+      -# .field
+      -#   %label stock
+      -#   = f.select :stock_id, options_for_select( @stocks_list, selected: purse.stock_id )
 
       .field
         %label Slug

data/app/views/iro/purses/index.haml

@@ -9,5 +9,6 @@
         = link_to '[~]', edit_purse_path(purse)
         = link_to purse.slug, purse_path(purse)
 
-  %hr
-  = render 'iro/purses/form', purse: Iro::Purse.new
+  .descr
+    %h5.header New Purse
+    = render 'iro/purses/form', purse: Iro::Purse.new

data/app/views/iro/strategies/_form_spread.haml

@@ -0,0 +1,69 @@
+
+.strategies--form
+  = form_for strategy do |f|
+    .actions
+      = f.submit
+
+    .row
+      .col-md-6
+        .field
+          %label Kind:
+          = strategy.kind
+          = hidden_field_tag 'strategy[kind]', params[:kind] if params[:kind]
+        .field
+          %label stock
+          = f.select :stock_id, options_for_select(@stocks_list, selected: strategy.stock_id), class: 'select2'
+        .field
+          %label long or short?
+          = f.select :long_or_short, options_for_select([nil, Iro::Strategy::LONG, Iro::Strategy::SHORT], selected: strategy.long_or_short)
+        .field
+          %label credit or debit?
+          = f.select :credit_or_debit, options_for_select([nil, Iro::Strategy::CREDIT, Iro::Strategy::DEBIT], selected: strategy.credit_or_debit)
+        .field
+          %label call or put?
+          .comment This is selected automatically
+          -# = f.select :call_or_put, options_for_select([nil, 'CALL', 'PUT'], selected: strategy.credit_or_debit)
+
+      -# .col-md-6
+      -#   .field
+      -#     %label slug
+      -#     = f.text_field :slug
+    %hr
+
+
+    .field
+      %label Threshold Buffer dollars above water
+      = f.number_field :threshold_buffer_above_water, placeholder: "0.49", step: 0.01
+    .field
+      = f.label :threshold_dte
+      = f.number_field :threshold_dte, placeholder: "1"
+    -# .field
+    -#   = f.label :next_max_outer_delta
+    -#   = f.number_field :next_max_outer_delta, placeholder: "0.25", step: 0.01
+    .field
+      = f.label :threshold_delta
+      = f.number_field :threshold_delta, placeholder: "0.14", step: 0.001
+    .field
+      = f.label :threshold_netp
+      = f.number_field :threshold_netp, placeholder: "0.69", step: 0.001
+
+    %hr
+
+    .field
+      = f.label :next_inner_delta
+      = f.number_field :next_inner_delta, placeholder: "0.25", step: 0.001
+    .field
+      = f.label :next_inner_strike
+      = f.number_field :next_inner_strike, placeholder: "20.0", step: 0.01
+      .comment Literally the min (max) dollar amount of next strike
+    .field
+      = f.label :next_spread_amount
+      = f.number_field :next_spread_amount, placeholder: "20", step: 0.1
+    .field
+      %label next buffer dollars above water
+      = f.number_field :next_buffer_above_water, placeholder: "80", step: 0.01
+
+    .actions
+      = f.submit
+
+

data/app/views/iro/strategies/{_form.haml → _form_wheel.haml}

@@ -7,19 +7,21 @@
     .row
       .col-md-6
         .field
-          %label Kind
-          = f.select :kind, options_for_select( Iro::Strategy::KINDS, selected: strategy.kind )
-        .field
-          %label long or short?
-          = f.select :long_or_short, options_for_select([nil, Iro::Strategy::LONG, Iro::Strategy::SHORT], selected: strategy.long_or_short)
+          %label Kind:
+          = strategy.kind
+          = hidden_field_tag 'strategy[kind]', params[:kind]
         .field
           %label stock
           = f.select :stock_id, options_for_select(@stocks_list, selected: strategy.stock_id), class: 'select2'
-
-      .col-md-6
         .field
-          %label slug
-          = f.text_field :slug
+          %label long or short?
+          Automatically long
+        .field
+          %label credit or debit?
+          Debit
+        .field
+          %label call or put?
+          Covered call
     %hr
 
 
@@ -47,9 +49,7 @@
     .field
       = f.label :next_inner_strike
       = f.number_field :next_inner_strike, placeholder: "20.0", step: 0.01
-    .field
-      = f.label :next_spread_amount
-      = f.number_field :next_spread_amount, placeholder: "20", step: 0.1
+      .comment Literally the min (max) dollar amount of next strike
     .field
       %label next buffer dollars above water
       = f.number_field :next_buffer_above_water, placeholder: "80", step: 0.01

data/app/views/iro/strategies/_header.haml

@@ -3,6 +3,7 @@
 .inline-search
   = form_tag strategies_path, method: :get do
     = text_field_tag :q
-= link_to '[+]', new_strategy_path
+= link_to '[+spread]', new_spread_strategy_path
+= link_to '[+wheel]', new_wheel_strategy_path
 
 

data/app/views/iro/strategies/_table.haml

@@ -10,7 +10,7 @@
         %th kind
         %th slug
         %th stock
-        %th long or short
+        -# %th long or short
         %th next_inner_delta
         %th.actions  
     %tbody
@@ -22,10 +22,8 @@
               = button_to 'x', strategy_path(sss), method: :delete, data: { confirm: 'Are you sure?' }
           %td= sss.kind
           %td= link_to sss.slug, strategy_path(sss)
-          %td.stock
-            = sss.stock
-          %td.long-or-short
-            = sss.long_or_short
+          %td.stock= sss.stock
+          -# %td.long-or-short= sss.long_or_short
           %td= sss.next_inner_delta
           %td
             = form_tag propose_position_path do

data/app/views/iro/strategies/edit.haml

@@ -1,3 +1,3 @@
 
 .strategies-edit.maxwidth
-  = render 'form', strategy: @strategy
+  = render "form_#{@strategy.kind}", strategy: @strategy

data/app/views/iro/strategies/index.haml

@@ -3,6 +3,7 @@
   .header
     %h5.title
       Strategies
-      = link_to '[+]', iro.new_strategy_path
+      = link_to '[+spread]', iro.new_spread_strategy_path
+      = link_to '[+wheel]', iro.new_wheel_strategy_path
 
   = render '/iro/strategies/table', strategies: @strategies

data/app/views/iro/strategies/new.haml

@@ -1,3 +1,3 @@
 
 .maxwidth
-  = render 'form', strategy: @strategy
+  = render "form_#{params[:kind]}", strategy: @strategy

data/app/views/layouts/iro/application.haml

@@ -43,7 +43,7 @@
 
     = render "/wco/main_header"
     = render "/iro/main_header"
-    = render '/wco/alerts_notices' if notice || alert
+    = render '/wco/application/alerts_notices' if notice || alert
     .spacer-small
 
     %span.absolute.collapse-expand#mainW

data/config/routes.rb

@@ -31,6 +31,8 @@ Iro::Engine.routes.draw do
   get 'stocks/sync', to: 'stocks#sync', as: :sync_stocks
   resources :stocks
 
+  get 'strategies/new-spread', to: 'strategies#new', as: :new_spread_strategy, defaults: { kind: 'spread' }
+  get 'strategies/new-wheel',  to: 'strategies#new', as: :new_wheel_strategy,  defaults: { kind: 'wheel' }
   resources :strategies
 
   get 'api/oauth2-redirect.html', to: 'api#oauth2_redirect'

data/lib/iron_warbler.rb

@@ -2,6 +2,7 @@
 require 'business_time'
 require 'haml'
 require 'mongoid'
+require 'httparty'
 
 require "iro/engine"
 
@@ -178,7 +179,7 @@ class Iro::Iro
       },
     })
     out = out.parsed_response
-    puts! out, 'out'
+    puts! out, '#schwab_sync'
 
     attrs = {
       schwab_access_token:  out['access_token'],

data/lib/tasks/iro_tasks.rake

@@ -73,6 +73,12 @@ namespace :iro do
     Iro::Position.active.where({ kind: 'covered_call' }).map &:refresh
   end
 
+  desc 'sync schwab'
+  task sync_schwab: :environment do
+    Iro::Iro.schwab_sync
+    puts '.'
+  end
+
   desc 'watch positions'
   task watch_positions: :environment do
     while true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron_warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.7.42
+  version: 2.0.7.45
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: business_time
@@ -242,16 +242,6 @@ files:
 - app/jobs/tda_job.rb-bk
 - app/mailers/iro/alert_mailer.rb
 - app/mailers/iro/application_mailer.rb
-- app/models/iro/alert.rb
-- app/models/iro/datapoint.rb
-- app/models/iro/date.rb
-- app/models/iro/option.rb
-- app/models/iro/option_black_scholes.rb
-- app/models/iro/position.rb
-- app/models/iro/priceitem.rb
-- app/models/iro/purse.rb
-- app/models/iro/stock.rb
-- app/models/iro/strategy.rb
 - app/models/tda/option.rb
 - app/models/tda/stock.rb
 - app/views/iro/_analytics.erb
@@ -269,19 +259,10 @@ files:
 - app/views/iro/positions/_form.haml
 - app/views/iro/positions/_formpart_4data.haml
 - app/views/iro/positions/_gameui_covered_call.haml
-- app/views/iro/positions/_gameui_covered_call.haml-bk
-- app/views/iro/positions/_gameui_long_credit_put_spread.haml
-- app/views/iro/positions/_gameui_long_debit_call_spread.haml
-- app/views/iro/positions/_gameui_long_debit_call_spread.haml-trash
-- app/views/iro/positions/_gameui_short_credit_call_spread.haml
-- app/views/iro/positions/_gameui_short_debit_put_spread.haml
-- app/views/iro/positions/_gameui_short_debit_put_spread.haml-trash
+- app/views/iro/positions/_gameui_spread.haml
 - app/views/iro/positions/_header.haml
 - app/views/iro/positions/_header_covered_call.haml
-- app/views/iro/positions/_header_long_credit_put_spread.haml
-- app/views/iro/positions/_header_long_debit_call_spread.haml
-- app/views/iro/positions/_header_short_credit_call_spread.haml
-- app/views/iro/positions/_header_short_debit_put_spread.haml
+- app/views/iro/positions/_header_spread.haml
 - app/views/iro/positions/_new.haml
 - app/views/iro/positions/_prepare_covered_call.haml
 - app/views/iro/positions/_prepare_long_debit_call_spread.haml
@@ -289,29 +270,38 @@ files:
 - app/views/iro/positions/_prepare_short_debit_put_spread.haml
 - app/views/iro/positions/_reasons.haml
 - app/views/iro/positions/_table.haml
+- app/views/iro/positions/done/_gameui_covered_call.haml-bk
+- app/views/iro/positions/done/_gameui_long_credit_put_spread.haml
+- app/views/iro/positions/done/_gameui_long_debit_call_spread.haml
+- app/views/iro/positions/done/_gameui_short_credit_call_spread.haml
+- app/views/iro/positions/done/_gameui_short_debit_put_spread.haml
+- app/views/iro/positions/done/_header_long_credit_put_spread.haml
+- app/views/iro/positions/done/_header_long_debit_call_spread.haml
+- app/views/iro/positions/done/_header_short_credit_call_spread.haml
+- app/views/iro/positions/done/_header_short_debit_put_spread.haml
+- app/views/iro/positions/done/roll-cc.haml-bk
 - app/views/iro/positions/edit.haml
 - app/views/iro/positions/new.haml
 - app/views/iro/positions/prepare.haml
 - app/views/iro/positions/prepare2.haml
-- app/views/iro/positions/roll-cc.haml-bk
-- app/views/iro/positions/roll.haml-trash
 - app/views/iro/purses/_form.haml
 - app/views/iro/purses/_form_extra_fields.haml
 - app/views/iro/purses/_header.haml
 - app/views/iro/purses/_summary.haml
+- app/views/iro/purses/done/gameui.haml-bk
+- app/views/iro/purses/done/gameui.haml-bk2
 - app/views/iro/purses/edit.haml
 - app/views/iro/purses/gameui.haml
-- app/views/iro/purses/gameui.haml-bk
-- app/views/iro/purses/gameui.haml-bk2
 - app/views/iro/purses/index.haml
 - app/views/iro/purses/show.haml
 - app/views/iro/stocks/_form.haml
-- app/views/iro/stocks/_grid_is_long.haml
-- app/views/iro/stocks/_grid_is_short.haml
+- app/views/iro/stocks/_grid_long.haml
+- app/views/iro/stocks/_grid_short.haml
 - app/views/iro/stocks/edit.haml
 - app/views/iro/stocks/index.haml
 - app/views/iro/stocks/show.haml
-- app/views/iro/strategies/_form.haml
+- app/views/iro/strategies/_form_spread.haml
+- app/views/iro/strategies/_form_wheel.haml
 - app/views/iro/strategies/_header.haml
 - app/views/iro/strategies/_show.haml
 - app/views/iro/strategies/_table.haml

data/app/models/iro/alert.rb

@@ -1,63 +0,0 @@
-
-class Iro::Alert
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Paranoia
-  store_in collection: 'iro_alerts'
-
-  # SLEEP_TIME_SECONDS = Rails.env.production? ? 60 : 15
-
-  DIRECTION_ABOVE = 'ABOVE'
-  DIRECTION_BELOW = 'BELOW'
-  def self.directions_list
-    [ nil, DIRECTION_ABOVE, DIRECTION_BELOW ]
-  end
-
-  STATUS_ACTIVE   = 'active'
-  STATUS_INACTIVE = 'inactive'
-  STATUSES        = [ nil, 'active', 'inactive' ]
-  field :status, default: STATUS_ACTIVE
-  def self.active
-    where( status: STATUS_ACTIVE )
-  end
-
-  field :class_name, default: 'Iro::Stock'
-  validates :class_name, presence: true
-
-  field :symbol, type: String
-  validates :symbol, presence: true
-
-  field :direction, type: String
-  validates :direction, presence: true
-
-  field :strike, type: Float
-  validates :strike, presence: true
-
-  def do_run
-    alert = self
-    begin
-      price = Tda::Stock.get_quote( alert.symbol )&.last
-      return if !price
-
-      if ( alert.direction == alert.class::DIRECTION_ABOVE && price >= alert.strike ) ||
-         ( alert.direction == alert.class::DIRECTION_BELOW && price <= alert.strike )
-
-        if Rails.env.production?
-          Iro::AlertMailer.stock_alert( alert.id.to_s ).deliver_later
-        else
-          Iro::AlertMailer.stock_alert( alert.id.to_s ).deliver_now
-        end
-        alert.update({ status: alert.class::STATUS_INACTIVE })
-        print '^'
-
-      end
-    rescue => err
-      puts! err, 'err'
-      ::ExceptionNotifier.notify_exception(
-        err,
-        data: { alert: alert }
-      )
-    end
-  end
-
-end