fanforce-app-factory 2.0.0.rc2 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37a435bd68e878c20b03d9732e7dec3c3fb1b2e4
-  data.tar.gz: 316ecc9519abcf404302dec20048212a9bd611e5
+  metadata.gz: 9431c182b75b2b4653a85bd0c8e7359bbd607458
+  data.tar.gz: ca5ba701910a7a319fff8f899009e27709bf37ab
 SHA512:
-  metadata.gz: 18a594cc7c197808b9c0e34ffedb242e57d18cf456d03c825885bd6ac25c9b0d4e71da58a8f40c6b4f9312d20cd3a8967602c143170edcf6b027c0c8e2fba605
-  data.tar.gz: 901754e108e86dc527733cdfb4b754b887a25d4160e94b99fce0124d644e50884f8ee44b889be5ccf861cedd221ac4132119fa05fe42945cc6712756551b6786
+  metadata.gz: d764c6b657376eb5556b92941053855f26e5d0405ecda426fca06869b8b6cca582d7cc33e83ba80ae799979aba6731c76601da9e0d6832eb645c57cbe2eee212
+  data.tar.gz: 28b95d97db2f491bc300d08591e03d32762123ff3bdd51b4bf988526d25118e5dc978a2987566b65fe83f1c93c2cfdfdd9d72f4d90d6abd952c1daa93b6af857

data/lib/fanforce/app_factory/Routes.rb

@@ -0,0 +1,31 @@
+class Fanforce::App::Sinatra
+
+  get '/internals/config.json' do
+    file = File.open("#{Fanforce::App.root_dir}/config.json")
+    config = MultiJson.load(file.read, symbolize_keys: true)
+    config[:iron_workers] ||= []
+
+    config[:iron_workers].each do |iron_worker|
+      iron_worker[:token] = ENV['IRON_TOKEN']
+      iron_worker[:project_id] = ENV['IRON_PROJECT_ID']
+    end
+
+    config.to_json
+  end
+
+  post '/internals/config.json' do
+    filename = "#{Fanforce::App.root_dir}/config.json"
+    file = File.open(filename)
+    old_config = MultiJson.load(file.read, symbolize_keys: true)
+    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])) }
+    json status: 'finished'
+  end
+
+  get '/app_factory/directives/:filename' do
+    factory_directive(params[:filename])
+  end
+
+end

data/lib/fanforce/app_factory/asset_framework/app_factory/directives/initiative-footer/_initiative-footer.coffee

