fanforce-plugin-factory 0.20.2 → 0.21.0

data/lib/fanforce/plugin_factory/assets/lib/vendors/knockout/knockout.custom-handlers.coffee

@@ -49,13 +49,13 @@ ko.bindingHandlers.hide =
 ko.bindingHandlers.chosen =
   init: (element, valueAccessor, allBindingsAccessor, viewModel)->
     chosen = allBindingsAccessor().chosen
-    settings = {default: 'Select one...'}
+    settings = {'default': 'Select one...'}
     $.extend(settings, chosen.settings) if chosen.settings?
     $(element).attr('data-placeholder', settings.default)
 
   update: (element, valueAccessor, allBindingsAccessor, viewModel)->
     chosen = allBindingsAccessor().chosen
-    settings = {default: 'Select one...', disable_search_threshold: 10}
+    settings = {'default': 'Select one...', disable_search_threshold: 10}
     $.extend(settings, chosen.settings) if chosen.settings?
 
     selectedOptions = if chosen.selectedOptions? then chosen.selectedOptions() else []
@@ -85,9 +85,9 @@ ko.bindingHandlers.chosen =
         module_title = $(element).find("option[value='#{ids_array[0]}']").text()
         fs_title = $(element).find('option:selected').html().replace('   - ', '')
         title =  "<span class='parent_module'>#{module_title}</span>: #{fs_title}"
-        $('#' + $(element).attr('id') + '_chzn').find('a.chzn-single span').html(title)
+        $('#' + $(element).attr('id') + '_chosen').find('a.chosen-single span').html(title)
 
-    $(element).trigger("liszt:updated")# if $(element).context.type != 'select-multiple'
+    $(element).trigger("chosen:updated")# if $(element).context.type != 'select-multiple'
 
 ko.bindingHandlers.class =
   update: (element, valueAccessor)->

data/lib/fanforce/plugin_factory/config/helpers/fanforce.rb

@@ -1,8 +1,8 @@
 module Sinatra::FanforceHelpers
   require 'fanforce/api'
 
-  def fanforce_id
-    @fanforce_id = params[:fanforce_id] || ff.params[:fanforce_id]
+  def organization_id
+    @organization_id = params[:organization_id] || ff.params[:organization_id]
   end
 
   def ff
@@ -10,12 +10,12 @@ module Sinatra::FanforceHelpers
     @ff = Fanforce::API.new(params)
     #return @ff if !@ff.valid_fanforce_request? and !@ff.valid_fanforce_js_request?
 
-    @ff.auth Sinatra::FanforceHelpers.find_api_key(ff.params[:fanforce_id])
+    @ff.auth Sinatra::FanforceHelpers.find_api_key(ff.params[:organization_id])
     @ff
   end
 
-  def self.find_api_key(fanforce_id, addon_type=:plugin, addon_id=FanforcePlugin._id)
-    $Redis.get("installed:#{addon_type}-#{addon_id}:#{fanforce_id}")
+  def self.find_api_key(organization_id, addon_type=:plugin, addon_id=FanforcePlugin._id)
+    $Redis.get("installed:#{addon_type}-#{addon_id}:#{organization_id}")
   end
 
 end

data/lib/fanforce/plugin_factory/layouts/add_edit_initiative.haml

@@ -9,6 +9,7 @@
 
   %body
     = yield
-    = javascript '///' + Fanforce.i_domain + '/devforce.js'
+    = javascript '/assets/vendors/jquery/jquery-1.10.2.js'
+    = javascript "///#{Fanforce.eye_domain}/devforce.js?zepto=0&env=#{ENV['RACK_ENV']}#{'&force_compile=1' if ENV['RACK_ENV']=='development'}"
     = javascript '/add_edit_initiative.js'
     = yield_content :after_core_js

data/lib/fanforce/plugin_factory/layouts/add_source.haml

@@ -9,6 +9,7 @@
 
   %body
     = yield
-    = javascript '///' + Fanforce.i_domain + '/devforce.js'
+    = javascript '/assets/vendors/jquery/jquery-1.10.2.js'
+    = javascript "///#{Fanforce.eye_domain}/devforce.js?zepto=0&env=#{ENV['RACK_ENV']}#{'&force_compile=1' if ENV['RACK_ENV']=='development'}"
     = javascript '/add_source.js'
     = yield_content :after_core_js

data/lib/fanforce/plugin_factory/layouts/engage.haml

@@ -9,6 +9,7 @@
   %body.layout-engage
     .lyt-root
       .lyt-header
+        #hello
         #logo
       = yield
       .lyt-root-footer
@@ -16,12 +17,19 @@
       %span#distributed-by
       %a{href: "http://#{Fanforce.base_domain}"} Powered by Fanforce.
 
-  = javascript "http://#{Fanforce.i_domain}/#{params[:fanforce_slug]}-fanforce.js#{'?force_compile=1&env=development' if ENV['RACK_ENV']=='development'}"
+  = javascript "http://#{Fanforce.eye_domain}/#{params[:organization_slug]}-fanforce.js#{'?force_compile=1&env=development' if ENV['RACK_ENV']=='development'}"
   = yield_content :after_fanforce_js
   :coffeescript
-    if FF.account.website_url
-      $('#distributed-by').html('Distributed by <a href="' + FF.account.website_url + '">' + FF.account.name + '</a>.&nbsp;')
-      $('#logo').html('<a href="' + FF.account.website_url + '"><img class="logo" src="' + FF.account.logo_url + '"></a>') if FF.account.logo_url?
-    else
-      $('#distributed-by').html('Distributed by ' + FF.account.name + '.&nbsp;')
-      $('#logo').html('<img class="logo" src="' + FF.account.logo_url + '">') if FF.account.logo_url
+    FF.on('logout', ->
+      $('#hello').html('')
+    )
+    FF.organization (organization)->
+      if organization.website_url
+        $('#distributed-by').html('Distributed by <a href="' + organization.website_url + '">' + organization.name + '</a>.&nbsp;')
+        $('#logo').html('<div class="logo"><a href="' + organization.website_url + '"><img src="' + organization.logo_url + '"></a></div>') if organization.logo_url
+      else
+        $('#distributed-by').html('Distributed by ' + organization.name + '.&nbsp;')
+        $('#logo').html('<div class="logo"><img src="' + organization.logo_url + '"></div>') if organization.logo_url
+    FF.visitor (visitor)->
+      return if !visitor.access_level
+      $('#hello').html('<div class="hello"><div class="hello-wrapper"><span class="greeting">Hello, ' + visitor.first_name + '!</span><a href="javascript: FF.logout(); void(0)">Logout</a></div></div>')

data/lib/fanforce/plugin_factory/layouts/new_message.haml

@@ -9,6 +9,7 @@
 
   %body
     = yield
-    = javascript "///#{Fanforce.i_domain}/devforce.js?force_compile=#{ENV['RACK_ENV']=='development' ? 1 : 0}&env=#{ENV['RACK_ENV']}"
+    = javascript '/assets/vendors/jquery/jquery-1.10.2.js'
+    = javascript "///#{Fanforce.eye_domain}/devforce.js?zepto=0&env=#{ENV['RACK_ENV']}#{'&force_compile=1' if ENV['RACK_ENV']=='development'}"
     = javascript '/new_message.js'
     = yield_content :after_core_js

data/lib/fanforce/plugin_factory/layouts/promotional.haml

@@ -9,6 +9,7 @@
 
   %body
     = yield
-    = javascript '///' + Fanforce.i_domain + '/devforce.js'
+    = javascript '/assets/vendors/jquery/jquery-1.10.2.js'
+    = javascript "///#{Fanforce.eye_domain}/devforce.js?zepto=0&env=#{ENV['RACK_ENV']}#{'&force_compile=1' if ENV['RACK_ENV']=='development'}"
     = javascript '/promotional.js'
     = yield_content :after_core_js

data/lib/fanforce/plugin_factory/layouts/source_details.haml

@@ -9,6 +9,7 @@
 
   %body
     = yield
-    = javascript '///' + Fanforce.i_domain + '/devforce.js'
+    = javascript '/assets/vendors/jquery/jquery-1.10.2.js'
+    = javascript "///#{Fanforce.eye_domain}/devforce.js?zepto=0&env=#{ENV['RACK_ENV']}#{'&force_compile=1' if ENV['RACK_ENV']=='development'}"
     = javascript '/source_details.js'
     = yield_content :after_core_js

data/lib/fanforce/plugin_factory/routes.rb

@@ -11,10 +11,10 @@ class FanforcePlugin::Sinatra
   # INSTALL ######################################################################
   def route_install(params)
     raise "This is not a valid plugin install request: #{env['HTTP_HOST']}" if !ff.valid_install_request?(params)
-    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:fanforce_id]}")
+    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}")
 
     #raise 'A different API key already exists for this addon. Please uninstall first.' if api_key.present? and ff.params[:api_key] != api_key
-    $Redis.set("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:fanforce_id]}", ff.params[:api_key])
+    $Redis.set("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}", ff.params[:api_key])
     ff.auth(ff.params[:api_key])
 
     json status: 'installed', success: true
@@ -24,10 +24,10 @@ class FanforcePlugin::Sinatra
   # UNINSTALL ####################################################################
   def route_uninstall(params)
     raise 'This is not a valid plugin uninstall request.' if !ff.valid_uninstall_request?(params)
-    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:fanforce_id]}")
+    api_key = $Redis.get("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}")
 
     raise 'API keys must match before an addon can be uninstalled.' if api_key.present? and ff.params[:api_key] != api_key
-    $Redis.del("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:fanforce_id]}")
+    $Redis.del("installed:#{ff.params[:addon_type]}-#{ff.params[:addon_id]}:#{ff.params[:organization_id]}")
     json status: 'uninstalled', success: true
   end
   any '/uninstall' do route_uninstall(params) end

data/lib/fanforce/plugin_factory/routes_behavior.rb

@@ -23,6 +23,6 @@ class FanforcePlugin::Sinatra
   def route_engage(params)
     page :engage, :layout => :engage
   end
-  get '/:fanforce_slug/:initiative_slug/engage.html' do route_engage(params) end
+  get '/:organization_slug/:initiative_slug/engage.html' do route_engage(params) end
 
 end

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module PluginFactory
-    VERSION = '0.20.2'
+    VERSION = '0.21.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Caleb Clark
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -112,44 +112,44 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -170,126 +170,126 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bugsnag
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rack-jsonr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: fanforce-api
+  name: fanforce-exceptions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: fanforce-errors
+  name: fanforce-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: fanforce-worker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.2
 description: 
 email:
 - cclark@fanforce.com
@@ -367,7 +367,7 @@ files:
 - lib/fanforce/plugin_factory/assets/lib/vendors/bootstrap/js/bootstrap.js
 - lib/fanforce/plugin_factory/assets/lib/vendors/bootstrap/js/bootstrap.min.js
 - lib/fanforce/plugin_factory/assets/lib/vendors/chosen/chosen-sprite.png
-- lib/fanforce/plugin_factory/assets/lib/vendors/chosen/chosen.jquery.min.js
+- lib/fanforce/plugin_factory/assets/lib/vendors/chosen/chosen.jquery.js
 - lib/fanforce/plugin_factory/assets/lib/vendors/chosen/chosen.scss
 - lib/fanforce/plugin_factory/assets/lib/vendors/font-awesome/css/font-awesome.css
 - lib/fanforce/plugin_factory/assets/lib/vendors/font-awesome/css/font-awesome.min.css
@@ -376,6 +376,7 @@ files:
 - lib/fanforce/plugin_factory/assets/lib/vendors/font-awesome/font/fontawesome-webfont.svg
 - lib/fanforce/plugin_factory/assets/lib/vendors/font-awesome/font/fontawesome-webfont.ttf
 - lib/fanforce/plugin_factory/assets/lib/vendors/font-awesome/font/fontawesome-webfont.woff
+- lib/fanforce/plugin_factory/assets/lib/vendors/jquery/jquery-1.10.2.js
 - lib/fanforce/plugin_factory/assets/lib/vendors/jquery/jquery.inputHint.js
 - lib/fanforce/plugin_factory/assets/lib/vendors/jquery/jquery.tmpl.debug.js
 - lib/fanforce/plugin_factory/assets/lib/vendors/knockout/knockout.custom-handlers.coffee