ishapi 0.1.8.118 → 0.1.8.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d9b06e956b2878a44cd52891961a82d04536014609c124acd07f1f1ea913f5
-  data.tar.gz: 83760e5ee0c862b5cb28bf6604a91732b29bacbe90569bcb03174d18f3441df2
+  metadata.gz: 1f5b81ff8ff4d08f7c2047a997030d679336b57fd8fedc4f550353e2aee6eaf7
+  data.tar.gz: 51a9cfad896137f46ce99db885060d09c5e74f276314ff43a45bffaf2430ad79
 SHA512:
-  metadata.gz: b1235b28c3c561ce3ce99359ea650ec6189189b785418586a8ac7ba5c2712eab186c3c7b6dfcc42046874aee8bd9e0b3fb816a16015fb026c47296b9371f0fdc
-  data.tar.gz: e5ffa95837862688301f061b7683002fa2e4b861b0fd65d2c7f4c13bc088c8072d34ba07683979fa324fab05a827649784d0538b0935bcc4a6a8a0a6c62aece4
+  metadata.gz: f7541abed98b9c6ce8d34aa57c2d458447433f00436d084e7eb1677e6ca996eae35a58539f6ecbef9b3467e9796f2d919e4f61e39ff2e2e987a6f7b0365c1cdb
+  data.tar.gz: 565df196c961730b8890ac98d32a7b22b24db4f25a974c74a100ac980c3c95f0594fea49ae13a5239356c3230e38ea7216ec6460ebb7da0af15a30e65522e891

data/app/controllers/ishapi/sites_controller.rb

@@ -35,7 +35,7 @@ module Ishapi
       end
 
       @galleries    = @site.galleries.limit( 10 )
-      @newsitems    = @site.newsitems.limit(10)
+      @newsitems    = @site.newsitems.limit( @site.newsitems_per_page )
       @reports      = @site.reports.limit( 10 )
       @langs        = ::Site.where( :domain => domain ).map( &:lang )
       @feature_tags = @site.tags.where( :is_feature => true )

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

@@ -9,6 +9,7 @@ json.newsitems do
     json.id          item.id.to_s
     json.name        item.name
     json.created_at  item.created_at
+    json.updated_at  item.updated_at
     
     if item.gallery
       json.item_type    'gallery'
@@ -43,8 +44,8 @@ json.newsitems do
       json.username   item.report.user_profile.name if item.report.user_profile
 
       if item.report.photo
-        json.photo_url item.report.photo.photo.url( :small ) 
-        json.thumb_url item.report.photo.photo.url( :thumb )
+        json.photo_s169_url item.report.photo.photo.url( :s169 ) 
+        json.photo_thumb2_url item.report.photo.photo.url( :thumb2 )
       end
 
       json.partial!    'ishapi/application/meta', :item => item.report
@@ -52,18 +53,16 @@ json.newsitems do
                           { slug: 'bars-and-clubs', name: 'Bars & Clubs' },
                           { slug: 'food', name: 'Food' },
                           { slug: 'late-night', name: 'Late Night' } ]
+
+      if item.report.is_premium
+        json.premium_tier item.report.premium_tier
+        json.is_premium   item.report.premium_tier > 0
+        json.is_purchased current_user.profile.has_premium_purchase( item.report )
+      end
     end
     
     if item.video_id
       json.partial! 'ishapi/videos/show', :video => Video.unscoped.find( item.video_id )
-      
-      # json.item_type  'video'
-      # json.name       item.video.name
-      # json.descr      item.video.descr
-      # json.x          item.video.x
-      # json.y          item.video.y
-      # json.youtube_id item.video.youtube_id
-      # json.url        item.video.video.url
     end
 
     if item.photo

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

@@ -1,21 +1,40 @@
 
+#
+# ish_api / videos / _show
+#
+
 json.id          video.id.to_s
+json.slug        video.id.to_s
 json.youtube_id  video.youtube_id
 json.name        video.name
 json.description video.descr
+json.subhead     video.subhead
 json.x           video.x
 json.y           video.y
 json.url         video.video.url 
 json.item_type   'video'
 
 if video.city
-  json.city_name video.city.name
+  json.cityname video.city.cityname
+  json.city do
+    json.name video.city.name
+    json.slug video.city.cityname
+  end
 end
 
-if video.tag
-  json.tag video.tag.name
-end
+json.tags         [ { slug: 'adventure', name: 'Adventure' },
+                    { slug: 'bars-and-clubs', name: 'Bars & Clubs' },
+                    { slug: 'food', name: 'Food' },
+                    { slug: 'late-night', name: 'Late Night' } ]
 
 if video.user_profile
   json.username video.user_profile.name
 end
+
+if video.is_premium
+  json.premium_tier video.premium_tier
+  json.is_premium   video.premium_tier > 0
+  if current_user && current_user.profile
+    json.is_purchased current_user.profile.has_premium_purchase( item.video )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.118
+  version: 0.1.8.119
 platform: ruby
 authors:
 - piousbox