fanforce 0.3.19 → 0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fanforce (0.3.9)
+    fanforce (0.3.19)
       multi_json (~> 1.3.6)
       rack (> 1.0)
       rest-client (~> 1.6.7)

data/lib/fanforce/main.rb

@@ -65,8 +65,8 @@ class Fanforce
     {success: true}
   end
 
-  def track(behavior_id, req_params)
-    post '/bie/track', req_params.merge(behavior_id: behavior_id)
+  def track(behavior_plugin_id, req_params)
+    post '/bie/track', req_params.merge(behavior_plugin_id: behavior_plugin_id)
     {success: true}
   end
 
@@ -96,7 +96,7 @@ class Fanforce
     @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])
+    @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], plugin_id: auth_data[:plugin_id], behavior_plugin_id: auth_data[:behavior_plugin_id], widget_id: auth_data[:widget_id])
     params.merge!(@auth_hash)
     valid_auth?
   end

data/lib/fanforce/utils.rb

@@ -21,14 +21,14 @@ module Fanforce::Utils
   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 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[:app_id]) and is_blank?(params[:behavior_id]) and is_blank?(params[:module_id]) and is_blank?(params[:widget_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
   end
@@ -36,7 +36,7 @@ module Fanforce::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[:app_id]) and is_blank?(params[:behavior_id]) and is_blank?(params[:module_id]) and is_blank?(params[:widget_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
   end
@@ -48,23 +48,23 @@ module Fanforce::Utils
   def collect_known_params(params)
     params = params.symbolize_keys
     if is_present?(params[:app_id])
-      plugin_type = :app
-      plugin_id = params[:app_id]
-    elsif is_present?(params[:behavior_id])
-      plugin_type = :behavior
-      plugin_id = params[:behavior_id]
-    elsif is_present?(params[:module_id])
-      plugin_type = :module
-      plugin_id = params[:module_id]
+      addon_type = :app
+      addon_id = params[:app_id]
+    elsif is_present?(params[:behavior_plugin_id])
+      addon_type = :plugin
+      addon_id = params[:behavior_plugin_id]
+    elsif is_present?(params[:plugin_id])
+      addon_type = :plugin
+      addon_id = params[:plugin_id]
     elsif is_present?(params[:widget_id])
-      plugin_type = :widget
-      plugin_id = params[:widget_id]
+      addon_type = :widget
+      addon_id = params[:widget_id]
     end
-    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], session_id: params[:session_id])
+    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])
   end
 
   def remove_internal_params(params)
-    params.clone.delete_if { |k,v| [:app_id, :behavior_id, :module_id, :widget_id, :plugin_type, :plugin_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, :fanforce_id, :fanforce_slug, :api_key].include? k }
   end
 
   def remove_sensitive_params(params)

data/lib/fanforce/version.rb

@@ -1,3 +1,3 @@
 class Fanforce
-  VERSION = "0.3.19"
+  VERSION = "0.4.1"
 end

data/lib/ff_globals.rb

@@ -6,8 +6,7 @@ if !ENV['RACK_ENV'] or ENV['RACK_ENV'] == 'development'
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
   $SMARTURL_DOMAIN = 'fanforc.gg'
-  $FF_MODULE_DOMAIN = 'ffmodule.gg'
-  $FF_BEHAVIOR_DOMAIN = 'ffbehavior.gg'
+  $FF_PLUGIN_DOMAIN = 'ffmodule.gg'
   $FF_APP_DOMAIN = 'ffapp.gg'
   $FF_WIDGET_DOMAIN = 'ffwidget.gg'
 
@@ -25,8 +24,7 @@ elsif ENV['RACK_ENV'] == 'test'
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
   $SMARTURL_DOMAIN = 'fanforc.gg'
-  $FF_MODULE_DOMAIN = 'ffmodule.gg'
-  $FF_BEHAVIOR_DOMAIN = 'ffbehavior.gg'
+  $FF_PLUGIN_DOMAIN = 'ffmodule.gg'
   $FF_WIDGET_DOMAIN = 'ffwidget.gg'
   $FF_APP_DOMAIN = 'ffapp.gg'
 
@@ -44,8 +42,7 @@ elsif ENV['RACK_ENV'] == 'qa'
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
   $SMARTURL_DOMAIN = 'fanforc.us'
-  $FF_MODULE_DOMAIN = 'ffmodule.us'
-  $FF_BEHAVIOR_DOMAIN = 'ffbehavior.us'
+  $FF_PLUGIN_DOMAIN = 'ffmodule.us'
   $FF_APP_DOMAIN = 'ffapp.us'
   $FF_WIDGET_DOMAIN = 'ffwidget.us'
 
@@ -63,8 +60,7 @@ elsif ENV['RACK_ENV'] == 'production'
   $WEBSITE_DOMAIN = $BASE_DOMAIN
 
   $SMARTURL_DOMAIN = 'fanforce.io'
-  $FF_MODULE_DOMAIN = 'ffmodule.io'
-  $FF_BEHAVIOR_DOMAIN = 'ffbehavior.io'
+  $FF_PLUGIN_DOMAIN = 'ffmodule.io'
   $FF_APP_DOMAIN = 'ffapp.io'
   $FF_WIDGET_DOMAIN = 'ffwidget.io'
 

metadata

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