ishapi 0.1.8.62 → 0.1.8.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fb0c5570bfa0936c96dd1a529a792a849879f70
-  data.tar.gz: 23112a0870d3736f43a13704c84e01c4a4f07f8e
+  metadata.gz: 6fac8d1833645b4ebde8a98e64c2a451d60a12af
+  data.tar.gz: f3b896338ce76e55694ec832a741d294b9560aaf
 SHA512:
-  metadata.gz: 2a4b8ebbe8a1a4462ce6887a31d51b0812c9cd903b9f75fc2a069cb2d627618465c6b12c19e5a52df5ee9b975c51f70ee133bb528619da8bb53800a824c9431c
-  data.tar.gz: bd728510c8311d0698b3d695c57a01b3d6fc79c84c68d6a2c675fc561a06296b13931a02022200cf3c6cb12ad7f64f81f838c678972f3a7e385e1479f445cbed
+  metadata.gz: 683cbd2710a726497fe846b8cacd1595454a6285b0b030f3245cb405cb5a11a08d908a75cd1ae57bf2b8d1ad42f9a77deb42eba21f5d992a4d4ead780d709410
+  data.tar.gz: 875d767317fe3bea45b5c4cd897d2626450e25a250e0914901beb6f6872e70ec03e42c426dc6ee8026f30b4f45e140dc873d53257bc3ec22cc3103d98977f387

data/app/controllers/ishapi/application_controller.rb

@@ -15,52 +15,51 @@ module Ishapi
     def check_profile
       accessToken   = request.headers[:accessToken]
       accessToken ||= params[:fb_long_access_token]
-      accessToken ||= params[:accessToken] # if (params[:debug] == 'abba' && Rails.env.development?)
+      accessToken ||= params[:accessToken]
       if accessToken
         @graph            = Koala::Facebook::API.new( accessToken )
         @me               = @graph.get_object( 'me', :fields => 'email' )
         @current_user     = User.find_by :email => @me['email']
-        @current_profile  = @current_user.profile
-        @current_order    = @current_profile.orders.where( :submitted_at => nil ).first || ::CoTailors::Order.create( :profile_id => @current_profile.id )
       else
-        @current_user = current_user if Rails.env.test?
+        @current_user     = current_user  if Rails.env.test?
       end
+      @current_profile  = @current_user.profile
+      @current_order    = @current_profile.current_order
+      # orders.where( :submitted_at => nil ).first || ::CoTailors::Order.create( :profile_id => @current_profile.id )
     end
 
     def set_profile
       accessToken   = request.headers[:accessToken]
       accessToken ||= params[:fb_long_access_token]
-      accessToken ||= params[:accessToken] # if (params[:debug] == 'abba' && Rails.env.development?)
+      accessToken ||= params[:accessToken]
 
-      params[:domain] ||= '_default'
+      # params[:domain] ||= '_default'
 
       if accessToken
         begin
           @graph            = Koala::Facebook::API.new( accessToken )
           @me               = @graph.get_object( 'me', :fields => 'email' )
-          @user             = User.find_or_create_by :email => @me['email']
+          @current_user     = User.find_or_create_by :email => @me['email']
           @oauth            = Koala::Facebook::OAuth.new( FB[params['domain']][:app], FB[params['domain']][:secret] )
           get_token         = get_long_token( accessToken )
           @long_lived_token = get_token['access_token']
 
           begin
-            @profile = IshModels::UserProfile.find_by :email => @me['email']
-            @profile.update_attributes({ :fb_access_token      => @long_lived_token,
+            @current_profile = IshModels::UserProfile.find_by :email => @me['email']
+            @current_profile.update_attributes({ :fb_access_token      => @long_lived_token,
                                          :fb_long_access_token => @long_lived_token,
                                          :fb_expires_in        => get_token['expires_in']
                                        })
           rescue Mongoid::Errors::DocumentNotFound
-            @profile = IshModels::UserProfile.create :user => @user, :email => @me['email'],
-                                                     :fb_access_token       => @long_lived_token,
-                                                     :fb_long_access_token  => @long_lived_token,
-                                                     :fb_expires_in         => get_token['expires_in'],
-                                                     :fb_id                 => params[:id],
-                                                     :name                  => params[:name],
-                                                     :signed_request        => params[:signedRequest]
+            @current_profile = IshModels::UserProfile.create :user => @current_user, :email => @me['email'],
+                                                             :fb_access_token       => @long_lived_token,
+                                                             :fb_long_access_token  => @long_lived_token,
+                                                             :fb_expires_in         => get_token['expires_in'],
+                                                             :fb_id                 => params[:id],
+                                                             :name                  => params[:name],
+                                                             :signed_request        => params[:signedRequest]
           end
-          @current_user     = @user
-          @current_profile  = @profile
-          @current_order    = @current_profile.orders.where( :submitted_at => nil ).first || ::CoTailors::Order.new( :profile_id => @current_profile.id )
+          @current_user.reload
         rescue Koala::Facebook::AuthenticationError => e
           render :json => { :status => :not_ok, :errors => "Probably expired token: #{accessToken}" }
           return
@@ -68,6 +67,9 @@ module Ishapi
       else
         @current_user = current_user if Rails.env.test?
       end
+      @current_profile = @current_user.profile
+      @current_order   = @current_profile.current_order
+      # orders.where( :submitted_at => nil ).first || ::CoTailors::Order.new( :profile_id => @current_profile.id )
     end
     
     def get_long_token accessToken

data/app/controllers/ishapi/order_items_controller.rb

@@ -5,18 +5,39 @@ module Ishapi
     before_action :check_profile, :only => [ :create ]
 
     def create
-      # byebug
-
       authorize! :add, CoTailors::OrderItem
-      @order_item = CoTailors::OrderItem.new params['order_item'].permit!
+      @measurement = CoTailors::ProfileMeasurement.create params['order_item'].permit( :neck_around )
+      @order_item = CoTailors::OrderItem.new params['order_item'].permit( :quantity, :kind, :fabric )
       @order_item.order_id = @current_order.id
+      @order_item.measurement = @measurement
+      @measurement.order_item_id = @order_item.id
+      @measurement.save
+
+      if params[:order_item][:saveMeasurement]
+        m = @current_profile.measurements[0] || CoTailors::ProfileMeasurement.create( :profile => @current_profile )
+        flag = m.update_attributes( measurement_params )
+        render :json => { :statuc => :not_ok, :error => m.errors.messages } and return if !flag
+      end
+      
       flag = @order_item.save
       if flag
+        puts! @order_item.measurement, 'ok'
         render :json => { :status => :ok, :message => 'Successfully put an order item' }
       else
         render :json => { :status => :not_ok, :error => @order_item.errors.messages }
       end
     end
 
+    #
+    # private
+    #
+    private
+
+    def measurement_params
+      out = {}
+      out[:neck_around] = params[:order_item][:neckAround] if params[:order_item][:neckAround]
+      out
+    end
+
   end
 end

data/app/controllers/ishapi/users_controller.rb

@@ -12,40 +12,7 @@ module Ishapi
 
     def show
       authorize! :fb_sign_in, Ishapi
-=begin
-      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
     end
 
-=begin
-    def update
-      authorize! :fb_sign_in, Ishapi
-      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 => @errors }
-      end
-    end
-=end
-
   end
 end

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

@@ -0,0 +1,4 @@
+
+json.measurement do
+  json.neck_around measurement.neck_around
+end

data/app/views/ishapi/orders/_item.jbuilder

@@ -1,3 +1,7 @@
 
-json.kind  item.kind
-json.fabric item.fabric
+json.kind        item.kind
+json.fabric      item.fabric
+json.quantity    item.quantity
+if item.measurement
+  json.neck_around item.measurement.neck_around 
+end

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

@@ -3,7 +3,7 @@
 
 json.n_items order.items.length
 json.order do
-  order.items.each do |item|
+  json.array! order.items do |item|
     json.partial! 'ishapi/orders/item', :item => item
   end
 end

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

@@ -19,5 +19,9 @@ if @current_profile.addresses[0]
   json.partial! 'ishapi/addresses/show', :address => @current_profile.addresses[0]
 end
 
+if @current_profile.measurements[0]
+  json.partial! 'ishapi/measurements/show', :measurement => @current_profile.measurements[0]
+end
+
 json.partial! 'ishapi/orders/show', :order => @current_order
 

data/lib/ishapi/engine.rb

@@ -1,7 +1,7 @@
 
 require 'rubygems'
 require 'rack/throttle'
-require 'jbuilder'
+# require 'jbuilder'
 
 module Ishapi
   class Engine < ::Rails::Engine

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.62
+  version: 0.1.8.63
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,6 +240,7 @@ files:
 - app/views/ishapi/galleries/index.jbuilder~
 - app/views/ishapi/galleries/show.jbuilder
 - app/views/ishapi/galleries/show.jbuilder~
+- app/views/ishapi/measurements/_show.jbuilder
 - app/views/ishapi/my/reports/index.jbuilder
 - app/views/ishapi/my/reports/index.jbuilder~
 - app/views/ishapi/newsitems/_index.jbuilder