ishapi 0.1.8.14 → 0.1.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ace07837fa637b3d9b053edb16cd769561956717
-  data.tar.gz: 3088ac3e4b42361e4e81fa206ac173dbdf78264e
+  metadata.gz: 56e342680489f7e39cb92550ace7d74a3510793c
+  data.tar.gz: da837c0fa8c43e47819ffd789134c0a9950e76b4
 SHA512:
-  metadata.gz: a1e0c0d2dd0e693de2dd6afe36dfdd07dc5a1f12cb72358ed84757b6d74c8f02917501d490b224c267d23e992f52df49fdffdb262903d8e4f6d763855fd8d615
-  data.tar.gz: 70f844785e3aa06062edeca406273048d85ddb85f291ce45c1442b1e5394b421ef9e294deeb33b809f64fc8398f6053726364ae75c745a886c119757005c3698
+  metadata.gz: bec8b8ed5524363e939197469c8941e3cbc60e046eb65b7d09be5d9dd654608e9b6dc62883b55d020b8ad30e39ae25caa049fd11f45fb1dcecc0b1453b7453c2
+  data.tar.gz: f51815fd33819d81ab67736922c76eed51838933927e441a6abeaed6c30647355f661a5a7fa34c71316bc1e4ee9ebcd337312f7cf36ebfc1739f9e6d7785aa1b

data/README.md

@@ -2,4 +2,5 @@
 # Develop
 # Test
 # Install
+ bundle
  gem build ishapi.gemspec

data/app/controllers/ishapi/application_controller.rb

@@ -1,9 +1,10 @@
 module Ishapi
   class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
+    protect_from_forgery :prepend => true, :with => :exception
     layout :false
     before_action :set_current_ability
     check_authorization
+    skip_before_action :verify_authenticity_token
 
     private
 

data/app/controllers/ishapi/cities_controller.rb

@@ -1,4 +1,3 @@
-
 require_dependency "ishapi/application_controller"
 
 module Ishapi

data/app/controllers/ishapi/users_controller.rb

@@ -0,0 +1,55 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class UsersController < ApplicationController
+
+    def fb_sign_in
+      authorize! :fb_sign_in, Ishapi
+
+      params.permit!
+
+      access_token = params[:accessToken]
+      email        = params[:email]
+      name         = params[:name]
+      user         = User.where( :email => email ).first
+
+      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)}") )
+
+      if u.save
+        render :json => { :status => :ok }
+      else
+        render :json => { :status => :not_ok, :errors => u.errors.messages }
+      end
+    end
+
+    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']
+    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 ) )
+      if flag
+        render :json => { :status => :ok }
+      else
+        render :json => { :status => :not_ok, :errors => @user_profile.errors.messages }
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,43 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class UsersController < ApplicationController
+
+    def fb_sign_in
+      authorize! :fb_sign_in, Ishapi
+
+      params.permit!
+
+      access_token = params[:accessToken]
+      email        = params[:email]
+      name         = params[:name]
+      user         = User.where( :email => email ).first
+
+      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)}") )
+
+      if u.save
+        render :json => { :status => :ok }
+      else
+        render :json => { :status => :not_ok, :errors => u.errors.messages }
+      end
+    end
+
+    def show
+      puts! params, 'params'
+
+      # @oauth = Koala::Facebook::OAuth.new # ( app_id, app_secret )
+      # @oauth.get_user_info_from_cookies(cookies)
+
+      access_token = params[:access_token]
+      # @graph = Koala::Facebook::Api.new( access_token )
+      # puts! @graph.get_object 'me'
+
+      raise 'not implemented'
+    end
+
+  end
+end

data/app/models/ishapi/ability.rb

@@ -33,7 +33,7 @@ class Ishapi::Ability
       report.is_public
     end
     
-    can [ :welcome_home ], Ishapi
+    can [ :welcome_home, :fb_sign_in, :open_permission ], Ishapi
 
     can [ :index, :show ], Site
 

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

@@ -12,9 +12,12 @@ json.cache! key do
     json.description @city.description
     json.x           @city.x
     json.y           @city.y
+
     json.partial! 'ishapi/newsitems/index', :newsitems => @city.newsitems
+    json.partial! 'ishapi/features/index',  :features  => @city.features
     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
     json.partial! 'ishapi/venues/index',    :venues    => @city.venues
     json.partial! 'ishapi/videos/index',    :videos    => @city.videos
   end

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

@@ -3,5 +3,10 @@
 # ishapi / features / _index
 #
 
+json.n_features features.count
 json.features do
+  json.array! features do |feature|
+    json.id   feature.id.to_s
+    json.name feature.name
+  end
 end

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

@@ -3,6 +3,7 @@
 # ishapi / galleries / _index
 #
 
+json.n_galleries galleries.count
 json.galleries do
   json.array! galleries do |gallery|
     json.partial! 'ishapi/galleries/show', :gallery => gallery

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

@@ -3,6 +3,7 @@
 # ishapi / newsitems / _index
 #
 
+json.n_newsitems newsitems.count
 json.newsitems do
   json.array! newsitems do |item|
     if item.gallery

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

@@ -3,6 +3,7 @@
 # ishapi / reports / _index
 #
 
+json.n_reports reports.count
 json.reports do
   json.array! reports do |report|
     json.id          report.id.to_s

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

@@ -0,0 +1,10 @@
+
+json.n_users users.count
+json.users do
+  json.array! users do |user|
+    json.id       user.id.to_s
+    json.username user.username
+    json.name     user.name
+    json.email    user.email
+  end
+end

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

@@ -0,0 +1,7 @@
+
+json.users do
+  json.array! users do |user|
+    json.id user.id.to_s
+    json.email user.email
+  end
+end

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

@@ -0,0 +1,15 @@
+
+#
+# ishapi / users / _show.jbuilder
+#
+
+json.email @user_profile.email
+json.about @user_profile.about
+
+if @user_profile.current_city
+  json.current_city_id @user_profile.current_city_id.to_s
+  json.current_city do
+    json.id   @user_profile.current_city_id.to_s
+    json.name @user_profile.current_city.name
+  end
+end

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

@@ -0,0 +1,9 @@
+
+#
+# ishapi / users / _show.jbuilder
+#
+
+json.current_city do
+  json.id   @user_profile.current_city_id.to_s
+  json.name @user_profile.current_city.name
+end

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

@@ -3,6 +3,7 @@
 # ishapi / venues / _index
 #
 
+json.n_venues venues.count
 json.venues do
   json.array! venues do |venue|
     json.id          venue.id.to_s

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

@@ -3,6 +3,7 @@
 # ishapi / videos / _index
 #
 
+json.n_videos videos.count
 json.videos videos do |video|
-  json.partial! :show, :video => video
+  json.partial! 'ishapi/videos/show', :video => video
 end

data/config/routes.rb

@@ -12,6 +12,11 @@ Ishapi::Engine.routes.draw do
 
   get 'sites/view/:domain', :to => 'sites#show', :constraints => { :domain => /[^\/]+/ }
 
+  post 'users/fb_sign_in',     :to => 'users#fb_sign_in'
+  post 'users/profile',        :to => 'users#show'
+  post 'users/profile/update', :to => 'users#update'
+  get  'users/profile',        :to => 'users#show' # @TODO: only for testing! accessToken must be hidden
+
   get 'venues/view/:venuename', :to => 'venues#show'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.14
+  version: 0.1.8.15
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,41 +81,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: koala
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: fb_graph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -150,6 +136,8 @@ files:
 - app/controllers/ishapi/reports_controller.rb~
 - app/controllers/ishapi/sites_controller.rb
 - app/controllers/ishapi/sites_controller.rb~
+- app/controllers/ishapi/users_controller.rb
+- app/controllers/ishapi/users_controller.rb~
 - app/controllers/ishapi/venues_controller.rb
 - app/controllers/ishapi/venues_controller.rb~
 - app/helpers/ishapi/application_helper.rb
@@ -189,6 +177,10 @@ files:
 - app/views/ishapi/reports/show.jbuilder~
 - app/views/ishapi/sites/show.jbuilder
 - app/views/ishapi/sites/show.jbuilder~
+- app/views/ishapi/users/_index.jbuilder
+- app/views/ishapi/users/_index.jbuilder~
+- app/views/ishapi/users/show.jbuilder
+- app/views/ishapi/users/show.jbuilder~
 - app/views/ishapi/venues/_index.haml~
 - app/views/ishapi/venues/_index.jbuilder
 - app/views/ishapi/venues/_index.jbuilder~