ishapi 0.1.8.16 → 0.1.8.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da10da04976a52d4648ffdb3c778062d142dcae7
-  data.tar.gz: 9dd2ffd57da0500042ff4c6d92c4765ab3480a34
+  metadata.gz: ae3828b157640356896379ff1249c5522a5a726e
+  data.tar.gz: 5207b80b7dff7969088deeefcf658ddb957e54c1
 SHA512:
-  metadata.gz: b513d96125b9d8d0b679560c15e5ad6abe38676a7ca434d667707e981019aac04d22a9db76277d935fc1e7c4aad000b4a31a4c87667c71e76ebc6f7f9a386e7f
-  data.tar.gz: faa27159f74fef4035a3355cb696ccb0dba8720a030810a58415a077b43e670b99a95e13eabd09ec0fb92ed0b245f24a5257a1ceaea7756d7c5c264bd97774a3
+  metadata.gz: b1f2fd2c999ce138c68f89eb47edaf4390ddd99585ef8e84e0baecd7e34a3ae15c0916ccfedb653365f01aafc46bfee62c6ca79d63d9fe4b570ac8875260a4e8
+  data.tar.gz: c102ffde5d23f1c224a4620a303a4283a9044fcf0c0345980db429578bf729263c89580e9f71cf26e5b9f91548e1783ba8769251bab8c3400f8844765b21ab74

data/app/controllers/ishapi/my/my_controller.rb

@@ -0,0 +1,24 @@
+
+module Ishapi
+  module My
+    class MyController < Ishapi::ApplicationController
+
+      before_action :set_profile
+
+      private
+
+      def set_profile
+        begin
+          @graph   = Koala::Facebook::API.new( params[:accessToken] )
+          me       = @graph.get_object( 'me', :fields => 'email' )
+          @profile = IshModels::UserProfile.find_by :email => me['email']
+        rescue Koala::Facebook::AuthenticationError => e
+          render :json => { :status => :not_ok, :errors => "Probably expired token." }
+          return
+        end
+      end
+
+    end
+  end
+end
+

data/app/controllers/ishapi/my/my_controller.rb~

@@ -0,0 +1,5 @@
+
+class My::MyController < IshApi::ApplicationController
+
+
+end

data/app/controllers/ishapi/my/reports_controller.rb

@@ -0,0 +1,14 @@
+
+module Ishapi
+  module My
+    class ReportsController < Ishapi::My::MyController
+
+      def index
+        authorize! :my_index, Report
+        @reports = @profile.reports
+      end
+
+    end
+  end
+end
+

data/app/controllers/ishapi/my/reports_controller.rb~

@@ -0,0 +1,7 @@
+
+class Ishapi::My::ReportsController < My::MyController
+
+  def index
+  end
+
+end

data/app/controllers/ishapi/reports_controller.rb

@@ -7,5 +7,14 @@ module Ishapi
       authorize! :show, @report
     end
 
+    def index
+      authorize! :index, Report
+      @reports = Report.all
+      if params[:cityname]
+        city = City.find_by :cityname => params[:cityname]
+        @reports = @reports.where( :city_id => city.id )
+      end
+    end
+
   end
 end

data/app/controllers/ishapi/users_controller.rb

@@ -5,7 +5,6 @@ module Ishapi
 
     def fb_sign_in
       authorize! :fb_sign_in, Ishapi
-
       params.permit!
 
       access_token = params[:accessToken]
@@ -13,14 +12,17 @@ module Ishapi
       name         = params[:name]
       user         = User.where( :email => email ).first
 
-      u = IshModels::UserProfile.find_or_create_by :email => email
+      u                 = IshModels::UserProfile.find_or_create_by :email => email
       u.fb_access_token = access_token
-      u.name ||= name
-      u.user = user
-      u.user ||= User.create( :email => email, :password => (0..8).map { "#{rand(100)}" }.join("#{rand(100)}") )
+      u.name          ||= name
+      u.user            = user
+      u.user          ||= User.create( :email => email, :password => (0..8).map { "#{rand(100)}" }.join("#{rand(100)}") )
+
+      auth                   = Koala::Facebook::OAuth.new
+      u.fb_long_access_token = auth.exchange_access_token access_token
 
       if u.save
-        render :json => { :status => :ok }
+        render :json => { :status => :ok, :profile => u }
       else
         render :json => { :status => :not_ok, :errors => u.errors.messages }
       end
@@ -28,26 +30,36 @@ module Ishapi
 
     def show
       authorize! :fb_sign_in, Ishapi
-
-      @graph        = Koala::Facebook::API.new( params[:accessToken] )
-      me            = @graph.get_object( 'me', :fields => 'email' )
-      @user         = User.find_by( :email => me['email'] )
-      @user_profile = IshModels::UserProfile.find_by :email => me['email']
+      begin
+        @graph        = Koala::Facebook::API.new( params[:accessToken] )
+        me            = @graph.get_object( 'me', :fields => 'email' )
+        @user         = User.find_by                   :email => me['email']
+        @user_profile = IshModels::UserProfile.find_by :email => me['email']
+      rescue Koala::Facebook::AuthenticationError => e
+        render :json => { :status => :not_ok, :errors => "Probably expired token." }
+        return
+      end
     end
 
     def update
       authorize! :fb_sign_in, Ishapi
 
-      @graph        = Koala::Facebook::API.new( params[:accessToken] )
-      me            = @graph.get_object( 'me', :fields => 'email' )
-      @user         = User.find_by( :email => me['email'] )
-      @user_profile = IshModels::UserProfile.find_by :email => me['email']
-      
-      flag = @user_profile.update_attributes( params[:user_profile].permit( :about, :current_city_id ) )
+      begin
+        @graph        = Koala::Facebook::API.new( params[:accessToken] )
+        me            = @graph.get_object( 'me', :fields => 'email' )
+        @user         = User.find_by( :email => me['email'] )
+        @user_profile = IshModels::UserProfile.find_by :email => me['email']
+        flag          = @user_profile.update_attributes( params[:user_profile].permit( :about, :current_city_id ) )
+        @errors       = @user_profile.errors.messages
+      rescue Koala::Facebook::AuthenticationError => e
+        flag = false
+        @errors = "Probably expired token."
+      end
+
       if flag
         render :json => { :status => :ok }
       else
-        render :json => { :status => :not_ok, :errors => @user_profile.errors.messages }
+        render :json => { :status => :not_ok, :errors => @errors }
       end
     end
 

data/app/models/ishapi/ability.rb

@@ -29,7 +29,8 @@ class Ishapi::Ability
       gallery.is_public
     end
 
-    can [ :show ], Report do |report|
+    can [ :index ], Report
+    can [ :my_index, :show ], Report do |report|
       report.is_public
     end
     

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

@@ -9,5 +9,8 @@ json.cache! key do
     json.id city.id.to_s
     json.name city.name
     json.cityname city.cityname
+    if city.profile_photo
+      json.photo city.profile_photo.photo.url( :thumb )
+    end
   end
 end

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

@@ -0,0 +1,7 @@
+
+json.reports do
+  json.array! @reports do |report|
+    json.id   report.id.to_s
+    json.name report.name
+  end
+end

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

@@ -0,0 +1,2 @@
+
+json.a 'b'

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

@@ -0,0 +1,15 @@
+
+#
+# ishapi / reports / index.jbuilder
+#
+
+json.array! @reports do |report|
+  json.id         report.id.to_s
+  json.name       report.name
+  json.reportname report.name_seo
+  json.subhead    report.subhead
+  if report.photo
+    json.photo      report.photo.photo.url( :thumb )
+  end
+end
+

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

@@ -0,0 +1,2 @@
+
+json.a 'b'

data/config/routes.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.16
+  version: 0.1.8.17
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,6 +132,10 @@ files:
 - app/controllers/ishapi/cities_controller.rb~
 - app/controllers/ishapi/galleries_controller.rb
 - app/controllers/ishapi/galleries_controller.rb~
+- app/controllers/ishapi/my/my_controller.rb
+- app/controllers/ishapi/my/my_controller.rb~
+- app/controllers/ishapi/my/reports_controller.rb
+- app/controllers/ishapi/my/reports_controller.rb~
 - app/controllers/ishapi/reports_controller.rb
 - app/controllers/ishapi/reports_controller.rb~
 - app/controllers/ishapi/sites_controller.rb
@@ -165,6 +169,8 @@ files:
 - app/views/ishapi/galleries/_show.jbuilder~
 - app/views/ishapi/galleries/show.jbuilder
 - app/views/ishapi/galleries/show.jbuilder~
+- app/views/ishapi/my/reports/index.jbuilder
+- app/views/ishapi/my/reports/index.jbuilder~
 - app/views/ishapi/newsitems/_index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder~
 - app/views/ishapi/photos/_index.jbuilder
@@ -173,6 +179,8 @@ files:
 - app/views/ishapi/photos/_show.jbuilder~
 - app/views/ishapi/reports/_index.jbuilder
 - app/views/ishapi/reports/_index.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