ishapi 0.1.8.114 → 0.1.8.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd43d94d4d5bee2b7c5256be58fcb1c3f5f5738d4a50b63820f77521b941da56
-  data.tar.gz: 4b4d6868efc90c9a382967245e8492c1a24b2fc0fe94f9b39f53ec034dc3df5f
+  metadata.gz: 5b55b77299fe0ad600967ee834aaeb25eeb531d4c76402788eee2efcf80443a4
+  data.tar.gz: c4409f71ee678ce226678acae816863e69d0c3cddda7a073087dfb3e323c713c
 SHA512:
-  metadata.gz: 12f57e6f9aba87accbb8a961e3d955997c21863c28b72330cba006e7321ce8224ed667a313c65a593b28b0bbe899c4020283c20d87097401d3ebe4e081ae098c
-  data.tar.gz: 9196172b477ef601108da041bf3ac686320e247ada3316963635adb55ba3fe586f74c438fbb492592f7521431f85fc62b82b780dda93fdf41c7d59551247cb38
+  metadata.gz: a345c900145cde1c693462f0f8f057d327c4097fb3e844861f897da4e6c5c3ee8900d6d85b952de12bc97ae76b547cf1674f39b37fd6fb286f8367d2f0cbf946
+  data.tar.gz: 23a8bc20a8727d2cca598f156a9c37ea50c384f55341e5ef682d030287448fa08c389957144f32adc681c4507f54ad3cb032eecec67c2546587a1889de935f9c

data/app/controllers/ishapi/application_controller.rb

@@ -37,13 +37,35 @@ module Ishapi
     private
 
     def append_long_term_token
-      puts! 'after action!', @long_term_token
-
       if @long_term_token
         response.body = JSON.parse(response.body).merge({ long_term_token: @long_term_token }).to_json
       end
     end
 
+    ## Hard check by default; craps out if accessToken is missing
+    def check_long_term_token soft=false
+      accessToken   = request.headers[:accessToken]
+      accessToken ||= params[:accessToken]
+      if accessToken
+        @graph            = Koala::Facebook::API.new( accessToken )
+        @me               = @graph.get_object( 'me', :fields => 'email' )
+        @current_user     = User.where( :email => @me['email'] ).first
+        @profile          = @current_user.profile
+        raise '98& - no profile' unless @profile
+      else
+        if soft
+          return
+        else
+          raise 'no access token'
+        end
+      end
+    end
+    ## Does not crap out if accessToken is missing
+    def soft_check_long_term_token
+      check_long_term_token soft=true
+      # puts! @profile, 'soft_check_long_term_token() profile'
+    end
+
     def check_multiprofile provider = 'google'
       if 'google' == provider
         # client_secrets = ::Google::APIClient::ClientSecrets.load
@@ -67,7 +89,6 @@ module Ishapi
           # long-term token
           #
           params['domain'] = 'tgm.piousbox.com'
-          puts! accessToken, 'accessToken'
           response = HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
             "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&" +
             "fb_exchange_token=#{accessToken}"
@@ -100,7 +121,8 @@ module Ishapi
         puts! @current_user, 'current_user'
         puts! @current_profile, 'current_profile'
         # byebug
-
+      else
+        puts! 'check_multiprofile(): no access token'
       end
 
       sign_in @current_user, scope: :user
@@ -108,7 +130,7 @@ module Ishapi
     end
 
     # this doesn't generate long-lived token, doesn't update user_profile
-    # this is only for facebook?
+    # this is only for facebook now
     def check_profile
       # return check_multiprofile 'google'
       return check_multiprofile 'facebook'
@@ -190,7 +212,7 @@ module Ishapi
 
     def set_current_ability
       # puts! current_user.email, '#set_current_ability() :: @current_user'
-      @current_user ||= User.new
+      @current_user ||= User.new({ profile: ::IshModels::UserProfile.new })
       @current_ability ||= ::Ishapi::Ability.new( @current_user )
     end
 

data/app/controllers/ishapi/galleries_controller.rb

@@ -3,6 +3,8 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class GalleriesController < ApplicationController
 
+    before_action :soft_check_long_term_token, only: [ :show ]
+
     def index
       @galleries = Gallery.all
       authorize! :index, Gallery
@@ -15,12 +17,20 @@ module Ishapi
         @galleries = @galleries.where( :site => @site )
       end
       @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
-      byebug
     end
 
     def show
       @gallery = ::Gallery.unscoped.find_by :galleryname => params[:galleryname]
       authorize! :show, @gallery
+      if @gallery.premium?
+        if current_user.profile.has_premium_purchase( @gallery )
+          render 'show_premium_unlocked'
+        else
+          render 'show_premium_locked'
+        end
+      else
+        render 'show'
+      end
     end
 
   end

data/app/controllers/ishapi/gameui_controller.rb

@@ -0,0 +1,64 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class GameuiController < ApplicationController
+    before_action :check_long_term_token, except: []
+
+    def buy_stars
+      authorize! :buy_stars, @profile
+      puts! @current_user, 'current_user'
+      puts! @profile, 'profile'
+
+      payment = Ish::Payment.new :email => @profile.email, :amount => params[:amount],
+        profile: @profile
+
+      ::Stripe.api_key = STRIPE_SK
+      acct = Stripe::Account.create(
+        :country => 'US',
+        :type => 'custom'
+      )
+      charge = ::Stripe::Charge.create(
+        :amount => params[:amount],
+        :currency => 'usd',
+        :source => params[:stripeToken],
+        :destination => { 
+          :account => acct,
+        }
+      )
+      puts! charge, 'charge'
+      payment.charge = JSON.parse( charge.to_json )
+      payment.save
+      if payment.persisted?
+        # add the star
+        @profile.n_stars += 1
+        @profile.save
+        if !@profile.persisted?
+          raise 'could not save profile, somehow'
+        end
+      else
+        puts! payment.errors.messages
+      end
+
+      render json: { status: 'ok', n_stars: @profile.n_stars }
+    end
+
+    ## spend the star
+    def do_purchase
+      authorize! :do_purchase, ::Gameui
+      item = params[:className].constantize.find_by_slug( params[:slug] )
+      
+      raise 'no such item'     if !item
+      raise 'too little funds' if @profile.n_stars < item.premium_tier
+
+      ::IshModels::UserProfile.with_session do
+        @profile.update_attributes( n_stars: @profile.n_stars - item.premium_tier )
+        @purchase = ::Gameui::PremiumPurchase.create! user_profile: @profile, item: item
+      end
+
+      render json: @purchase
+    rescue ::Exception => e
+      render json: e
+    end
+
+  end
+end

data/app/controllers/ishapi/maps_controller.rb

@@ -0,0 +1,39 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class MapsController < ApplicationController
+
+    before_action :soft_check_long_term_token, only: [ :show ]
+    
+    def index
+      authorize! :index, ::Gameui::Map
+      @maps = ::Gameui::Map.all
+    end
+
+    def show
+      @map = ::Gameui::Map.find_by slug: params[:slug]
+      @markers = @map.markers.where( is_active: true )
+
+      case @map.ordering_type
+      when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
+        @markers = @markers.order_by( name: :asc )
+      when ::Gameui::Map::ORDERING_TYPE_CUSTOM
+        @markers = @markers.order_by( ordering: :asc )
+      end
+
+      if city = City.where( cityname: @map.slug ).first
+        @newsitems = city.newsitems
+        @galleries = city.galleries
+        @reports = city.reports
+        @videos = city.videos
+      end
+      authorize! :show, @map
+    end
+
+    def show_marker
+      @marker = ::Gameui::Marker.find_by slug: params[:slug]
+      authorize! :show, @marker
+      render json: @marker
+    end
+
+  end
+end

data/app/models/ishapi/ability.rb

@@ -16,13 +16,14 @@ class Ishapi::Ability
       can [ :show ], Gallery do |gallery|
         gallery.user_profile == user.profile
       end
+      can [ :do_purchase ], ::Gameui
 
       can [ :update ], ::CoTailors::Address do |address|
         puts [ user.inspect, address.inspect ], '+++ user in cancancan'
         true
       end
 
-
+      can [ :buy_stars ], ::IshModels::UserProfile
 
     end
     #
@@ -41,10 +42,15 @@ class Ishapi::Ability
 
     can [ :index, :show ], Event
 
+    #
+    # G
+    #
     can [ :index ], Gallery
     can [ :show ], Gallery do |gallery|
-      gallery.is_public
+      gallery.is_public && !gallery.is_trash
     end
+    can [ :index, :show ], ::Gameui::Map
+    can [ :show ], ::Gameui::Marker
 
     can [ :index ], Report
     can [ :my_index, :show ], Report do |report|

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

@@ -1,10 +1,8 @@
-
 #
 # 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
+json.id           gallery.id.to_s
+json.name         gallery.name
+json.galleryname  gallery.galleryname
+json.description  gallery.description

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

@@ -1,4 +1,3 @@
-
 #
 # ishapi / galleries / show
 #
@@ -6,11 +5,8 @@
 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.description @gallery.descr
-    json.partial! 'ishapi/photos/index', :photos => @gallery.photos
+    json.partial! 'ishapi/galleries/show', gallery: @gallery   
+    json.partial! 'ishapi/photos/index', :photos => @gallery.photos 
   end
 end
 

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

@@ -0,0 +1,17 @@
+#
+# ishapi / galleries / show_premium_locked
+#
+
+this_key = [ @gallery, params.permit! ]
+json.cache! this_key do
+  json.gallery do
+    json.message      "This is premium content - please purchase it to view!"
+    json.premium_tier @gallery.premium_tier
+    json.is_premium   @gallery.is_premium
+    json.is_purchased false
+
+    json.partial! 'ishapi/galleries/show', gallery: @gallery   
+    json.partial! 'ishapi/photos/index', :photos => [ @gallery.photos[0] ]
+  end
+end
+

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

@@ -0,0 +1,17 @@
+#
+# ishapi / galleries / show_premium_unlocked
+#
+
+this_key = [ @gallery, params.permit! ]
+json.cache! this_key do
+  json.gallery do
+    json.message      "Thanks for purchasing!"
+    json.premium_tier @gallery.premium_tier
+    json.is_premium   @gallery.is_premium
+    json.is_purchased true
+
+    json.partial! 'ishapi/galleries/show', gallery: @gallery   
+    json.partial! 'ishapi/photos/index', :photos => @gallery.photos
+  end
+end
+

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

@@ -0,0 +1,12 @@
+#
+# ishapi / maps / index
+#
+
+json.maps do
+  @maps.each do |map|
+    json.id map.id.to_s
+    json.slug map.slug
+  end
+end
+
+

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

@@ -0,0 +1,42 @@
+#
+# ishapi / maps / show
+#
+
+this_key = [ @map, params.permit! ]
+json.cache! this_key do
+  json.map do
+    json.id          @map.id.to_s
+    json.slug        @map.slug
+    json.parent_slug @map.parent_slug
+    json.description @map.description
+    json.w           @map.w
+    json.h           @map.h
+    json.img_path    @map.img_path
+    json.updated_at  @map.updated_at
+
+    json.markers do
+      json.array! @markers do |marker|
+        json.name marker.name
+        json.slug marker.slug
+        json.x    marker.x
+        json.y    marker.y
+        json.w    marker.w
+        json.h    marker.h
+        json.img_path marker.img_path
+        json.title_img_path marker.title_img_path
+        json.item_type marker.item_type
+      end
+    end
+
+    if @newsitems
+      json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems
+    end
+
+    if @galleries
+      json.partial! 'ishapi/galleries/index', galleries: @galleries
+    end
+
+  end
+end
+
+

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

@@ -11,13 +11,21 @@ json.newsitems do
     json.created_at  item.created_at
     
     if item.gallery
-      json.item_type  'gallery'
-      json.name        item.gallery.name
-      json.galleryname item.gallery.galleryname
-      json.username    item.username
+      json.item_type    'gallery'
+      json.name         item.gallery.name
+      json.galleryname  item.gallery.galleryname
+      json.username     item.username
+      
      
       json.partial!    'ishapi/application/meta', :item => item.gallery
-      json.partial!    'ishapi/photos/index',     :photos => item.gallery.photos
+      if item.gallery.is_premium
+        json.premium_tier item.gallery.premium_tier
+        json.is_premium   item.gallery.premium_tier > 0
+        json.is_purchased current_user.profile.has_premium_purchase( item.gallery )
+        json.partial!    'ishapi/photos/index',     :photos => [ item.gallery.photos[0] ]
+      else
+        json.partial!    'ishapi/photos/index',     :photos => item.gallery.photos
+      end
     end
 
     if item.report

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

@@ -1,6 +1,5 @@
-
-#
 #
+# ishapi / newsitems / index
 #
 
 json.partial! 'index', :newsitems => @newsitems

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

@@ -16,8 +16,8 @@ json.cache! key do
     end
 
     # @TODO: move this to meta
-    json.created_at  @report.created_at.strftime('%Y%m%d')
-    json.updated_at  @report.updated_at.strftime('%Y%m%d')
+    json.created_at  @report.created_at
+    json.updated_at  @report.updated_at
     json.username    @report.user_profile.name if @report.user_profile
     json.cityname    @report.city.cityname if @report.city
     json.tagname     @report.tag.name_seo  if @report.tag

data/app/views/ishapi/user_profiles/my.jbuilder

@@ -6,6 +6,7 @@ json.email    @profile.email
 json.n_reports   @profile.reports.count
 json.n_galleries @profile.galleries.count
 json.n_videos    @profile.videos.count
+json.n_stars     @profile.n_stars
 
 if @profile.current_city
   json.current_city @profile.current_city

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

@@ -5,6 +5,7 @@ json.username @profile.username
 json.n_reports   @profile.reports.count
 json.n_galleries @profile.galleries.count
 json.n_videos    @profile.videos.count
+json.n_stars     @profile.n_stars
 
 if @profile.current_city
   json.current_city @profile.current_city

data/config/routes.rb

@@ -15,6 +15,8 @@ Ishapi::Engine.routes.draw do
   namespace :co_tailors do
   end
 
+  post 'do_purchase', to: 'gameui#do_purchase'
+  
   get 'events/view/:eventname',      :to => 'events#show'
 
   get  'galleries',                   :to => 'galleries#index'
@@ -24,15 +26,15 @@ Ishapi::Engine.routes.draw do
 
   post 'invoices/search', :to => 'invoices#search'
 
+  get 'maps', to: 'maps#index'
+  get 'maps/view/:slug', to: 'maps#show'
+  get 'markers/view/:slug', to: 'maps#show_marker'
+
   get 'my/newsitems', to: 'newsitems#index'
   get 'my/account',   to: 'user_profiles#my'
   namespace :my do
-    post 'reports', :to => 'reports#index'
+    # post 'reports', :to => 'reports#index'
     get  'reports', :to => 'reports#index'
-
-    # resources :reports
-    # resources :galleries
-    # resources :videos
   end
   
   post 'payments', :to => 'payments#create'
@@ -49,11 +51,10 @@ Ishapi::Engine.routes.draw do
   get 'sites/view/:domain/reports/page/:reports_page', :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
   get 'sites/view/:domain/tags',                       :to => 'tags#index',      :constraints => { :domain => /[^\/]+/ }
 
+  post 'stars/buy', to: 'gameui#buy_stars'
+
   get 'tags/view/:tagname', :to => 'tags#show'
   get 'test', to: 'application#test'
-  
-  namespace :tgm do
-  end
 
   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.114
+  version: 0.1.8.116
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -201,7 +201,9 @@ files:
 - app/controllers/ishapi/cities_controller.rb
 - app/controllers/ishapi/events_controller.rb
 - app/controllers/ishapi/galleries_controller.rb
+- app/controllers/ishapi/gameui_controller.rb
 - app/controllers/ishapi/invoices_controller.rb
+- app/controllers/ishapi/maps_controller.rb
 - app/controllers/ishapi/measurements_controller.rb
 - app/controllers/ishapi/my/my_controller.rb
 - app/controllers/ishapi/my/reports_controller.rb
@@ -223,8 +225,6 @@ files:
 - app/jobs/ishapi/application_job.rb
 - app/mailers/ishapi/application_mailer.rb
 - app/models/ishapi/ability.rb
-- app/models/ishapi/application_record.rb
-- app/models/ishapi/article.rb
 - app/views/ishapi/addresses/_show.jbuilder
 - app/views/ishapi/application/_meta.jbuilder
 - app/views/ishapi/articles/_form.html.erb
@@ -243,8 +243,11 @@ files:
 - app/views/ishapi/galleries/_show.jbuilder
 - app/views/ishapi/galleries/index.jbuilder
 - app/views/ishapi/galleries/show.jbuilder
+- app/views/ishapi/galleries/show_premium_locked.jbuilder
+- app/views/ishapi/galleries/show_premium_unlocked.jbuilder
+- app/views/ishapi/maps/index.jbuilder
+- app/views/ishapi/maps/show.jbuilder
 - app/views/ishapi/measurements/_show.jbuilder
-- app/views/ishapi/my/reports/index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder
 - app/views/ishapi/newsitems/index.jbuilder
 - app/views/ishapi/orders/_item.jbuilder
@@ -270,7 +273,6 @@ files:
 - app/views/ishapi/videos/_index.jbuilder
 - app/views/ishapi/videos/_show.jbuilder
 - app/views/ishapi/videos/index.jbuilder
-- app/views/layouts/ishapi/application.html.erb
 - config/routes.rb
 - lib/ishapi.rb
 - lib/ishapi/engine.rb

data/app/models/ishapi/application_record.rb

@@ -1,5 +0,0 @@
-
-module Ishapi
-  class ApplicationRecord
-  end
-end

data/app/models/ishapi/article.rb

@@ -1,4 +0,0 @@
-module Ishapi
-  class Article < ApplicationRecord
-  end
-end

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

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

data/app/views/layouts/ishapi/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Ishapi</title>
-  <%= stylesheet_link_tag    "ishapi/application", media: "all" %>
-  <%= javascript_include_tag "ishapi/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>