fanforce 0.3.4 → 0.3.6

data/lib/fanforce/main.rb

@@ -4,10 +4,16 @@ require 'rest-client'
 
 class Fanforce
   include Fanforce::Utils
-
+  attr_reader :params
   ########################################################################
-  def initialize(auth_data=nil)
-    auth(auth_data) if is_present?(auth_data)
+  def initialize(params={})
+    add_params(params)
+    auth(@params) if @params.length > 0
+  end
+
+  def add_params(params)
+    @params ||= {}
+    @params.merge!(collect_known_params params)
   end
 
   def get(path, params={})
@@ -42,8 +48,8 @@ class Fanforce
 
   def delete(path, params={})
     url = complete_url(path)
-    params = apply_auth(url)
-    RestClient.delete(url, {:query => params, :accept => :json}) do |response, request, result, &block|
+    params = apply_auth(params)
+    RestClient.delete(url, {:params => params, :accept => :json}) do |response, request, result, &block|
       handle_response(response, request, url, params)
     end
   end
@@ -81,17 +87,16 @@ class Fanforce
   end
 
   def auth(auth_data=nil)
-    if is_present?(auth_data)
-      auth_data = auth_data.is_a?(Hash) ? auth_data.symbolize_keys : {api_key: auth_data.to_s}
-      @auth_hash ||= {}
-      @auth_hash[:api_key] = auth_data[:api_key] if is_present?(auth_data[:api_key])
-      @auth_hash[:fanforce_id] = auth_data[:fanforce_id] if is_present?(auth_data[:fanforce_id])
-    end
-    @auth_hash
+    @auth_hash ||= {}
+    return @auth_hash if is_blank?(auth_data)
+    auth_data = auth_data.is_a?(Hash) ? auth_data.symbolize_keys : {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], app_id: auth_data[:app_id], module_id: auth_data[:module_id], behavior_id: auth_data[:behavior_id], widget_id: auth_data[:widget_id])
+    @params.merge!(@auth_hash)
+    valid_auth?
   end
 
   def valid_auth?
-    is_present?(@auth_hash) and is_present?(@auth_hash[:api_key])
+    is_present?(@auth_hash) and is_present?(@auth_hash[:api_key]) and is_present?(@auth_hash[:fanforce_id])
   end
 
   def apply_auth(params)

data/lib/fanforce/utils.rb

@@ -12,20 +12,20 @@ module Fanforce::Utils
     !is_blank?(obj)
   end
 
-  def valid_fanforce_js_request?(params)
+  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 true
   end
 
-  def valid_fanforce_request?(params)
+  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[:app_id]) and is_blank?(params[:behavior_id]) and is_blank?(params[:module_id]) and is_blank?(params[:widget_id])
     return true
   end
 
-  def valid_install_request?(params)
+  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[:app_id]) and is_blank?(params[:behavior_id]) and is_blank?(params[:module_id]) and is_blank?(params[:widget_id])
@@ -33,7 +33,7 @@ module Fanforce::Utils
     return true
   end
 
-  def valid_uninstall_request?(params)
+  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[:app_id]) and is_blank?(params[:behavior_id]) and is_blank?(params[:module_id]) and is_blank?(params[:widget_id])
@@ -41,7 +41,11 @@ module Fanforce::Utils
     return true
   end
 
-  def parse_params(params)
+  def remove_nil_values(hash)
+    hash.delete_if {|k,v| v.nil? }
+  end
+
+  def collect_known_params(params)
     if is_present?(params[:app_id])
       plugin_type = :app
       plugin_id = params[:app_id]
@@ -55,7 +59,15 @@ module Fanforce::Utils
       plugin_type = :widget
       plugin_id = params[:widget_id]
     end
-    {:"#{plugin_type}_id" => params["#{plugin_type}_id"], plugin_type: plugin_type, plugin_id: plugin_id, fanforce_id: params[:fanforce_id], api_key: params[:api_key]}
+    remove_nil_values(:"#{plugin_type}_id" => params["#{plugin_type}_id"], plugin_type: plugin_type, plugin_id: plugin_id, fanforce_id: params[:fanforce_id], fanforce_slug: params[:fanforce_slug], api_key: params[:api_key])
+  end
+
+  def remove_internal_params(params)
+    params.delete_if { |k,v| [:app_id, :behavior_id, :module_id, :widget_id, :plugin_type, :plugin_id, :fanforce_id, :fanforce_slug, :api_key].include? k }
+  end
+
+  def remove_sensitive_params(params)
+    params.delete_if { |k,v| [:api_key].include? k }
   end
 
   def parse_url(raw_url)

data/lib/fanforce/version.rb

@@ -1,3 +1,3 @@
 class Fanforce
-  VERSION = "0.3.4"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors: