disguise 0.3.11 → 0.3.12

data/README.rdoc

@@ -48,7 +48,16 @@ Disguise can run in two modes.  The first is the default which let's an administ
 via the built in admin interface.  The second looks at the url of the incoming request and matches it to a theme.
 To enable this second mode create an initializer in /config/initializers/disguise.rb and enter the following contents:
 
-  Disguise::USE_DOMAIN_FOR_THEMES = true
+  Disguise.use_domain_for_themes = false
+  
+  # These options are also available to configure disguise.  In most cases the defaults should work fine.
+  Disguise.themes_enabled = true
+  Disguise.theme_path = 'themes'
+  Disguise.theme_full_base_path = File.join(RAILS_ROOT, Disguise.theme_path)
+
+== Notes
+After installing Disguise be sure to generate a theme and set that theme as the default theme.  Not setting a theme
+will result in the application continually resetting the current theme which can cause performance problems.
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/app/models/domain_theme.rb

@@ -4,7 +4,7 @@ class DomainTheme < ActiveRecord::Base
   
   class << self
     def use_domain_themes?
-      Disguise::USE_DOMAIN_FOR_THEMES
+      Disguise.use_domain_for_themes
     end
   
     def get_theme(request)

data/app/models/theme.rb

@@ -12,7 +12,7 @@ class Theme < ActiveRecord::Base
   # along with a preview image.
   def self.available_themes(selected_theme)
     themes = []
-    theme_path = File.join(RAILS_ROOT, Disguise::THEME_PATH)
+    theme_path = File.join(RAILS_ROOT, Disguise.theme_path)
     current_theme = nil
     
     Dir.glob("#{theme_path}/*").each do |theme_directory|

data/disguise.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{disguise}
-  s.version = "0.3.11"
+  s.version = "0.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2010-01-20}
   s.description = %q{Add themes to your Rails application to easily change the view layer and impress everyone you know}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -245,3 +245,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/action_controller/disguise_application.rb

@@ -23,11 +23,13 @@ module ActionController
       protected
 
       def setup_theme
+        return if !Disguise.themes_enabled
         return if current_theme.blank? || current_theme.name.blank?
-        theme_view_path = File.join(Disguise::THEME_FULL_BASE_PATH, current_theme.name, 'views')
+        theme_view_path = File.join(Disguise.theme_full_base_path, current_theme.name, 'views')
         if self.view_paths.first == theme_view_path
           return
         else
+          return if !theme_exists(theme_view_path)
           clean_theme_view_path
           self.prepend_view_path(theme_view_path)
           clean_theme_locale
@@ -36,12 +38,17 @@ module ActionController
         end
       end
 
+      def theme_exists(theme_view_path)
+        @themes_exists ||= {}
+        @themes_exists[theme_view_path] ||= File.exists?(theme_view_path)
+      end
+      
       def clean_theme_view_path
-        self.view_paths.delete_if {|view_path| view_path.to_s.index(Disguise::THEME_PATH) == 0}
+        self.view_paths.delete_if {|view_path| view_path.to_s.index(Disguise.theme_path) == 0}
       end
 
       def clean_theme_locale
-        I18n.load_path.delete_if {|localization_path| localization_path.index(Disguise::THEME_FULL_BASE_PATH) == 0}
+        I18n.load_path.delete_if {|localization_path| localization_path.index(Disguise.theme_full_base_path) == 0}
       end
 
       def set_theme_locale

data/lib/disguise.rb

@@ -2,8 +2,19 @@ ActionController::Base.send :include, ActionController::DisguiseApplication
 
 I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locales', '*.{rb,yml}') ]
 
-module Disguise
-  THEME_PATH = 'themes'
-  THEME_FULL_BASE_PATH = File.join(RAILS_ROOT, THEME_PATH)
-  USE_DOMAIN_FOR_THEMES = false
-end
+class Disguise
+  
+  class << self
+    attr_accessor :themes_enabled
+    attr_accessor :use_domain_for_themes
+    attr_accessor :theme_path
+    attr_accessor :theme_full_base_path
+  end
+  
+end
+
+# Set defaults
+Disguise.themes_enabled = true
+Disguise.use_domain_for_themes = false
+Disguise.theme_path = 'themes'
+Disguise.theme_full_base_path = File.join(RAILS_ROOT, Disguise.theme_path)

data/test/rails_root/config/environment.rb

@@ -1,4 +1,4 @@
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 require File.join(File.dirname(__FILE__), 'boot')
 

data/test/rails_root/config/initializers/disguise.rb

@@ -1 +1,2 @@
-USE_DOMAIN_FOR_THEMES = false
+Disguise.themes_enabled = true
+Disguise.use_domain_for_themes = false

data/test/rails_root/test/test_helper.rb

@@ -25,11 +25,11 @@ class ActiveSupport::TestCase
   end
   
   def clean_theme_view_path(controller)
-    controller.view_paths.delete_if {|view_path| view_path.to_s.index(Disguise::THEME_PATH) == 0}
+    controller.view_paths.delete_if {|view_path| view_path.to_s.index(Disguise.theme_path) == 0}
   end
 
   def clean_theme_locale
-    I18n.load_path.delete_if {|localization_path| localization_path.index(Disguise::THEME_FULL_BASE_PATH) == 0}
+    I18n.load_path.delete_if {|localization_path| localization_path.index(Disguise.theme_full_base_path) == 0}
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: disguise
 version: !ruby/object:Gem::Version 
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -06:00
+date: 2010-01-20 00:00:00 -07:00
 default_executable: 
 dependencies: []