fanforce-app-factory 1.3.0 → 1.4.0

data/lib/fanforce/app_factory/_init_sinatra.rb

@@ -19,10 +19,25 @@ class FanforceApp::Sinatra < Sinatra::Base
   helpers Sinatra::ContentFor
 
   def self.any(url,&block)
-    get(url,&block)
-    post(url,&block)
-    put(url,&block)
-    delete(url,&block)
+    get(url, &block)
+    put(url, &block)
+    post(url, &block)
+    delete(url, &block)
+  end
+
+  def self.default_javascript_package(package_name)
+
+  end
+
+  def self.require_controllers
+    require "#{FanforceApp.config.factory_root_dir}/controllers/base_controller"
+    Dir["#{FanforceApp.config.root_dir}/controllers/*_controller.rb"].each {|f| require f }
+  end
+
+  @@static_files = {}
+  def self.static(url, *args, &block)
+    @@static_files[url] = {args: args, block: block}
+    get(url, &block)
   end
 
   def page(page, options={})
@@ -50,6 +65,7 @@ class FanforceApp::Sinatra < Sinatra::Base
     else
       options[:layout] = false
     end
+
     haml page_path, options
   end
 

data/lib/fanforce/app_factory/assets/css/convert_initiative.scss

@@ -0,0 +1 @@
+@import 'common/layouts/convert_initiative';

data/lib/fanforce/app_factory/assets/js/convert_initiative.js

@@ -0,0 +1 @@
+//= require common/layouts/convert_initiative

data/lib/fanforce/app_factory/config/core_config.rb

@@ -8,7 +8,7 @@ class FanforceApp::CoreConfig
       dashboard: true,
       add_initiative: true,
       edit_initiative: true,
-      convert_pending_initiative: true,
+      convert_initiative: true,
       add_source: true,
       close_popup: true,
       engage: true,
@@ -71,16 +71,9 @@ class FanforceApp::CoreConfig
     $: << File.join(@root_dir,'lib') if File.directory?("#{@root_dir}/lib")
     $: << @root_dir if File.directory?("#{@root_dir}")
 
-    require "#{@root_dir}/config/initializer" if File.exists?("#{@root_dir}/config/initializer.rb")
-    require "#{@root_dir}/initializer" if File.exists?("#{@root_dir}/initializer.rb")
-    if File.directory?("#{@root_dir}/initializers")
-      Dir["#{@root_dir}/initializers/*.rb"].each {|file| require file }
-    end
+    Dir["#{@root_dir}/initializers/*.rb"].each {|f| require f } if File.directory?("#{@root_dir}/initializers")
 
-    require "#{@root_dir}/config/routes" if File.exists?("#{@root_dir}/config/routes.rb")
-    require "#{@root_dir}/views/_routes" if File.exists?("#{@root_dir}/views/_routes.rb")
-    require "#{@root_dir}/_routes" if File.exists?("#{@root_dir}/_routes.rb")
-    require "#{@root_dir}/routes" if File.exists?("#{@root_dir}/routes.rb")
+    require "#{@root_dir}/Routes" if File.exists?("#{@root_dir}/Routes.rb")
 
     require "#{@factory_root_dir}/routes_core"
     require "#{@factory_root_dir}/routes_connector"

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

@@ -18,21 +18,4 @@ module Sinatra::FanforceHelpers
     $Redis.get("installed:#{addon_type}-#{addon_id}:#{organization_id}")
   end
 
-  # Creates a string representation of a javascript object for ractive.js
-  def compile_ractive_templates(options={}, &block)
-    context = Object.new
-    class << context
-      include Haml::Helpers
-    end
-    context.init_haml_helpers
-
-    format = options[:format] == 'html' ? :html : :json
-
-    return context.capture_haml(&block) if format == :html
-    single_line_html = context.capture_haml(&block).split(/\r?\n/).inject('') {|sl, l| sl += l.strip + ' ' }
-    matches = single_line_html.scan(/<script id=[\"'](.*?)[\"'](?:.*?)>(.*?)(?:<\/script>)/mi)
-
-    matches.inject({}) {|t,m| t[m[0]] = m[1]; t }.to_json
-  end
-
 end

data/lib/fanforce/app_factory/config/helpers/ractive.rb

@@ -1,5 +1,22 @@
 module Sinatra::RactiveHelpers
 
+  # Creates a string representation of a javascript object for ractive.js
+  def compile_ractive_templates(options={}, &block)
+    context = Object.new
+    class << context
+      include Haml::Helpers
+    end
+    context.init_haml_helpers
+
+    format = options[:format] == 'html' ? :html : :json
+
+    return context.capture_haml(&block) if format == :html
+    single_line_html = context.capture_haml(&block).split(/\r?\n/).inject('') {|sl, l| sl += l.strip + ' ' }
+    matches = single_line_html.scan(/<script id=[\"'](.*?)[\"'](?:.*?)>(.*?)(?:<\/script>)/mi)
+
+    matches.inject({}) {|t,m| t[m[0]] = m[1]; t }.to_json
+  end
+
   def RACTIVE(helper, &block)
     begin require 'haml' rescue LoadError raise 'You must have the haml gem installed to use Fanforce.compile_jquery_templates.' end
     raise ArgumentError, "Missing block" unless block_given?
@@ -24,4 +41,17 @@ module Sinatra::RactiveHelpers
     RACTIVE(helper, &block)
   end
 
+  def column(size, &block)
+    begin require 'haml' rescue LoadError raise 'You must have the haml gem installed to use Fanforce.compile_jquery_templates.' end
+    if block
+      context = Object.new
+      class << context
+        include Haml::Helpers
+      end
+      context.init_haml_helpers
+      html = context.capture_haml(&block)
+    end
+    "<div class='small-12 medium-#{size} column'>\n#{html}</div>"
+  end
+
 end

data/lib/fanforce/app_factory/controllers/base_controller.rb

@@ -0,0 +1,14 @@
+class FanforceApp::BaseController
+
+  def initialize(app)
+    @app = app
+  end
+
+  def app; @app end
+  def params; @app.params end
+  def ff; @app.ff end
+  def json(*args) @app.json(*args) end
+  def page(*args) @app.page(*args) end
+  def redirect(*args) @app.redirect(*args) end
+
+end

data/lib/fanforce/app_factory/layouts/{convert_pending_initiative.haml → convert_initiative.haml}

@@ -5,7 +5,7 @@
     %title Fanforce
     %meta{'http-equiv'=>'Content-Type', content:'text/html; charset=iso-8859-1'}/
     %meta{'http-equiv'=>'Content-Language', content: 'en-us'}/
-    = stylesheet '/convert_pending_initiative.css'
+    = stylesheet '/convert_initiative.css'
     :javascript
       BASE_DOMAIN   = #{Fanforce.base_domain.to_json}
       API_DOMAIN    = #{Fanforce.api_domain.to_json}
@@ -15,5 +15,5 @@
     = yield
     = 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 '/convert_pending_initiative.js'
+    = javascript '/convert_initiative.js'
     = yield_content :after_core_js

data/lib/fanforce/app_factory/routes_behavior.rb

@@ -1,44 +1,31 @@
 class FanforceApp::Sinatra
 
-  # ARCHIVE INITIATIVE ###########################################################
-  def route_archive_initiative(params)
-    json status: 'finished-processing'
+  def route_add_initiative_ui
+    page :add_initiative, :layout => :add_edit_initiative, com_dir: "#{params[:com_behavior_shortid]}"
   end
-  post '/:com_behavior_shortid/archive_initiative' do route_archive_initiative(params) end
 
-  # DESTROY INITIATIVE ###########################################################
-  def route_destroy_initiative(params)
-    json status: 'finished-processing'
+  def route_convert_initiative_ui
+    page :convert_initiative, :layout => :convert_initiative, com_dir: "#{params[:com_behavior_shortid]}"
   end
-  post '/:com_behavior_shortid/destroy_initiative' do route_destroy_initiative(params) end
 
-  # AUTOCREATE PENDING INITIATIVE ###########################################################
-  def route_autocreate_pending_initiative(params)
-    json status: 'finished-processing'
+  def route_edit_initiative_ui
+    page :edit_initiative, :layout => :add_edit_initiative, com_dir: "#{params[:com_behavior_shortid]}"
   end
-  get '/:com_behavior_shortid/autocreate_pending_initiative' do route_autocreate_pending_initiative(params) end
 
-  # ADD INITIATIVE UI ############################################################
-  def route_add_initiative(params)
-    page :add_initiative, :layout => :add_edit_initiative, com_dir: "#{params[:com_behavior_shortid]}"
+  def route_engage_page_ui
+    page :engage, :layout => :engage, com_dir: "#{params[:com_behavior_shortid]}"
   end
-  get '/:com_behavior_shortid/add_initiative.html' do route_add_initiative(params) end
 
-  # ADD PENDING INITIATIVE UI ############################################################
-  def route_convert_pending_initiative(params)
-    page :convert_pending_initiative, :layout => :convert_pending_initiative, com_dir: "#{params[:com_behavior_shortid]}"
+  def route_archive_initiative_callback
+    json status: 'finished-processing'
   end
-  get '/:com_behavior_shortid/convert_pending_initiative.html' do route_convert_pending_initiative(params) end
 
-  # EDIT INITIATIVE UI ###########################################################
-  def route_edit_initiative(params)
-    page :edit_initiative, :layout => :add_edit_initiative, com_dir: "#{params[:com_behavior_shortid]}"
+  def route_destroy_initiative_callback
+    json status: 'finished-processing'
   end
-  get '/:com_behavior_shortid/edit_initiative.html' do route_edit_initiative(params) end
 
-  # ENGAGE #######################################################################
-  def route_engage_page(params)
-    page :engage, :layout => :engage, com_dir: "#{params[:com_behavior_shortid]}"
+  def route_autocreate_initiative_callback
+    json status: 'finished-processing'
   end
 
 end

data/lib/fanforce/app_factory/routes_broadcaster.rb

@@ -1,9 +1,7 @@
 class FanforceApp::Sinatra
 
-  # NEW MESSAGE ##################################################################
-  def route_new_message(params)
+  def route_new_message_ui
     page :new_message, :layout => :new_message
   end
-  get '/new_message.html' do route_new_message(params) end
 
 end

data/lib/fanforce/app_factory/routes_connector.rb

@@ -1,21 +1,11 @@
 class FanforceApp::Sinatra
 
-  # ADD SOURCE ##################################################################
-  def route_add_source(params)
+  def route_add_source_ui
     page :add_source, :layout => :add_source
   end
-  get '/:com_connector_shortid/add_source.html' do route_add_source(params) end
 
-  # CLOSE POPUP #################################################################
-  def route_close_popup(params)
-    page :close_popup
-  end
-  get '/close_popup.html' do route_close_popup(params) end
-
-  # SOURCE DETAILS ##############################################################
-  def route_source_details(params)
+  def route_source_details_ui
     page :source_details, :layout => :source_details
   end
-  get '/:com_connector_shortid/source_details.html' do route_source_details(params) end
 
 end

data/lib/fanforce/app_factory/routes_core.rb

@@ -1,15 +1,18 @@
 class FanforceApp::Sinatra
 
-  # INDEX ########################################################################
-  def route_index(params)
+  def route_index_ui
     page :index, :layout => :promotional
   end
-  ['/', '/index.html'].each do |path|
-    get path do route_index(params) end
+
+  def route_config_ui
+    page :config, :layout => :config
+  end
+
+  def route_close_popup_ui
+    page :close_popup
   end
 
-  # INSTALL ######################################################################
-  def route_install(params)
+  def route_install_callback
     raise "This is not a valid app install request: #{env['HTTP_HOST']}" if !ff.valid_install_request?(params)
     api_key = $Redis.get("installed:app-#{ff.params[:app_id]}:#{params[:organization_id]}")
 
@@ -22,10 +25,8 @@ class FanforceApp::Sinatra
 
     json status: 'finished-processing'
   end
-  any '/install' do route_install(params) end
 
-  # UNINSTALL ####################################################################
-  def route_uninstall(params)
+  def route_uninstall_callback
     raise 'This is not a valid app uninstall request.' if !ff.valid_uninstall_request?(params)
     api_key = $Redis.get("installed:app-#{ff.params[:app_id]}:#{params[:organization_id]}")
 
@@ -37,18 +38,9 @@ class FanforceApp::Sinatra
     $Redis.del("installed:app-#{ff.params[:app_id]}:#{params[:organization_id]}")
     json status: 'finished-processing'
   end
-  any '/uninstall' do route_uninstall(params) end
-
-  # DASHBOARD ####################################################################
-  def route_dashboard(params)
-    page :dashboard, :layout => :dashboard
-  end
-  get '/dashboard.html' do route_dashboard(params) end
 
-  # PING-PONG ####################################################################
-  def route_ping_pong(params)
+  def route_ping_pong
     json success: true
   end
-  get '/ping-pong' do route_ping_pong(params) end
 
 end

data/lib/fanforce/app_factory/routes_js_widget.rb

@@ -1,10 +1,8 @@
 class FanforceApp::Sinatra
 
-  # WIDGET TEMPLATES #################################################################
-  def route_widget_templates(params)
+  def route_widget_templates
     content_type 'application/javascript'
     page :widget_templates
   end
-  get '/widget_templates' do route_widget_templates(params) end
 
 end

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module AppFactory
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -350,7 +350,7 @@ files:
 - lib/fanforce/app_factory/_init_sinatra.rb
 - lib/fanforce/app_factory/assets/css/add_edit_initiative.scss
 - lib/fanforce/app_factory/assets/css/add_source.scss
-- lib/fanforce/app_factory/assets/css/convert_pending_initiative.scss
+- lib/fanforce/app_factory/assets/css/convert_initiative.scss
 - lib/fanforce/app_factory/assets/css/dashboard.scss
 - lib/fanforce/app_factory/assets/css/engage.scss
 - lib/fanforce/app_factory/assets/css/new_message.scss
@@ -364,7 +364,7 @@ files:
 - lib/fanforce/app_factory/assets/js/add_edit_initiative.js
 - lib/fanforce/app_factory/assets/js/add_source.js
 - lib/fanforce/app_factory/assets/js/add_source_popup.js
-- lib/fanforce/app_factory/assets/js/convert_pending_initiative.js
+- lib/fanforce/app_factory/assets/js/convert_initiative.js
 - lib/fanforce/app_factory/assets/js/dashboard.coffee
 - lib/fanforce/app_factory/assets/js/fanforce-engager.js
 - lib/fanforce/app_factory/assets/js/fanforce-finder.js
@@ -387,7 +387,7 @@ files:
 - lib/fanforce/app_factory/assets/lib/common/icons/initiative.png
 - lib/fanforce/app_factory/assets/lib/common/layouts/_add_edit_initiative.scss
 - lib/fanforce/app_factory/assets/lib/common/layouts/_add_source.scss
-- lib/fanforce/app_factory/assets/lib/common/layouts/_convert_pending_initiative.scss
+- lib/fanforce/app_factory/assets/lib/common/layouts/_convert_initiative.scss
 - lib/fanforce/app_factory/assets/lib/common/layouts/_dashboard.scss
 - lib/fanforce/app_factory/assets/lib/common/layouts/_engage.scss
 - lib/fanforce/app_factory/assets/lib/common/layouts/_new_message.scss
@@ -395,7 +395,7 @@ files:
 - lib/fanforce/app_factory/assets/lib/common/layouts/_source_details.scss
 - lib/fanforce/app_factory/assets/lib/common/layouts/add_edit_initiative.js
 - lib/fanforce/app_factory/assets/lib/common/layouts/add_source.js
-- lib/fanforce/app_factory/assets/lib/common/layouts/convert_pending_initiative.js
+- lib/fanforce/app_factory/assets/lib/common/layouts/convert_initiative.js
 - lib/fanforce/app_factory/assets/lib/common/layouts/dashboard.js
 - lib/fanforce/app_factory/assets/lib/common/layouts/engage.js
 - lib/fanforce/app_factory/assets/lib/common/layouts/new_message.js
@@ -455,9 +455,10 @@ files:
 - lib/fanforce/app_factory/config/helpers/fanforce.rb
 - lib/fanforce/app_factory/config/helpers/json.rb
 - lib/fanforce/app_factory/config/helpers/ractive.rb
+- lib/fanforce/app_factory/controllers/base_controller.rb
 - lib/fanforce/app_factory/layouts/add_edit_initiative.haml
 - lib/fanforce/app_factory/layouts/add_source.haml
-- lib/fanforce/app_factory/layouts/convert_pending_initiative.haml
+- lib/fanforce/app_factory/layouts/convert_initiative.haml
 - lib/fanforce/app_factory/layouts/dashboard.haml
 - lib/fanforce/app_factory/layouts/engage.haml
 - lib/fanforce/app_factory/layouts/new_message.haml
@@ -477,7 +478,7 @@ files:
 - lib/fanforce/app_factory/views/add_initiative.haml
 - lib/fanforce/app_factory/views/add_source.haml
 - lib/fanforce/app_factory/views/close_popup.haml
-- lib/fanforce/app_factory/views/convert_pending_initiative.haml
+- lib/fanforce/app_factory/views/convert_initiative.haml
 - lib/fanforce/app_factory/views/dashboard.haml
 - lib/fanforce/app_factory/views/edit_initiative.haml
 - lib/fanforce/app_factory/views/engage.haml

data/lib/fanforce/app_factory/assets/css/convert_pending_initiative.scss

@@ -1 +0,0 @@
-@import 'common/layouts/convert_pending_initiative';

data/lib/fanforce/app_factory/assets/js/convert_pending_initiative.js

@@ -1 +0,0 @@
-//= require common/layouts/convert_pending_initiative