ishapi 0.1.8.189 → 0.1.8.191

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7b88652fb9949a0f69a25a7a2972f569ebeb2353014464aee3622de87c0ba5f
-  data.tar.gz: 175c76708f9cd360743a0752d22dcb8fc2a47dcc022e4ea1be7bec30044b5d97
+  metadata.gz: 6810b728f6c15f3cbe1033a35e6f63bf46fa5407b6949195b838423862c2f7a9
+  data.tar.gz: 50353e0c352130b314da53a9a250aaed054c28af118dc9c53e233ed5f8b7a99b
 SHA512:
-  metadata.gz: 5b16b8d679909aea31a2bf1fefd6e325b350d8f3acf326190e595c4aab8a229cab56a9f5914c9603cd21fa94501362c8507ef8f0d6584ace1d5f187db2fa5b78
-  data.tar.gz: ca30eabd8eeb8f25476f2ee400ce1a278e6e738bc5bf28714da8caeeeca700c12906c48211e3b51d2520f6a997561dc9891211f0378eb678cd5264f645da276a
+  metadata.gz: ee30b8a0815c5eecf6c9e8bd74896212c7006e85083982fc44831b3228bee1837c2336ddf17fef4a73e108b0cf2446bd6a149b529b3549a90c972b3d0bd3a116
+  data.tar.gz: 2f1836cd62c6d6cb1351dfb6022b9a803dcf92c8f4dca78735e951035deb8f7541d24f004b82f4a27950553349ec6eb61bfc0dad2f09f879996617d33001f4e4

data/app/controllers/ishapi/maps_controller.rb

@@ -10,12 +10,11 @@ class Ishapi::MapsController < Ishapi::ApplicationController
     @map = @location.map || @location
 
     authorize! :show, @map
-    @newsitems = @location.newsitems
 
-    @markers = @map.markers.permitted_to(@current_user.profile).order_by(ordering: :asc)
-
-    @tags = @map.tags
+    @newsitems = @location.newsitems.page( params[:newsitems_page]
+      ).per( @location.newsitems_page_size )
 
+    @markers = @map.markers.permitted_to(@current_user.profile).order_by(ordering: :asc)
     # case @map.ordering_type
     # when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
     #   @markers = @markers.order_by( name: :asc )
@@ -23,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/views/ishapi/application/_pagination.jbuilder

@@ -0,0 +1,11 @@
+
+## From: https://gist.github.com/be9/6446051
+
+current, total, per_page = collection.current_page, collection.total_pages, collection.limit_value
+
+json.current  current
+json.previous (current > 1 ? (current - 1) : nil)
+json.next     (current == total ? nil : (current + 1))
+json.per_page per_page
+json.pages    total
+json.count    collection.total_count

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.map_type     map.map_type
+    # 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
@@ -19,14 +18,16 @@ json.markers do
     json.asset3d_path   marker.asset3d ? marker.asset3d.object.url : ''
 
     ## @TODO: this is copy-pasted and should be abstracted.
-    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
-    if destination.is_premium
-      if current_user && current_user.profile
-        json.is_purchased current_user.profile.has_premium_purchase( destination )
+    if destination = marker.destination
+      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 )
+        end
       end
     end
 

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

@@ -2,8 +2,11 @@
 # ishapi / newsitems / _index
 #
 
-json.n_newsitems newsitems.count
+json.newsitems_pagination do
+  json.partial! "ishapi/application/pagination", collection: newsitems
+end
 json.newsitems do
+
   json.array! newsitems do |item|
     json.newsitem_id item.id.to_s
     json.name        item.name
@@ -46,7 +49,6 @@ 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 # @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

@@ -23,7 +23,13 @@ json.cache! key do
     json.username    @report.user_profile.name if @report.user_profile
     json.cityname    @report.city.cityname if @report.city
     json.subhead     @report.subhead
-    json.description @report.descr
+
+    case @report.item_type
+    when 'wordpress'
+      json.raw_json    JSON.parse(@report.raw_json)
+    else
+      json.description @report.descr
+    end
 
     if @report.photo
       json.photo do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.189
+  version: 0.1.8.191
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-18 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -299,6 +299,7 @@ files:
 - app/models/ishapi/ability.rb
 - app/views/ishapi/addresses/_show.jbuilder
 - app/views/ishapi/application/_meta.jbuilder
+- app/views/ishapi/application/_pagination.jbuilder
 - app/views/ishapi/articles/_form.html.erb
 - app/views/ishapi/articles/edit.html.erb
 - app/views/ishapi/articles/index.html.erb
@@ -326,6 +327,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