ishapi 0.1.8.52 → 0.1.8.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd9de6a31c033a184f716a05a36454379fb66860
-  data.tar.gz: ce211d7218f50a1a57fc7f093f13a1c72911b8d6
+  metadata.gz: b62f4c9e48fbdace0290ac3548dea0ee7c95e0d2
+  data.tar.gz: 72e101241e6e8be73e6b3c5adcfe9ed0f993319f
 SHA512:
-  metadata.gz: abcf3b251846db4b0b48639adae80eeb1ca411c9e0bafc0a267b80d3a92db9bb21538b69454a170dc36e833a8f93fd32029355ca26dc09955e25ae1d905c8ece
-  data.tar.gz: '071957bbcb204f0b45f4254b0c90eb055262a17774864d42481cb79ec697c1aee4f46fde2251c3ae9830fe4d51974c857cc8ea5fe724dc232c01335f1862de43'
+  metadata.gz: 0aa6eed78a9ba44ae37032f9b42fd4a5fe9efb2933346c87319fee34a3a1f2cc4fa4ac25763f8065b27f47bad24e5ce99c06319259f02e8c39cca841094213de
+  data.tar.gz: f93bfcf69162647fc2a92d74d1cca173d10e44f1c3622dc40e429cef460ff38ba931a6c360c8470b192360a9e03d6e8de1c8dbc7804b39d5bee0d283513f5993

data/app/controllers/ishapi/events_controller.rb

@@ -0,0 +1,21 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class EventsController < ApplicationController
+
+    def index
+      @events = Event.all
+      authorize! :index, Event
+      if params[:cityname]
+        city = City.find_by :cityname => params[:cityname]
+        @events = @events.where( :city => city )
+      end
+      @events = @events.page( params[:events_page] ).per( 10 )
+    end
+
+    def show
+      @event = ::Event.unscoped.find_by :eventname => params[:eventname]
+      authorize! :show, @event
+    end
+
+  end
+end

data/app/models/ishapi/ability.rb

@@ -25,6 +25,8 @@ class Ishapi::Ability
 
     can [ :index, :show ], City
     
+    can [ :index, :show ], Event
+
     can [ :index ], Gallery
     can [ :show ], Gallery do |gallery|
       gallery.is_public

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

@@ -0,0 +1,11 @@
+
+json.event do
+  json.name @event.name
+  json.date @event.date
+  json.eventname @event.eventname
+  json.description @event.description
+  json.city do
+    json.name @event.city.name
+    json.cityname @event.city.cityname
+  end
+end

data/config/routes.rb

@@ -8,6 +8,8 @@ Ishapi::Engine.routes.draw do
   namespace :co_tailors do
   end
 
+  get 'events/view/:eventname',      :to => 'events#show'
+
   get 'galleries',                   :to => 'galleries#index'
   get 'galleries/view/:galleryname', :to => 'galleries#show'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.52
+  version: 0.1.8.53
 platform: ruby
 authors:
 - piousbox
@@ -172,6 +172,7 @@ files:
 - app/controllers/ishapi/articles_controller.rb
 - app/controllers/ishapi/cities_controller.rb
 - app/controllers/ishapi/cities_controller.rb~
+- app/controllers/ishapi/events_controller.rb
 - app/controllers/ishapi/galleries_controller.rb
 - app/controllers/ishapi/galleries_controller.rb~
 - app/controllers/ishapi/invoices_controller.rb
@@ -210,6 +211,7 @@ files:
 - app/views/ishapi/cities/show.jbuilder
 - app/views/ishapi/cities/show.jbuilder~
 - app/views/ishapi/events/_index.jbuilder
+- app/views/ishapi/events/show.jbuilder
 - app/views/ishapi/features/_index.jbuilder
 - app/views/ishapi/galleries/_index.jbuilder
 - app/views/ishapi/galleries/_index.jbuilder~