plataforma_social 0.0.30 → 0.0.32

data/lib/plataforma_social/facebook.rb

@@ -6,9 +6,9 @@ module PlataformaSocial
     def facebook_login
       load_oauth
       load_graph
-      
+
       redirect = false
-      
+
       if params[:code]
         begin
           @oauth.get_access_token(params[:code])
@@ -18,12 +18,12 @@ module PlataformaSocial
       else
         redirect = true if parse_facebook_signed_request && !parse_facebook_signed_request['oauth_token']
       end
-      
+
       if parse_facebook_signed_request && parse_facebook_signed_request['oauth_token']
         if !session[:not_verify_facebook_permissions] === true
           permissions = @graph.get_object('me', :fields => 'permissions')['permissions']['data'][0]
           session[:not_verify_facebook_permissions] = true
-        
+
           PlataformaSocial.facebook_scope.split(',').each do |permission|
             redirect = true unless permissions[permission.strip]
           end
@@ -32,7 +32,7 @@ module PlataformaSocial
 
       render :text => %|<script type="text/javascript">window.top.location.href="#{@oauth.url_for_oauth_code(:permissions => PlataformaSocial.configuration.facebook_scope)}";</script>| if redirect
     end
-    
+
     def load_user_data options = {}
       settings = {
         referral_code: params[:gm_referral_code],
@@ -45,13 +45,13 @@ module PlataformaSocial
         referrer: request.referer,
         signed_request: params[:signed_request]
       }.merge options
-      
+
       facebook_data          = facebook_user_data.try(:symbolize_keys)
       plataforma_social_data = plataforma_social_user_data(settings).try(:symbolize_keys)
-      
+
       @user_data = { :facebook => facebook_data, :plataforma_social => plataforma_social_data }
     end
-    
+
     def plataforma_social_user_data options = {}
       settings = {
         referral_code: params[:gm_referral_code],
@@ -64,28 +64,28 @@ module PlataformaSocial
         referrer: request.referer,
         signed_request: params[:signed_request]
       }.merge options
-      
+
       if settings[:signed_request]
         response = Request.post("#{PlataformaSocial.domains('login')}/register", settings)
-        
+
         data = {}
         data[:reference] = response['id'] if response.present? && response['id']
-        
+
         data
       end
     end
-    
+
     def facebook_user_data
       if load_graph
         @graph.get_object('me')
       end
     end
-    
+
     def parse_facebook_signed_request
       load_oauth
       @oauth.parse_signed_request params[:signed_request] if params[:signed_request].present?
     end
-    
+
     def load_oauth
       if params[:callback_url].present?
         callback_url = params[:callback_url]
@@ -94,19 +94,27 @@ module PlataformaSocial
       else
         callback_url = PlataformaSocial.facebook_callback_url.to_s
       end
-      
+
       uri = URI.parse(callback_url)
-      
+
       callback_url = if uri && uri.scheme.present?
-        uri.query = [uri.query, "gm_referral_code=#{params[:gm_referral_code]}", "utm_source=#{params[:utm_source]}", "campaign=#{params[:utm_campaign]}", "medium=#{params[:utm_medium]}", "source=#{params[:utm_source]}"].compact.join('&')
+        uri.query = [
+          uri.query,
+          "gm_referral_code=#{URI.encode(params[:gm_referral_code] || '')}",
+          "utm_source=#{URI.encode(params[:utm_source] || '')}",
+          "campaign=#{URI.encode(params[:utm_campaign] || '')}",
+          "medium=#{URI.encode(params[:utm_medium] || '')}",
+          "source=#{URI.encode(params[:utm_source] || '')}"
+        ].compact.join('&')
+
         uri.to_s
       else
         nil
       end
-      
+
       @oauth = Koala::Facebook::OAuth.new(PlataformaSocial.facebook_app_id, PlataformaSocial.facebook_app_secret, callback_url)
     end
-    
+
     def load_graph
       @graph = Koala::Facebook::API.new parse_facebook_signed_request['oauth_token'] if parse_facebook_signed_request.present? && parse_facebook_signed_request['oauth_token']
     end
@@ -115,4 +123,4 @@ end
 
 class ActionController::Base
   include PlataformaSocial::Facebook
-end
+end

data/lib/plataforma_social/request.rb

@@ -5,15 +5,15 @@ require 'httparty'
 module PlataformaSocial
   class Request
     
-    def self.post url, params = {}
-      request url, params, 'post'
+    def self.post url, params = {}, headers = {}
+      request url, params, headers, 'post'
     end
     
-    def self.get url, params = {}
-      request url, params, 'get'
+    def self.get url, params = {}, headers = {}
+      request url, params, headers, 'get'
     end
     
-    def self.request url, params = {}, method = "get"
+    def self.request url, params = {}, headers = {}, method = "get"
       secret           = PlataformaSocial.secret
       platform_api_key = PlataformaSocial.api_key
       secret_key       = OpenSSL::PKey::RSA.new(File.read("#{Rails.root}/plataforma_social/keys/public.pem")).public_encrypt secret
@@ -21,7 +21,7 @@ module PlataformaSocial
       params           = { :network_name => "fb", :platform_api_key => platform_api_key, :signature => secret_key }.merge(params)
       
       begin
-        response = HTTParty.send(method.to_sym, url, params_name => params)
+        response = HTTParty.send(method.to_sym, url, params_name => params, :headers => headers.stringify_keys)
       rescue => e
         return e.to_s
       end
@@ -33,4 +33,7 @@ module PlataformaSocial
       return response
     end  
   end
+  
+  
+  
 end

data/lib/plataforma_social/version.rb

@@ -1,3 +1,3 @@
 module PlataformaSocial
-  VERSION = "0.0.30"
+  VERSION = "0.0.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plataforma_social
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano