plataforma_social 0.0.12 → 0.0.13

data/lib/plataforma_social/helpers.rb

@@ -81,7 +81,7 @@ module PlataformaSocial
     end
     
     def from_facebook?
-      request.referer && request.referer.index('facebook.com')
+      request && request.referer && request.referer.index('facebook.com')
     end
     
     def from_admin?

data/lib/plataforma_social/request.rb

@@ -14,8 +14,8 @@ module PlataformaSocial
     end
     
     def self.request url, params = {}, method = "get"
-      secret           = PlataformaSocial.secret
-      platform_api_key = PlataformaSocial.api_key
+      secret           = params[:secret].present? ? params[:secret] : PlataformaSocial.secret
+      platform_api_key = params[:platform_api_key].present? ? params[:platform_api_key] : PlataformaSocial.api_key
       secret_key       = OpenSSL::PKey::RSA.new(File.read("#{Rails.root}/plataforma_social/keys/public.pem")).public_encrypt secret
       params_name      = method == 'get' ? :query : :body
       params           = { :network_name => "fb", :platform_api_key => platform_api_key, :signature => secret_key }.merge(params)
@@ -28,8 +28,18 @@ module PlataformaSocial
       
       return nil if response.nil?
       
-      response = response.parsed_response["data"]
-      response = JSON.parse(response) if response.present? && response.is_a?(String)
+      if response.parsed_response["data"]
+        response = response.parsed_response["data"]
+      
+        begin
+          response = JSON.parse(response) if response.present? && response.is_a?(String)
+        rescue JSON::ParserError => e
+          response = response
+        end
+      elsif response.parsed_response["error"]
+        response = { "error" => response.parsed_response["error"] }
+      end
+      
       return response
     end  
   end

data/lib/plataforma_social/version.rb

@@ -1,3 +1,3 @@
 module PlataformaSocial
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plataforma_social
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -97,6 +97,7 @@ files:
 - lib/plataforma_social/request.rb
 - lib/plataforma_social/version.rb
 - plataforma_social.gemspec
+- spec/dummy/log/development.log
 homepage: http://www.dito.com.br/
 licenses: []
 post_install_message: 
@@ -121,4 +122,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Plataforma Social's integration gem
-test_files: []
+test_files:
+- spec/dummy/log/development.log
+has_rdoc: