ishapi 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12aa0f7a51bb0ae81a76a6f54c0bd200f1fcfe5
-  data.tar.gz: 8c2ae7b6e33a27aa67d429bd586fa509cca5975f
+  metadata.gz: 0bc2551ac0f596f9a00805d21aac56f9b47bcb95
+  data.tar.gz: 92906c76403bbedfdfa1c48637ff73c2f47890e2
 SHA512:
-  metadata.gz: f8fa6de9dff4045b905f2b04a62b4145aaa2bf6c108ec5430e3d11866a6cde6eb539de67e00ba0da44c6101254b4253b0c3b012221df95822eec7a5cb394567d
-  data.tar.gz: 674e5c1ebca037b4fa0bddae22c782ef4577416d0af19a93404066c4fcf282ed4a88b2bfe31ab82c03be29211c67f2209f17a546d569e94bb07236bfedf639bb
+  metadata.gz: 28f3be37b2755ea3a4369b9938c394cda3f8383be3dff28de75dc1402b54f43b9b187b93d2942809ac10a397615b05e0767cc9c2f8623a45d7b8698c8a19a19c
+  data.tar.gz: 3c07240b2b30509bb8eb60feb48a7dbd6d2682bb828829720d29274db762f0b957dbbe488fa1c6b3878ce4eaa30527016223ff732aca36cc101dc3905a8abc36

data/app/controllers/ishapi/application_controller.rb

@@ -2,5 +2,11 @@ module Ishapi
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
     layout :false
+
+    def puts! a, b=''
+      puts "+++ +++ #{b}"
+      puts a.inspect
+    end
+
   end
 end

data/app/controllers/ishapi/galleries_controller.rb

@@ -0,0 +1,10 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class GalleriesController < ApplicationController
+
+    def show
+      @gallery = ::Gallery.find_by :galleryname => params[:galleryname]
+    end
+
+  end
+end

data/app/controllers/ishapi/galleries_controller.rb~

@@ -0,0 +1,20 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class SitesController < ApplicationController
+
+    def index
+      @sites = ::Site.all
+    end
+
+    def show
+      if params[:domain].include?(".json")
+        domain = params[:domain][0...-5]
+      else
+        domain = params[:domain]
+      end
+      @site = ::Site.find_by :domain => domain, :lang => :en
+      @newsitems = @site.newsitems.limit(10)
+    end
+
+  end
+end

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

@@ -2,3 +2,12 @@
 #
 # ishapi / cities / index
 #
+
+key = [ ::IshModels::CacheKey.one.cities ]
+json.cache! key do
+  json.array! @cities do |city|
+    json.id city.id.to_s
+    json.name city.name
+    json.cityname city.cityname
+  end
+end

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

@@ -6,8 +6,14 @@
 key = [ @city, params.permit! ]
 json.cache! key do
   json.city do
-    json.id       @city.id.to_s
-    json.name     @city.name
-    json.cityname @city.cityname
+    json.id          @city.id.to_s
+    json.name        @city.name
+    json.cityname    @city.cityname
+    json.description @city.description
+    json.x           @city.x
+    json.y           @city.y
+    json.partial! 'ishapi/newsitems/index', :newsitems => @city.newsitems
+    json.partial! 'ishapi/galleries/index', :galleries => @city.galleries
+    json.partial! 'ishapi/reports/index',   :reports   => @city.reports
   end
 end

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

@@ -0,0 +1,7 @@
+
+#
+# ishapi / features / _index
+#
+
+json.features do
+end

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

@@ -0,0 +1,10 @@
+
+#
+# ishapi / galleries / _index
+#
+
+json.galleries do
+  json.array! galleries do |gallery|
+    json.partial! 'ishapi/galleries/show', :gallery => gallery
+  end
+end

data/app/views/ishapi/galleries/_index.jbuilder~

@@ -0,0 +1,10 @@
+
+#
+# ishapi / galleries / _index
+#
+
+json.galleries do
+  json.array! @city.galleries do |gallery|
+    json.partial! 'ishapi/galleries/show', :gallery => gallery
+  end
+end

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

@@ -0,0 +1,10 @@
+
+#
+# ishapi / galleries / _show
+#
+
+json.id          gallery.id.to_s
+json.name        gallery.name
+json.galleryname gallery.galleryname
+
+json.partial! 'ishapi/photos/index', :photos => gallery.photos

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

@@ -0,0 +1,9 @@
+
+#
+# ishapi / galleries / _show
+#
+
+json.id gallery.id.to_s
+json.name gallery.name
+json.galleryname gallery.galleryname
+json.partial! 'ishapi/photos/index', :photos => gallery.photos

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

@@ -0,0 +1,15 @@
+
+#
+# ishapi / galleries / show
+#
+
+this_key = [ @gallery, params.permit! ]
+json.cache! this_key do
+  json.gallery do
+    json.id @gallery.id.to_s
+    json.name @gallery.name
+    json.galleryname @gallery.galleryname
+    json.partial! 'ishapi/photos/index', :photos => @gallery.photos
+  end
+end
+

data/app/views/ishapi/galleries/show.jbuilder~

@@ -0,0 +1,22 @@
+
+#
+# ishapi / galleries / show
+#
+
+this_key = [ @gallery, params.permit! ]
+json.cache! this_key do
+  json.gallery do
+    json.id @gallery.id.to_s
+    json.name @gallery.name
+    json.galleryname @gallery.galleryname
+    json.photos do
+      json.array! @gallery.photos do |photo|
+        json.photo do
+          json.thumb_url photo.photo.url( :thumb )
+          json.large_url photo.photo.url( :large )
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,16 @@
+
+#
+# ishapi / newsitems / _index
+#
+
+json.newsitems do
+  json.array! newsitems do |item|
+    if item.gallery
+      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
+    end
+    json.descr item.descr
+  end
+end

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

@@ -0,0 +1,5 @@
+
+#
+# ishapi / newsitems / _index
+#
+

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

@@ -0,0 +1,10 @@
+
+#
+# ishapi / photos / _index
+#
+
+json.photos do
+  json.array! photos do |photo|
+    json.partial! 'ishapi/photos/show', :photo => photo
+  end
+end          

data/app/views/ishapi/photos/_index.jbuilder~

@@ -0,0 +1,10 @@
+
+#
+# ishapi / photos / _index
+#
+
+json.photos do
+  json.array! item.gallery.photos do |photo|
+    json.partial! 'ishapi/photos/show', :photo => photo
+  end
+end          

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

@@ -0,0 +1,9 @@
+
+#
+# ishapi / photos / _show
+#
+
+json.mini_url  photo.photo.url( :mini  )
+json.thumb_url photo.photo.url( :thumb )
+json.small_url photo.photo.url( :small )
+json.large_url photo.photo.url( :large )

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

@@ -0,0 +1,7 @@
+
+#
+# ishapi / photos / _show
+#
+
+json.thumb_url photo.photo.url( :thumb )
+json.large_url photo.photo.url( :large )

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

@@ -0,0 +1,13 @@
+
+#
+# ishapi / reports / _index
+#
+
+json.reports do
+  json.array! reports do |report|
+    json.id          report.id.to_s
+    json.name        report.name
+    json.reportname  report.name_seo
+    json.description report.descr
+  end
+end

data/app/views/ishapi/reports/_index.jbuilder~

@@ -0,0 +1,12 @@
+
+#
+# ishapi / reports / _index
+#
+
+json.reports do
+  json.array! reports do |report|
+    json.id report.id.to_s
+    json.name report.name
+    json.description report.descr
+  end
+end

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

@@ -0,0 +1,14 @@
+
+#
+# ishapi / reports / show
+#
+
+key = [ @report, params.permit! ]
+json.cache! key do
+  json.report do
+    json.id          @report.id.to_s
+    json.name        @report.name
+    json.reportname  @report.name_seo
+    json.description @report.descr
+  end
+end

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

@@ -0,0 +1,4 @@
+
+json.report do
+  json.a 'b'
+end

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

@@ -9,10 +9,6 @@ json.cache! key do
     json.id        @site.id.to_s
     json.domain    @site.domain
     json.lang      @site.lang
-    json.newsitems do
-      json.array! @newsitems do |item|
-        json.descr item.descr
-      end
-    end
+    json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems
   end
 end

data/config/routes.rb

@@ -6,6 +6,8 @@ Ishapi::Engine.routes.draw do
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
 
+  get 'galleries/view/:galleryname', :to => 'galleries#show'
+
   get 'reports/view/:name_seo', :to => 'reports#show'
 
   get 'sites/view/:domain', :to => 'sites#show', :constraints => { :domain => /[^\/]+/ }

data/lib/ishapi/version.rb

@@ -1,3 +1,3 @@
 module Ishapi
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,6 +102,8 @@ files:
 - app/controllers/ishapi/articles_controller.rb
 - app/controllers/ishapi/cities_controller.rb
 - app/controllers/ishapi/cities_controller.rb~
+- app/controllers/ishapi/galleries_controller.rb
+- app/controllers/ishapi/galleries_controller.rb~
 - app/controllers/ishapi/reports_controller.rb
 - app/controllers/ishapi/reports_controller.rb~
 - app/controllers/ishapi/sites_controller.rb
@@ -120,6 +122,23 @@ files:
 - app/views/ishapi/cities/index.jbuilder
 - app/views/ishapi/cities/show.jbuilder
 - app/views/ishapi/cities/show.jbuilder~
+- app/views/ishapi/features/_index.jbuilder
+- app/views/ishapi/galleries/_index.jbuilder
+- app/views/ishapi/galleries/_index.jbuilder~
+- app/views/ishapi/galleries/_show.jbuilder
+- app/views/ishapi/galleries/_show.jbuilder~
+- app/views/ishapi/galleries/show.jbuilder
+- app/views/ishapi/galleries/show.jbuilder~
+- app/views/ishapi/newsitems/_index.jbuilder
+- app/views/ishapi/newsitems/_index.jbuilder~
+- app/views/ishapi/photos/_index.jbuilder
+- app/views/ishapi/photos/_index.jbuilder~
+- app/views/ishapi/photos/_show.jbuilder
+- app/views/ishapi/photos/_show.jbuilder~
+- app/views/ishapi/reports/_index.jbuilder
+- app/views/ishapi/reports/_index.jbuilder~
+- app/views/ishapi/reports/show.jbuilder
+- app/views/ishapi/reports/show.jbuilder~
 - app/views/ishapi/sites/show.jbuilder
 - app/views/ishapi/sites/show.jbuilder~
 - app/views/layouts/ishapi/application.html.erb