@@ -1,6 +1,6 @@
 App.directive('initiativeFooter', [() ->
   restrict: 'E',
-  templateUrl: '/directives/initiative-footer'
+  templateUrl: '/app_factory/directives/initiative-footer'
   scope: {
     initiative_name: '=initiativeName'
     saveCallback: '=save'

data/lib/fanforce/app_factory/asset_framework/app_factory/scafolding/_engagement.scss

@@ -0,0 +1 @@
+@import 'scafolding_assets/css/engagement';

data/lib/fanforce/app_factory/core_config.rb

@@ -22,8 +22,8 @@ class Fanforce::App::CoreConfig
     @factory_dir || (raise 'factory_dir is missing')
   end
 
-  def show_error_details=(bool)
-    @show_error_details = [true,1,'1'].include?(bool)
+  def show_error_details=(opt)
+    @show_error_details = ['1','text'].include?(opt.to_s) ? opt.to_s : false
   end
 
   def redis_url
@@ -69,7 +69,7 @@ class Fanforce::App::CoreConfig
     require "#{@factory_dir}/sinatra/helper_routes/com_js_widget"
 
     Dir["#{@root_dir}/initializers/*.rb"].each {|f| require f } if File.directory?("#{@root_dir}/initializers")
-    require "#{@factory_dir}/sinatra/Routes"
+    require "#{@factory_dir}/Routes"
     require "#{@root_dir}/Routes"
   end
 

data/lib/fanforce/app_factory/directive_views/initiative-footer.haml

@@ -0,0 +1,8 @@
+.footer
+  %label Save initiative as...
+  .input-wrapper(onclick='$(this).find("input").focus()')
+    .prefix {{prefix}}
+    %input.form-control.input-sm(type='text' ng-disabled='is_disabled' ng-model='initiative_name')
+  %button.btn.btn-sm.btn-primary(ng-click='save()' ng-disabled='is_disabled')
+    %i.icon-plus.icon-white
+    Create

data/lib/fanforce/app_factory/scafolding/Routes.rb

@@ -57,7 +57,7 @@ class App::Sinatra
   ######################################################################################################################
   # ENGAGE
 
-  #static '/:organization_slug/:com_behavior_shortid/:initiative_id', :engage do route_engage_page_ui end
+  #static '/:organization_slug/:com_behavior_shortid/:initiative_id', :engagement do route_engagement_page_ui end
 
   ######################################################################################################################
 

data/lib/fanforce/app_factory/scafolding/layouts/{engage.haml → engagement.haml}

@@ -5,8 +5,8 @@
     %title Fanforce
     %meta{'http-equiv'=>'Content-Type', content:'text/html; charset=iso-8859-1'}/
     %meta{'http-equiv'=>'Content-Language', content: 'en-us'}/
-    = stylesheet '/engage.css'
-  %body.layout-engage
+    = stylesheet '/engagement.css'
+  %body.layout-engagement
     .lyt-root
       .lyt-header
         #hello

data/lib/fanforce/app_factory/scafolding/scafolding_assets/css/engagement.scss

@@ -0,0 +1,66 @@
+@import 'compass/css3';
+@import "compass/layout/sticky-footer";
+@import 'compass/utilities';
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+@import 'app_factory/common';
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+h1, .h1 { font-size: 30px; font-weight:bold; margin:10px 0; line-height:1em; }
+h2, .h2 { font-size: 20px; font-weight:bold; margin:8px 0; line-height:1em; }
+h3, .h3 { font-size: 17px; font-weight:bold; margin:6px 0; line-height:1em; }
+h4, .h4 { font-size: 14px; font-weight:bold; margin:4px 0; line-height:1em; }
+h5, .h5 { font-size: 13px; font-weight: bold; margin:2px 0; line-height:1em; }
+h6, .h6 { font-size: 12px; font-weight: bold; margin:2px 0; line-height:1em; }
+h7, .h7 { font-size: 11px; font-weight: bold; margin:2px 0; line-height:1em; }
+
+p, .p { line-height:1.5em; margin-bottom:10px; }
+a { text-decoration:none; color:#1861a8;
+  &:hover { text-decoration:underline; }
+}
+strong, .strong { font-weight:bold; }
+emphasis, .emphasis { font-style:italic; }
+
+ul { list-style-type: square; list-style-position:outside; padding:0; margin-left:0; line-height:1.5em;
+  li { margin-top:5px; margin-left:1em; }
+}
+
+ol { list-style-type:decimal; list-style-position:outside; padding:0; margin-left:0; line-height:1.5em;
+  li { margin-top:5px; margin-left:1.5em; }
+}
+
+pre { font-family:"Courier New", Courier, monospace, sans-serif; color: #555; line-height: 1.6em; }
+
+.hide { display:none !important; }
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// FRAMEWORK: MODULE ACTIVATION
+//////////////////////////////////////////////////////////////////////////////////////////////////
+html { height:100%; }
+body { height: 100%; background-color:#292a2e; @include ff-gradient(#26262a,#2b2d31); text-align:center; margin:0; font-family:'Helvetica', Arial, sans-serif; font-size:12px; line-height:1.5em;
+  @include sticky-footer(40px, ".lyt-root", ".lyt-root-footer", ".lyt-footer");
+
+  .lyt-root { @include ff-gradient(#26262a,#2b2d31); }
+  .lyt-header { min-height:80px;
+    .hello { background: #2d2d31; height:40px; line-height: 44px; text-align: right; border-bottom:1px solid #000000; @include box-shadow(#343438 0 1px 0);
+      .hello-wrapper { max-width: 960px; margin:0 auto; }
+      .greeting { color: #858789; font-style: italic; padding-right:10px; font-weight: 100; }
+      a { font-weight: bold; color: #aeb2b4; }
+    }
+    .logo { border-bottom:1px solid #000000; @include box-shadow(#343438 0 1px 0); background-position: center center; background-repeat:no-repeat;
+      img { margin-top:18px; }
+    }
+  }
+  .lyt-footer { color:#565d65; font-size:10px; line-height:40px;  border-top:1px solid #343438; @include box-shadow(#000000 0 -1px 0);
+    a { color:#565d65;
+      &:hover { color:#747d88; }
+    }
+  }
+
+  // layout-specific components
+  .ff-widget { display:inline-block; @include box-shadow(#000000 2px 2px 2px); border:10px solid #ffffff; @include border-radius(3px); margin:50px 0 50px; color: #444444;
+    .loading { line-height: 100px; }
+  }
+}

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

@@ -43,6 +43,10 @@ class Fanforce::App::Sinatra < Sinatra::Base
     end
   end
 
+  def self.create_basic_routes_from_views
+    create_basic_routes_from(:views)
+  end
+
   def self.create_basic_route(path)
     get "/#{path}" do page(path) end
   end
@@ -52,6 +56,12 @@ class Fanforce::App::Sinatra < Sinatra::Base
     get(url, &block)
   end
 
+  def factory_directive(page)
+    factory_dir = Pathname.new(Fanforce::App.config.factory_dir)
+    app_views_dir = Pathname.new(settings.views)
+    haml :"#{factory_dir.relative_path_from(app_views_dir).to_s}/directive_views/#{page}"
+  end
+
   def page(page, options={})
     app_views_dir = Pathname.new(settings.views)
     page = :"#{options[:com_dir]}/#{page}" if File.exists?("#{app_views_dir}/#{options[:com_dir]}/#{page}.haml")

data/lib/fanforce/app_factory/sinatra/error_handling.rb

@@ -12,14 +12,15 @@ class Fanforce::App::Sinatra
     end
     message = errors[0][:message]
 
+    show_error_details = params[:show_error_details] || Fanforce::App.config.show_error_details
     admin_details = fetch_admin_details(e, errors)
     Bugsnag.notify(e, admin_details.merge(app_id: Fanforce::App.app_id)) if Fanforce::App.is_bugsnag_enabled?
 
     body = {errors: message}
-    body.merge!(admin_details.merge(backtrace: e.backtrace)).delete(:public_response) if params[:show_error_details] or Fanforce::App.config.show_error_details
+    body.merge!(admin_details.merge(backtrace: e.backtrace)).delete(:public_response) if show_error_details
 
     status(e.respond_to?(:code ) ? e.code : 500)
-    if params[:show_error_details]=='text'
+    if show_error_details == 'text'
       response.headers['Content-Type'] = 'text/plain'
       format_as_text(body)
     else
@@ -29,7 +30,7 @@ class Fanforce::App::Sinatra
 
   def format_as_text(body)
     text =  "--------------------------------------------------------------------------------------------------------\n"
-    text += "ERROR: #{body[:errors]}\n"
+    text += "ERROR: #{body[:raw_message]}\n"
     text += "CLASS: #{body[:error_class]}\n" if body[:error_class]
     text += "\nCURL COMMAND: #{body[:curl_command]}\n" if body[:curl_command]
     text += "\nBACKTRACE:\n#{body[:backtrace].join("\n")}\n" if body[:backtrace]

data/lib/fanforce/app_factory/sinatra/helper_routes/com_behavior.rb

@@ -8,8 +8,8 @@ class Fanforce::App::Sinatra
     page :edit_initiative, :layout => :standard, com_dir: params[:com_behavior_shortid]
   end
 
-  def route_engage_page_ui
-    page :engage, :layout => :standard, com_dir: params[:com_behavior_shortid]
+  def route_engagement_page_ui
+    page :engagement, :layout => :engagement, com_dir: params[:com_behavior_shortid]
   end
 
   def route_archive_initiative_callback

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class AppFactory
-    VERSION = '2.0.0.rc2'
+    VERSION = '2.0.0.rc4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Caleb Clark
@@ -308,6 +308,7 @@ files:
 - fanforce-app-factory.gemspec
 - lib/fanforce/app_factory.rb
 - lib/fanforce/app_factory/Rakefile
+- lib/fanforce/app_factory/Routes.rb
 - lib/fanforce/app_factory/app.rb
 - lib/fanforce/app_factory/asset_framework/app_factory/_bootstrap.scss
 - lib/fanforce/app_factory/asset_framework/app_factory/_common.scss
@@ -359,6 +360,7 @@ files:
 - lib/fanforce/app_factory/asset_framework/app_factory/lib/ng-visible.js
 - lib/fanforce/app_factory/asset_framework/app_factory/lib/url.coffee
 - lib/fanforce/app_factory/asset_framework/app_factory/lib/utils.coffee
+- lib/fanforce/app_factory/asset_framework/app_factory/scafolding/_engagement.scss
 - lib/fanforce/app_factory/asset_framework/app_factory/scafolding/_promotional.scss
 - lib/fanforce/app_factory/asset_framework/app_factory/scafolding/_standard.scss
 - lib/fanforce/app_factory/asset_framework/app_factory/scafolding/promotional.coffee
@@ -370,10 +372,12 @@ files:
 - lib/fanforce/app_factory/cli/_cleanorgs.rb
 - lib/fanforce/app_factory/controllers/base_controller.rb
 - lib/fanforce/app_factory/core_config.rb
+- lib/fanforce/app_factory/directive_views/initiative-footer.haml
 - lib/fanforce/app_factory/scafolding/Routes.rb
-- lib/fanforce/app_factory/scafolding/layouts/engage.haml
+- lib/fanforce/app_factory/scafolding/layouts/engagement.haml
 - lib/fanforce/app_factory/scafolding/public/favicon.ico
 - lib/fanforce/app_factory/scafolding/public/robots.txt
+- lib/fanforce/app_factory/scafolding/scafolding_assets/css/engagement.scss
 - lib/fanforce/app_factory/scafolding/scafolding_assets/css/promotional.scss
 - lib/fanforce/app_factory/scafolding/scafolding_assets/css/standard.scss
 - lib/fanforce/app_factory/scafolding/scafolding_assets/img/icon-16.png
@@ -396,7 +400,6 @@ files:
 - lib/fanforce/app_factory/scafolding/views/new_message.haml
 - lib/fanforce/app_factory/scafolding/views/source_details.haml
 - lib/fanforce/app_factory/scafolding/views/widget_templates.haml
-- lib/fanforce/app_factory/sinatra/Routes.rb
 - lib/fanforce/app_factory/sinatra/_load.rb
 - lib/fanforce/app_factory/sinatra/error_handling.rb
 - lib/fanforce/app_factory/sinatra/helper_routes/app.rb

data/lib/fanforce/app_factory/sinatra/Routes.rb

@@ -1,17 +0,0 @@
-class Fanforce::App::Sinatra
-
-  get '/internals/config.json' do
-    File.open("#{Fanforce::App.root_dir}/config.json").read
-  end
-
-  post '/internals/config.json' do
-    filename = File.open("#{Fanforce::App.root_dir}/config.json")
-    old_config = MultiJson.load(filename.read, symbolize_keys: true)
-    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])) }
-    json status: 'finished'
-  end
-
-end