ishapi 0.1.8.39 → 0.1.8.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a03e7a23a56473ffb3bec9258496b2ca9540188b
-  data.tar.gz: 1459021e9585b6531ab9d5556d9b326a43861328
+  metadata.gz: 89fcd96a1a5fd1d61b520030884fa5de0cb8e2ce
+  data.tar.gz: 645baf85d6b1321a17fb13f0b4cba0bf838c6e92
 SHA512:
-  metadata.gz: a623d72a2274a679a6ef4290af96a001ea3f1fa6453aae758e10d0de599373c64f3dc7837b0d675914adf479ef929c882168e4143a2ffedd4822ab36c0111197
-  data.tar.gz: 2b4be1351143d21d01e25abed0bd94fb00a6436aa8f7f571dce11643991dce0e4d0d9e1135f03708a1848f91387e75e305a88df1ea1c67beae7ab496b972d93e
+  metadata.gz: 788554098c180689be69d9061dd4ed80549cd346e316cf6562267eb6bfd7615eb2fd54c45fbc66661303d2e6dccd60974633d3421d078884627c5be552ebe838
+  data.tar.gz: 716ac31a8709504622a90e6e63b951b1ff0eca956bd5aba88fe7b58451b5fe0d792cecfb54543957e31c3a28c03ae338754e94140b67f38b7ea194927d01602a

data/app/controllers/ishapi/api_controller.rb

@@ -4,6 +4,8 @@ module Ishapi
   class ApiController < ApplicationController
 
     def home
+      puts! params, 'params'
+
       render :json => { :status => :ok, :message => 'Ishapi::ApiController.home', 
                         :n_reports => Report.count, :n_cities => City.count }
       authorize! :welcome_home, Ishapi

data/app/controllers/ishapi/reports_controller.rb

@@ -14,6 +14,12 @@ module Ishapi
         city = City.find_by :cityname => params[:cityname]
         @reports = @reports.where( :city_id => city.id )
       end
+      if params[:domain]
+        site = Site.find_by :domain => params[:domain], :lang => :en
+        @reports = @reports.where( :site_id => site.id )
+      end
+
+      @reports = @reports.page( params[:reports_page] ).per( 10 )
     end
 
   end

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

@@ -4,10 +4,13 @@
 #
 
 json.array! @reports do |report|
-  json.id         report.id.to_s
-  json.name       report.name
-  json.reportname report.name_seo
-  json.subhead    report.subhead
+  json.created_at  report.created_at
+
+  json.id          report.id.to_s
+  json.name        report.name
+  json.reportname  report.name_seo
+  json.subhead     report.subhead
+  json.description report.descr
   if report.photo
     json.photo      report.photo.photo.url( :thumb )
   end

data/config/routes.rb

@@ -2,6 +2,7 @@
 Ishapi::Engine.routes.draw do
 
   root :to => 'api#home'
+  post 'home', :to => 'api#home'
 
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
@@ -25,8 +26,10 @@ Ishapi::Engine.routes.draw do
   get 'reports', :to => 'reports#index'
   get 'reports/view/:name_seo', :to => 'reports#show'
 
-  get 'sites/view/:domain',                           :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
-  get 'sites/view/:domain/newsitems/:newsitems_page', :to => 'newsitems#index', :constraints => { :domain => /[^\/]+/ }
+  get 'sites/view/:domain',                            :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
+  get 'sites/view/:domain/newsitems/:newsitems_page',  :to => 'newsitems#index', :constraints => { :domain => /[^\/]+/ }
+  get 'sites/view/:domain/reports',                    :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
+  get 'sites/view/:domain/reports/page/:reports_page', :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
 
   post 'users/fb_sign_in',     :to => 'users#fb_sign_in'
   post 'users/profile',        :to => 'users#show'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.39
+  version: 0.1.8.40
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails