iron_warbler 2.0.7.28 → 2.0.7.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7ca7e6c0657dbafd3a3e9149fbf05f7a0e0aa275b39d183e145d8802cadc175
-  data.tar.gz: c67d4ee07b9646761ed2de0d1291e68d36d7a794ed6b4db58a2d7f2428d72944
+  metadata.gz: 60a17bd2d6ccedafac952f5463331f53ff1e1817e8eab7a00285b43deb265396
+  data.tar.gz: e85425f94157c1d040c2606247ca42b5c7d928431d05978c92d94ea1b8f1b365
 SHA512:
-  metadata.gz: ad587c8488a2a3a1f7a269c32129ba879c3fde5fb54e2a32a7e2a2f45132995e7d2566a492e002c9ee72d83cfb40fdbc1c81dc5f7a536cd5b368cdb95bb2a038
-  data.tar.gz: 4c08a09952620d5339e9f76e5b29ebf5d1134fe0fd20b774f3b7123cd6fe28683b7f517388ac08f1af6142df4edda686d36ab304ff8816c954ce368bdf5a22db
+  metadata.gz: 5f035df03d218468790ed2af125164f2173dcdbcd47598cd3f846aea14cfc6b032b2c16f72d03f7ca53d5eebfa37bf398359bfd032230e2c74e44296214a6f1e
+  data.tar.gz: 9e71f4855db33c8f7b02fd021980eb1e8b8eff59d6d7f24c96c8d3de380aeafb286a127650ef56dea0192f60f874b8b4f71b2feb57028706a2a681661d4fb822

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

@@ -0,0 +1,9 @@
+
+.iro-alerts--index {
+  .field {
+    label {
+      min-width: auto;
+    }
+  }
+}
+

data/app/controllers/iro/alerts_controller.rb

@@ -45,8 +45,8 @@ class Iro::AlertsController < Iro::ApplicationController
     super
 
     # @profiles_list = Wco::Profile.list
-    @stocks_list = Iro::Stock.list
-    puts! @stocks_list, '@stocks_list'
+    @stocks_list  = Iro::Stock.list
+    @symbols_list = [[nil,nil]] + Iro::Stock.active.map { |s| [ s.ticker, s.ticker ] }
   end
 
 

data/app/controllers/iro/api_controller.rb

@@ -1,8 +1,41 @@
 
+class Schwab
+  include HTTParty
+  debug_output $stdout
+end
+
 class Iro::ApiController < ActionController::Base
   layout false
 
-  before_action :decode_jwt
+  before_action :decode_jwt, except: [ :oauth2_redirect ]
+
+  def oauth2_redirect
+    out = Schwab.post( "https://api.schwabapi.com/v1/oauth/token", {
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      basic_auth: { username: SCHWAB_DATA[:key], password: SCHWAB_DATA[:secret] },
+      body: {
+        grant_type: 'authorization_code',
+        code: params[:code].sub('%40', '@'),
+        redirect_uri: SCHWAB_DATA[:redirect_url],
+      },
+    })
+    out = out.parsed_response
+
+    attrs = {
+      schwab_access_token:  out['access_token'],
+      schwab_refresh_token: out['refresh_token'],
+      schwab_id_token:      out['id_token'],
+    }
+    # puts! attrs, 'attrs'
+
+    profile = Wco::Profile.find_by email: 'piousbox@gmail.com'
+    profile.update(attrs)
+    profile.save!
+
+    render json: { status: :ok }
+  end
 
   ##
   ## private

data/app/models/tda/option.rb

@@ -84,7 +84,7 @@ class Tda::Option
       end
     end
     if params[:expirationDate]
-      opts[:fromDate] = opts[:toDate] = params[:expirationDate]
+      opts[:fromDate] = opts[:toDate] = params[:expirationDate].to_s[0...10]
     else
       raise Iro::InputError.new("Invalid input, missing 'date'.")
     end
@@ -98,11 +98,12 @@ class Tda::Option
       opts[:strike] = params[:strike]
     end
 
-    query = { apikey: ::TD_AMERITRADE[:apiKey] }.merge opts
+    query = { }.merge opts
     # puts! query, 'input opts'
 
     headers = {
-      Authorize: "Bearer #{::TD_AMERITRADE[:access_token]}",
+      accept:    'application/json',
+      Authorization: "Bearer #{::SCHWAB_DATA[:access_token]}",
     }
 
 

data/app/models/tda/stock.rb

@@ -13,14 +13,16 @@ class Tda::Stock
   ## tickers = "GME"
   ## tickers = "NVDA,GME"
   def self.get_quotes tickers
+    profile = Wco::Profile.find_by email: 'piousbox@gmail.com'
+
     path = "/quotes"
     headers = {
       accept:    'application/json',
-      Authorization: "Bearer #{::SCHWAB_DATA[:access_token]}",
+      Authorization: "Bearer #{profile.schwab_access_token}",
     }
     inns = self.get path, { headers: headers, query: { symbols: tickers } }
     inns = inns.parsed_response
-    # puts! inns, 'parsed response'
+    puts! inns, 'parsed response'
 
     if [ NilClass, String ].include?( inns.class )
       return []

data/app/views/iro/_main_header.haml

@@ -7,6 +7,8 @@
     .W
       .d-flex.flex-wrap
         %ul
+          %li
+            = link_to "Schwab Login", "https://api.schwabapi.com/v1/oauth/authorize?client_id=#{SCHWAB_DATA[:key]}&redirect_uri=#{SCHWAB_DATA[:redirect_url]}"
           %li
             = link_to "Stocks (#{Iro::Stock.all.length})", stocks_path
             = link_to '[sync]', sync_stocks_path

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

@@ -24,7 +24,7 @@
       -#   = f.text_field :kind
       .field
         = f.label :symbol
-        = f.select :symbol, options_for_select( @stocks_list, selected: alert.symbol )
+        = f.select :symbol, options_for_select( @symbols_list, selected: alert.symbol )
       .field
         = f.label :direction
         = f.select :direction, options_for_select([ :ABOVE, :BELOW ], selected: alert.direction)

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

@@ -1,9 +1,9 @@
 
-.iro-alerts--index.maxwidth
+.iro-alerts--index.padded
   %h5 Iro Alerts
 
-  %ul
+  .a
     - @alerts.each do |alert|
-      %li
+      .a
         = render 'iro/alerts/form', alert: alert
-    %li= render 'iro/alerts/form', alert: Iro::Alert.new
+    .a= render 'iro/alerts/form', alert: Iro::Alert.new

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

@@ -18,9 +18,9 @@
       %label Stock
       = f.select :stock_id, options_for_select( @stocks_list, selected: position.stock_id )
 
-    .field
-      %label long or short?
-      = f.select :long_or_short, options_for_select([nil, Iro::Strategy::LONG, Iro::Strategy::SHORT], selected: long_or_short )
+    -# .field
+    -#   %label long or short?
+    -#   = f.select :long_or_short, options_for_select([nil, Iro::Strategy::LONG, Iro::Strategy::SHORT], selected: long_or_short )
 
     %label Strategy
     = f.select :strategy_id, options_for_select( @strategies_list, selected: position.strategy_id )

data/config/routes.rb

@@ -9,14 +9,14 @@ Iro::Engine.routes.draw do
 
   resources :option_watches
 
-  match 'positions/:id/close', to: 'positions#close', as: :close_position, via: [ :get, :post ]
-  get  'positions/duplicate/:id', to: 'positions#new',    as: :duplicate_position
-  post 'positions/propose', to: 'positions#propose',      as: :propose_position
-  get  'positions/:id/prepare', to: 'positions#prepare',  as: :prepare_to_roll_position, defaults: { template: 'gameui' }
-  match  'positions/:id/prepare2', to: 'positions#prepare2', as: :prepare2_position, defaults: { template: 'gameui' }, via: [ :get, :post ]
-  match  'positions/:id/prepare3', to: 'positions#prepare3', as: :prepare3_position, defaults: { template: 'gameui' }, via: [ :get, :post ]
-  post 'positions/:id/roll', to: 'positions#do_roll',     as: :roll_position
-  get  'positions/:id/sync', to: 'positions#sync',  as: :sync_position
+  match 'positions/:id/close',     to: 'positions#close',    as: :close_position, via: [ :get, :post ]
+  get   'positions/duplicate/:id', to: 'positions#new',      as: :duplicate_position
+  post  'positions/propose',       to: 'positions#propose',  as: :propose_position
+  get   'positions/:id/prepare',   to: 'positions#prepare',  as: :prepare_to_roll_position, defaults: { template: 'gameui' }
+  match 'positions/:id/prepare2',  to: 'positions#prepare2', as: :prepare2_position,        defaults: { template: 'gameui' }, via: [ :get, :post ]
+  match 'positions/:id/prepare3',  to: 'positions#prepare3', as: :prepare3_position,        defaults: { template: 'gameui' }, via: [ :get, :post ]
+  post  'positions/:id/roll',      to: 'positions#do_roll',  as: :roll_position
+  get   'positions/:id/sync',      to: 'positions#sync',     as: :sync_position
   resources :positions
   resources :profiles
 
@@ -29,6 +29,7 @@ Iro::Engine.routes.draw do
 
   resources :strategies
 
+  get 'api/oauth2-redirect.html', to: 'api#oauth2_redirect'
   namespace :api do
     get 'stocks', to: 'stocks#index'
     get 'stocks/:ticker',                to: 'stocks#show'

data/lib/tasks/iro_tasks.rake

@@ -62,7 +62,8 @@ namespace :iro do
         # Wco::Exceptionist.notify(e, 'Error in iro:watch_stocks')
       end
 
-      sleep 15*60 # 15 min
+      print '.'
+      sleep 15 # *60 # 15 min
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron_warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.7.28
+  version: 2.0.7.29
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: business_time
@@ -218,6 +218,7 @@ files:
 - app/assets/javascript/iron_warbler/application.js
 - app/assets/javascript/iron_warbler/gameui.js
 - app/assets/stylesheets/iron_warbler/Card.scss
+- app/assets/stylesheets/iron_warbler/alerts.scss
 - app/assets/stylesheets/iron_warbler/application.css
 - app/assets/stylesheets/iron_warbler/positions.scss
 - app/assets/stylesheets/iron_warbler/positions_gameui.scss