ishapi 0.1.8.168 → 0.1.8.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f6b63ce57718ceef61fcd162151f2ffb42d8a69103db1d1427a5c42b10905c
-  data.tar.gz: 8221bb7ca6f4466a7c257157ef1e3a98c81510e79bcdada3d51fefc2293b3982
+  metadata.gz: '08c592821bf116f81b983afba7ed5986838709ff2328c22a32219efdc01c8c83'
+  data.tar.gz: 65b5532741934fa9abeddb5e7f226e7d38bcb2c66255812177574334275598cb
 SHA512:
-  metadata.gz: 61c04819a602e0b7336641c1e89bb7ed635acf7681d0ea1fd063d7649fb2f7d08768be99113fd594dd132b78e48d271e492b787fa730b892c02f545f0f13e554
-  data.tar.gz: b5e03c0aa54375793094d661899c8ab698eebc320870c47a893189fa64dcf7d02ce64ce875e7de074886d78fff2fd5a01314fdd61702d8826a1792f445ffd7ab
+  metadata.gz: b0fe164c5c7c3662bd4f7df897e8b5b10b69441b727392543bc41b3d2d9ab2f6da444a538787d8726160bfe3e4014229cf3d1691b8b9136928dde4a0b2d94135
+  data.tar.gz: c965e844069b23c23eb4837175f6bdc9dbcac69d11e0a5b3f0c6cf3be98cc6158d45aed5342a085cdb2ec70ea7c7f36fc744daa79484025642c992b8b6616e33

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
+    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/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/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

data/app/models/ishapi/ability.rb

@@ -16,10 +16,16 @@ 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
 
+      can [ :index ], IronWarbler::StockWatch # @TODO: scope this to profile!
+
       can [ :buy_stars ], ::Ish::UserProfile
 
     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/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.168
+  version: 0.1.8.169
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-02-16 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,6 +271,7 @@ 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
@@ -318,6 +319,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