ishapi 0.1.8.13 → 0.1.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e3661caa825656de657c68ebdeab671a1ebe8c2
-  data.tar.gz: 2a3eff25d05f492f30c2671e93756ee1346b2237
+  metadata.gz: ace07837fa637b3d9b053edb16cd769561956717
+  data.tar.gz: 3088ac3e4b42361e4e81fa206ac173dbdf78264e
 SHA512:
-  metadata.gz: baa89561e89a0f91d3f78bdd41210f762768991e40076a5f788d82ed9743b1de1e60c443ef60b7509641062f77c22d36649fa68d62a0bf0ce48f0696cadbcf7a
-  data.tar.gz: f344dbf8cc87fc52b2d62b573c4bcddef1344e54000fa3426283a4a5df1781110e1e0ef8230ab1c36b76715090debdf08f0fdb64336359d0147fe19dd5a718d9
+  metadata.gz: a1e0c0d2dd0e693de2dd6afe36dfdd07dc5a1f12cb72358ed84757b6d74c8f02917501d490b224c267d23e992f52df49fdffdb262903d8e4f6d763855fd8d615
+  data.tar.gz: 70f844785e3aa06062edeca406273048d85ddb85f291ce45c1442b1e5394b421ef9e294deeb33b809f64fc8398f6053726364ae75c745a886c119757005c3698

data/app/views/ishapi/application/_meta.jbuilder

@@ -0,0 +1,11 @@
+
+#
+# ishapi / application / _meta
+#
+
+if item.city
+  json.city_name item.city.name
+end
+if item.tag
+  json.tag_name item.tag.name
+end

data/app/views/ishapi/application/_meta.jbuilder~

@@ -0,0 +1,11 @@
+
+#
+# ishapi / application / _meta
+#
+
+if item.gallery.city
+  json.city_name item.gallery.city.name
+end
+if item.gallery.tag
+  json.tag_name item.gallery.tag.name
+end

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

@@ -9,7 +9,9 @@ json.newsitems do
       json.item_type  'gallery' #@TODO: should be a constant
       json.name        item.gallery.name
       json.galleryname item.gallery.galleryname
-      json.partial!   'ishapi/photos/index', :photos => item.gallery.photos
+     
+      json.partial!    'ishapi/application/meta', :item => item.gallery
+      json.partial!    'ishapi/photos/index',     :photos => item.gallery.photos.limit( 6 )
     end
     if item.report
       json.item_type  'report'
@@ -18,6 +20,8 @@ json.newsitems do
       json.report_id  item.report_id.to_s
     end
     if item.video
+      json.partial! 'ishapi/videos/show', :video => item.video
+    
       json.item_type  'video'
       json.name       item.video.name
       json.descr      item.video.descr

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

@@ -4,9 +4,5 @@
 #
 
 json.videos videos do |video|
-  json.youtube_id  video.youtube_id
-  json.name        video.name
-  json.description video.descr
-  json.x           video.x
-  json.y           video.y
+  json.partial! :show, :video => video
 end

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

@@ -0,0 +1,19 @@
+
+json.id          video.id.to_s
+json.youtube_id  video.youtube_id
+json.name        video.name
+json.description video.descr
+json.x           video.x
+json.y           video.y
+
+if video.city
+  json.city_name video.city.name
+end
+
+if video.tag
+  json.tag video.tag.name
+end
+
+if video.user_profile
+  json.username video.user_profile.username
+end

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

@@ -0,0 +1,15 @@
+
+json.id          video.id.to_s
+json.youtube_id  video.youtube_id
+json.name        video.name
+json.description video.descr
+json.x           video.x
+json.y           video.y
+
+if video.city
+  json.city_name video.city.name
+end
+
+if video.user
+  json.username video.user.username
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.13
+  version: 0.1.8.14
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -160,6 +160,8 @@ files:
 - app/models/ishapi/ability.rb~
 - app/models/ishapi/application_record.rb
 - app/models/ishapi/article.rb
+- app/views/ishapi/application/_meta.jbuilder
+- app/views/ishapi/application/_meta.jbuilder~
 - app/views/ishapi/articles/_form.html.erb
 - app/views/ishapi/articles/edit.html.erb
 - app/views/ishapi/articles/index.html.erb
@@ -194,6 +196,8 @@ files:
 - app/views/ishapi/venues/show.jbuilder~
 - app/views/ishapi/videos/_index.jbuilder
 - app/views/ishapi/videos/_index.jbuilder~
+- app/views/ishapi/videos/_show.jbuilder
+- app/views/ishapi/videos/_show.jbuilder~
 - app/views/layouts/ishapi/application.html.erb
 - config/routes.rb
 - lib/ishapi.rb