fanforce-plugin-factory 2.0.0.rc8 → 2.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b064a79cff700b98ef2368c397347d9607ff0fc
-  data.tar.gz: 6fd8016e58e474c025f881db81dab0437053d533
+  metadata.gz: 8e212a1da66f382e5fb89e0feb285414bd858bff
+  data.tar.gz: 4485a106e8fe69b1f4f5556ef53f780ceea3e2e8
 SHA512:
-  metadata.gz: a7a4e4952a8056bebdc8caa2c16dbe4b8076fc15b7f583131a224c3ab49347ce705a50d72100d1b9fcccec9aa96d9a1daae7bc5f04e030973affb83aead0d10a
-  data.tar.gz: 35a33f079c42dd4ff817c38ff14f5c2abe28df927e0a819e800afbdd3074564a0b244dea1e1ce816631adbf48c041e6d73d770c80776f22607334a3629bd7338
+  metadata.gz: 4246057f32d34e3a6a386a312967a2454a96a3be98b9104466456abc86c3fbe906cb4b9c9db4a166f4116475eadc168f57af8f552be3e9a971fdd3ed72f27b95
+  data.tar.gz: 9ff0cd6d538b30dc7df4cc5c53d0e07726a26813056880df469ad832ca09499f22a2632696b780f7e747fea33f32d764118837bbe990705b50c8f2832826a8be

data/lib/fanforce/plugin_factory/Routes.rb

@@ -22,7 +22,8 @@ class Fanforce::Plugin::Sinatra
     new_config = MultiJson.load(params[:config], symbolize_keys: true)
     raise 'IUIDs do not match' if old_config[:_iuid] and old_config[:_iuid] != new_config[:_iuid]
 
-    File.open(filename, 'w') {|f| f.write(JSON.pretty_generate(Hash[new_config.sort]) + $RS) }
+    raw_json = JSON.pretty_generate(Hash[new_config.sort]) + $/
+    File.open(filename, 'w') {|f| f.write(raw_json) }
     json status: 'finished'
   end
 

data/lib/fanforce/plugin_factory/asset_framework/plugin_factory/vendors/cross-dresser.js

@@ -219,9 +219,9 @@ var CrossDresser;
             return this.element = this.element || $('iframe#' + this._id);
         };
         ChildFrame.prototype.loadContent = function () {
-            if (this.instance.content_prms) {
+            if (this.instance.content_request) {
                 var frame = this;
-                this.instance.content_prms.then(function (html) {
+                this.instance.content_request.then(function (html) {
                     frame.getElement()[0].contentWindow.CrossDresser.injectIntoPage(html);
                 });
             }
@@ -243,7 +243,7 @@ var CrossDresser;
             var is_native = false;
             if (settings.use_native_base) {
                 var goto_url = ((url.indexOf('?') > -1) ? url + '&' : url + '?') + $.param(attrs);
-                var content_prms = $.ajax({
+                var content_request = $.ajax({
                     url: goto_url,
                     dataType: 'jsonp',
                     jsonp: 'callback'
@@ -254,7 +254,7 @@ var CrossDresser;
             }
             attrs.crss_drssr = _id + '::' + encodeURIComponent(CrossDresser.current.getConduitUrl());
             if (goto_url) {
-                attrs.crss_drssr += '::' + encodeURIComponent(goto_url);
+                attrs.crss_drssr += '::' + encodeURIComponent(btoa(goto_url));
             }
             url = (url.indexOf('?') > -1) ? url + '&' : url + '?';
             url += $.param(attrs);
@@ -264,7 +264,7 @@ var CrossDresser;
                 height: height,
                 url: url,
                 is_native: is_native,
-                content_prms: content_prms
+                content_request: content_request
             };
             return new ChildFrame(_id);
         };
@@ -559,17 +559,17 @@ var CrossDresser;
             this.raw_uri = CrossDresser.Utils.parseUrl(this.raw_url);
             this.raw_params = CrossDresser.Utils.parseQueryString(this.raw_uri.query_string);
             try {
-                if (window.opener || (window.top && window.top.opener)) {
-                    this.environment = 'popup';
-                    this.parent = window.opener || window.top.opener;
-                    this.is_popup = true;
-                }
-                else if (window.top && window.top != window.self && document.referrer != this.raw_url.replace(document.location.hash, '')) {
+                if (window.top && window.top != window.self && document.referrer != this.raw_url.replace(document.location.hash, '')) {
                     this.environment = 'frame';
                     this.parent = window.top;
                     this.is_frame = true;
                     this.is_native = this.isNativeFrame();
                 }
+                else if (window.opener || (window.top && window.top.opener)) {
+                    this.environment = 'popup';
+                    this.parent = window.opener || window.top.opener;
+                    this.is_popup = true;
+                }
                 else {
                     this.environment = 'toplevel';
                     this.parent = null;
@@ -587,8 +587,8 @@ var CrossDresser;
         }
         Current.prototype.isNativeFrame = function () {
             try {
-                var parent_host = CrossDresser.Utils.parseUrl(window.top.location.href).host;
                 var current_host = this.raw_uri.host;
+                var parent_host = CrossDresser.Utils.parseUrl(window.top.location.href).host;
                 return (parent_host == current_host) ? true : false;
             }
             catch (err) {
@@ -607,7 +607,7 @@ var CrossDresser;
             this._id = array[0];
             this.parent_conduit_url = decodeURIComponent(array[1]);
             if (array[2]) {
-                this.url_to_load = decodeURIComponent(array[2]);
+                this.url_to_load = atob(decodeURIComponent(array[2]));
             }
             if (this.url_to_load && !this.is_native) {
                 var url = this.url_to_load;

data/lib/fanforce/plugin_factory/cli/lib/bitbucket.rb

@@ -1,4 +1,3 @@
-require 'bitbucket_rest_api'
 require 'rest_client'
 require 'open3'
 
@@ -7,6 +6,8 @@ class Fanforce::PluginFactory::CLI::Bitbucket
 
   attr_reader :plugin
 
+  require_gem 'bitbucket_rest_api', 'bitbucket_rest_api'
+
   def initialize(plugin)
     @plugin = plugin
   end

data/lib/fanforce/plugin_factory/cli/lib/iron.rb

@@ -34,6 +34,7 @@ class Fanforce::PluginFactory::CLI::Iron
         code_name = filename.gsub('.worker', '')
 
         puts "#{'Uploading'.format(:green,:bold)} #{filename.gsub('.worker', '')} to #{environment.to_s.titleize}..."
+
         code = IronWorkerNG::Code::Base.new(:workerfile => "#{plugin.dir}/workers/#{filename}")
         code.gem('fanforce-plugin-factory', factory_version)
         code.remote

data/lib/fanforce/plugin_factory/cli/scripts/restart.rb

@@ -1,3 +1,5 @@
+require_relative '../lib/heroku'
+
 class Fanforce::PluginFactory::CLI::Scripts
   include Fanforce::PluginFactory::CLI::Utils
 

data/lib/fanforce/plugin_factory/core_config.rb

@@ -49,7 +49,7 @@ class Fanforce::Plugin::CoreConfig
 
   def validate_config_json(config_json)
     config_json.is_a?(Hash) || (raise "#{@base_dir}/config.json must contain a json object (not a #{config_json.class})")
-    config_json[:_id].present? || (raise '#{@base_dir}/config.json must include an _id field')
+    config_json[:_id].present? || (raise "#{@base_dir}/config.json must include an _id field")
     return config_json
   end
 
@@ -80,7 +80,7 @@ class Fanforce::Plugin::CoreConfig
     require "#{factory_dir}/sinatra/route_helpers/com_database"
     require "#{factory_dir}/sinatra/route_helpers/com_campaign"
     require "#{factory_dir}/sinatra/route_helpers/com_identifier"
-    require "#{factory_dir}/sinatra/route_helpers/com_js_widget"
+    require "#{factory_dir}/sinatra/route_helpers/com_widget"
     require "#{factory_dir}/sinatra/route_helpers/plugin"
 
     Dir["#{@base_dir}/initializers/*.rb"].each {|f| require f } if File.directory?("#{@base_dir}/initializers")

data/lib/fanforce/plugin_factory/directive_views/initiative-added.haml

@@ -1,8 +1,8 @@
 %h2 SUCCESS!
-%h3
+%h3(ng-if='initiative')
   Your fanforce is now tracking
   %a.initiative-name(ng-href="//#{Fanforce.client_domain}/#/initiatives/{{initiative._id}}" target='_top') {{prefix}} {{initiative.name}}
 .buttons
-  %a.btn.btn-default(ng-href="//#{Fanforce.client_domain}/#/initiatives/{{initiative._id}}" target='_top') Open Initiative
+  %a.btn.btn-default(ng-if='initiative' ng-href="//#{Fanforce.client_domain}/#/initiatives/{{initiative._id}}" target='_top') Open Initiative
   %a.btn.btn-default(ng-click='reset()' ng-show='has_reset_feature') Add Another Initiative
   %a.btn.btn-default(ng-click='close()') Close Overlay

data/lib/fanforce/plugin_factory/plugin.rb

@@ -1,5 +1,4 @@
 require 'redis'
-require 'sass'
 require 'fileutils'
 require 'rack/jsonr'
 require 'rack/jquery-params'
@@ -43,7 +42,11 @@ class Fanforce::Plugin
   end
 
   def self.redis
-    @@redis ||= ::Redis.new(url: @@config.redis_url)
+    if ENV['RACK_ENV'] == 'development'
+      Thread.current[:plugin_factory_redis] ||= Redis.new(url: @@config.redis_url)
+    else
+      @@redis ||= Redis.new(url: @@config.redis_url)
+    end
   end
 
   ######################################################################################################################

data/lib/fanforce/plugin_factory/scaffolding/layouts/._visitor.haml.registry

@@ -6,3 +6,6 @@ fanforce-plugin-factory-1.6.0:704a6dfc8e71d43ffec0fcbe859c7c2860595a2c
 fanforce-plugin-factory-1.6.0:53e9e89632a66d4ad9ec8967ab7c0e68b5dfc2f4
 fanforce-plugin-factory-1.6.0.rc4:cfe06885954ae0e14caba0ef27af32071f6f48fe
 fanforce-plugin-factory-2.0.0.rc4:31826496dbfa9106191e449909ec535bd01318af
+fanforce-plugin-factory-2.0.0.rc8:91ab029d981cb646b3ad8922cdbd6016e6ae04c6
+fanforce-plugin-factory-2.0.0.rc8:ee0c9ebae4c527c27060b9fcb6ca034272fd35f6
+fanforce-plugin-factory-2.0.0.rc8:8b4aaef7947b95ac823e0905c2bb25414bf06bba

data/lib/fanforce/plugin_factory/scaffolding/layouts/visitor.haml

@@ -3,14 +3,15 @@
 !!! 5
 %html.visitor-layout
   %head
-    %title Fanforce
+    %title Engagement Page
     %meta(http-equiv='Content-Type' content='text/html; charset=iso-8859-1')
     %meta(http-equiv='Content-Language' content='en-us')
     = stylesheet '/visitor.css'
     = javascript '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.js'
-    = javascript "//#{Fanforce.eye_domain}/#{params[:organization_slug]}-fanforce.js#{'?DEBUG=true&DYNAMIC=true' if ENV['RACK_ENV']=='development'}" do
-      FF.option('track_browse_webpage', false)
-      FF.option('dynamic_url', FF.browser.uri.scheme + '://' + '#{FanforcePlugin._id}.{{SHORT_DOMAIN}}/{{INITIATIVE_ID}}')
+    = javascript "//#{Fanforce.eye_domain}/#{params[:organization_slug]}-fanforce.js#{'?DEBUG=true&DYNAMIC=true' if ENV['RACK_ENV']=='development'}"
+    :javascript
+      FF.option('core:disable_browse_webpage', true)
+      FF.option('dynamic_url', FF.browser.uri.scheme + '://' + '#{Plugin._id}.{{SHORT_DOMAIN}}/{{INITIATIVE_ID}}')
   %body
     .lyt-root
       .lyt-header

data/lib/fanforce/plugin_factory/scaffolding/views/._cross-dresser.html.registry

@@ -1,2 +1,5 @@
 fanforce-plugin-factory-2.0.0.rc3:39092030cfc19fa4d63e6f1b6bdf4c9b5bc5cc40
 fanforce-plugin-factory-2.0.0.rc3:1b592a137f1da55422e78637439ac775047eadea
+fanforce-plugin-factory-2.0.0.rc8:29cff279c95cc5bea8aa45fda35ed5bc803efe83
+fanforce-plugin-factory-2.0.0.rc8:cd6a0fe4200c18ff77297e89dce6fb8af858a7b3
+fanforce-plugin-factory-2.0.0.rc8:8c7e3867788bad4517347c0c9f3b6bb9b75398c7

data/lib/fanforce/plugin_factory/scaffolding/views/cross-dresser.html

@@ -5,18 +5,19 @@
     <script type='text/javascript'>
         window.onload = function() {
             try {
-                if (window.opener || (window.top && window.top.opener)) {
-                    environment = 'popup'
-                    parent = window.opener || window.top.opener
-                } else if (window.top) {
+                if (window.parent && window.parent.parent && window.parent != window.parent.parent) {
                     environment = 'frame'
                     parent = window.top
+                }else if (window.opener || (window.top && window.top.opener)) {
+                    environment = 'popup'
+                    parent = window.opener || window.top.opener
                 } else {
-                    throw('not found')
+                    throw('environment type is unknown')
                 }
                 parent.CrossDresser.conduit.fromIframe(environment, document.location.href)
             } catch(err) {
                 console.error('CrossDresser can only be used inside an iframe or popup window: ' + err)
+                console.log(err)
             }
         }
     </script>

data/lib/fanforce/plugin_factory/sinatra/helpers/assets.rb

@@ -1,15 +1,15 @@
 module Fanforce::Plugin::Sinatra::AssetHelpers
 
-  def stylesheet(s)
-    s += '.css' unless s.include?('.css')
-    s = asset_path(s) unless s =~ /^https?:\// or s =~ /^\/\/.+/
-    "<link rel='stylesheet' href='#{s}' />"
+  def stylesheet(src)
+    src += '.css' unless src.include?('.css')
+    src = asset_path(src) unless src =~ /^https?:\// or src =~ /^\/\/.+/
+    "<link rel='stylesheet' href='#{src}' />"
   end
 
-  def javascript(s)
-    s += '.js' unless s.include?('.js')
-    s = asset_path(s) unless s =~ /^https?:\// or s =~ /^\/\/.+/
-    "<script type='text/javascript' src='#{s}'></script>"
+  def javascript(src, &block)
+    src += '.js' unless src.include?('.js')
+    src = asset_path(src) unless src =~ /^https?:\// or src =~ /^\/\/.+/
+    "<script type='text/javascript' src='#{src}'></script>"
   end
 
   def asset_path(source, options={})

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginFactory
-    VERSION = '2.0.0.rc8'
+    VERSION = '2.0.0.rc9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc8
+  version: 2.0.0.rc9
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -522,7 +522,7 @@ files:
 - lib/fanforce/plugin_factory/sinatra/route_helpers/com_database.rb
 - lib/fanforce/plugin_factory/sinatra/route_helpers/com_identifier.rb
 - lib/fanforce/plugin_factory/sinatra/route_helpers/com_initiative.rb
-- lib/fanforce/plugin_factory/sinatra/route_helpers/com_js_widget.rb
+- lib/fanforce/plugin_factory/sinatra/route_helpers/com_widget.rb
 - lib/fanforce/plugin_factory/sinatra/route_helpers/plugin.rb
 - lib/fanforce/plugin_factory/sprockets/compiler.rb
 - lib/fanforce/plugin_factory/sprockets/hacks.rb