fanforce-app-factory 0.35.1 → 0.36.0

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

@@ -4,6 +4,8 @@ class FanforceApp::CoreConfig
   attr_accessor :bugsnag, :bugsnag_enabled
   attr_reader :type
 
+  REDIS_URL = ENV['REDIS_URL'] || 'redis://localhost:6379'
+
   def initialize(root_dir)
     @layout_for_index = true
     @layout_for_dashboard = true
@@ -11,7 +13,7 @@ class FanforceApp::CoreConfig
     @_id = ENV['FANFORCE_APP_ID']
     @root_dir = root_dir
     @factory_root_dir = File.expand_path '../../', __FILE__
-    @redis_url = ENV['REDIS_URL'] || 'redis://localhost:6379'
+    @redis_url = REDIS_URL
     @show_error_details = false
 
     @bugsnag = (ENV['BUGSNAG_API_KEY'].present?) ? {api_key: ENV['BUGSNAG_API_KEY']} : nil
@@ -55,18 +57,28 @@ class FanforceApp::CoreConfig
     @dir_name = /\/([^\/]+)\/?$/.match(@root_dir)[1]
 
     $: << 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}/config/routes" if File.exists?("#{@root_dir}/config/routes.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
+
+    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 "#{@factory_root_dir}/routes"
   end
 
   def load_redis
-    $Redis = ::Redis.new(url: @redis_url)
+    self.class.load_redis(@redis_url)
+  end
+
+  def self.load_redis(redis_url=REDIS_URL)
+    $Redis = ::Redis.new(url: redis_url)
   end
 
 end

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module AppFactory
-    VERSION = '0.35.1'
+    VERSION = '0.36.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0
   prerelease: 
 platform: ruby
 authors: