ishapi 0.1.8.215 → 0.1.8.217

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908d42fcfe99cabb27c82e7c99144efe71ff92ce74b96bfcf85162b2dd14141c
-  data.tar.gz: cea7d86798ed13c2835396d141bfc6e796bb45f4ce42508fc9c46ed3a5523ab7
+  metadata.gz: b5327c6d97d7c4bbac4285833c8d46f43fe58bb1e011fa730040d252acf4ef2a
+  data.tar.gz: dfc315e44f063a8cb1de1b6bede93171477f57c293cae167999573ab70e77e09
 SHA512:
-  metadata.gz: a5e3a23fcba44eea22651cdb19e4458bb3e62df19b402ecd64749f9d47ae0c2da185f97a9e47bda05e385c98cadbe51d7e8cca5ea9f225b3862aa4b4d741d26c
-  data.tar.gz: eb0658150810d1ec02dbe487161fffb4992cb0d67734987b1992f24f7097a88e53cea1010b1de6988b5b6db5d39df9b1577c07eab2ef494f39f4b84e79abcf2d
+  metadata.gz: e7910b9bff69f6be9bc29242a348bd6f7f2ab6a58b92c49fa307d33c72aba48ec220fc57bdad5a7fdd10db35676dfd74e708cf1f0d0197ae0323a98bb6f9da0a
+  data.tar.gz: e3dced336ce3cfb026bbc8ed14facf33a1a899a20655fa8d8fe31ae5a663e0fef771a958ba20af02c6013533d4352d0df737baeccf400306f3a2dbc7165d0c07

data/app/controllers/ishapi/application_controller.rb

@@ -1,5 +1,9 @@
 
-class Ishapi::ApplicationController < ActionController::Base
+class ::Ishapi::ApplicationController < ActionController::Base
+
+  def exception
+    throw "this exception: #{Time.now}"
+  end
 
   def home
     render json: { status: :ok }, status: :ok

data/app/controllers/ishapi/email_messages_controller.rb

@@ -1,37 +1,52 @@
 
 require_dependency "ishapi/application_controller"
 
-module Ishapi
-  class EmailMessagesController < ApplicationController
+class ::Ishapi::EmailMessagesController < ::Ishapi::ApplicationController
 
-    before_action :check_jwt, only: [ :show ]
+  before_action :check_jwt, only: [ :show ]
+  layout false
 
-    def show
-      msg = Office::EmailMessage.find( params[:id] )
-      authorize! :email_messages_show, ::Ishapi
-      render json: {
-        item: msg,
-      }
-    end
+  def show
+    @msg = Office::EmailMessage.find( params[:id] )
+    authorize! :show, @msg
 
-    ## From lambda, ses
-    def receive
-      if params[:secret] != AWS_SES_LAMBDA_SECRET
-        render status: 400, json: { status: 400 }
-        return
+    if params[:load_images]
+      ;
+    else
+      doc = Nokogiri::HTML(@msg.part_html)
+      images = doc.search('img')
+      images.each do |img|
+        img['src'] = 'missing'
       end
+      @msg.part_html = doc
+    end
 
-      msg = Office::EmailMessageStub.new({
-        object_path: params[:object_path],
-        object_key:  params[:object_key],
-      })
-      if msg.save
-        ::Ishapi::EmailMessageIntakeJob.perform_later( msg.id.to_s )
-        render status: :ok, json: { status: :ok }
-      else
-        render status: 400, json: { status: 400 }
+    respond_to do |format|
+      format.json do
+        render json: { item: @msg, }
       end
+      format.html do
+      end
+    end
+  end
+
+  ## From lambda, ses
+  def receive
+    if params[:secret] != AWS_SES_LAMBDA_SECRET
+      render status: 400, json: { status: 400 }
+      return
     end
 
+    msg = Office::EmailMessageStub.new({
+      # object_path: params[:object_path],
+      object_key:  params[:object_key],
+    })
+    if msg.save
+      ::Ishapi::EmailMessageIntakeJob.perform_later( msg.id.to_s )
+      render status: :ok, json: { status: :ok }
+    else
+      render status: 400, json: { status: 400 }
+    end
   end
+
 end

data/app/jobs/ishapi/email_message_intake_job.rb

@@ -7,8 +7,10 @@ stub = Stub.find_by( object_key: m_id_2 )
 stub.update_attribute(:state, 'state_pending')
 Ishapi::EmailMessageIntakeJob.perform_now( stub.id.to_s )
 
-
 =end
+
+
+
 ##
 ## 2023-02-26 _vp_ let's go
 ## 2023-03-02 _vp_ Continue
@@ -49,7 +51,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
   def perform id
     stub = ::Office::EmailMessageStub.find id
-    puts "Performing EmailMessageIntakeJob for message_id #{stub.object_key}"
+    puts "Performing EmailMessageIntakeJob for object_key #{stub.object_key}"
     if stub.state != ::Office::EmailMessageStub::STATE_PENDING
       raise "This stub has already been processed: #{stub.id.to_s}."
       return
@@ -61,7 +63,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
 
     _mail          = client.get_object( bucket: ::S3_CREDENTIALS[:bucket_ses], key: stub.object_key ).body.read
     the_mail       = Mail.new(_mail)
-    message_id     = the_mail.header['message-id'].decoded ## == stub.object_key
+    message_id     = the_mail.header['message-id'].decoded
     in_reply_to_id = the_mail.header['in-reply-to']&.to_s
 
     @message = ::Office::EmailMessage.where( message_id: message_id ).first
@@ -73,7 +75,7 @@ class Ishapi::EmailMessageIntakeJob < Ishapi::ApplicationJob
       in_reply_to_id: in_reply_to_id,
 
       object_key:  stub.object_key,
-      object_path: stub.object_path,
+      # object_path: stub.object_path,
 
       subject: the_mail.subject,
       date:    the_mail.date,

data/app/models/ishapi/ability.rb

@@ -7,7 +7,7 @@ class Ishapi::Ability
     #
     # signed in user_profile
     #
-    if !user_profile.blank?
+    if user_profile.present?
 
       can [ :my_index ], Gallery
       can [ :show ], Gallery do |gallery|
@@ -29,13 +29,15 @@ class Ishapi::Ability
 
       can [ :buy_stars ], ::Ish::UserProfile
 
-      #
-      # superuser
-      #
+      ##
+      ## superuser
+      ##
       if %w| victor@wasya.co victor@piousbox.com piousbox@gmail.com |.include?( user_profile.email )
+        puts! user_profile, 'ze profile'
+
         can [ :email_conversations_delete ], ::Ishapi
 
-        can [ :email_messages_show ], ::Ishapi
+        can [ :show ], ::Office::EmailMessage
       end
 
     end

data/app/views/ishapi/email_messages/show.haml

@@ -0,0 +1,3 @@
+
+%html
+  %body{ style: 'background: white' }= raw @msg.part_html

data/config/routes.rb

@@ -4,13 +4,23 @@ Ishapi::Engine.routes.draw do
   root :to => 'application#home'
   post 'home', :to => 'application#home'
 
+  # A
   resources :addresses
 
+  # E
+  post 'email_messages', to: 'email_messages#receive'
+  get 'email_messages/:id', to: 'email_messages#show', as: :email_message
+
+  delete 'email_conversations', to: 'email_conversations#delete'
+
+  # G
   get  'galleries',                   :to => 'galleries#index'
   post 'galleries',                   :to => 'galleries#index'
   get  'galleries/view/:slug', :to => 'galleries#show'
   post 'galleries/view/:slug', :to => 'galleries#show'
 
+  # H
+  # I
   post 'invoices/search', :to => 'invoices#search'
 
   # L
@@ -31,11 +41,6 @@ Ishapi::Engine.routes.draw do
   # N
   delete 'newsitems/:id', to: 'newsitems#destroy'
 
-  post 'email_messages', to: 'email_messages#receive'
-  get 'email_messages/:id', to: 'email_messages#show'
-
-  delete 'email_conversations', to: 'email_conversations#delete'
-
   post 'do_purchase', to: 'gameui#do_purchase' # @TODO: rename to just purchase, or destroy endpoint
   post 'payments', :to => 'payments#create'
   post 'payments2', :to => 'payments#create2' # @TODO: change
@@ -54,7 +59,8 @@ Ishapi::Engine.routes.draw do
   get 'option_price_items/view/:symbol/from/:begin_at/to/:end_at', to: 'option_price_items#view'
 
 
-  get 'test', to: 'application#test'
+  get 'test',      to: 'application#test'
+  get 'exception', to: 'application#exception'
 
   post  'users/fb_sign_in',      to: 'users#fb_sign_in'
   get   'users/me',              to: 'users#account'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.215
+  version: 0.1.8.217
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,6 +241,7 @@ files:
 - app/views/ishapi/application/_meta.jbuilder
 - app/views/ishapi/application/_pagination.jbuilder
 - app/views/ishapi/application_mailer/forwarder_notify.html.erb
+- app/views/ishapi/email_messages/show.haml
 - app/views/ishapi/galleries/_index.jbuilder
 - app/views/ishapi/galleries/_show.jbuilder
 - app/views/ishapi/galleries/index.jbuilder