ishapi 0.1.8.174 → 0.1.8.177

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca21156e5ba448350ec31e26cd9b5535e592f1466fcd93d2fdc20a95c54a6e6
-  data.tar.gz: 81296feba05c6e80d915ba72471a14bb478dbb56b4426a89fc8a74dc1ee9c879
+  metadata.gz: 3d2316758e2797aeecb65f3e8cacdb034902a7271f8518da15707050bf64e097
+  data.tar.gz: ba8bc72419963ea42441cee3dfd3b537aa79d3bf8dd21ff5fa4f44f7e77b37c7
 SHA512:
-  metadata.gz: caf3f76f15dfa7ce327ad1397e2c5c5675a049319078d889e1d86975277052f3f7b93a0125965e3e0b1b6e391a3884b5f95f6590b1b298d5661edd21698a074f
-  data.tar.gz: a8d1894747b69ead5559264ed71c78f4ff3c4beb7add7890e9f87b1a928fba61c6afac94daa0e4cd1391ee8b2b6a8f8dfaee6143e771536ac5359e382f3a3b15
+  metadata.gz: 33e25407dddeeafa0fe7e80e3483c0e674ebb36028644f69c4b37c2ac03787d93568cddad0ce6981d4c63c0f527c754a4bb572e6d4a8d622e215d212c9e9b22b
+  data.tar.gz: cfed72d717b27f1c7f303eace2491441f0e5108f2536a51fdedaf7c1ed00735012a16b2db13422e4dc6f93aff33a008e4a5b843685fd26fc4c443f3f22fcea60

data/app/controllers/ishapi/user_profiles_controller.rb

@@ -2,12 +2,26 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class UserProfilesController < ApplicationController
 
-    before_action :check_profile
+    before_action :check_profile, only: %i| show | ## @TODO: hmmm I may not need this check at all
+
+    before_action :check_profile_hard, only: %i| update |
 
     def show
-      @profile = IshModels::UserProfile.find_by :username => params[:username]
+      @profile = Ish::UserProfile.find_by :username => params[:username]
       authorize! :show, @profile
     end
 
+    def update
+      @profile = Ish::UserProfile.find @current_user.profile
+      authorize! :update, @profile
+
+      flag = @profile.update params[:profile].permit!
+      if flag
+        render json: { message: 'ok' }, status: :ok
+      else
+        render json: { message: "No luck: #{@profile.errors.full_messages.join(", ")}." }, code: 400
+      end
+    end
+
   end
 end

data/app/models/ishapi/ability.rb

@@ -33,6 +33,9 @@ class Ishapi::Ability
     user ||= User.new
 
     can [ :show ], Ish::UserProfile
+    can [ :update ], Ish::UserProfile do |p|
+      p.user.id.to_s == user.id.to_s
+    end
 
     can [ :index, :show ], City
 

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

@@ -20,10 +20,9 @@ json.markers do
     ## @TODO: this is copy-pasted and should be abstracted.
     destination = marker.destination
     json.premium_tier destination.premium_tier
+    json.is_premium   destination.is_premium
     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

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

@@ -5,6 +5,7 @@
 json.n_newsitems newsitems.count
 json.newsitems do
   json.array! newsitems do |item|
+    json.id          item.id.to_s
     json.name        item.name
     json.created_at  item.created_at
     json.updated_at  item.updated_at
@@ -59,7 +60,7 @@ json.newsitems do
       end
     end
 
-    if item.video_id
+    if item.video
       json.id item.video_id.to_s
       # @TODO: why this relation is so weird here?!
       video = Video.unscoped.find( item.video_id )

data/config/routes.rb

@@ -58,8 +58,8 @@ Ishapi::Engine.routes.draw do
 
   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'
+  post  'users/profile',         to: 'users#show' ## @TODO: change, this makes no sense
+  post  'users/profile/update',  to: 'user_profiles#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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.174
+  version: 0.1.8.177
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-19 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails