ishapi 0.1.8.168 → 0.1.8.172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f6b63ce57718ceef61fcd162151f2ffb42d8a69103db1d1427a5c42b10905c
-  data.tar.gz: 8221bb7ca6f4466a7c257157ef1e3a98c81510e79bcdada3d51fefc2293b3982
+  metadata.gz: 7b51cdb462ddeb86fe0fd4e10c6b3b7e9dfea2fffef44b773f2d1748a1a3b8d8
+  data.tar.gz: 1f5c3705a6b9eb7828dee1296113d222058d9015665d4f183429e72714beb3e3
 SHA512:
-  metadata.gz: 61c04819a602e0b7336641c1e89bb7ed635acf7681d0ea1fd063d7649fb2f7d08768be99113fd594dd132b78e48d271e492b787fa730b892c02f545f0f13e554
-  data.tar.gz: b5e03c0aa54375793094d661899c8ab698eebc320870c47a893189fa64dcf7d02ce64ce875e7de074886d78fff2fd5a01314fdd61702d8826a1792f445ffd7ab
+  metadata.gz: a43ea617b94979fada76da3479dea3e62efce08e61484e2e17c32687de0f83c0a9df5e9fdc7ec79beba43e5453ff61f91405c654477815b99b793a8443e85035
+  data.tar.gz: de56a014a64631b435557e85dbdca01fc979d52ca66230e84a5f806c95dde9c938067ca29e2d304b5251759298580a190a8031d970798a42654510ee9adc5a68

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
@@ -41,14 +43,16 @@ module Ishapi
       end
     end
 
-    ## This is for guyd _vp_ 20200721
+    ## This is for guyd _vp_ 2020-07-21
+    ## It's been a while! _vp_ 2022-03-01
     def create2
       authorize! :create, ::Ish::Payment
+      current_user.profile.update_attributes({ is_purchasing: true })
 
       begin
         amount_cents  = 503 # @TODO: change
 
-        ::Stripe.api_key = STRIPE_SK
+        ::Stripe.api_key = ::STRIPE_SK
         intent = Stripe::PaymentIntent.create({
           amount: amount_cents,
           currency: 'usd',
@@ -57,18 +61,20 @@ module Ishapi
 
         payment = Ish::Payment.create!(
           client_secret: intent.client_secret,
-          email: @current_user.email,
+          email: current_user.email,
           payment_intent_id: intent.id,
-          profile_id: @current_user.profile.id )
+          profile_id: current_user.profile.id )
 
         render json: { client_secret: intent.client_secret }
       rescue Mongoid::Errors::DocumentNotFound => e
-        puts! e, 'e'
+        puts! e, '#create2 Mongoid::Errors::DocumentNotFound'
         render :status => 404, :json => e
       end
     end
 
+    ##
     ## webhook
+    ##
     def stripe_confirm
       authorize! :open_permission, ::Ishapi
       payload = request.body.read
@@ -76,7 +82,7 @@ module Ishapi
       begin
         event = Stripe::Event.construct_from(JSON.parse(payload, symbolize_names: true))
       rescue StandardError => e
-        puts! e, 'e'
+        puts! e, 'could not #stripe_confirm'
         render status: 400, json: { status: :not_ok }
         return
       end
@@ -85,8 +91,11 @@ module Ishapi
 
       payment = Ish::Payment.where( payment_intent_id: payment_intent.id ).first
       if payment && payment_intent['status'] == 'succeeded'
+
         payment.update_attributes( status: :confirmed )
-        payment.profile.update_attributes!( n_unlocks: payment.profile.n_unlocks + 5 )
+        n_unlocks = payment.profile.n_unlocks + 5
+
+        payment.profile.update_attributes!( n_unlocks: n_unlocks, is_purchasing: false ) # @TODO: it's not always 5? adjust
       end
 
       render status: 200, json: { status: :ok }
@@ -96,18 +105,18 @@ module Ishapi
       authorize! :unlock, ::Ish::Payment
       item = Object::const_get(params['kind']).find params['id']
 
-      puts! params, 'unlocking...'
-
       existing = Purchase.where( user_profile: @current_user.profile, item: item ).first
       if existing
         render status: 200, json: { status: :ok, message: 'already purchased' }
         return
       end
 
-      @current_user.profile.update_attributes n_unlocks: @current_user.profile.n_unlocks - 1 # @TODO: the number is variable
+      @current_user.profile.inc( n_unlocks: -item.premium_tier )
+
       purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_user.profile, )
 
-      render status: 200, json: { status: :ok }
+      @profile = @current_user.profile
+      render 'ishapi/users/account'
     end
 
   end

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

@@ -3,9 +3,9 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class UsersController < ApplicationController
 
-    skip_authorization_check only: %i| fb_sign_in login |
+    skip_authorization_check only: %i| create 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
@@ -17,6 +17,20 @@ module Ishapi
       }, status: 401
     end
 
+    def create
+      @profile = Profile.new( email: params[:email] )
+      @user = User.new( email: params[:email], password: params[:password], profile: @profile )
+
+      if @profile.save && @user.save
+        @jwt_token = encode(user_id: @user.id.to_s)
+        render 'login'
+      else
+        render json: {
+          messages: [],
+        }, status: 401
+      end
+    end
+
     def fb_sign_in
       authorize! :fb_sign_in, Ishapi
       # render :json => { :status => :ok }
@@ -25,6 +39,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 +50,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,22 @@ 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
+
+    ## @TODO: this is copy-pasted and should be abstracted.
+    destination = marker.destination
+    json.premium_tier destination.premium_tier
+    json.id           destination.id.to_s
+    if destination.is_premium
+      json.premium_tier destination.premium_tier
+      json.is_premium   destination.premium_tier > 0
+      if current_user && current_user.profile
+        json.is_purchased current_user.profile.has_premium_purchase( destination )
+      end
+    end
+
   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|
@@ -41,7 +39,8 @@ json.newsitems do
         json.id         item.report_id.to_s
         json.item_type  item.report.class.name
         json.name       item.report.name
-        json.reportname item.report.slug
+        json.reportname item.report.slug # @TODO: @deprecated, remove
+        json.slug       item.report.slug
         json.subhead    item.report.subhead
         json.username   item.report.user_profile.name if item.report.user_profile
 

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

@@ -8,10 +8,12 @@ key = [ @report, params ]
 json.cache! key do
   json.report do
     json.id          @report.id.to_s
+    json.item_type   @report.class.name
     json.name        @report.name
-    json.reportname  @report.slug
+    json.reportname  @report.slug # @TODO: @deprecated, remove
+    json.slug        @report.slug
     if @report.photo
-      json.photo_url   @report.photo.photo.url( :small ) 
+      json.photo_url   @report.photo.photo.url( :small )
       json.thumb_url   @report.photo.photo.url( :thumb )
     end
 
@@ -22,7 +24,7 @@ json.cache! key do
     json.cityname    @report.city.cityname if @report.city
     json.subhead     @report.subhead
     json.description @report.descr
-  
+
     if @report.photo
       json.photo do
         json.thumb_url @report.photo.photo.url :thumb
@@ -42,5 +44,5 @@ json.cache! key do
       json.large_url @report.photo.photo.url :large
     end
   end
-  
+
 end

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,16 +1,15 @@
 
-
+json.id                @profile.id.to_s
 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
 
-json.n_reports   @profile.reports.count
-json.n_galleries @profile.galleries.count
-json.n_videos    @profile.videos.count
-json.n_stars     @profile.n_stars # @TODO: which one is deprecated?
-json.n_unlocks   @profile.n_unlocks # @TODO: which one is deprecated?
-
+json.n_reports     @profile.reports.count
+json.n_galleries   @profile.galleries.count
+json.n_videos      @profile.videos.count
+json.n_stars       @profile.n_stars # @TODO: which one is deprecated?
+json.n_unlocks     @profile.n_unlocks # @TODO: which one is deprecated?
+json.is_purchasing @profile.is_purchasing
 if @profile.current_city
   json.current_city @profile.current_city
 end

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

@@ -1,2 +1,2 @@
 
-json.partial! 'account'
+json.partial! 'ishapi/users/account'

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/app/views/ishapi/videos/_show.jbuilder

@@ -30,6 +30,7 @@ if video.user_profile
   json.username video.user_profile.name
 end
 
+## @TODO: this is copy-pasted and should be abstracted.
 if video.is_premium
   json.premium_tier video.premium_tier
   json.is_premium   video.premium_tier > 0

data/config/routes.rb

@@ -8,13 +8,6 @@ Ishapi::Engine.routes.draw do
   get 'cities/view/:cityname', :to => 'cities#show'
   get 'cities/features',       :to => 'cities#features'
 
-  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
-
   get 'events/view/:eventname',      :to => 'events#show'
 
   get  'galleries',                   :to => 'galleries#index'
@@ -27,8 +20,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 +41,29 @@ 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'
+  post  'users',                 to: 'users#create'
 
   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.168
+  version: 0.1.8.172
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ 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
@@ -271,14 +271,13 @@ 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/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
@@ -318,6 +317,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/controllers/ishapi/unrestricted_controller.rb

@@ -1,25 +0,0 @@
-module Ishapi
-  class UnrestrictedController < ActionController::Base
-    protect_from_forgery :prepend => true, :with => :exception
-    layout :false
-
-    before_action :set_current_ability
-    
-    check_authorization
-    skip_before_action :verify_authenticity_token
-
-
-    private
-
-
-    def set_current_ability
-      @current_ability ||= ::Ishapi::Ability.new( User.new )
-    end
-
-    def puts! a, b=''
-      puts "+++ +++ #{b}"
-      puts a.inspect
-    end
-
-  end
-end

data/app/helpers/ishapi/articles_helper.rb

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