ishapi 0.1.8.190 → 0.1.8.192

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f891100a3a85dcf7b3b9dfaae2582cbd897c62707c8a461cb7db2028180a3746
-  data.tar.gz: 2a8abf11cff24eb963e1a58c09e97521c5bfbdc0b5e2b2f71a7f1ae9f4a9a18a
+  metadata.gz: 9f5c1ad68578b52733f865cb38d3c39f284cd292397013ef86d6f85180a73429
+  data.tar.gz: 22bbef87fec502ec568cffc8f16d8f0de2c3517cc78eb6cfa47c769e8b85fe1a
 SHA512:
-  metadata.gz: 4b450ae541f0ccb3a85865af3c3fd41133cc280b20985c002a87756b7ea4dad7063546237a2c3dd6c4f4f15be05003e361141768b9b7f6ed56736d02dbc73c81
-  data.tar.gz: bee01f4ad4dc3715fffebe4f18894333df46141c923347ef1fcff0eb6cbd5eeef5115fe105313ddd738fcb17f5deef12d5203d82c879f4142d731560f53e28a4
+  metadata.gz: 0ae933fdaacbf915a46bed4ae172d1831e63754ddad5dee9ee130966e35e20739ac65bd7ead6119e514ef6907b9a09b82b4bfdbd85e10ae1ce311c46b7526a17
+  data.tar.gz: d8cda98e7fabb820f051178563a616bce7d623179bfc9df0875edb633d02b7322bddc92c26726d27abe4710a293b77ddedf80a0536b4fa93511c88b19b1e2c1b

data/app/controllers/ishapi/maps_controller.rb

@@ -15,9 +15,6 @@ class Ishapi::MapsController < Ishapi::ApplicationController
       ).per( @location.newsitems_page_size )
 
     @markers = @map.markers.permitted_to(@current_user.profile).order_by(ordering: :asc)
-
-    @tags = @map.tags
-
     # case @map.ordering_type
     # when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
     #   @markers = @markers.order_by( name: :asc )
@@ -25,6 +22,15 @@ class Ishapi::MapsController < Ishapi::ApplicationController
     #   @markers = @markers.order_by( ordering: :asc )
     # end
 
+    @tags = @map.tags
+
+    if @map.is_premium && !@current_user.profile.has_premium_purchase( @map )
+      render 'show_restricted'
+    else
+      render 'show'
+    end
+
+
   end
 
   def show_marker

data/app/controllers/ishapi/photos_controller.rb

@@ -0,0 +1,13 @@
+require_dependency "ishapi/application_controller"
+
+class Ishapi::PhotosController < Ishapi::ApplicationController
+
+  # before_action :soft_check_long_term_token, only: [ :show ]
+  before_action :check_jwt
+
+  def show
+    @photo = Photo.find params[:id]
+    authorize! :show, @photo
+  end
+
+end

data/app/models/ishapi/ability.rb

@@ -71,6 +71,11 @@ class Ishapi::Ability
       m.is_public
     end
 
+    #
+    # P
+    #
+    can [ :show ], Photo
+
     #
     # R
     #

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

@@ -12,15 +12,17 @@ json.cache! this_key do
     json.description  map.description
     json.w            map.w
     json.h            map.h
-    json.x            map.x
-    json.y            map.y
+    # json.x            map.x
+    # json.y            map.y
     # json.map_type     map.map_type
     json.img_path     map.image.image.url(:original)
     json.updated_at   map.updated_at
     json.rated        map.rated
     json.name         map.name
+
     json.premium_tier map.premium_tier
     json.is_premium   map.is_premium
+    json.is_purchased current_user&.profile&.has_premium_purchase( map )
 
     json.breadcrumbs do
       json.array! map.breadcrumbs do |b|

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

@@ -0,0 +1,44 @@
+#
+# ishapi / maps / show_restricted
+#
+map = @map
+
+this_key = [ map.id, map.updated_at ]
+json.cache! this_key do
+
+  json.map do
+    json.id           map.id.to_s
+    json.slug         map.slug
+    json.parent_slug  map.parent_slug
+    json.updated_at   map.updated_at
+    json.rated        map.rated
+    json.name         map.name
+    json.premium_tier map.premium_tier
+    json.is_premium   map.is_premium
+
+    json.breadcrumbs do
+      json.array! map.breadcrumbs do |b|
+        json.name b[:name]
+        json.slug b[:slug]
+        json.link b[:link]
+      end
+    end
+
+    ## _vp_ 2021-10-14 I removed json parsing from here!
+    ## _vp_ 2021-10-19 I added json parsing here!
+    ## _vp_ 2022-09-13 Must use my own config, example: 3D -> geodesic. Parent is MapPanelNoZoom, but self is ThreePanelV1
+    ##                 Maybe it's if map_slug is present, rather than parent_slug?
+    if map.map_slug.present?
+      json.config JSON.parse map.map.config
+      json.labels JSON.parse map.map.labels
+    else
+      json.config JSON.parse map.config
+      json.labels JSON.parse map.labels
+    end
+
+    # json.map({ config: {} })
+
+  end
+end
+
+

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

@@ -5,7 +5,6 @@
 json.markers do
   json.array! markers do |marker|
     json.name marker.name
-    json.slug marker.slug
     json.x    marker.x
     json.y    marker.y
     json.w    marker.w
@@ -20,10 +19,11 @@ json.markers do
 
     ## @TODO: this is copy-pasted and should be abstracted.
     if destination = marker.destination
-      json.destination_slug destination.slug
-      json.premium_tier destination.premium_tier
-      json.is_premium   destination.is_premium
-      json.id           destination.id.to_s
+      json.destination_slug destination.slug # @TODO: this looks obsolete, if I'm using slug instead. _vp_ 2022-09-23
+      json.slug             destination.slug
+      json.premium_tier     destination.premium_tier
+      json.is_premium       destination.is_premium
+      json.id               destination.id.to_s
       if destination.is_premium
         if current_user && current_user.profile
           json.is_purchased current_user.profile.has_premium_purchase( destination )

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

@@ -0,0 +1,6 @@
+
+json.photo do
+  json.partial! 'ishapi/photos/show', photo: @photo
+  json.item_type 'Photo'
+end
+

data/config/routes.rb

@@ -41,6 +41,7 @@ Ishapi::Engine.routes.draw do
   post 'payments/unlock', to: 'payments#unlock' # do_purchase
   post  'stripe_confirm', to: 'payments#stripe_confirm' # @TODO: test-drive
 
+  get 'photos/view/:id', to: 'photos#show'
   get 'profiles/view/:username', :to => 'user_profiles#show'
 
   get 'reports', :to => 'reports#index'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.190
+  version: 0.1.8.192
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -282,6 +282,7 @@ files:
 - app/controllers/ishapi/order_items_controller.rb
 - app/controllers/ishapi/orders_controller.rb
 - app/controllers/ishapi/payments_controller.rb
+- app/controllers/ishapi/photos_controller.rb
 - app/controllers/ishapi/reports_controller.rb
 - app/controllers/ishapi/sites_controller.rb
 - app/controllers/ishapi/stock_watches_controller.rb
@@ -327,6 +328,7 @@ files:
 - app/views/ishapi/maps/_show_lite.jbuilder-trash
 - app/views/ishapi/maps/index.jbuilder
 - app/views/ishapi/maps/show.jbuilder
+- app/views/ishapi/maps/show_restricted.jbuilder
 - app/views/ishapi/markers/_index.jbuilder
 - app/views/ishapi/my/videos/index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder
@@ -335,6 +337,7 @@ files:
 - app/views/ishapi/orders/_show.jbuilder
 - app/views/ishapi/photos/_index.jbuilder
 - app/views/ishapi/photos/_show.jbuilder
+- app/views/ishapi/photos/show.jbuilder
 - app/views/ishapi/products/show.jbuilder
 - app/views/ishapi/reports/_index.jbuilder
 - app/views/ishapi/reports/index.jbuilder