ishapi 0.1.8.162 → 0.1.8.164

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fa09912746d1a54e92a52ed51546cc456494013bbf086422b59245283d8d1d9
-  data.tar.gz: 6a6c0fed814e96ecf013ac7166c884d4bad34d674ef0fe7f8fb4c7d19a26905b
+  metadata.gz: 5d090b8c99082a64b9df8d76cdab1f87cf55e4991577486f7f7e8f1b83e7781f
+  data.tar.gz: 7811076deafa69ff6fd3f78503485f30900afd437c50744e8d4433ab4a617d4b
 SHA512:
-  metadata.gz: 923863eddd777cdbd6f01509fd59ac5de72544cd88277f6c6247052bc2da9975ece2a62a56b3debe6ce804adcda1c546fec8c3b75215731a66ce3a05f31fa9b7
-  data.tar.gz: e4cf17ccc87fc3bfaade2e5b3c90f0ea526acc16ab3079231f04f8783b5364896d7d68fa73d3d5cc28d5a7590827768dce66e764f94b3b5cd2db7a390d3b7fd7
+  metadata.gz: 7e4339fd145e7790912be6d932a741910ebb5358cc717123bd5fd1d10fb72167192c095ff8f18f935c8db0fbfc0108f4c529f1d54669e1bd7adfe63d1f5b73a1
+  data.tar.gz: 64cee7884aabc8e5482f13e61d8f0d77487ae88602267601fb2c91c241c7dd9d5ed82fc38f3d9db4df371b54a372051ca60a563184686df87d460dbe89d842fd

data/app/controllers/ishapi/application_controller.rb

@@ -1,73 +1,73 @@
-module Ishapi
-  class ApplicationController < ActionController::Base
 
-    ## POST /api/users/long_term_token , a FB login flow
-    def long_term_token
-      accessToken   = request.headers[:accessToken]
-      accessToken ||= params[:accessToken]
+class Ishapi::ApplicationController < ActionController::Base
 
-      params['domain'] = 'tgm.piousbox.com'
+  ## POST /api/users/long_term_token , a FB login flow
+  def long_term_token
+    accessToken   = request.headers[:accessToken]
+    accessToken ||= params[:accessToken]
 
-      response = ::HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
-        "client_id=#{::FB[params['domain']][:app]}&client_secret=#{::FB[params['domain']][:secret]}&" +
-        "fb_exchange_token=#{accessToken}"
-      j = JSON.parse response.body
-      @long_term_token  = j['access_token']
-      @graph            = Koala::Facebook::API.new( accessToken )
-      @me               = @graph.get_object( 'me', :fields => 'email' )
-      @current_user     = User.where( :email => @me['email'] ).first
+    params['domain'] = 'tgm.piousbox.com'
 
-      # send the jwt to client
-      @jwt_token = encode(user_id: @current_user.id.to_s)
+    response = ::HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
+      "client_id=#{::FB[params['domain']][:app]}&client_secret=#{::FB[params['domain']][:secret]}&" +
+      "fb_exchange_token=#{accessToken}"
+    j = JSON.parse response.body
+    @long_term_token  = j['access_token']
+    @graph            = Koala::Facebook::API.new( accessToken )
+    @me               = @graph.get_object( 'me', :fields => 'email' )
+    @current_user     = User.where( :email => @me['email'] ).first
 
-      render json: {
-        email: @current_user.email,
-        jwt_token: @jwt_token,
-        long_term_token: @long_term_token,
-        n_unlocks: @current_user.profile.n_unlocks,
-      }
-    end
+    # send the jwt to client
+    @jwt_token = encode(user_id: @current_user.id.to_s)
 
-    private
+    render json: {
+      email: @current_user.email,
+      jwt_token: @jwt_token,
+      long_term_token: @long_term_token,
+      n_unlocks: @current_user.profile.n_unlocks,
+    }
+  end
 
-    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 arent logged in, or you have been logged out.'
-        # @current_user = User.new
-      end
-    end
+  private
 
-    # jwt
-    def check_jwt
-      begin
-        decoded = decode(params[:jwt_token])
-        @current_user = User.find decoded['user_id']
-      rescue JWT::ExpiredSignature
-        Rails.logger.info("JWT::ExpiredSignature")
-      rescue JWT::DecodeError
-        Rails.logger.info("JWT::DecodeError")
-      end
-      current_ability
+  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.'
+      # puts! 'You are not logged in, or you have been logged out.'
     end
+  end
 
-    # jwt
-    def decode(token)
-      decoded = JWT.decode(token, Rails.application.secrets.secret_key_base.to_s)[0]
-      HashWithIndifferentAccess.new decoded
+  # jwt
+  def check_jwt
+    begin
+      decoded = decode(params[:jwt_token])
+      @current_user = User.find decoded['user_id']
+    rescue JWT::ExpiredSignature
+      Rails.logger.info("JWT::ExpiredSignature")
+    rescue JWT::DecodeError
+      Rails.logger.info("JWT::DecodeError")
     end
+    current_ability
+  end
 
-    # jwt
-    def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
-      payload[:exp] = exp.to_i
-      JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
-    end
+  # jwt
+  def decode(token)
+    decoded = JWT.decode(token, Rails.application.secrets.secret_key_base.to_s)[0]
+    HashWithIndifferentAccess.new decoded
+  end
 
-    def current_ability
-      @current_ability ||= Ishapi::Ability.new( current_user )
-    end
+  # jwt
+  def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
+    payload[:exp] = exp.to_i
+    JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
+  end
 
+  def current_ability
+    @current_ability ||= Ishapi::Ability.new( @current_user )
   end
+
 end
+

data/app/controllers/ishapi/maps_controller.rb

@@ -1,36 +1,47 @@
+
 require_dependency "ishapi/application_controller"
-module Ishapi
-  class MapsController < ApplicationController
-    before_action :check_profile, only: [ :show ]
-
-    def show
-      @map = ::Gameui::Map.find_by slug: params[:slug]
-      @markers = @map.markers.where( is_active: true )
-      @newsitems = @map.newsitems
-
-      case @map.ordering_type
-      when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
-        @markers = @markers.order_by( name: :asc )
-      when ::Gameui::Map::ORDERING_TYPE_CUSTOM
-        @markers = @markers.order_by( ordering: :asc )
-      end
-
-      ## @TODO: figure this out eventually
-      if city = City.where( cityname: @map.slug ).first
-        # @newsitems = city.newsitems
-        @galleries = city.galleries
-        @reports = city.reports
-        @videos = city.videos
-      end
-
-      authorize! :show, @map
-    end
 
-    def show_marker
-      @marker = ::Gameui::Marker.find_by slug: params[:slug]
-      authorize! :show, @marker
-      render json: @marker
+class Ishapi::MapsController < Ishapi::ApplicationController
+  before_action :check_profile, only: [ :show ]
+
+  def show
+    @location = ::Gameui::Map.unscoped.find_by slug: params[:slug]
+    @map = @location.map || @location
+    authorize! :show, @map
+    @newsitems = @map.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
 
+    # case @map.ordering_type
+    # when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
+    #   @markers = @markers.order_by( name: :asc )
+    # when ::Gameui::Map::ORDERING_TYPE_CUSTOM
+    #   @markers = @markers.order_by( ordering: :asc )
+    # end
+
+    # ## @TODO: figure this out eventually
+    # if city = City.where( cityname: @map.slug ).first
+    #   # @newsitems = city.newsitems
+    #   @galleries = city.galleries
+    #   @reports = city.reports
+    #   @videos = city.videos
+    # end
+
+  end
+
+  def show_marker
+    @marker = ::Gameui::Marker.find_by slug: params[:slug]
+    authorize! :show, @marker
+    render json: @marker
   end
+
 end
+

data/app/models/ishapi/ability.rb

@@ -8,14 +8,9 @@ class Ishapi::Ability
     #
     unless user.blank?
 
-      if user.profile && user.profile.sudoer?
-        can :manage, :all
-      end
-
-      can [ :update ], ::CoTailors::Address do |address|
-        puts [ user.inspect, address.inspect ], '+++ user in cancancan'
-        true
-      end
+      # if user.profile && user.profile.sudoer?
+      #   can :manage, :all
+      # end
 
       can [ :my_index ], Gallery
       can [ :show ], Gallery do |gallery|
@@ -25,7 +20,7 @@ class Ishapi::Ability
 
       can [ :create, :unlock ], ::Ish::Payment
 
-      can [ :buy_stars ], ::IshModels::UserProfile
+      can [ :buy_stars ], ::Ish::UserProfile
 
     end
     #
@@ -33,22 +28,12 @@ class Ishapi::Ability
     #
     user ||= User.new
 
-    can [ :show ], IshModels::UserProfile
+    can [ :show ], Ish::UserProfile
 
     can [ :index, :show ], City
 
-    can [ :update ], ::CoTailors::Address
-    can [ :add ], ::CoTailors::OrderItem
-    can [ :create, :update_measurements ], ::CoTailors::Order
-    can [ :show ], ::CoTailors::Product
-
     can [ :index, :show ], Event
 
-    #
-    # Ish::P
-    #
-
-
     #
     # G
     #
@@ -56,18 +41,39 @@ class Ishapi::Ability
     can [ :show ], Gallery do |gallery|
       gallery.is_public && !gallery.is_trash
     end
-    can [ :index, :show ], ::Gameui::Map
-    can [ :show ], ::Gameui::Marker
 
+    #
+    # I
+    #
+    can [ :fb_sign_in, :long_term_token, :open_permission, :welcome_home ], Ishapi
+
+    #
+    # M
+    #
+    can [ :index ], ::Gameui::Map
+    can [ :show ], ::Gameui::Map do |map|
+      map.is_public || map.shared_profiles.include?( user.profile )
+    end
+    can [ :show ], ::Gameui::Marker do |m|
+      m.is_public
+    end
+
+    #
+    # R
+    #
     can [ :index ], Report
     can [ :my_index, :show ], Report do |report|
       report.is_public
     end
 
-    can [ :fb_sign_in, :long_term_token, :open_permission, :welcome_home ], Ishapi
-
+    #
+    # S
+    #
     can [ :index, :show ], Site
 
+    #
+    # T
+    #
     can [ :index ], Tag
     can [ :show ], Tag do |tag|
       tag.is_public
@@ -84,5 +90,6 @@ class Ishapi::Ability
     can [ :show ], Video do |video|
       video.is_public
     end
+
   end
 end

data/app/views/ishapi/cities/features.jbuilder

@@ -3,7 +3,7 @@
 # ishapi / cities / features
 #
 
-key = [ ::IshModels::CacheKey.one.feature_cities ]
+key = [ ::Ish::CacheKey.one.feature_cities ]
 json.cache! key do
   json.partial! 'index', :cities => @cities
 end

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

@@ -3,7 +3,7 @@
 # ishapi / cities / index
 #
 
-key = [ ::IshModels::CacheKey.one.cities ]
+key = [ ::Ish::CacheKey.one.cities ]
 json.cache! key do
   json.partial! 'index', :cities => @cities
 end

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

@@ -15,6 +15,7 @@ json.cache! this_key do
     json.h           map.h
     json.img_path    map.image.image.url(:original)
     json.updated_at  map.updated_at
+    json.rated       map.rated
 
     json.partial! 'ishapi/markers/index', map: map
 

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

@@ -2,7 +2,11 @@
 # ishapi / maps / show
 #
 
-this_key = [ @map, params.permit! ]
+this_key = [
+  @map.id, @map.updated_at,
+  current_user&.profile&.updated_at,
+  params.permit!
+]
 json.cache! this_key do
   json.map do
     json.id          @map.id.to_s
@@ -13,18 +17,25 @@ json.cache! this_key do
     json.h           @map.h
     json.img_path    @map.image.image.url(:original)
     json.updated_at  @map.updated_at
+    json.rated       @map.rated
+
+    if @map.is_premium
+      json.premium_tier @map.premium_tier
+      json.is_premium   @map.premium_tier > 0
+      json.is_purchased current_user&.profile&.has_premium_purchase( @map )
+    end
 
     if @map.map
       json.partial! 'ishapi/maps/show', map: @map.map
       json.config JSON.parse @map.parent.config
       json.labels JSON.parse @map.parent.labels
-      json.partial! 'ishapi/markers/index', map: @map.map
+      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
       json.config JSON.parse @map.config
       json.labels JSON.parse @map.labels
-      json.partial! 'ishapi/markers/index', map: @map
+      json.partial! 'ishapi/markers/index', markers: @markers
     end
 
     json.breadcrumbs do

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

@@ -3,7 +3,7 @@
 #
 
 json.markers do
-  json.array! map.markers do |marker|
+  json.array! markers do |marker|
     json.name marker.name
     json.slug marker.slug
     json.x    marker.x

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.162
+  version: 0.1.8.164
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails