locomotive_cms 0.0.2.2 → 0.0.2.3

data/app/controllers/admin/base_controller.rb

@@ -4,7 +4,7 @@ module Admin
     include Locomotive::Routing::SiteDispatcher
   
     layout 'admin/application'
-  
+    
     before_filter :authenticate_admin!
       
     before_filter :require_site
@@ -15,6 +15,11 @@ module Admin
   
     helper_method :sections
   
+    # https://rails.lighthouseapp.com/projects/8994/tickets/1905-apphelpers-within-plugin-not-being-mixed-in
+    Dir[File.dirname(__FILE__) + "/../../helpers/**/*_helper.rb"].each do |file|
+      helper "admin/#{File.basename(file, '.rb').gsub(/_helper$/, '')}"
+    end
+    
     protected
   
     def flash_success!(options = {})

data/app/controllers/admin/passwords_controller.rb

@@ -6,6 +6,8 @@ module Admin
     layout 'admin/login'
   
     before_filter :require_site
+    
+    helper 'admin/base', 'admin/login'
   
   end
 end

data/app/controllers/admin/sessions_controller.rb

@@ -6,6 +6,8 @@ module Admin
     layout 'admin/login'
   
     before_filter :require_site
+    
+    helper 'admin/base', 'admin/login'
   
     protected
   

data/app/helpers/admin/base_helper.rb

@@ -1,5 +1,3 @@
-puts "base helper loaded...."
-
 module Admin::BaseHelper
   
   def title(title = nil)
@@ -9,7 +7,7 @@ module Admin::BaseHelper
       @content_for_title = title
       ''
     end
-  end  
+  end
     
   def admin_menu_item(name, url)
     label = content_tag(:em) + escape_once(' ') + t("admin.shared.menu.#{name}")

data/app/helpers/admin/sites_helper.rb

@@ -8,11 +8,11 @@ module Admin::SitesHelper
   
   def main_site_url(site = current_site, options = {})
     url = "http://#{site.subdomain}.#{Locomotive.config.default_domain}"
-    url += ":#{request.port}" if request.port != 80    
+    url += ":#{request.port}" if request.port != 80
     url = File.join(url, controller.request.fullpath) if options.has_key?(:uri) && options[:uri]
     url
   end
-  
+    
   def error_on_domain(site, name)
     if (error = (site.errors[:domains] || []).detect { |n| n.include?(name) })
       content_tag(:span, error, :class => 'inline-errors')

data/lib/locomotive/engine.rb

@@ -1,5 +1,6 @@
 puts "...Locomotive engine loaded"
 
+require 'mimetype_fu'
 require 'liquid'
 require 'devise'
 require 'carrierwave'
@@ -7,21 +8,11 @@ require 'formtastic'
 require 'mongoid'
 require 'mongoid_acts_as_tree'
 
+# FIXME: get rid of it once custom_fields is a gem
 require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'
 
-ActiveSupport.on_load(:action_view) {
-  Rails.logger.info "ActiveSupport.on_load(:action_view) / #{ActionController::Base.helpers_path.inspect}"
-}
-
 module Locomotive
   class Engine < Rails::Engine
 
-    initializer "locomotive.add_helpers" do |app|
-      puts "locomotive.add_helpers"      
-      path = [*ActionController::Base.helpers_path] << File.dirname(__FILE__) + "/../../app/helpers"
-      ActionController::Base.helpers_path = path
-      Rails.logger.info "locomotive.add_helpers / #{ActionController::Base.helpers_path.inspect}"
-    end
-        
   end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 2
-  - 2
-  version: 0.0.2.2
+  - 3
+  version: 0.0.2.3
 platform: ruby
 authors: 
 - Didier Lafforgue
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
+date: 2010-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency