wco_models 3.1.0.270 → 3.1.0.271

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021150c40e30bb02fb18567bf718130b52075e9fa8bcb999e231f95c80413ed9
-  data.tar.gz: 52f7e91b77c3ead85ced22ccd64f4267cfc96d3fddf59671fa115ce413c13267
+  metadata.gz: b6ada52987a4f58f060e2b8104870700dad094fb51db42ed715ce24ec6f04577
+  data.tar.gz: '0905e9664dc97846574e75a1e5770d2af1b3d4ac2dcde4e355980f73416f5067'
 SHA512:
-  metadata.gz: dbfe2e00671a9ca7dc6c232186993e45f00c7afd6e74f4f2140d0902c19e29c5e709462dfef1d41112a2f9652e04c6b367fc5b878ce32ffc8d07d11245aafc07
-  data.tar.gz: 2160353727634f5e7df835689ab93192d6e95dc42f37d600ef346a840d1221d5812c9c790d0e480dbf0312dfd8c6d3bb83b033bf66ca1877143eb3b3b4b59b50
+  metadata.gz: fc75d66a19e349914126d525aab2b56715b0abe93fc1c5301a2d17529925ba5244d02a10c6ea159667de670c72fe8201b5af7433aa000c7317b4c81c6bf9af4d
+  data.tar.gz: f225faf92e792a5f7c10236ec38c35d955821d11149f3d0cf16d9c88f50252904badab3b386d023a19a318d50cbc0e932ac5222aedb470cc4bb3e200f0f54e06

data/README.txt

@@ -1,25 +1,23 @@
 
 WasyaCo Models. The functionality shared across all (most) projects, including:
-* The ActiveRecord models
-* some stylesheets,
-* some javascript.
+* the ActiveRecord models
+* some stylesheets
+* some javascript
+* some controllers and views
 
-== Setup ==
+= Setup =
 
-Docker is reqiured for development. It is used for mongo, and localstack.
+Docker is reqiured for development. It is used for mongo (?), and localstack.
 
-Some infrastructure is driven by ansible - therefore, local python is required:
+Some infrastructure is driven by ansible - therefore, local python3 and ansible are required:
 
   python3 -m venv zenv
   . zenv/bin/activate
+  pip install -r requirements.txt
 
-== Test ==
+= Test =
 
-Login to the localstack container, then:
-
-  awslocal s3api put-object --bucket wco-email-ses-development \
-    --key 00nn652jk1395ujdr3l11ib06jam0oevjqv2o4g1 \
-    --body /opt/tmp/00nn652jk1395ujdr3l11ib06jam0oevjqv2o4g1
+See doc/localstack.txt
 
 In ruby console:
 

data/app/assets/stylesheets/wco/main.scss

@@ -3,6 +3,10 @@
 //   display: block;
 // }
 
+// .tmp-1 {
+//   float: right;
+// }
+
 hr {
   border-top: 1px solid red;
 }
@@ -16,6 +20,14 @@ textarea {
   min-height: 300px;
 }
 
+/* A */
+
+.absolute {
+  border: 1px solid pink;
+  position: absolute;
+  background: pink;
+}
+
 /* B */
 
 .blue {
@@ -70,6 +82,13 @@ table.bordered {
   }
 }
 
+table.no-padding {
+  td {
+    padding: 0;
+  }
+}
+
+
 
 /* C */
 
@@ -208,6 +227,11 @@ input[type=file] {
   font-size: 0.75em;
 }
 .mini-inputs {
+  border: 1px solid gray;
+  padding: 0.5em;
+
+  display: inline-block;
+
   input[type='number'] {
     width: 4em;
   }

data/app/assets/stylesheets/wco/newsvideos.scss

@@ -1,10 +1,44 @@
 
+.zero-height {
+  position: absolute;
+}
+
+.timeline-stamps {
+  border: 1px solid red;
+  width: 50px;
+
+  position: absolute;
+  top: 3px; // border
+
+  height: 100%;
+
+  .tick {
+    position: absolute;
+    left: 0;
+    font-size: 10px;
+    transform: translateY(-50%);
+    border-top: 1px solid black;
+    height: 5px;
+    background: white;
+  }
+
+}
+
+
+
+
+
 .NewsoverlayTimeline {
   border: 5px solid green;
   position: absolute;
   left: 230px;
 }
 
+.NewspartialTimelineW {
+  position: relative;
+  min-height: 50px;
+}
+
 .NewspartialTimeline {
   border: 1px solid blue;
   position: relative;
@@ -28,9 +62,20 @@
       min-width: 300px;
     }
 
+    .full-textC {
+      z-index: 4;
+      position: relative;
+      background: white;
+      padding: 10px;
+      border: 1px solid black;
+      border-radius: 10px;
+    }
+
   }
 
   .main {
+
+
     width: 200px;
   }
 

data/app/controllers/wco/api_controller.rb

@@ -17,8 +17,8 @@ class Wco::ApiController < ActionController::Base
   end
 
   def decode_simple_api_key
-    if params[:api_key] === SIMPLE_API_KEY &&
-       params[:api_secret] === SIMPLE_API_SECRET
+    if params[:api_key] === WCO_SIMPLE_API_KEY &&
+       params[:api_secret] === WCO_SIMPLE_API_SECRET
       user = User.find_by({ email: 'piousbox@gmail.com' })
       sign_in user
     else

data/app/controllers/wco/application_controller.rb

@@ -29,6 +29,47 @@ class Wco::ApplicationController < ActionController::Base
     render layout: false
   end
 
+  def linkedin_cb
+    authorize! :open_permission, Wco
+    code = params[:code]
+    pi = Wco::Profile.pi
+
+    uri = URI("https://www.linkedin.com/oauth/v2/accessToken")
+    res = Net::HTTP.post_form(uri, {
+      grant_type: 'authorization_code',
+      code: code,
+      redirect_uri: linkedin_cb_url,
+      client_id: pi.linkedin_client_id,
+      client_secret: pi.linkedin_client_secret,
+    })
+    data = JSON.parse(res.body)
+    pi.update({ linkedin_access_token: data['access_token'] })
+    flash[:notice] = 'Ok.'
+    redirect_to '/'
+  end
+
+  def linkedin_sync
+    authorize! :open_permission, Wco
+
+    pi = Wco::Profile.pi
+    redirect_uri = linkedin_cb_url
+
+    base_url = "https://www.linkedin.com/oauth/v2/authorization"
+
+    params = {
+      response_type: "code",
+      client_id: pi.linkedin_client_id,
+      redirect_uri: redirect_uri,
+
+      scope: "openid profile email w_member_social"  ## r_organization_admin w_organization_social
+    }
+
+    url = "#{base_url}?#{URI.encode_www_form(params)}"
+
+    puts! url, "linkedin_oauth_url"
+
+    redirect_to url, allow_other_host: true
+  end
 
   ##
   ## private
@@ -83,6 +124,10 @@ class Wco::ApplicationController < ActionController::Base
   end
 
   def set_lists
+    @new_tag      = Wco::Tag.new
+    @sidebar_tags = @current_profile.sidebar_tags
+    @tags         = Wco::Tag.all.order_by( slug: :asc )
+    @tags_list    = Wco::Tag.list
   end
 
 end

data/app/controllers/wco/leads_controller.rb

@@ -46,11 +46,9 @@ class Wco::LeadsController < Wco::ApplicationController
       lead   = Wco::Lead.find_by( email: lead_attrs[:email] ) rescue nil
       lead ||= Wco::Lead.create!(lead_attrs)
 
-      # Assign selected tags
       selected_tag_ids.each do |tag_id|
         lead.tags << Wco::Tag.find(tag_id)
       end
-      # lead.save!
     end
 
     redirect_to wco.leads_path, notice: "Leads imported successfully"

data/app/controllers/wco/newspartials_controller.rb

@@ -84,7 +84,7 @@ class Wco::NewspartialsController < Wco::ApplicationController
     else
       flash_alert "Cannot update newspartial: #{@newspartial.errors.messages}"
     end
-    redirect_to action: 'index'
+    redirect_to newsvideo_path(@newspartial.newsvideo_id)
   end
 
   ##

data/app/controllers/wco/newsvideos_controller.rb

@@ -86,13 +86,14 @@ class Wco::NewsvideosController < Wco::ApplicationController
 
     sentences = PragmaticSegmenter::Segmenter.new(text: @newsvideo.body).segment
     phrases = sentences_to_phrases(sentences)
-    # puts! phrases, 'phrases'
+    puts! phrases, 'phrases'
+
     phrases.each do |phrase|
       newspartial = Wco::Newspartial.new body: phrase, newsvideo: @newsvideo
       newspartial.save!
     end
 
-    flash_notice 'All done.'
+    flash_notice 'Done spliting the video.'
     redirect_to request.referrer
   end
 

data/app/controllers/wco/publishers_controller.rb

@@ -1,10 +1,6 @@
 
-# require 'httparty'
-
 class Wco::PublishersController < Wco::ApplicationController
 
-  ## Alphabetized : )
-
   def create
     @publisher = Wco::Publisher.new params[:publisher].permit!
     authorize! :create, @publisher
@@ -16,6 +12,7 @@ class Wco::PublishersController < Wco::ApplicationController
     redirect_to action: 'index'
   end
 
+  ## this is becoming obsolete - try using do_run_any
   def do_run
     @publisher = Wco::Publisher.find params[:id]
     authorize! :do_run, @publisher
@@ -29,6 +26,17 @@ class Wco::PublishersController < Wco::ApplicationController
     redirect_to action: 'index'
   end
 
+  def do_run_any
+    @publisher = Wco::Publisher.find params[:id]
+    authorize! :do_run, @publisher
+
+    @publisher.props = OpenStruct.new( JSON.parse params[:props] )
+    @publisher.do_run
+
+    flash_notice "Probably ok"
+    redirect_to request.referrer || { action: 'index' }
+  end
+
   def edit
     @publisher = Wco::Publisher.find params[:id]
     authorize! :edit, @publisher

data/app/controllers/wco/reports_controller.rb

@@ -8,7 +8,15 @@ class Wco::ReportsController < Wco::ApplicationController
 
     @report = Wco::Report.new params[:report].permit!
     authorize! :create, @report
+
     @report.author = current_profile
+
+    if params[:report][:image_thumb]&.[](:image).present?
+      thumb = @report.image_thumb || @report.build_image_thumb
+      thumb.image = params[:report][:image_thumb_attributes][:image]
+      thumb.save
+    end
+
     if @report.save
       flash_notice "created report"
     else
@@ -51,16 +59,148 @@ class Wco::ReportsController < Wco::ApplicationController
     @report = Wco::Report.unscoped.find params[:id]
     authorize! :show, @report
 
+    @publishers_list = Wco::Publisher.list
+
     # @config = JSON.parse( @report.config_json )
     # @duration_ms = @config['vtimes'].last.to_i + @config['vdurations'].last.to_i
   end
 
+  ## not working, no access
+  def to_company_linkedin
+    @report = Wco::Report.unscoped.find params[:id]
+    authorize! :edit, @report
+    pi = Wco::Profile.pi
+
+    response = HTTParty.get(
+      "https://api.linkedin.com/v2/organizationAcls?q=roleAssignee",
+      headers: {
+        "Authorization" => "Bearer #{pi.linkedin_access_token}"
+      }
+    )
+    org = JSON.parse(response.body)
+    puts! org, 'org'
+
+    uri = URI("https://api.linkedin.com/v2/ugcPosts")
+
+    req = Net::HTTP::Post.new(uri)
+    req["Authorization"] = "Bearer #{pi.linkedin_access_token}"
+    req["Content-Type"] = "application/json"
+    req["X-Restli-Protocol-Version"] = "2.0.0"
+
+    body = {
+      author: "urn:li:organization:#{org['id']}",
+      lifecycleState: "PUBLISHED",
+      specificContent: {
+        "com.linkedin.ugc.ShareContent": {
+          shareCommentary: {
+            text: "#{@report.title}   #{@report.body}",
+          },
+          shareMediaCategory: "NONE"
+        }
+      },
+      visibility: {
+        "com.linkedin.ugc.MemberNetworkVisibility": "PUBLIC"
+      }
+    }
+
+    req.body = body.to_json
+
+    res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+      http.request(req)
+    end
+
+    puts res.body
+  end
+
+  def to_facebook
+    @report = Wco::Report.unscoped.find params[:id]
+    authorize! :edit, @report
+    pi = Wco::Profile.pi
+
+    text = @report.body
+    text.gsub!(%r{</p\s*>}i, "\n")
+    text.gsub!(%r{<p\s*/?>}i, "")
+    text.gsub!(%r{<[^>]*>}, "")
+    text.strip.gsub(/\n{3,}/, "\n\n")
+
+    Wco::FacebookPoster.new.post("#{@report.title}\n\n#{text}")
+    flash_notice 'Probably ok.'
+    redirect_to request.referrer
+  end
+
+  def to_linkedin
+    @report = Wco::Report.unscoped.find params[:id]
+    authorize! :edit, @report
+    pi = Wco::Profile.pi
+
+    uri = URI("https://api.linkedin.com/v2/userinfo")
+    req = Net::HTTP::Get.new(uri)
+    req['Authorization'] = "Bearer #{pi.linkedin_access_token}"
+
+    res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |http| http.request(req) }
+    profile = JSON.parse(res.body)
+    puts! profile, 'profile'
+    user_id = profile['sub']
+
+    # Create post
+    post_uri = URI("https://api.linkedin.com/v2/ugcPosts")
+    post_req = Net::HTTP::Post.new(post_uri)
+
+    post_req['Authorization'] = "Bearer #{pi.linkedin_access_token}"
+    post_req['Content-Type'] = "application/json"
+    post_req['X-Restli-Protocol-Version'] = "2.0.0"
+
+
+    text = @report.body
+    text.gsub!(%r{</p\s*>}i, "\n")
+    text.gsub!(%r{<p\s*/?>}i, "")
+    text.gsub!(%r{<[^>]*>}, "")
+    text.strip.gsub(/\n{3,}/, "\n\n")
+
+    body = {
+      author: "urn:li:person:#{user_id}",
+      lifecycleState: "PUBLISHED",
+      specificContent: {
+        "com.linkedin.ugc.ShareContent": {
+          shareCommentary: {
+            text: "#{@report.title}\n\n#{text}",
+          },
+          shareMediaCategory: "NONE"
+        }
+      },
+      visibility: {
+        "com.linkedin.ugc.MemberNetworkVisibility": "PUBLIC"
+      }
+    }
+
+    post_req.body = body.to_json
+
+    post_res = Net::HTTP.start(post_uri.hostname, post_uri.port, use_ssl: true) do |http|
+      http.request(post_req)
+    end
+
+    render json: JSON.parse(post_res.body)
+  end
+
+
   def update
     params[:report][:tag_ids]&.delete ''
+    img_thumb_params = params[:report][:image_thumb]
+    params[:report].delete :image_thumb
+    # puts! img_thumb_params, 'img_thumb_params'
 
     @report = Wco::Report.unscoped.find params[:id]
     authorize! :update, @report
+
     if @report.update params[:report].permit!
+
+      if img_thumb_params.present?
+        @photo = Wco::Photo.new photo: img_thumb_params
+        @photo.save!
+        @report.image_thumb = @photo
+      end
+
+
       flash_notice "updated report"
     else
       flash_alert "Cannot update report: #{@report.errors.messages}"

data/app/controllers/wco/tags_controller.rb

@@ -22,7 +22,7 @@ class Wco::TagsController < Wco::ApplicationController
     else
       flash_alert 'No luck.'
     end
-    redirect_to action: 'index'
+    redirect_to request.referrer
   end
 
   def edit
@@ -32,7 +32,7 @@ class Wco::TagsController < Wco::ApplicationController
 
   def index
     authorize! :index, Wco::Tag
-    @tags = Wco::Tag.all
+    @tags = Wco::Tag.all.order_by( slug: :asc )
 
     tags = Wco::Tag.all.to_a.group_by(&:parent_id)
     build_tree = lambda do |parent_id|
@@ -50,6 +50,18 @@ class Wco::TagsController < Wco::ApplicationController
     authorize! :new, Wco::Tag
   end
 
+  def new_for_sidebar
+    authorize! :new, Wco::Tag
+  end
+  def create_for_sidebar
+    authorize! :create, Wco::Tag
+    @current_profile.sidebar_tags.push Wco::Tag.find(params[:tag_id])
+    @current_profile.save
+
+    flash_notice 'Ok'
+    redirect_to request.referrer
+  end
+
   def add_to
     @tag = Wco::Tag.find params[:id]
     resource = params[:resource].constantize.find params[:resource_id]
@@ -108,6 +120,8 @@ class Wco::TagsController < Wco::ApplicationController
     @leads     = @tag.leads.page( params[::Wco::Lead::PAGE_PARAM_NAME] ).per( current_profile.per_page )
     @leadsets  = @tag.leadsets.page( params[::Wco::Leadset::PAGE_PARAM_NAME] ).per( current_profile.per_page )
     @reports   = @tag.reports.page( params[:reports_page] ).per( current_profile.per_page )
+
+    # render params['template'] || 'show'
   end
 
   def update
@@ -127,10 +141,9 @@ class Wco::TagsController < Wco::ApplicationController
   private
 
   def set_lists
-    @new_tag = Wco::Tag.new
+    super
+
     @sites_list = Wco::Site.list
-    @tags = Wco::Tag.all.order_by( slug: :asc )
-    @tags_list = Wco::Tag.list
   end
 
 

data/app/controllers/wco/videos_controller.rb

@@ -9,6 +9,10 @@ class Wco::VideosController < Wco::ApplicationController
     @video = Wco::Video.new params[:video].permit!
     authorize! :create, @video
 
+    if !params[:video][:thumb]
+      @video.generate_thumbnail
+    end
+
     if @video.save
       flash[:notice] = 'Success'
       redirect_to videos_path

data/app/mailers/wco_email/application_mailer.rb

@@ -87,7 +87,7 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     mail( from:    @ctx.from_email,
           to:      @ctx.to_email,
           cc:      @ctx.cc,
-          bcc:     DEFAULT_BCC,
+          bcc:     @ctx.from_email, # DEFAULT_BCC,
           subject: rendered_subject,
           body:    rendered_str,
           content_type: "text/html",

data/app/models/ability.rb

@@ -13,6 +13,9 @@ class Ability
       if [ ENV['EMAIL'], 'piousbox@gmail.com' ].include? user.email
         can :manage, :all
       end
+      if Rails.env.test?
+        can :manage, :all
+      end
 
     end
 

data/app/models/iro/option.rb

@@ -17,8 +17,6 @@ class Iro::Option
   field :put_call, type: :string # 'PUT' or 'CALL'
   validates :put_call, presence: true
 
-  field :delta, type: :float
-
   field :strike, type: :float
   validates :strike, presence: true
 
@@ -52,9 +50,10 @@ class Iro::Option
   field :end_price, type: :float
   field :end_delta, type: :float
 
-
   has_one :pos_of_outer, class_name: 'Iro::Position', inverse_of: :outer
   has_one :pos_of_inner, class_name: 'Iro::Position', inverse_of: :inner
+  belongs_to :poss_of_inner, class_name: 'Iro::Position', inverse_of: :inners, optional: true
+  belongs_to :poss_of_outer, class_name: 'Iro::Position', inverse_of: :outers, optional: true
 
   field :last, type: :float