refinerycms-theming 0.9.8.2 → 0.9.9

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.8.2'
+version = '0.9.9'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir[%q{**/*}].flatten.reject{|f| f =~ /\.gem$/}
 
@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.authors           = %w(Resolve\\ Digital)
+  s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 
   s.files             = [
@@ -22,8 +23,8 @@ Gem::Specification.new do |s|
     '#{Dir.glob("test/**/*.rb").join("',\n    '")}'
   ]" if File.directory?("test")}
 
-  s.add_dependency('refinerycms', '>= 0.9.8')
+  s.add_dependency('refinerycms', '>= 0.9.9')
 end
 EOF
 
-File.open(File.expand_path("../../refinerycms-theming.gemspec", __FILE__), 'w').puts(gemspec)
+File.open(File.expand_path("../../refinerycms-theming.gemspec", __FILE__), 'w').puts(gemspec)

data/lib/refinerycms-theming.rb

@@ -4,35 +4,37 @@ module Refinery
   class ThemingEngine < ::Rails::Engine
 
     config.to_prepare do
-      ::ApplicationController.module_eval do
+      [::ApplicationController, ::Admin::BaseController].each do |controller|
+        controller.module_eval do
 
-        # Add or remove theme paths to/from Refinery application
-        prepend_before_filter :attach_theme_to_refinery
+          # Add or remove theme paths to/from Refinery application
+          prepend_before_filter :attach_theme_to_refinery
 
-        def attach_theme_to_refinery
-          # remove any paths relating to any theme.
-          view_paths.reject! { |v| v.to_s =~ %r{^themes/} }
+          def attach_theme_to_refinery
+            # remove any paths relating to any theme.
+            view_paths.reject! { |v| v.to_s =~ %r{^themes/} }
 
-          # add back theme paths if there is a theme present.
-          if (theme = ::Theme.current_theme(request.env)).present?
-            # Set up view path again for the current theme.
-            view_paths.unshift ::Theme.current_theme_dir.join("views").to_s
+            # add back theme paths if there is a theme present.
+            if (theme = ::Theme.current_theme(request.env)).present?
+              # Set up view path again for the current theme.
+              view_paths.unshift ::Theme.current_theme_dir.join("views").to_s
 
-            # Ensure that routes within the application are top priority.
-            # Here we grab all the routes that are under the application's view folder
-            # and promote them ahead of any other path.
-            view_paths.select{|p| p.to_s =~ %r{^#{Rails.root.join('app', 'views')}}}.each do |app_path|
-              view_paths.unshift app_path
+              # Ensure that routes within the application are top priority.
+              # Here we grab all the routes that are under the application's view folder
+              # and promote them ahead of any other path.
+              view_paths.select{|p| p.to_s =~ %r{^#{Rails.root.join('app', 'views')}}}.each do |app_path|
+                view_paths.unshift app_path
+              end
             end
-          end
 
-          # Set up menu caching for this theme or lack thereof
-          if RefinerySetting.table_exists? and
-             RefinerySetting.get(:refinery_menu_cache_action_suffix) != (suffix = "#{"#{theme}_" if theme.present?}site_menu")
-            RefinerySetting.set(:refinery_menu_cache_action_suffix, suffix)
+            # Set up menu caching for this theme or lack thereof
+            if RefinerySetting.table_exists? and
+               RefinerySetting.get(:refinery_menu_cache_action_suffix) != (suffix = "#{"#{theme}_" if theme.present?}site_menu")
+              RefinerySetting.set(:refinery_menu_cache_action_suffix, suffix)
+            end
           end
+          protected :attach_theme_to_refinery
         end
-        protected :attach_theme_to_refinery
 
       end
 

data/refinerycms-theming.gemspec

@@ -1,12 +1,13 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-theming}
-  s.version           = %q{0.9.8.2}
+  s.version           = %q{0.9.9}
   s.description       = %q{Theming functionality for the Refinery CMS project, extracted from Refinery CMS core.}
-  s.date              = %q{2010-10-27}
+  s.date              = %q{2010-12-15}
   s.summary           = %q{Theming functionality for the Refinery CMS project.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.authors           = %w(Resolve\ Digital)
+  s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 
   s.files             = [
@@ -82,5 +83,5 @@ Gem::Specification.new do |s|
   ]
   
 
-  s.add_dependency('refinerycms', '>= 0.9.8')
+  s.add_dependency('refinerycms', '>= 0.9.9')
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-theming
 version: !ruby/object:Gem::Version 
-  hash: 35
   prerelease: false
   segments: 
   - 0
   - 9
-  - 8
-  - 2
-  version: 0.9.8.2
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +13:00
+date: 2010-12-15 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
-        - 8
-        version: 0.9.8
+        - 9
+        version: 0.9.9
   type: :runtime
   version_requirements: *id001
 description: Theming functionality for the Refinery CMS project, extracted from Refinery CMS core.
@@ -91,8 +88,8 @@ files:
 - themes/hemingway/views/layouts/application.html.erb
 has_rdoc: true
 homepage: http://refinerycms.com
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -103,7 +100,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -112,7 +108,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"