ish_manager 0.1.8.59 → 0.1.8.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73116e66f68529d0170c4b4a4b6aff18fb1862bd
-  data.tar.gz: 07403b534867c689e2d17cfecc2ac25fe1934735
+  metadata.gz: 19377ade825fddd2bc25dd1c70455449440617c1
+  data.tar.gz: 8c5656d7f405c96d4e066ac95ac969c52a65b7e7
 SHA512:
-  metadata.gz: 194440497f3543bf63281ba9aba1599c51ec16421f658aa716c378cd67f685347cc00ddf59ef72dfcef02588b8fe604730fb72a98cae3fda8161a05bffe8ab5d
-  data.tar.gz: 26a8c3ddbbd2a43724d1eff69b97324f1c6e698a036f62caff07648253e92a766ae7ac9968f7e1cdbfb01ab3ae2b7498e3004fd0dd294f9bd0c9cc7ab9f95100
+  metadata.gz: 2222d95f13995024176f5ce8bb25fc1f57287bdd33d7119cfa7a04531461889300d83e70383a7284bc714e843a6ae2df0c99d9ca04fea0c719c0a2a588e746fc
+  data.tar.gz: 3a1f690799b3570346f1b8468477cf7ba664b0cbc6882d268493f14c0daa60e36cd9600dac280780c5c62c3122b02aae13d5b0fb197d0d5b504049c0014cb6c5

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

