fanforce-app-factory 1.1.0 → 1.2.0

data/lib/fanforce/app_factory/_init_sinatra.rb

@@ -26,23 +26,26 @@ class FanforceApp::Sinatra < Sinatra::Base
   end
 
   def page(page, options={})
-    current_dir = File.expand_path('../', __FILE__)
-    if !File.exists?("#{settings.views}/#{page}.haml")
-      if File.exists?("#{settings.views}/#{options[:com_dir]}/#{page}.haml")
+    gem_dir = Pathname.new(File.expand_path('../', __FILE__))
+    app_dir = Pathname.new(File.expand_path('../', settings.views))
+    app_views_dir = Pathname.new(settings.views)
+    gem_rel_dir = gem_dir.relative_path_from(app_views_dir).to_s
+    gem_abs_dir = File.expand_path(gem_rel_dir, app_views_dir)
+
+    if !File.exists?("#{app_dir}/views/#{page}.haml")
+      if File.exists?("#{app_dir}/views/#{options[:com_dir]}/#{page}.haml")
         page_path = :"#{options[:com_dir]}/#{page}"
       else
-        rel_path = Pathname.new(current_dir).relative_path_from(Pathname.new(settings.views))
-        page_path = :"#{rel_path}/views/#{page}" if File.exists?("#{rel_path}/views/#{page}.haml")
+        page_path = :"#{gem_rel_dir}/views/#{page}" if File.exists?("#{gem_abs_dir}/views/#{page}.haml")
       end
     end
     page_path ||= page
 
     if options[:layout] and FanforceApp.config.has_layout_for(page)
-      if File.exists?("#{settings.views}/../layouts/#{options[:layout]}.haml")
+      if File.exists?("#{app_dir}/layouts/#{options[:layout]}.haml")
         options[:layout] = :"../layouts/#{options[:layout]}"
       else
-        rel_path = Pathname.new(current_dir).relative_path_from(Pathname.new(settings.views))
-        options[:layout] = :"#{rel_path}/layouts/#{options[:layout]}"
+        options[:layout] = :"#{gem_rel_dir}/layouts/#{options[:layout]}"
       end
     else
       options[:layout] = false

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

@@ -7,9 +7,10 @@ class FanforceApp::CoreConfig
       index: true,
       dashboard: true,
       add_initiative: true,
+      edit_initiative: true,
+      convert_pending_initiative: true,
       add_source: true,
       close_popup: true,
-      edit_initiative: true,
       engage: true,
       new_message: true,
       source_details: true,

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module AppFactory
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/lib/fanforce/app_factory/views/convert_pending_initiative.haml

@@ -1 +1 @@
-%h2 Add Initiative
+%h2 Convert Pending Initiative

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -340,7 +340,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rbenv-gemsets
-- .rbenv-version
+- .ruby-version
 - Gemfile
 - README.md
 - Rakefile