ishapi 0.1.8.28 → 0.1.8.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae89ec7aaf612bc98491fc746edf87b8ca945b64
-  data.tar.gz: e724ada43ec7481af6f522fce2090b96d75f6f4e
+  metadata.gz: ec7fe74393929b6e351f36e7385a4cc353d81741
+  data.tar.gz: f3b9ddea39ddf198673226cba2ecbf10bfc2e6af
 SHA512:
-  metadata.gz: 20ef5015f02fcd9794d96bd89a78dfdf702be671ded3a24d763a77e9b1846dfc3a451123dccde017e2d67d0505f808a93ad694789c7e08bc774a9853995b5f52
-  data.tar.gz: baa6110aadbe4a82c187bdb634efa7c70bd36b99dcef8af02ad87733ab9ba66b8c43236b7c66af174e05323f67baa6dfc2e17022c41aec2f7f58b0d923d6513b
+  metadata.gz: 78541f0abc0c129ff8bcfdc2e67f00fe5f9bfa1b1edf41f365e72552758a31d4657d02cc80fa69f12fea043e412a632fa76c414fcd3236952bc4757996168bff
+  data.tar.gz: c2a310aaa4993c27900c56a5f4fedd54508e9eb1f70895d3601849ae8a392569127e5e1c75de9e2f807dd492ac43b63dadc764b0dde36868081b02efe44702e7

data/app/controllers/ishapi/users_controller.rb

@@ -15,7 +15,8 @@ module Ishapi
       u                 = IshModels::UserProfile.find_or_create_by :email => email
       u.fb_access_token = access_token
       u.name          ||= name
-      u.user            = user
+      u.user          ||= user
+      u.email         ||= email
       u.user          ||= User.create( :email => email, :password => (0..8).map { "#{rand(100)}" }.join("#{rand(100)}") )
 
       auth                   = Koala::Facebook::OAuth.new

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

@@ -15,7 +15,7 @@ json.cache! key do
     json.y           @city.y
 
     json.partial! 'ishapi/newsitems/index', :newsitems => @city.newsitems
-    json.partial! 'ishapi/features/index',  :features  => @city.features
+    json.partial! 'ishapi/features/index',  :features  => @city.features, :resource => @city
     json.partial! 'ishapi/galleries/index', :galleries => @city.galleries
     json.partial! 'ishapi/reports/index',   :reports   => @city.reports
     json.partial! 'ishapi/users/index',     :users     => @city.current_users

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

@@ -3,9 +3,12 @@
 # ishapi / features / _index
 #
 
+resource ||= site if defined? site
+resource ||= city if defined? city
+
 json.n_features features.count
 json.features do
-  json.array! features do |feature|
+  json.array! features.limit( resource.n_features ) do |feature|
 
     json.name       feature.name       unless feature.name.blank?
     json.subhead    feature.subhead    unless feature.subhead.blank?

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

@@ -9,7 +9,7 @@ json.cache! key do
     json.id          @report.id.to_s
     json.name        @report.name
     json.reportname  @report.name_seo
-    json.photo_url   @report.photo.photo.url( :small )
+    json.photo_url   @report.photo.photo.url( :small ) if @report.photo
     json.thumb_url   @report.photo.photo.url( :thumb )
 
     # @TODO: move this to meta

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

@@ -12,7 +12,7 @@ json.cache! key do
 
     json.is_ads_enabled @site.is_ads_enabled
 
-    json.partial! 'ishapi/features/index',  :features  => @site.features
+    json.partial! 'ishapi/features/index',  :features  => @site.features, :resource => @site
     json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems
     json.partial! 'ishapi/videos/index',    :videos    => @site.videos
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.28
+  version: 0.1.8.29
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails