fanforce-plugin-factory 2.0.0.rc3 → 2.0.0.rc5

data/lib/fanforce/plugin_factory/core_config.rb

@@ -10,7 +10,7 @@ class Fanforce::Plugin::CoreConfig
   end
 
   def _id
-    raw_config[:_id] || (raise 'base_dir is missing')
+    config_json[:_id] || (raise 'base_dir is missing')
   end
 
   def base_dir
@@ -29,16 +29,28 @@ class Fanforce::Plugin::CoreConfig
     @redis_url || ENV['REDIS_URL'] || 'redis://localhost:6379'
   end
 
+  def worker_should_bypass_enqueue
+    ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE'] == 'true'
+  end
+
+  def worker_should_bypass_enqueue=(bool)
+    if bool == true
+      ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE'] = 'true'
+    else
+      ENV.delete('FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE')
+    end
+  end
+
   ######################################################################################################################
 
-  def raw_config
-    @raw_config ||= validate_config_file(MultiJson.load(File.open("#{@base_dir}/config.json").read, symbolize_keys: true))
+  def config_json
+    @config_json ||= validate_config_json(MultiJson.load(File.open("#{@base_dir}/config.json").read, symbolize_keys: true))
   end
 
-  def validate_config_file(raw_config)
-    raw_config.is_a?(Hash) || (raise "#{@base_dir}/config.json must contain a json object (not a #{raw_config.class})")
-    raw_config[:_id].present? || (raise '#{@base_dir}/config.json must include an _id field')
-    return raw_config
+  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')
+    return config_json
   end
 
   ######################################################################################################################
@@ -56,15 +68,20 @@ class Fanforce::Plugin::CoreConfig
     @is_bugsnag_enabled = true
   end
 
-  def load_routes
-    $: << File.join(@base_dir,'lib') if File.directory?("#{@base_dir}/lib")
+  def load_global_paths
     $: << @base_dir if File.directory?("#{@base_dir}")
+    $: << File.join(@base_dir,'lib') if File.directory?("#{@base_dir}/lib")
+  end
 
-    require "#{factory_dir}/sinatra/helper_routes/com_database"
-    require "#{factory_dir}/sinatra/helper_routes/com_campaign"
-    require "#{factory_dir}/sinatra/helper_routes/com_identifier"
-    require "#{factory_dir}/sinatra/helper_routes/com_js_widget"
-    require "#{factory_dir}/sinatra/helper_routes/plugin"
+  def load_routes
+    load_global_paths
+
+    require "#{factory_dir}/sinatra/route_helpers/base"
+    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/plugin"
 
     Dir["#{@base_dir}/initializers/*.rb"].each {|f| require f } if File.directory?("#{@base_dir}/initializers")
     require "#{factory_dir}/Routes"

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

@@ -0,0 +1,13 @@
+%h2 SUCCESS!
+%h3(ng-if='campaign')
+  Your new campaign has been added
+  %a.campaign-name(ng-href="//#{Fanforce.client_domain}/#/campaigns/{{campaign._id}}" target='_top') {{campaign.name}}
+%h3(ng-if='campaigns')
+  {{campaigns.length}} campaigns have been added
+  %ul
+    %li(ng-repeat='campaign in campaigns')
+      %a.campaign-name(ng-href="//#{Fanforce.client_domain}/#/campaigns/{{campaign._id}}" target='_top') {{campaign.name}}
+.buttons
+  %a.btn.btn-default(ng-if='campaign' ng-href="//#{Fanforce.client_domain}/#/campaigns/{{campaign._id}}" target='_top') Open Campaign
+  %a.btn.btn-default(ng-click='reset()' ng-show='has_reset_feature') Add Another Campaign
+  %a.btn.btn-default(ng-click='close()') Close Overlay

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

@@ -1,8 +1,8 @@
 %h2 SUCCESS!
 %h3
   Your fanforce is now tracking
-  %a.initiative-name(ng-href='//0.0.0.0:4567/#/initiatives/{{initiative._id}}' target='_top') {{prefix}} {{initiative.name}}
+  %a.initiative-name(ng-href="//#{Fanforce.client_domain}/#/initiatives/{{initiative._id}}" target='_top') {{prefix}} {{initiative.name}}
 .buttons
-  %a.btn.btn-default(ng-href='//0.0.0.0:4567/#/initiatives/{{initiative._id}}' target='_top') Open Initiative
+  %a.btn.btn-default(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
+  %a.btn.btn-default(ng-click='close()') Close Overlay

data/lib/fanforce/plugin_factory/scaffolding/._Gemfile.registry

@@ -2,3 +2,5 @@ fanforce-plugin-factory-1.6.0:ae064a186c4105989dbb1fc1d89d297c4bb50645
 fanforce-plugin-factory-1.6.0:b4efb7323d5dd68f09d7a16c16d02880a0504284
 fanforce-plugin-factory-1.6.0:8b96f77d8bb7e7cea7a96b2bd9e580bd8b12dee8
 fanforce-plugin-factory-2.0.0.rc1:804c185c4212d74d0be61e4f5f035d9eecbfa8be
+fanforce-plugin-factory-2.0.0.rc4:d148b77d6f0c2f48ae1d6ab3a52ec1850e051724
+fanforce-plugin-factory-2.0.0.rc5:4087247960e532a1d6b1b05b1c4b9d11d1b9a8f2

data/lib/fanforce/plugin_factory/scaffolding/Gemfile

@@ -1,7 +1,7 @@
 # PluginFactoryScaffolding : PARTIAL
 ########################################################################################################################
 source 'https://rubygems.org'
-ruby '1.9.3'
+ruby '2.1.6'
 
 gem FANFORCE-PLUGIN-FACTORY
 

data/lib/fanforce/plugin_factory/scaffolding/assets/css/._fembedded.scss.registry

@@ -4,3 +4,6 @@ fanforce-plugin-factory-1.6.0:4bbddc05c99b42b72cc9b71036b1540db02b7842
 fanforce-plugin-factory-1.6.0:3100df670df8f5fb23b7e9fce2653228db080841
 fanforce-plugin-factory-2.0.0.rc1:37b5ba82eda9b6058e6ee625916caa998dc0d64b
 fanforce-plugin-factory-2.0.0.rc3:d45041fa836d5116a97dbb03cae9dd2888186758
+fanforce-plugin-factory-2.0.0.rc3:db562b36043cf48c1bf0594b1aded41befa5b6c9
+fanforce-plugin-factory-2.0.0.rc4:9bb7912bed2d260ab4224f21859cff9534519b94
+fanforce-plugin-factory-2.0.0.rc4:bc85412edbbb93d6922d295d5950f281d1b23722

data/lib/fanforce/plugin_factory/scaffolding/assets/css/._fembedded_native.scss.registry

@@ -4,3 +4,5 @@ fanforce-app-factory-3.0.0.rc1:509bc7bca24f5e3baf4f0e23b2e151ccf25439cb
 fanforce-app-factory-3.0.0.rc1:2a5b9a55d2e729cc71d8b0ae9d9547206ae604e7
 fanforce-plugin-factory-2.0.0.rc3:3074d3afdd42742c82b4049fecd8be7af2535100
 fanforce-plugin-factory-2.0.0.rc3:a55e3190bce532b2f7b75c423dec3b6e9f3b6879
+fanforce-plugin-factory-2.0.0.rc3:c3e63e3366297d36815af078c30ef8d667280bb4
+fanforce-plugin-factory-2.0.0.rc4:71856ea0a579ba082683126ae4b6d2af92fdfa27

data/lib/fanforce/plugin_factory/scaffolding/assets/css/fembedded.scss

@@ -6,8 +6,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-@import 'plugin_factory/bootstrap';
-@import 'plugin_factory/font-awesome';
+@import 'plugin_factory/bootstrap_override';
 @import 'plugin_factory/common';
 @import 'plugin_factory/ui-select';
 @import 'plugin_factory/directives';
@@ -15,8 +14,8 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 html.fembedded-layout {
-  body { overflow: hidden; background: white;
-    &.success { background: #eefcd8; }
+  body { background: white;
+    &.finished { background: #eefcd8; }
   }
 }
 

data/lib/fanforce/plugin_factory/scaffolding/assets/css/fembedded_native.scss

@@ -14,10 +14,10 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 html.fembedded-layout {
-  body { overflow: hidden; background: white;
-    &.success { background: #eefcd8; }
+  body { background: white;
+    &.finished { background: #eefcd8; }
   }
-  page { height: auto; visibility: visible; }
+  page { height: auto; overflow: visible; visibility: visible; }
 }
 
 // END PARTIAL /////////////////////////////////////////////////////////////////////////////////////////////////////////

data/lib/fanforce/plugin_factory/scaffolding/assets/js/._app-fembedded.coffee.registry

@@ -1 +1,3 @@
 fanforce-plugin-factory-2.0.0.rc3:0f4456eaafd17b96293f4c3dc935c93067d9dc5b
+fanforce-plugin-factory-2.0.0.rc3:d13885ac4ffa8036573c00ca00c5e9cb4441b0ab
+fanforce-plugin-factory-2.0.0.rc3:cb0be34c600ef218f5e7fbb89ee8239225237daf

data/lib/fanforce/plugin_factory/scaffolding/assets/js/._fembedded.js.registry

@@ -2,3 +2,5 @@ fanforce-plugin-factory-1.6.0:130fe4541ada9247bd4224b54f744f17476d7e55
 fanforce-plugin-factory-1.6.0:89a46b16eb62e6dd5b68767cc9e2d39733eb94c0
 fanforce-plugin-factory-1.6.0:bd29cc97b29b1819d13004bbecd02ef8d161e2ac
 fanforce-plugin-factory-2.0.0.rc1:d381adc3c98eb0d96afb32c12444487b6c1b16b3
+fanforce-plugin-factory-2.0.0.rc3:615dde2adfdaf70249a3daf4e3557e0003a8917e
+fanforce-plugin-factory-2.0.0.rc3:c6b73eaebe3fbb5a320d88cbc1c752e79ce9bc9f

data/lib/fanforce/plugin_factory/scaffolding/assets/js/app-fembedded.coffee

@@ -10,5 +10,16 @@
   $rootScope.app_is_loaded = true;
 ])
 
+FF(->
+  CrossDresser.on('finished', ->
+    $('body').addClass('finished')
+    $('page').addClass('finished')
+  )
+  CrossDresser.on('restart', ->
+    $('body').removeClass('finished')
+    $('page').removeClass('finished')
+  )
+)
+
 # END PARTIAL ##########################################################################################################
 

data/lib/fanforce/plugin_factory/scaffolding/assets/js/lib/._cookie.coffee.registry

@@ -1,3 +1,4 @@
 fanforce-plugin-factory-1.6.0:4a06d7375c7bc27405e8dfa3e169cba1a9aa314a
 fanforce-plugin-factory-1.6.0:71aedacc6a103c40403df6adca83dd4a891f204a
 fanforce-plugin-factory-1.6.0:8eb981facec4de7be79809c9b3593fd57875afe4
+fanforce-plugin-factory-2.0.0.rc3:8d0d215b856f823fa61a0507df64fa2784e8aab9

data/lib/fanforce/plugin_factory/scaffolding/assets/js/lib/cookie.coffee

@@ -8,7 +8,7 @@ Cookie.set = ((name, value, exdays=null)->
   exdate.setDate(exdate.getDate() + exdays)
   value = "#{escape(value)}; path=/"
   value += "; expires=#{exdate.toUTCString()}" if exdays
-  value += "; domain=.#{BASE_DOMAIN}"  if BASE_DOMAIN and URL.parse(window.location.href).root_domain != '0.0'
+  value += "; domain=.#{FANFORCE_BASE_DOMAIN}" if FANFORCE_BASE_DOMAIN and URL.parse(window.location.href).root_domain != '0.0'
   document.cookie = "#{name}=#{value}"
 )
 

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

@@ -5,3 +5,10 @@ fanforce-plugin-factory-1.6.0:fbda63d2f1b25138acc371c7be5d2e70f05886bf
 fanforce-plugin-factory-2.0.0.rc1:0a8a72543f701e54c2f05f649a3a92ce2dc482e7
 fanforce-plugin-factory-2.0.0.rc3:076369cf88b03cf8f38453b927ac00653540e8fa
 fanforce-plugin-factory-2.0.0.rc3:15d429776dafd31e304531de0f10628d6eb9a45c
+fanforce-plugin-factory-2.0.0.rc3:c596cb7a720d42e7ee0ba780d1f7482aa5e5f2d7
+fanforce-plugin-factory-2.0.0.rc3:1f5eb1b782dd1db04513df7ec3a6f66e27f7773f
+fanforce-plugin-factory-2.0.0.rc3:582b0518b2e142638aad774c4eac3cd4320d74f5
+fanforce-plugin-factory-2.0.0.rc3:7715e6ae2f0df0837b30305b34795e7ec6f567ca
+fanforce-plugin-factory-2.0.0.rc4:026173352b2da4cea91aa4226719cf2dbbfa3d55
+fanforce-plugin-factory-2.0.0.rc4:ac609118ff63594709813b95b045de4287fa2892
+fanforce-plugin-factory-2.0.0.rc4:a32c15c51b2c610e277b59fb5cdb168d2be93b7a

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

@@ -2,3 +2,5 @@ fanforce-app-factory-3.0.0.rc1:f93a960435a3776e00415deb6ce72517e72a1ccd
 fanforce-app-factory-3.0.0.rc1:05d604b0736ee73c6e6f017d8b2191275d9de318
 fanforce-app-factory-3.0.0.rc1:bbc7a316e0edb12545a1b9d123b2ab5826ad307e
 fanforce-plugin-factory-2.0.0.rc3:d27cf17e7fc08396477568f9b6112e6d185c14a1
+fanforce-plugin-factory-2.0.0.rc3:d784eb2d04f2fdb68836359687f40f29a47a6f4f
+fanforce-plugin-factory-2.0.0.rc3:e26e2bc0c0f804aa062b8add9722495411a32d79

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

@@ -1,2 +1,4 @@
 fanforce-plugin-factory-1.6.0:ad07029e9f29896e1661791055508f17339a6d35
 fanforce-plugin-factory-1.6.0:51584a3ea897dce3224e0ed97d8e1e9e07e16b46
+fanforce-plugin-factory-2.0.0.rc3:ff5fb7ad27f5ee2e406a5c3b19aa8ed78af564f2
+fanforce-plugin-factory-2.0.0.rc4:dfd58c507bf38dbed0f59657d87eba654115056d

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

@@ -5,3 +5,4 @@ fanforce-plugin-factory-1.6.0:e26e07d033f76de23a645ec185b856c332caa9b6
 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

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

@@ -6,16 +6,19 @@
     %title Fanforce Plugin
     :javascript
       PLUGIN_ID = #{Plugin._id.to_json}
-      BASE_DOMAIN = #{Fanforce.base_domain.to_json}
-      API_DOMAIN  = #{Fanforce.api_domain.to_json}
+      FANFORCE_BASE_DOMAIN = #{Fanforce.base_domain.to_json}
+      FANFORCE_API_DOMAIN = #{Fanforce.api_domain.to_json}
       PLUGINS_BASE_DOMAIN = #{Fanforce.plugins_base_domain.to_json}
-    = javascript 'http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.js'
-    = javascript 'http://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js'
-    = javascript 'http://i.fanforce.dev/devforce.js'
-    = javascript "#{request.base_url}/assets/fembedded.js"
-    = stylesheet "#{request.base_url}/assets/fembedded.css"
-  %body(ng-class='{success: is_success}')
+    = stylesheet '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css'
+    = stylesheet '//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css'
+    = stylesheet '/assets/fembedded.css'
+    = javascript '//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.js'
+    = javascript '//ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js'
+    = javascript "//#{Fanforce.eye_domain}/devforce.js"
+    = javascript '/assets/plugin_factory/vendors/cross-dresser.js'
+    = javascript '/assets/fembedded.js'
+  %body
     %loading(ng-hide='app_is_loaded') Page loading...
-    %page(class=page_classes ng-show='app_is_loaded' ng-class='{success: is_success}' ng-cloak)
+    %page(class=page_classes ng-show='app_is_loaded' ng-cloak)
       %ng-view
       = yield

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

@@ -1,8 +1,10 @@
 -# PluginFactoryScaffolding : FILE
 -#######################################################################################################################
+:javascript
+  PLUGIN_ID = #{Plugin._id.to_json}
 = stylesheet "#{request.base_url}/assets/fembedded_native.css"
 = javascript "#{request.base_url}/assets/fembedded_native.js"
 %loading(ng-hide='app_is_loaded') Page loading...
-%page.ng-hide(class=page_classes ng-show='app_is_loaded' ng-class='{success: is_success}' ng-cloak)
+%page.ng-hide(class=page_classes ng-show='app_is_loaded' ng-cloak)
   %ng-view
   = yield

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

@@ -8,12 +8,11 @@
     %meta{'http-equiv'=>'Content-Language', content: 'en-us'}/
     = stylesheet '/promotional.css'
     :javascript
-      BASE_DOMAIN = #{Fanforce.base_domain.to_json}
-      API_DOMAIN  = #{Fanforce.api_domain.to_json}
-
-  %body
-    = yield
+      FANFORCE_BASE_DOMAIN = #{Fanforce.base_domain.to_json}
+      FANFORCE_API_DOMAIN = #{Fanforce.api_domain.to_json}
     = javascript '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'
     = javascript "//#{Fanforce.eye_domain}/devforce.js#{'?DEBUG=1&DYNAMIC=1' if ENV['RACK_ENV']=='development'}"
     = javascript '/promotional.js'
-    = yield_content :after_core_js
+
+  %body
+    = yield

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

@@ -4,10 +4,13 @@
 %html.visitor-layout
   %head
     %title Fanforce
-    %meta{'http-equiv'=>'Content-Type', content:'text/html; charset=iso-8859-1'}/
-    %meta{'http-equiv'=>'Content-Language', content: 'en-us'}/
+    %meta(http-equiv='Content-Type' content='text/html; charset=iso-8859-1')
+    %meta(http-equiv='Content-Language' content='en-us')
     = stylesheet '/visitor.css'
-    %script(src='//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.js')
+    = 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}}')
   %body
     .lyt-root
       .lyt-header
@@ -19,23 +22,22 @@
       %span#distributed-by
       %a{href: "http://#{Fanforce.base_domain}"} Powered by Fanforce.
 
-  = 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}}')
-
-  = yield_content :after_fanforce_js
   :coffeescript
     FF.css_framework = 'bootstrap3'
-    FF.on('visitor.logout', ->
-      $('#hello').html('')
+    FF(->
+      FF.on('visitor.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.visitor.logout(); void(0)">Logout</a></div></div>')
+      )
     )
-    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.visitor.logout(); void(0)">Logout</a></div></div>')

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

@@ -0,0 +1,2 @@
+fanforce-plugin-factory-2.0.0.rc3:39092030cfc19fa4d63e6f1b6bdf4c9b5bc5cc40
+fanforce-plugin-factory-2.0.0.rc3:1b592a137f1da55422e78637439ac775047eadea

data/lib/fanforce/plugin_factory/scaffolding/views/._index.haml.registry

@@ -1,3 +1,4 @@
 fanforce-plugin-factory-1.6.0:48bf030f14a9dbd660503d182ecb91690a43066e
 fanforce-plugin-factory-1.6.0:2c454a47b0f525bcff75cb76e7273ae9d22282e0
 fanforce-plugin-factory-1.6.0:4cb444083045792c9c8f696db2d79df8ba0ce135
+fanforce-plugin-factory-2.0.0.rc4:982d98f3f169b800cdeace6d45838584274369b2

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

@@ -0,0 +1,26 @@
+<!-- PluginFactoryScaffolding : FILE -->
+<html>
+<head>
+    <title>CrossDresser Frame</title>
+    <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) {
+                    environment = 'frame'
+                    parent = window.top
+                } else {
+                    throw('not found')
+                }
+                parent.CrossDresser.conduit.fromIframe(environment, document.location.href)
+            } catch(err) {
+                console.error('CrossDresser can only be used inside an iframe or popup window: ' + err)
+            }
+        }
+    </script>
+</head>
+<body></body>
+</html>
+

data/lib/fanforce/plugin_factory/scaffolding/views/index.haml

@@ -32,8 +32,8 @@
         %span.plugin_company_description
         %a{href: "http://#{Fanforce.base_domain}"} Learn more.
 
-- content_for :after_core_js do
-  :coffeescript
+:coffeescript
+  FF(->
     FF.get('/available_plugins/#{Plugin._id}').done((plugin)->
       $('.plugin_company_name').text(plugin.company_name || 'Engineers Who Love Coffee')
       $('.plugin_company_description').text(plugin.company_description)
@@ -42,3 +42,4 @@
       $('.loaded').show()
       $('.about-box').hide() if !plugin.company_description
     )
+  )

data/lib/fanforce/plugin_factory/sinatra/_load.rb

@@ -4,7 +4,6 @@ PluginWorker = Fanforce::PluginWorker
 ########################################################################################################################
 
 class Fanforce::Plugin::Sinatra < Sinatra::Base
-  require 'sinatra/content_for'
   require 'bugsnag'
 
   require_relative 'error_handling'
@@ -39,8 +38,8 @@ class Fanforce::Plugin::Sinatra < Sinatra::Base
 
   def self.setup_catchall_routes_from_folder(path)
     path = ('views/' + path.to_s.gsub(/^views\/?/, '')).gsub(/\/$/, '')
-    Dir["#{Fanforce::Plugin.config.base_dir}/#{path}/*/*.haml"].each do |file|
-      create_basic_route($1) if file =~ /\/views\/(.+).haml/
+    Dir["#{Fanforce::Plugin.config.base_dir}/#{path}/**/*.{html,haml}"].each do |file|
+      create_basic_route($1) if (file =~ /\/views\/(.+)\.haml/) || (file =~ /\/views\/(.+\.html)/)
     end
   end
 
@@ -65,11 +64,30 @@ class Fanforce::Plugin::Sinatra < Sinatra::Base
 
   def page(page, options={})
     plugin_views_dir = Pathname.new(settings.views)
-    page = :"#{options[:com_dir]}/#{page}" if File.exists?("#{plugin_views_dir}/#{options[:com_dir]}/#{page}.haml")
 
-    options[:layout] = options[:layout] ? :"../layouts/#{options[:layout]}" : false
-    locals = {page_classes: page.to_s.split('/')}
-    haml page.to_sym, options, locals
+    if File.exists?("#{plugin_views_dir}/#{options[:com_dir]}/#{page}.haml")
+      page = :"#{options[:com_dir]}/#{page}"
+      file_type = :haml
+    elsif File.exists?("#{plugin_views_dir}/#{options[:com_dir]}/#{page}")
+      page = :"#{options[:com_dir]}/#{page}"
+      file_type = :html
+    elsif File.exists?("#{plugin_views_dir}/#{page}.haml")
+      file_type = :haml
+    else
+      file_type = :html
+    end
+
+    if file_type == :haml
+      options[:layout] = options[:layout] ? :"../layouts/#{options[:layout]}" : false
+      locals = {page_classes: page.to_s.split('/')}
+      haml(page.to_sym, options, locals)
+    else
+      html("#{plugin_views_dir}/#{page}")
+    end
+  end
+
+  def html(filepath)
+    File.read(filepath)
   end
 
   configure do