fanforce-plugin-factory 2.0.0.rc15 → 2.0.0.rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794da4cd0ff9859c513a2870f50f3354116a071e
-  data.tar.gz: 0df04009aaab8bdc8819502a4798d22911aee0a4
+  metadata.gz: 21b09a1ea73d8048e81fad91617274128f0d5277
+  data.tar.gz: 3c3ba94227357137c371cef1c7059d15504d0a3f
 SHA512:
-  metadata.gz: fcd01f6aca569248b3e33c087fd3694f368b379979850a1f78a6f47062f089c17053edf2d0912f249b3dae15e89bda211b6884f21f404d59a438ca1df905a8e5
-  data.tar.gz: 2c0091d1373cd21c9eae075d946a4e9fc90c8a92eaa9d4a5536afbedb8510345815bb54e0720fdd7ca1ea4857332561e79c01b6a0e537be8e898d000950013f7
+  metadata.gz: 7e2600ccfff01bb278a23f81b80e71ec9b49eaf282d242454e3f2375e53cd7efc85d59815f6c538aadc7714298e150ad2951ef77fedf16854c73dd56339a0d43
+  data.tar.gz: 130356789529c4b38cfbc10e2a02023156d4a11445ad4f703a7969f47bbe1315d5e408d9c944f597b5cd8a2ccef7bd4d5d83735b15f8c01f8efce1981a274567

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

@@ -5,11 +5,12 @@ App.directive('initiativeFooter', [() ->
     initiative_name: '=initiativeName'
     saveCallback: '=save'
     prefix: '@'
+    button: '@?'
   }
   link: (($scope, $element, attrs) ->
 
     $scope.save = (()->
-      $scope.saveCallback()
+      $scope.saveCallback($scope.initiative_name)
     )
 
   )

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

@@ -5,4 +5,4 @@
       %input.form-control.input-sm(type='text' ng-disabled='is_disabled' ng-model='campaign_name')
     %button.btn.btn-sm.btn-primary(ng-click='save()' ng-disabled='is_disabled')
       %i.icon-plus.icon-white
-      Create
+      {{button || 'Create'}}

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

@@ -6,4 +6,4 @@
       %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 || !initiative_name')
       %i.icon-plus.icon-white
-      Create
+      {{button || 'Create'}}

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

@@ -61,6 +61,11 @@ class Fanforce::Plugin::Sinatra < Sinatra::Base
     haml :"#{factory_dir.relative_path_from(plugin_views_dir).to_s}/directive_views/#{page}"
   end
 
+  def partial(path, options={})
+    options[:css_framework] = params[:css_framework] if params[:css_framework]
+    haml(path.to_sym, options)
+  end
+
   def page(page, options={})
     plugin_views_dir = Pathname.new(settings.views)
 

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

@@ -6,6 +6,13 @@ module Fanforce::Plugin::Sinatra::RactiveHelpers
     context = create_context
 
     html = context.capture_haml(&block)
+    html.gsub!(/([^\s])\s*\{\{\/if}}(\s*\{\{elseif)/, '\1\2') # if/elseif
+    html.gsub!(/([^\s])\s*\{\{\/if}}(\s*\{\{else)/, '\1\2') # if/else
+    html.gsub!(/([^\s])\s*\{\{\/elseif}}(\s*\{\{elseif)/, '\1\2') # elseif/elseif
+    html.gsub!(/([^\s])\s*\{\{\/elseif}}(\s*\{\{else)/, '\1\2') # elseif/else
+    html.gsub!(/{\{\/elseif}}/, '{{/if}}') # /elseif -> /if
+    html.gsub!(/{\{\/else}}/, '{{/if}}') # /else -> /if
+
     return html if format == :html
 
     single_line_html = html.split(/\r?\n/).inject('') {|sl, l| sl += l.strip + ' ' }
@@ -13,25 +20,32 @@ module Fanforce::Plugin::Sinatra::RactiveHelpers
     matches.inject({}) {|t,m| t[m[0]] = m[1]; t }.to_json
   end
 
-  def RACTIVE(helper, &block)
+  def RACTIVE(command, 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?
 
+    opener = "#{command}"
+    opener += " #{helper}" if helper
+    closer = command.gsub('#','')
+
     context = create_context
-    helper = '#'+helper if helper !~ /^[#\^]/
-    "{{#{helper}}}\n" + context.capture_haml(&block) + "{{/#{helper.gsub(/(#|\^)/,'')}}}"
+    "{{#{opener}}}\n" + context.capture_haml(&block).to_s.split("\n").inject('') {|html, l| html += "  #{l}\n"} + "{{/#{closer}}}"
   end
 
   def IF(helper, &block)
-    RACTIVE(helper, &block)
+    RACTIVE('#if', helper, &block)
   end
 
   def ELSE_IF(helper, &block)
-    RACTIVE(helper, &block)
+    RACTIVE('elseif', helper, &block)
+  end
+
+  def ELSE(&block)
+    RACTIVE('else', nil, &block)
   end
 
   def FOREACH(helper, &block)
-    RACTIVE(helper, &block)
+    RACTIVE("##{helper}", nil, &block)
   end
 
   def create_context

data/lib/fanforce/plugin_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginFactory
-    VERSION = '2.0.0.rc15'
+    VERSION = '2.0.0.rc16'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc15
+  version: 2.0.0.rc16
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake