ishapi 0.1.8.167 → 0.1.8.171

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e49663b1aa867161c3b7142934d9ff52cebbfd08e144667a89b3bc729266836
-  data.tar.gz: c648fdda0b0c325fee88d8f3dfd509e950de62bf3e23be287e60c7a45af98d77
+  metadata.gz: 1061557c4a428d72d380f5eaa54ece94dfb5c6c5493707d23297007af653b929
+  data.tar.gz: 310cf825c56d201501a57e592ef31a0ae8b282811c1d43d6cb91399f80d4deb2
 SHA512:
-  metadata.gz: 4a833d2656fb03cd94e40f660f5baa80fc12fdcd65a61fdbc48491b30f8275ae1788993b25abd8b9e009098eaf68aa15eb9b7b893b95b0a12cc96bccabaa3af8
-  data.tar.gz: d8e8676f306debb28d9c19945c10173c18ddd604623e0d45f9f0d5f52994203d2a5dbd01ad65c494eb84d3c818cce1d7e23bbeed70c900ad249bd63d937d5aea
+  metadata.gz: 238eaa5df713a592f8f88456771188a357b0ae4d1d5c463ad390e339573b3ce04749ac3c16779588b5be4374ff7798ee5a44155d932d1281f954ca6ab70f0f1f
+  data.tar.gz: d9208f4b3fb2075bcb418badad07d7466818eed030381b13aba91474dc24db48d87fc8819ecf934b9ae9e7c296a289cec02b57b133753c51589548f076a3938e

data/app/controllers/ishapi/application_controller.rb

@@ -1,6 +1,10 @@
 
 class Ishapi::ApplicationController < ActionController::Base
 
+  def home
+    render json: { status: :ok }, status: :ok
+  end
+
   ## POST /api/users/long_term_token , a FB login flow
   def long_term_token
     accessToken   = request.headers[:accessToken]
@@ -30,12 +34,25 @@ class Ishapi::ApplicationController < ActionController::Base
 
   private
 
+  ## This returns an empty user if not logged in!
   def check_profile
     begin
       decoded = decode(params[:jwt_token])
       @current_user = User.find decoded['user_id']
     rescue JWT::ExpiredSignature, JWT::DecodeError => e
-      flash[:notice] = 'You are not logged in, or you have been logged out.'
+      # flash[:notice] = 'You are not logged in, or you have been logged out.'
+      # puts! 'You are not logged in, or you have been logged out.'
+      @current_user = User.new({ profile: Ish::UserProfile.new })
+    end
+  end
+
+  ## This errors out if not logged in!
+  def check_profile_hard
+    begin
+      decoded = decode(params[:jwt_token])
+      @current_user = User.find decoded['user_id']
+    rescue JWT::ExpiredSignature, JWT::DecodeError => e
+      # flash[:notice] = 'You are not logged in, or you have been logged out.'
       # puts! 'You are not logged in, or you have been logged out.'
     end
   end

data/app/controllers/ishapi/cities_controller.rb

@@ -1,10 +1,10 @@
 require_dependency "ishapi/application_controller"
 
 module Ishapi
-  class CitiesController < UnrestrictedController
+  class CitiesController < Ishapi::ApplicationController
     protect_from_forgery :prepend => true, :with => :exception
     layout :false
-    
+
     check_authorization
     skip_before_action :verify_authenticity_token
     before_action :set_current_ability

data/app/controllers/ishapi/maps_controller.rb

@@ -5,20 +5,13 @@ class Ishapi::MapsController < Ishapi::ApplicationController
   before_action :check_profile, only: [ :show ]
 
   def show
-    @location = ::Gameui::Map.unscoped.find_by slug: params[:slug]
+    @location = ::Gameui::Map.find_by slug: params[:slug]
     @map = @location.map || @location
+
     authorize! :show, @map
     @newsitems = @location.newsitems
 
-    ##
-    ## @TODO: absolutely change this!
-    ##
-
-    @markers = @map.markers.where( is_active: true )
-    if @current_user
-      a = @current_user.profile.shared_markers.unscoped.where( is_active: true, map_id: @map.id ).to_a
-      @markers = @markers + a
-    end
+    @markers = @map.markers.permitted_to(current_user.profile)
 
     # case @map.ordering_type
     # when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC

data/app/controllers/ishapi/payments_controller.rb

@@ -4,6 +4,8 @@ module Ishapi
 
     before_action :check_profile, only: %i| create2 unlock |
 
+    # alphabetized : )
+
     ##
     ## this is for invoices on wasya.co, isn't it?
     ## 20200712

data/app/controllers/ishapi/stock_watches_controller.rb

@@ -0,0 +1,13 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class StockWatchesController < ApplicationController
+
+    before_action :check_jwt
+
+    def index
+      authorize! :index, IronWarbler::StockWatch
+      @stock_watches = IronWarbler::StockWatch.active # @TODO: restrict by-profile, no?
+    end
+
+  end
+end

data/app/controllers/ishapi/users_controller.rb

@@ -5,7 +5,7 @@ module Ishapi
 
     skip_authorization_check only: %i| fb_sign_in login |
 
-    before_action :check_profile, only: %i| account |
+    before_action :check_profile_hard, only: %i| account |
 
     def account
       @profile = current_user&.profile
@@ -25,6 +25,7 @@ module Ishapi
 
     def login
       @current_user = User.where( email: params[:email] ).first
+
       if !@current_user
         render json: { status: :not_ok }, status: 401
         return
@@ -35,15 +36,6 @@ module Ishapi
         # send the jwt to client
         @jwt_token = encode(user_id: @current_user.id.to_s)
         @profile = @current_user.profile
-
-=begin
-        render json: {
-          email: @current_user.email,
-          jwt_token: @jwt_token,
-          n_unlocks: @current_user.profile.n_unlocks,
-        }
-=end
-
       end
     end
 

data/app/helpers/ishapi/application_helper.rb

@@ -1,4 +1,9 @@
 module Ishapi
   module ApplicationHelper
+
+    def image_missing
+      'https://s3.amazonaws.com/ish-wp/wp-content/uploads/2022/02/25232018/100x100_crossout.png'
+    end
+
   end
 end

data/app/models/ishapi/ability.rb

@@ -16,7 +16,11 @@ class Ishapi::Ability
       can [ :show ], Gallery do |gallery|
         gallery.user_profile == user.profile
       end
+
       can [ :do_purchase ], ::Gameui
+      can [ :show ], ::Gameui::Map do |map|
+        map.creator_profile == user.profile
+      end
 
       can [ :create, :unlock ], ::Ish::Payment
 

data/app/views/ishapi/maps/show.jbuilder

@@ -15,7 +15,7 @@ json.cache! this_key do
     json.description @map.description
     json.w           @map.w
     json.h           @map.h
-    json.img_path    @map.image.image.url(:original)
+    json.img_path    @map.image ? @map.image.image.url(:original) : image_missing
     json.updated_at  @map.updated_at
     json.rated       @map.rated
 
@@ -32,7 +32,7 @@ json.cache! this_key do
       json.partial! 'ishapi/markers/index', markers: @markers
     else
       ## I removed json parsing from here! _vp_ 2021-10-14
-      ## I added json parsing here! _vo_ 2021-10-19
+      ## I added json parsing here, and is seems right. _vp_ 2021-10-19
       json.config JSON.parse @map.config
       json.labels JSON.parse @map.labels
       json.partial! 'ishapi/markers/index', markers: @markers

data/app/views/ishapi/markers/_index.jbuilder

@@ -12,9 +12,11 @@ json.markers do
     json.h    marker.h
     json.centerOffsetX  marker.centerOffsetX
     json.centerOffsetY  marker.centerOffsetY
-    json.img_path       marker.image.image.url(:original)
-    json.title_img_path marker.title_image.image.url(:thumb)
+    json.img_path       marker.image ? marker.image.image.url(:original) : image_missing
+    json.title_img_path marker.title_image ? marker.title_image.image.url(:thumb) : image_missing
     json.item_type      marker.item_type
     json.url            marker.url
+    json.premium_tier   marker.destination.premium_tier
+    json.id             marker.destination.id.to_s
   end
 end

data/app/views/ishapi/newsitems/_index.jbuilder

@@ -2,8 +2,6 @@
 # ishapi / newsitems / _index
 #
 
-puts! newsitems, 'newsitems idx'
-
 json.n_newsitems newsitems.count
 json.newsitems do
   json.array! newsitems do |item|

data/app/views/ishapi/stock_watches/index.jbuilder

@@ -0,0 +1,11 @@
+
+#
+# ishapi / stock_watches / index
+#
+
+json.array! @stock_watches do |w|
+  json.i w
+  json.price w[:price]
+  json.ticker w[:ticker]
+end
+

data/app/views/ishapi/users/_account.jbuilder

@@ -1,7 +1,6 @@
 
-
+json.id                @profile.id
 json.name              @profile.name
-json.username          @profile.username
 json.email             @profile.email
 json.profile_photo_url @profile.profile_photo.photo.url( :thumb ) if @profile.profile_photo
 

data/app/views/ishapi/users/login.jbuilder

@@ -1,5 +1,5 @@
 
-json.email    @profile.email
+json.email     @profile.email
 json.n_unlocks @profile.n_unlocks
 json.jwt_token @jwt_token
-json.partial! 'account'
+json.partial!  'account'

data/config/routes.rb

@@ -8,12 +8,15 @@ Ishapi::Engine.routes.draw do
   get 'cities/view/:cityname', :to => 'cities#show'
   get 'cities/features',       :to => 'cities#features'
 
+  ## @TODO: remove all co-tailors stuff
+=begin
   post 'co_tailors/orders',                 :to => 'orders#create'
   post 'co_tailors/order_items',            :to => 'order_items#create'
   post 'co_tailors/measurements',           :to => 'measurements#update'
   get  'co_tailors/products/by-kind/:kind', :to => 'products#show'
   namespace :co_tailors do
   end
+=end
 
   get 'events/view/:eventname',      :to => 'events#show'
 
@@ -27,8 +30,7 @@ Ishapi::Engine.routes.draw do
   get 'maps', to: 'maps#index'
   get 'maps/view/:slug', to: 'maps#show'
   get 'markers/view/:slug', to: 'maps#show_marker'
-  get  "/my/account", to: "users#account"
-  post "/my/account", to: "users#account"
+  match  "/my/account", to: "users#account", via: [ :get, :post ]
   namespace :my do
     get 'galleries', to: 'galleries#index'
     get 'newsitems', to: 'newsitems#index'
@@ -49,24 +51,28 @@ Ishapi::Engine.routes.draw do
   get 'reports', :to => 'reports#index'
   get 'reports/view/:slug', :to => 'reports#show'
 
-  get 'sites/view/:domain',                            :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
-  post 'sites/view/:domain',                           :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
-  get 'sites/view/:domain/newsitems/:newsitems_page',  :to => 'newsitems#index', :constraints => { :domain => /[^\/]+/ }
-  get 'sites/view/:domain/reports',                    :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
-  get 'sites/view/:domain/reports/page/:reports_page', :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
-  get 'sites/view/:domain/tags',                       :to => 'tags#index',      :constraints => { :domain => /[^\/]+/ }
+  get  'sites/view/:domain',                            :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
+  post 'sites/view/:domain',                            :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
+  get  'sites/view/:domain/newsitems/:newsitems_page',  :to => 'newsitems#index', :constraints => { :domain => /[^\/]+/ }
+  get  'sites/view/:domain/reports',                    :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
+  get  'sites/view/:domain/reports/page/:reports_page', :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
+  get  'sites/view/:domain/tags',                       :to => 'tags#index',      :constraints => { :domain => /[^\/]+/ }
 
   post 'stars/buy', to: 'gameui#buy_stars'
 
+  ## 2022-02-12 moved to iron_warbler gem _vp_
+  # resources "stock_watches"
+
   get 'tags/view/:slug', :to => 'tags#show'
   get 'test', to: 'application#test'
 
-  post  'users/fb_sign_in',     :to => 'users#fb_sign_in'
-  post  'users/profile',        :to => 'users#show'
-  post  'users/profile/update', :to => 'users#update'
-  get   'users/profile',        :to => 'users#show' # @TODO: only for testing! accessToken must be hidden
+  post  'users/fb_sign_in',      to: 'users#fb_sign_in'
+  get   'users/me',              to: 'users#account'
+  post  'users/profile',         to: 'users#show'
+  post  'users/profile/update',  to: 'users#update'
+  get   'users/profile',         to: 'users#show' # @TODO: only for testing! accessToken must be hidden
   match 'users/long_term_token', to: 'application#long_term_token', via: [ :get, :post ]
-  post  'users/login', to: 'users#login'
+  post  'users/login',           to: 'users#login'
 
   get 'venues', :to => 'venues#index'
   get 'venues/view/:venuename', :to => 'venues#show'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.167
+  version: 0.1.8.171
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.5
+        version: 7.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.5
+        version: 7.3.0
+- !ruby/object:Gem::Dependency
+  name: mongoid-paperclip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid_paranoia
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
@@ -165,19 +221,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0'
 description: " Description of Ishapi."
 email:
 - piousbox@gmail.com
@@ -215,14 +271,14 @@ files:
 - app/controllers/ishapi/products_controller.rb
 - app/controllers/ishapi/reports_controller.rb
 - app/controllers/ishapi/sites_controller.rb
+- app/controllers/ishapi/stock_watches_controller.rb
 - app/controllers/ishapi/tags_controller.rb
-- app/controllers/ishapi/unrestricted_controller.rb
+- app/controllers/ishapi/unrestricted_controller.rb-trash
 - app/controllers/ishapi/user_profiles_controller.rb
 - app/controllers/ishapi/users_controller.rb
 - app/controllers/ishapi/venues_controller.rb
 - app/controllers/ishapi/videos_controller.rb
 - app/helpers/ishapi/application_helper.rb
-- app/helpers/ishapi/articles_helper.rb
 - app/jobs/ishapi/application_job.rb
 - app/mailers/ishapi/application_mailer.rb
 - app/models/ishapi/ability.rb
@@ -262,6 +318,7 @@ files:
 - app/views/ishapi/reports/index.jbuilder
 - app/views/ishapi/reports/show.jbuilder
 - app/views/ishapi/sites/show.jbuilder
+- app/views/ishapi/stock_watches/index.jbuilder
 - app/views/ishapi/tags/_index.jbuilder
 - app/views/ishapi/tags/_widget.jbuilder
 - app/views/ishapi/tags/index.jbuilder

data/app/helpers/ishapi/articles_helper.rb

@@ -1,4 +0,0 @@
-module Ishapi
-  module ArticlesHelper
-  end
-end