@@ -138,3 +138,15 @@ table.stock_watches td {
 table.stock_watches .trashy {
   background: #cecece;
 }
+
+.stock-option {
+  /* border: 1px solid red; */
+  border-radius: 5px;
+  display: inline-block;
+  padding: 5px;
+  box-shadow: 2px 2px 5px grey;
+  margin: 5px;
+}
+.stock-option:hover {
+  box-shadow: 3px 3px 5px grey;
+}

data/app/controllers/ish_manager/ally_controller.rb

@@ -0,0 +1,8 @@
+
+class IshManager::AllyController < IshManager::ApplicationController
+
+  def home
+    authorize! :ally_home, IshManager::Ability
+  end
+
+end

data/app/controllers/ish_manager/photos_controller.rb

@@ -43,13 +43,13 @@ class IshManager::PhotosController < IshManager::ApplicationController
     @photo.gallery.touch
 
     if @photo.save
-      j = { :name => @photo.photo.original_filename,
+      j = {
+        :name => @photo.photo.original_filename,
         :size => @photo.photo.size,
         :url => @photo.photo.url( :large ),
         :thumbnail_url => @photo.photo.url( :thumb ),
         :delete_url => photo_path(@photo),
-        :delete_type => 'DELETE',
-        :name => @photo.name
+        :delete_type => 'DELETE'
       }
       render :json => [ j ]
     else

data/app/controllers/ish_manager/stock_actions_controller.rb

@@ -0,0 +1,60 @@
+
+class IshManager::StockActionsController < IshManager::ApplicationController
+
+  PERMITTED_PARAMS = [ :stock_watch, :is_active ]
+
+  def index
+    authorize! :index, Ish::StockAction
+    @profiles      = IshModels::UserProfile.all
+    @stock_watches_list = Ish::StockWatch.all.map { |w| [w.to_s, w.id] }
+    @stock_options_list = Ish::StockOption.all.map { |o| [ o.to_s, o.id] }
+    @stock_actions = Ish::StockAction.all.includes( :profile )
+    @stock_action  = Ish::StockAction.new
+    render 'index', :layout => 'ish_manager/application_no_materialize'
+  end
+
+  def create
+    @stock_action = Ish::StockAction.new params.require(:ish_stock_action).permit( PERMITTED_PARAMS )
+    @stock_action.profile = current_user.profile
+    authorize! :create, @stock_action
+
+    flag = true
+    if params[:ish_stock_action][:stock_options]
+      stock_options = Ish::StockOption.where( :id.in => params[:ish_stock_action][:stock_options] )
+      flag = stock_options.update_all( :stock_action_id => @stock_action.id )
+    end
+    if flag
+      flag = @stock_action.save
+    end
+    if flag
+      flash[:notice] = 'Created stock action.'
+    else
+      flash[:alert] = "Cannot create stock action: #{@stock_action.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def update
+    @stock_action = Ish::StockAction.find params[:id]
+    authorize! :update, @stock_action
+
+    flag = true
+    if params[:ish_stock_action][:stock_options]
+      stock_options = Ish::StockOption.where( :id.in => params[:ish_stock_action][:stock_options] )
+      flag = stock_options.update_all( :stock_action_id => @stock_action.id )
+    end
+    if flag
+      flag = @stock_action.update_attributes params.require(:ish_stock_action).permit( PERMITTED_PARAMS )
+    end
+    if flag
+      flash[:notice] = 'Updated stock action.'
+    else
+      flash[:alert] = "Cannot update stock action: #{@stock_action.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+end
+
+
+

data/app/controllers/ish_manager/stock_options_controller.rb

@@ -0,0 +1,43 @@
+
+class IshManager::StockOptionsController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Ish::StockOption
+    @profiles = IshModels::UserProfile.all
+    @stock_options = Ish::StockOption.all.includes( :profile )
+    @stock_option = Ish::StockOption.new
+    render 'index', :layout => 'ish_manager/application_no_materialize'
+  end
+
+  def create
+    @stock_option = Ish::StockOption.new params[:ish_stock_option].permit!
+    @stock_option.profile = current_user.profile
+    authorize! :create, @stock_option
+    flag = @stock_option.save
+
+    byebug
+
+    if flag
+      flash[:notice] = 'Created stock option.'
+    else
+      flash[:alert] = "Cannot create stock option: #{@stock_option.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def update
+    @stock_option = Ish::StockOption.find params[:id]
+    authorize! :update, @stock_option
+    flag = @stock_option.update_attributes params[:ish_stock_option].permit!
+    if flag
+      flash[:notice] = 'Updated stock option.'
+    else
+      flash[:alert] = "Cannot update stock option: #{@stock_option.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+end
+
+
+

data/app/controllers/ish_manager/stock_watches_controller.rb

@@ -2,15 +2,15 @@
 class IshManager::StockWatchesController < IshManager::ApplicationController
 
   def index
-    authorize! :index, IshModels::StockWatch
+    authorize! :index, Ish::StockWatch
     @profiles = IshModels::UserProfile.all
-    @stock_watches = IshModels::StockWatch.all.includes( :profile )
-    @stock_watch = IshModels::StockWatch.new
+    @stock_watches = Ish::StockWatch.all.includes( :profile )
+    @stock_watch = Ish::StockWatch.new
     render 'index', :layout => 'ish_manager/application_no_materialize'
   end
 
   def create
-    @stock_watch = IshModels::StockWatch.new params[:ish_models_stock_watch].permit!
+    @stock_watch = Ish::StockWatch.new params[:ish_stock_watch].permit!
     authorize! :create, @stock_watch
     flag = @stock_watch.save
     if flag
@@ -22,9 +22,9 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
   end
 
   def update
-    @stock_watch = IshModels::StockWatch.find params[:id]
+    @stock_watch = Ish::StockWatch.find params[:id]
     authorize! :update, @stock_watch
-    flag = @stock_watch.update_attributes params[:ish_models_stock_watch].permit!
+    flag = @stock_watch.update_attributes params[:ish_stock_watch].permit!
     if flag
       flash[:notice] = 'Updated stock watch.'
     else

data/app/models/ish_manager/ability.rb

@@ -25,7 +25,7 @@ class IshManager::Ability
         can [ :show, :edit, :update, :create_newsitem, :new_feature, :create_feature ], ::Site do |site|
           !site.is_private && !site.is_trash
         end
-        can [ :manage ], IshModels::StockWatch
+        can [ :manage ], Ish::StockWatch
 
         # can [ :new_feature, :create_feature ], ::Tag
 

data/app/views/ish_manager/ally/home.haml

@@ -0,0 +1,6 @@
+
+%h5 Ally Home
+
+%ul
+  %li= link_to 'Stock Options (positions)', stock_options_path
+  %li= link_to 'Stock Watches', stock_watches_path

data/app/views/ish_manager/application/_main_header.haml

@@ -14,6 +14,10 @@
           %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
           %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
           %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
-          %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Ally',      stock_watches_path
+        %ul.nav.nav-pills
+          %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
+          %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
+          %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
+          %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
   %hr
 

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

@@ -0,0 +1,27 @@
+
+-#
+-# ish_manager / stock_actions / _form
+-#
+  
+- url = stock_actions_path if !stock_action.persisted? 
+- url = stock_action_path( stock_action ) if stock_action.persisted?
+
+- if stock_action.profile
+  Belongs to #{stock_action.profile.email}
+= form_for stock_action, :url => url, :html => { :class => 'form-inline well' } do |f|
+  .form-group
+    %label.control-label Active?
+    = f.check_box :is_active
+  .form-group
+    - which_selected = stock_action.stock_watch ? stock_action.stock_watch.id : nil
+    %label.control-label When stock watch
+    = f.select :stock_watch, options_for_select( @stock_watches_list, :selected => which_selected )
+  .form-group
+    %label.control-label Sell options
+    - @stock_options_list.each do |item|
+      - checked = stock_action.stock_options.map(&:id).include?(item[1])
+      .stock-option
+        = f.check_box :stock_options, { :multiple => true, :checked => checked }, item[1], nil
+        = item[0]
+  .form-group
+    = f.submit ">", :class => %w(btn blue)

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

@@ -0,0 +1,13 @@
+
+%h4 Stock Actions
+
+%p <b>Note:</b> a stock option cannot belong to two actions.
+
+%hr
+- @stock_actions.each do |stock_action|
+  = render 'form', :stock_action => stock_action
+        
+%hr
+%h5 New
+= render 'form', :stock_action => @stock_action
+

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

@@ -0,0 +1,22 @@
+
+- url = stock_options_path if !stock_option.persisted? 
+- url = stock_options_path( stock_option ) if stock_option.persisted?
+
+- if stock_option.profile
+  Belongs to #{stock_option.profile.email}
+= form_for stock_option, :url => url, :html => { :class => 'form-inline well' } do |f|
+  .form-group
+    = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
+  .form-group
+    = f.text_field :expires_on, :class => 'form-control', :placeholder => 'YYYYMMDD' # :placeholder => 'MON(TH) DD YYYY'
+  .form-group
+    %label.control-label $
+    = f.number_field :strike, :step => 0.01, :class => 'form-control', :placeholder => '0.01'
+  .form-group
+    %label.control-label CALL/PUT?
+    = f.select :direction, options_for_select( Ish::StockOption::DIRECTIONS.map{|d|[d,d]}, :selected => stock_option.direction )
+  .form-group
+    %label.control-label quantity:
+    = f.number_field :quantity, :placeholder => 0
+  .form-group
+    = f.submit ">", :class => %w(btn blue)

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

@@ -0,0 +1,11 @@
+
+%h4 Stock Options Index
+
+%hr
+- @stock_options.each do |stock_option|
+  = render 'form', :stock_option => stock_option
+        
+%hr
+%h5 New
+= render 'form', :stock_option => @stock_option
+

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

@@ -4,7 +4,7 @@
 
 = form_for stock_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
   .form-group
-    = f.select :action, options_for_select( IshModels::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
+    = f.select :action, options_for_select( Ish::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
   .form-group
     = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
   .form-group
@@ -12,7 +12,7 @@
     = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
   .form-group
     %label.control-label Price
-    = f.select :direction, options_for_select( IshModels::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
+    = f.select :direction, options_for_select( Ish::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
   .form-group
     %label.control-label $
     = f.number_field :price, :step => 0.01, :placeholder => "0.01"

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

@@ -1,5 +1,5 @@
 
-%h4 Ally / Home
+%h4 Stock Watches
 
 %hr
 - @stock_watches.each do |stock|

data/config/routes.rb

@@ -33,10 +33,10 @@ IshManager::Engine.routes.draw do
     resources :reports
   end
   
+  get 'ally', :to => 'ally#home', :as => :ally_root
+  resources :stock_actions
+  resources :stock_options
   resources :stock_watches
-  # scope :ally, :as => 'ally' do
-  #   root :to => 'ally#home'
-  # end
 
   resources :tags
 

data/lib/tasks/ish_manager_tasks.rake

@@ -18,25 +18,33 @@ namespace :ish_manager do
     puts 'OK'
   end
 
-  desc 'watch the stocks'
+  desc 'watch the stocks, and trigger actions'
   task :watch_stocks => :environment do
     while true
-      stocks = IshModels::StockWatch.where( :notification_type => :EMAIL )
+      stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
       puts! stocks.map(&:ticker), "Watching these stocks on #{Time.now}"
       stocks.each do |stock|
         begin
           Timeout::timeout( 10 ) do
             r = HTTParty.get "https://www.alphavantage.co/query?function=TIME_SERIES_INTRADAY&symbol=#{stock.ticker}&interval=1min&apikey=X1C5GGH5MZSXMF3O"
-            r = JSON.parse( r.body )['Time Series (1min)']
-            r = r[r.keys.first]['4. close'].to_f
-            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, 'e in :watch_stocks'
         end
+        r = JSON.parse( r.body )['Time Series (1min)']
+        r = r[r.keys.first]['4. close'].to_f
+        if stock.direction == :ABOVE &&  r >= stock.price ||
+           stock.direction == :BELOW && r <= stock.price
+          IshManager::ApplicationMailer.stock_alert( stock ).deliver
+
+=begin
+          # actions
+          stock.stock_actions.where( :is_active => true ).each do |action|
+            # @TODO: actions
+          end
+=end
+          
+        end
       end
       sleep 60
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.59
+  version: 0.1.8.60
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-autoinc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Description of IshManager.
 email:
 - piousbox@gmail.com
@@ -138,6 +152,7 @@ files:
 - app/assets/stylesheets/ish_manager/materialize.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
+- app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
 - app/controllers/ish_manager/features_controller.rb
@@ -147,6 +162,8 @@ files:
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/sites_controller.rb
+- app/controllers/ish_manager/stock_actions_controller.rb
+- app/controllers/ish_manager/stock_options_controller.rb
 - app/controllers/ish_manager/stock_watches_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
@@ -162,6 +179,7 @@ files:
 - app/models/ish_manager/ability.rb
 - app/models/ish_manager/ability.rb~
 - app/models/ish_manager/application_record.rb
+- app/views/ish_manager/ally/home.haml
 - app/views/ish_manager/application/_form_errors.haml
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
@@ -256,6 +274,10 @@ files:
 - app/views/ish_manager/sites/index.haml
 - app/views/ish_manager/sites/new.haml
 - app/views/ish_manager/sites/show.haml
+- app/views/ish_manager/stock_actions/_form.haml
+- app/views/ish_manager/stock_actions/index.haml
+- app/views/ish_manager/stock_options/_form.haml
+- app/views/ish_manager/stock_options/index.haml
 - app/views/ish_manager/stock_watches/_form.haml
 - app/views/ish_manager/stock_watches/index.haml
 - app/views/ish_manager/tags/_features.haml