ish_manager 0.1.8.278 → 0.1.8.282

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea88d9378fd171766a3dfd996a631f5a92d28880018fcc52bca01aed7d7d2b2
-  data.tar.gz: f4ae443eb6d4ff99e7242b11205121fa93111db2e3666602e227480a3156844a
+  metadata.gz: 62ac19ed592915fa7a6434a0a61ee2b9efa4d1cd988ac354391abe13e061138f
+  data.tar.gz: 44beb8d38194b1615c5d2d40168ac1acb8d2eccd53034f5652e3a425caecf7a8
 SHA512:
-  metadata.gz: 487c21d056637ed963ca9bf71e11540fb083eb528a78c477ccaa718e0c5acf3c40b23e229d5c2668a62dc4403151de0447523facfb76c83a670c2a5e3d22aa99
-  data.tar.gz: 779c28a83610c15f69cb44111258d27ecb6200e338f5c20cd95471b7c37805bb25121b2a3e5b00f8846ed3153793a5f02f8d5283894ae58152ccfa2dbab4bd63
+  metadata.gz: a946c5fd3c36b6156b323015e647ced9570b22ea41962133db97a7d01bc8887784e78d06f542750714c7a8fee04fafbc239f465bcc0d253e88bd5ccaf168d5c5
+  data.tar.gz: 8467f4cbb960f3d1eba742d834660a73eb7817486ab5fd98389276f22f945c66cb3653888b646c68b7ecbc173c14ba47cf829566eb36a0bc5d81ed9e40dd4053

data/app/assets/stylesheets/ish_manager/application.scss

@@ -58,23 +58,6 @@ ul:not(.browser-default).bullets, {
 }
 
 
-.flat-row {
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  align-content: flex-start;
-
-  height: 2.4em;
-  line-height: 3em;
-
-  width: 100%;
-  margin: 1em 0 0 0;
-  padding: 0;
-
-  > * {
-    padding-right: 1em;
-  }
-}
 
 
 /* A */
@@ -130,9 +113,28 @@ ul:not(.browser-default).bullets, {
 /* E */
 /* F */
 
+.flat-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-content: flex-start;
+
+  height: 2.4em;
+  line-height: 3em;
+
+  width: 100%;
+  margin: 1em 0 0 0;
+  padding: 0;
+
+  > * {
+    padding-right: 1em;
+  }
+}
+
+
 .flex-row {
   display: flex;
-  flex-wrap: wrap;
+  flex-wrap: wrap; /* @TODO: why does it wrap? in ish_manager/show , I'd prefer it didn't. */
 }
 
 .float-left {
@@ -172,14 +174,6 @@ textarea.large {
 
 /* M */
 
-.menu-secondary li {
-  display: inline;
-}
-.menu-secondary li a {
-  padding: 1rem;
-  background: white;
-}
-
 
 .manager--main-header {
   background: url('/assets/bg/weather.png');
@@ -217,6 +211,16 @@ textarea.large {
   border-bottom: 1px solid red;
 }
 
+.menu-secondary li {
+  display: inline;
+}
+.menu-secondary li a {
+  padding: 1rem;
+  background: white;
+}
+.meta-edit {
+  display: inline;
+}
 
 /* P */
 .panel-content {

data/app/assets/stylesheets/ish_manager/videos.scss

@@ -1 +1,26 @@
 
+.ish_manager-videos-show {
+  border-bottom: 2px solid red;
+  margin: 0 auto;
+  padding-bottom: .8em;
+  width: 640px;
+
+
+  .title {
+    font-size: 1.4em;
+    margin-left: .2em;
+  }
+
+  .row {
+    display: flex;
+    margin: 0;
+
+    img {
+      margin-right: .8em;
+      width: 100px;
+      height: 100px;
+    }
+  }
+
+
+}

data/app/controllers/ish_manager/option_watches_controller.rb

@@ -0,0 +1,60 @@
+
+class IshManager::OptionWatchesController < IshManager::ApplicationController
+
+  layout 'ish_manager/application2'
+
+  ## alphabetized : )
+
+  def create
+    @option_watch = Warbler::OptionWatch.new permitted_params
+    authorize! :create, @option_watch
+    flag = @option_watch.save
+    if flag
+      flash[:notice] = 'Created option watch.'
+    else
+      flash[:alert] = "Cannot create option watch: #{@option_watch.errors.messages}"
+    end
+    redirect_to controller: 'stock_watches', action: 'index'
+  end
+
+  def destroy
+    @w = Warbler::StockWatch.find params[:id]
+    authorize! :destroy, @w
+    flag = @w.destroy
+    if flag
+      flash[:notice] = 'Success.'
+    else
+      flash[:alert] = @w.errors.messages
+    end
+    redirect_to controller: 'stock_watches', action: 'index'
+  end
+
+  def index
+    authorize! :open_permission, IshManager::Ability
+    flash[:notice] = 'Redirected option->stock watch index'
+    # redirect_to controller: IshManager::StockWatchesController, action: 'index'
+    redirect_to controller: 'stock_watches', action: 'index'
+  end
+
+  def update
+    @option_watch = Warbler::OptionWatch.find params[:id]
+    authorize! :update, @option_watch
+    flag = @option_watch.update_attributes permitted_params
+    if flag
+      flash[:notice] = 'Updated option watch.'
+    else
+      flash[:alert] = "Cannot update option watch: #{@option_watch.errors.messages}"
+    end
+    redirect_to controller: 'stock_watches', action: 'index'
+  end
+
+  private
+
+  def permitted_params
+    params[:warbler_option_watch].permit!
+  end
+
+end
+
+
+

data/app/controllers/ish_manager/stock_watches_controller.rb

@@ -3,6 +3,8 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
 
   layout 'ish_manager/application2'
 
+  ## alphabetized : )
+
   def create
     @stock_watch = Warbler::StockWatch.new permitted_params
     authorize! :create, @stock_watch
@@ -33,6 +35,8 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
     @stock_watches = Warbler::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
       ).includes( :profile )
     @stock_watch = Warbler::StockWatch.new
+    @option_watches = Warbler::OptionWatch.order_by( ticker: :asc, direction: :asc, price: :desc ).includes( :profile )
+    @option_watch = Warbler::OptionWatch.new
   end
 
   def update

data/app/controllers/ish_manager/videos_controller.rb

@@ -34,7 +34,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   def destroy
     @video = Video.unscoped.find params[:id]
     authorize! :destroy, @video
-    flag = @video.update_attributes( :is_trash => true )
+    flag = @video.delete
     @video.city.touch if @video.city
     @video.site.touch if @video.site
     @video.tags.map &:touch
@@ -91,7 +91,7 @@ class IshManager::VideosController < IshManager::ApplicationController
   end
 
   def show
-    @video = Video.where( :youtube_id => params[:youtube_id] ).first
+    @video = Video.unscoped.where( :youtube_id => params[:youtube_id] ).first
     @video ||= Video.unscoped.find params[:id]
     authorize! :show, @video
 

data/app/models/ish_manager/ability.rb

@@ -7,7 +7,7 @@ class IshManager::Ability
     #
     # signed in user
     #
-    unless user.blank?
+    if !user.blank?
 
       #
       # only sudoer... total power
@@ -100,6 +100,8 @@ class IshManager::Ability
     #
     user ||= ::User.new
 
+    can [ :open_permission ], IshManager::Ability
+
     can [ :show ], ::Gallery do |gallery|
       gallery.is_public
     end

data/app/views/ish_manager/option_watches/_form.haml

@@ -0,0 +1,37 @@
+
+- if option_watch.persisted?
+  .float-left= button_to '[X]', option_watch_path(option_watch.id), method: :delete, data: { confirm: 'Are you sure?' }
+
+
+- url = option_watches_path if !option_watch.persisted?
+- url = option_watch_path( option_watch ) if option_watch.persisted?
+
+= form_for option_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
+  .flex-row
+    .form-group
+      = f.label :action
+      = f.select :action, options_for_select( Warbler::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => option_watch.action )
+    .form-group
+      = f.label :profile
+      = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => option_watch.profile ? option_watch.profile.id : nil )
+    .form-group
+      %label.control-label When
+      = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
+    .form-group
+      %label.control-label Type
+      = f.select :contractType, options_for_select( [['none',nil],['PUT', 'PUT'], ['CALL', 'CALL']], :selected => option_watch.contractType )
+    .form-group
+      %label.control-label On date
+      = f.text_field :date, :class => 'form-control', :placeholder => 'date'
+    .form-group
+      %label.control-label Strike
+      = f.number_field :strike, :step => 0.01, :placeholder => "0.01"
+    .form-group
+      %label.control-label Is
+      = f.select :direction, options_for_select( Warbler::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => option_watch.direction )
+    .form-group
+      %label.control-label Price
+      = f.number_field :price, :step => 0.01, :placeholder => "0.01"
+    .form-group
+      = f.submit ">", :class => %w(btn blue)
+

data/app/views/ish_manager/stock_watches/index.haml

@@ -1,10 +1,24 @@
 
 %h4 Stock Watches
 
-%hr
 - @stock_watches.each do |stock|
+  %hr
   = render 'form', :stock_watch => stock
-        
+
 %hr
 %h5 New
 = render 'form', :stock_watch => @stock_watch
+
+
+%hr
+%hr
+
+%h4 Option Watches
+
+- @option_watches.each do |option|
+  %hr
+  = render 'ish_manager/option_watches/form', option_watch: option
+
+%hr
+%h5 New
+= render 'ish_manager/option_watches/form', option_watch: @option_watch

data/app/views/ish_manager/videos/_embed.haml

@@ -0,0 +1,5 @@
+
+- if !video.youtube_id.blank?
+  = render 'embed_youtube', video: video
+- else
+  = render 'embed_s3', video: video

data/app/views/ish_manager/videos/_embed_s3.erb

@@ -0,0 +1,6 @@
+
+<div class="" style="" >
+  <!-- <iframe width="430" height="322" src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe> -->
+  <iframe width="640" height="480" src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe>
+  <!-- <iframe src="<%= video.video.url %>" frameborder="0" allowfullscreen></iframe> -->
+</div>

data/app/views/ish_manager/videos/_index.haml

@@ -23,9 +23,8 @@
                 .thumb= image_tag video.thumb.url(:thumb)
             .a
               = link_to video.name, video_path( video )
-              .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-              = link_to '[~]', edit_video_path( video )
-            = render 'meta', :item => video
+            = render 'meta_edit', item: video
+            = render 'meta', item: video
             .c
 
   = paginate videos, :param_name => :videos_page, :views_prefix => 'ish_manager'

data/app/views/ish_manager/videos/_meta_edit.haml

@@ -0,0 +1,4 @@
+
+.meta-edit
+  .inline= button_to '[x]', video_path( item ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+  = link_to '[~]', edit_video_path( item )

data/app/views/ish_manager/videos/show.haml

@@ -2,19 +2,18 @@
 - content_for :title do
   #{@video.name} | #{@site ? @site.title : ''}
 
-.row
-  .large-12.columns
+.ish_manager-videos-show
+  = link_to '[Back]', videos_path
 
-    %h3
-      - if @video.name.blank?
-        = t('videos.no_title')
-      - else
-        = @video.name
-    = render 'ish_manager/application/meta', :item => @video
-    .text-center= render 'embed', :video => @video
-    %hr
-    = link_to @video.video.url, @video.video.url
+  = render 'embed', :video => @video
+
+  .row
+    = image_tag @video.thumb.url(:thumb)
+    .a
+      .title
+        = @video.name.blank? ? t('videos.no_title') : @video.name
+      .flex-row
+        = render 'meta_edit', item: @video
+        = render 'ish_manager/application/meta', :item => @video
+        = link_to @video.video_file_name, @video.video.url
 
-    %p <b>User Profile:</b> #{@video.user_profile.name}
-    %p= image_tag @video.thumb.url(:thumb)
-    %p <b>Video:</b> #{@video.inspect}

data/config/routes.rb

@@ -82,6 +82,7 @@ IshManager::Engine.routes.draw do
   # resources :stock_actions
   # resources :stock_options
   resources :stock_watches
+  resources :option_watches
 
   resources :tags do
     resources :features

data/lib/tasks/ish_manager_tasks.rake

@@ -4,10 +4,6 @@ def puts! a, b=''
   puts a.inspect
 end
 
-class Warbler::StockWatch
-  SLEEP_TIME_SECONDS = 60
-end
-
 namespace :ish_manager do
 
   desc "every user needs a user_profile"
@@ -27,9 +23,6 @@ namespace :ish_manager do
     while true
       stocks = Warbler::StockWatch.where( notification_type: :EMAIL )
       stocks.each do |stock|
-
-        puts! stock, 'stock'
-
         begin
           Timeout::timeout( 10 ) do
             out = Warbler::Ameritrade::Api.get_quote({ symbol: stock.ticker })
@@ -40,7 +33,7 @@ namespace :ish_manager do
            end
           end
         rescue Exception => e
-          puts! e, 'e in :watch_stocks'
+          puts! e, 'Error in ish_manager:watch_stocks :'
         end
       end
       sleep Warbler::StockWatch::SLEEP_TIME_SECONDS

data/lib/tasks/warbler_tasks.rake

@@ -0,0 +1,55 @@
+
+def puts! a, b=''
+  puts "+++ +++ #{b}:"
+  pp a
+end
+
+namespace :warbler do
+
+  ## @TODO: this is still in ish_manager namespace, need to actually move it here.
+  desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
+  task watch_stocks: :environment do
+    while true
+      stocks = Warbler::StockWatch.where( notification_type: :EMAIL )
+      stocks.each do |stock|
+        begin
+          Timeout::timeout( 10 ) do
+            out = Warbler::Ameritrade::Api.get_quote({ symbol: stock.ticker })
+            r = out[:lastPrice]
+            if  stock.direction == :ABOVE && r >= stock.price ||
+                stock.direction == :BELOW && r <= stock.price
+              IshManager::ApplicationMailer.stock_alert( stock ).deliver
+            end
+          end
+        rescue Exception => e
+          puts! e, 'Error in ish_manager:watch_stocks :'
+        end
+      end
+      sleep Warbler::StockWatch::SLEEP_TIME_SECONDS
+    end
+  end
+
+  desc 'watch option: contractType=PUT|CALL strike symbol date=yyyy-mm-dd'
+  task watch_options: :environment do
+    while true
+      option_watches = Warbler::OptionWatch.where( notification_type: :EMAIL )
+      option_watches.each do |option|
+        begin
+          Timeout::timeout( 10 ) do
+            ## opts = { contractType: 'PUT', strike: 355.0, symbol: 'NVDA', date: '2022-02-18' }
+            out = Warbler::Ameritrade::Api.get_option( option )
+            r = out[:last]
+            if  option.direction == :ABOVE && r >= option.price ||
+                option.direction == :BELOW && r <= option.price
+              Warbler::ApplicationMailer.option_alert( option ).deliver
+            end
+          end
+        rescue Exception => e
+          puts! e, 'Error in ish_manager:watch_options :'
+        end
+      end
+      sleep Warbler::OptionWatch::SLEEP_TIME_SECONDS
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.278
+  version: 0.1.8.282
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,6 +202,7 @@ files:
 - app/controllers/ish_manager/maps_controller.rb
 - app/controllers/ish_manager/markers_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
+- app/controllers/ish_manager/option_watches_controller.rb
 - app/controllers/ish_manager/orders_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
@@ -305,6 +306,7 @@ files:
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
+- app/views/ish_manager/option_watches/_form.haml
 - app/views/ish_manager/payments/index.haml
 - app/views/ish_manager/photos/_meta.haml
 - app/views/ish_manager/photos/_meta_manager.haml
@@ -355,14 +357,17 @@ files:
 - app/views/ish_manager/venues/index.haml
 - app/views/ish_manager/venues/new.haml
 - app/views/ish_manager/venues/show.haml
-- app/views/ish_manager/videos/_embed.erb
+- app/views/ish_manager/videos/_embed.haml
 - app/views/ish_manager/videos/_embed_half.erb
 - app/views/ish_manager/videos/_embed_mini.erb
+- app/views/ish_manager/videos/_embed_s3.erb
+- app/views/ish_manager/videos/_embed_youtube.erb
 - app/views/ish_manager/videos/_form.haml
 - app/views/ish_manager/videos/_index.haml
 - app/views/ish_manager/videos/_index_title.haml
 - app/views/ish_manager/videos/_list.haml
 - app/views/ish_manager/videos/_list_small.haml
+- app/views/ish_manager/videos/_meta_edit.haml
 - app/views/ish_manager/videos/_preview.haml
 - app/views/ish_manager/videos/edit.haml
 - app/views/ish_manager/videos/index.haml
@@ -377,6 +382,7 @@ files:
 - lib/systemd/system/watch_stocks.service
 - lib/tasks/ish_manager_tasks.rake
 - lib/tasks/migrate.rake
+- lib/tasks/warbler_tasks.rake
 homepage: http://wasya.co
 licenses:
 - MIT