fanforce-api 0.14.9 → 0.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY5NDllN2IwOTFiNTQ0MGFjZjgxYTIxNDY0OGY2ZDEwZTNlZjkxNA==
+    Yjk5MjI3MGNlN2FkODk3NzU0OTJlNmFjODUzODU3Njc5YWI4Y2JhMQ==
   data.tar.gz: !binary |-
-    YzQ1OGY0OGY4OTU0OGIyYjdjNTc3NWYxNjNlNGNmYjNmMWI5YWVhMg==
+    MzBlNTQ2YjlhZTAzNDEzNzc3NzQxNGY4MzQyNDFjN2IxMTY3YWZhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2ZkY2Q1MDljZjdiMjJkM2RkNzU1MGZjZjliMGIwYTg2OTM5MmQ3OTkxODgz
-    OTJlYzljODEwMmQwZjBlNWNkOTE4ZmJjZDNmOGM3NDljMDM2YjIzNjEwYmE0
-    YzE2OTMwNTMxNzNmZDRkOGVlYTk5MzEzY2JhY2UwNTVlZjYxYjg=
+    NTlhYzEwMjIzMzM5MjU4YjUyNDBhYjYyYzRkNjRhNmNkNTlmNDdlZDU0MzRl
+    ZDA3ZWUyNWFjYjg1YWIxOGQ5NWUxZmNhNzAyNjg2MmQzYTUyOTQwMWMxZjNj
+    MmY5NTc1YjYzNGY2YTIwYTcwMzM1YWMwODliNzMzMzFhZjVhOGE=
   data.tar.gz: !binary |-
-    ZDdmMGRkMjcxZmVlN2FjYzA2NmM0NjY0YzQ4MTk0NGQxMjhhMjIxYTYyNGFj
-    NzkyYmRhMTFjMGRhZjYyZjAxMzYxYzYzMmQ3NjUwNzNjNzFjMTYwZDJkYTBl
-    ZjZkMDkwNGViNjVhOWE3YzRmM2U1Y2RhODJhZDEyYWZkODgyYjY=
+    Zjg1MzU0YWZjZDUyMjlhOTJiYmM1OGRhNWE1M2JmNDZhNDU3Nzc4ODViYTE1
+    YTAzNTFhOTQzYjI3YTE0M2UzNDcyOWNlZjgyMGZkOWFhYmYyYTBhY2Q1MmM4
+    YjA3NGM0NGY0ZTlhMTdjZmI5YWJkMDg1ZmRjZjM4NGJjMzRjNTc=

data/lib/fanforce/api/_main.rb

@@ -88,13 +88,13 @@ class Fanforce::API
     @auth_hash ||= {}
     return @auth_hash if is_blank?(auth_data)
     auth_data = auth_data.is_a?(Hash) ? symbolize_keys(auth_data) : {api_key: auth_data.to_s}
-    @auth_hash.merge! remove_nil_values(api_key: auth_data[:api_key], fanforce_id: auth_data[:fanforce_id], fanforce_slug: auth_data[:fanforce_slug])
+    @auth_hash.merge! remove_nil_values(api_key: auth_data[:api_key], organization_id: auth_data[:organization_id], organization_slug: auth_data[:organization_slug])
     params.merge!(@auth_hash)
     valid_auth?
   end
 
   def valid_auth?
-    is_present?(@auth_hash) and is_present?(@auth_hash[:api_key]) and is_present?(@auth_hash[:fanforce_id])
+    is_present?(@auth_hash) and is_present?(@auth_hash[:api_key]) and is_present?(@auth_hash[:organization_id])
   end
 
   def apply_auth(req_params)

data/lib/fanforce/api/error.rb

@@ -53,7 +53,7 @@ end
 class Fanforce::API::DecodingError < Fanforce::API::Error
 
   def initialize(e, response, request, requested_url, requested_params)
-    @message = "There was a Fanforce gem error while decoding JSON response: #{e.message}"
+    @message = "There was a Fanforce gem error while decoding JSON response: #{e.is_a?(String) ? e : e.message}"
     @errors = [{message: @message}]
     super(@message, response, request, requested_url, requested_params)
   end

data/lib/fanforce/api/response.rb

@@ -5,7 +5,9 @@ class Fanforce::API::Response
     raise Fanforce::API::ServerError.new(response, request, requested_url, requested_params) if response.code > 201
     begin  response_hash = Fanforce::Utils.decode_json(response)
     rescue Exception => e; raise Fanforce::API::DecodingError.new(e, response, request, requested_url, requested_params) end
-    if response_hash[:results]
+    if !response_hash.is_a?(Hash)
+      raise Fanforce::API::DecodingError.new('Server did not send a valid hash.', response, request, requested_url, requested_params)
+    elsif response_hash[:results]
       Fanforce::API::Results.new(response_hash, response, request, requested_url, requested_params)
     else
       Fanforce::API::Result.new(response_hash, response, request, requested_url, requested_params)
@@ -71,7 +73,7 @@ class Fanforce::API::Results < Array
     @curl_command ||= Fanforce::Utils.curl_command(@request.method, @requested_url, @requested_params)
   end
 
-  def body;
+  def body
     @response.to_s
   end
 

data/lib/fanforce/api/utils.rb

@@ -7,20 +7,20 @@ module Fanforce::API::Utils
 
   def valid_fanforce_js_request?(params=@params)
     return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id]) or is_blank?(params[:api_key])
+    return false if is_blank?(params[:organization_id]) or is_blank?(params[:api_key])
     return true
   end
 
   def valid_fanforce_request?(params=@params)
     return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id])
+    return false if is_blank?(params[:organization_id])
     return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
     return true
   end
 
   def valid_install_request?(params=@params)
     return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id])
+    return false if is_blank?(params[:organization_id])
     return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
     return false if is_blank?(params[:api_key])
     return true
@@ -28,7 +28,7 @@ module Fanforce::API::Utils
 
   def valid_uninstall_request?(params=@params)
     return false if !params.is_a?(Hash)
-    return false if is_blank?(params[:fanforce_id])
+    return false if is_blank?(params[:organization_id])
     return false if is_blank?(params[:app_id]) and is_blank?(params[:behavior_plugin_id]) and is_blank?(params[:plugin_id]) and is_blank?(params[:widget_id])
     return false if is_blank?(params[:api_key])
     return true
@@ -53,11 +53,11 @@ module Fanforce::API::Utils
       addon_type = :widget
       addon_id = params[:widget_id]
     end
-    remove_nil_values(:"#{addon_type}_id" => params[:"#{addon_type}_id"], addon_type: addon_type, addon_id: addon_id, fanforce_id: params[:fanforce_id], fanforce_slug: params[:fanforce_slug], api_key: params[:api_key], session_id: params[:session_id])
+    remove_nil_values(:"#{addon_type}_id" => params[:"#{addon_type}_id"], addon_type: addon_type, addon_id: addon_id, organization_id: params[:organization_id], organization_slug: params[:organization_slug], api_key: params[:api_key], session_id: params[:session_id])
   end
 
   def remove_internal_params(params)
-    params.clone.delete_if { |k,v| [:app_id, :behavior_plugin_id, :plugin_id, :widget_id, :addon_type, :addon_id, :fanforce_id, :fanforce_slug, :api_key].include? k }
+    params.clone.delete_if { |k,v| [:app_id, :behavior_plugin_id, :plugin_id, :widget_id, :addon_type, :addon_id, :organization_id, :organization_slug, :api_key].include? k }
   end
 
   def remove_sensitive_params(params)

data/lib/fanforce/api/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class API
-    VERSION = '0.14.9'
+    VERSION = '0.15.0'
   end
 end

data/test/fanforce_test.rb

@@ -6,7 +6,7 @@ require 'fanforce'
 
 describe Fanforce do
 
-  it "should test if var is blank" do
+  it 'should test if var is blank' do
     assert Fanforce.is_blank?(nil)
     assert !Fanforce.is_blank?("value")
 
@@ -15,7 +15,7 @@ describe Fanforce do
     assert !ff.is_blank?("value")
   end
 
-  it "should create new instance of fanforce with api_key" do
+  it 'should create new instance of fanforce with api_key' do
     Fanforce.new('13d90b01-6df7-4618-881c-c79320a0dc21')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-api
 version: !ruby/object:Gem::Version
-  version: 0.14.9
+  version: 0.15.0
 platform: ruby
 authors:
 - Caleb Clark