radiant 0.6.2 → 0.6.3

data/config/environments/test.rb

@@ -5,8 +5,15 @@
 # your test database is "scratch space" for the test suite and is wiped
 # and recreated between test runs.  Don't rely on the data there!
 config.cache_classes = true
-config.extension_paths << File.join(File.expand_path(RADIANT_ROOT), 'test', 'fixtures', 'extensions')
+
+# ensure test extensions are loaded
+test_extension_dir = File.join(File.expand_path(RADIANT_ROOT), 'test', 'fixtures', 'extensions')
+config.extension_paths << test_extension_dir
 config.extension_paths.uniq!
+if config.extensions && !config.extensions.include?(:all)
+  config.extensions.concat(Dir["#{test_extension_dir}/*"].sort.map {|x| File.basename(x).sub(/^\d+_/,'')})
+  config.extensions.uniq!
+end
 
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils    = true
@@ -19,4 +26,4 @@ ResponseCache.defaults[:perform_caching]             = false
 # Tell ActionMailer not to deliver emails to the real world.
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
+config.action_mailer.delivery_method = :test

data/db/migrate/016_add_sessions.rb

@@ -0,0 +1,16 @@
+class AddSessions < ActiveRecord::Migration
+  def self.up
+    create_table :sessions do |t|
+      t.column :session_id, :string
+      t.column :data, :text
+      t.column :updated_at, :datetime
+    end
+
+    add_index :sessions, :session_id
+    add_index :sessions, :updated_at
+  end
+
+  def self.down
+    drop_table :sessions
+  end
+end

data/db/schema.rb

@@ -2,7 +2,7 @@
 # migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
 
-ActiveRecord::Schema.define(:version => 15) do
+ActiveRecord::Schema.define(:version => 16) do
 
   create_table "config", :force => true do |t|
     t.column "key",   :string, :limit => 40, :default => "", :null => false
@@ -52,6 +52,15 @@ ActiveRecord::Schema.define(:version => 15) do
     t.column "lock_version", :integer,                 :default => 0
   end
 
+  create_table "sessions", :force => true do |t|
+    t.column "session_id", :string
+    t.column "data",       :text
+    t.column "updated_at", :datetime
+  end
+
+  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
+  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+
   create_table "snippets", :force => true do |t|
     t.column "name",         :string,   :limit => 100, :default => "", :null => false
     t.column "filter_id",    :string,   :limit => 25

data/lib/generators/extension/templates/tasks.rake

@@ -11,7 +11,18 @@ namespace :radiant do
           <%= class_name %>.migrator.migrate
         end
       end
-    
+      
+      desc "Copies public assets of the <%= extension_name %> to the instance public/ directory."
+      task :update => :environment do
+        is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
+        Dir[<%= class_name %>.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
+          path = file.sub(<%= class_name %>.root, '')
+          directory = File.dirname(path)
+          puts "Copying #{path}..."
+          mkdir_p RAILS_ROOT + directory
+          cp file, RAILS_ROOT + path
+        end
+      end  
     end
   end
-end
+end

data/lib/generators/extension/templates/test_helper.rb

@@ -1,7 +1,8 @@
-# Load the the environment
+require 'test/unit'
+# # Load the environment
 unless defined? RADIANT_ROOT
   ENV["RAILS_ENV"] = "test"
-  require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/boot"
+  require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment"
 end
 require "#{RADIANT_ROOT}/test/test_helper"
 

data/lib/login_system.rb

@@ -5,6 +5,7 @@ module LoginSystem
       
       @@controllers_where_no_login_required = []
       @@controller_permissions = Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = Hash.new } }
+      helper_method :current_user
     }
     base.extend ClassMethods
     super
@@ -12,13 +13,27 @@ module LoginSystem
   
   protected
   
+    def current_user
+      @current_user ||= User.find(session['user_id']) rescue nil
+    end
+    
+    def current_user=(value=nil)
+      if value && value.is_a?(User)
+        @current_user = value
+        session['user_id'] = value.id 
+      else
+        @current_user = nil
+        session['user_id'] = nil
+      end
+      @current_user
+    end
+    
     def authenticate
       action = params['action'].to_s.intern
-      user = session['user']
-      if no_login_required? or (user and user_has_access_to_action?(action))
+      if no_login_required? or (current_user and user_has_access_to_action?(action))
         true
       else
-        if user
+        if current_user
           permissions = self.class.controller_permissions[self.class][action]
           flash[:error] = permissions[:denied_message] || 'Access denied.'
           redirect_to permissions[:denied_url] || { :action => :index }
@@ -35,7 +50,7 @@ module LoginSystem
     end
   
     def user_has_role?(role)
-      session['user'].send("#{role}?")
+      current_user.send("#{role}?")
     end
     
     def user_has_access_to_action?(action)

data/lib/plugins/extension_patches/init.rb

@@ -1,4 +1,4 @@
 require 'routing_extension'
 require 'view_paths_extension'
 require 'mailer_view_paths_extension'
-require 'fixture_loading_extension'
+require 'fixture_loading_extension' if RAILS_ENV == 'test'

data/lib/plugins/extension_patches/lib/fixture_loading_extension.rb

@@ -5,42 +5,41 @@ module Radiant
         include ClassMethods
         alias_method_chain :create_fixtures, :multiple_paths
       end
-    end
-  end
-  
-  module ClassMethods
-    def create_fixtures_with_multiple_paths(fixtures_directory, table_names, class_names = {})
-      table_names = [table_names].flatten.map { |n| n.to_s }
-      connection = block_given? ? yield : ActiveRecord::Base.connection
-      ActiveRecord::Base.silence do
-        fixtures_map = {}
-        fixtures = table_names.map do |table_name|
-          paths = fixtures_directory.dup
-          begin
-            directory = paths.pop
-            fixtures_map[table_name] = Fixtures.new(connection, File.split(table_name.to_s).last, class_names[table_name.to_sym], File.join(directory, table_name))
-          rescue Exception => e
-            retry unless paths.empty?
-            raise e
-          end
-        end               
-        all_loaded_fixtures.merge! fixtures_map  
-  
-        connection.transaction(Thread.current['open_transactions'] == 0) do
-          fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
-          fixtures.each { |fixture| fixture.insert_fixtures }
-  
-          # Cap primary key sequences to max(pk).
-          if connection.respond_to?(:reset_pk_sequence!)
-            table_names.each do |table_name|
-              connection.reset_pk_sequence!(table_name)
+    end
 
+    module ClassMethods
+      def create_fixtures_with_multiple_paths(fixtures_directory, table_names, class_names = {})
+        table_names = [table_names].flatten.map { |n| n.to_s }
+        connection = block_given? ? yield : ActiveRecord::Base.connection
+        ActiveRecord::Base.silence do
+          fixtures_map = {}
+          fixtures = table_names.map do |table_name|
+            paths = fixtures_directory.dup
+            begin
+              directory = paths.pop
+              fixtures_map[table_name] = Fixtures.new(connection, File.split(table_name.to_s).last, class_names[table_name.to_sym], File.join(directory, table_name))
+            rescue Exception => e
+              retry unless paths.empty?
+              raise e
+            end
+          end               
+          all_loaded_fixtures.merge! fixtures_map  
+    
+          connection.transaction(Thread.current['open_transactions'] == 0) do
+            fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures }
+            fixtures.each { |fixture| fixture.insert_fixtures }
+    
+            # Cap primary key sequences to max(pk).
+            if connection.respond_to?(:reset_pk_sequence!)
+              table_names.each do |table_name|
+                connection.reset_pk_sequence!(table_name)
+              end
             end
           end
+    
+          return fixtures.size > 1 ? fixtures : fixtures.first
         end
-  
-        return fixtures.size > 1 ? fixtures : fixtures.first
-      end
-    end  
+      end  
+    end
   end
 end
 

data/lib/radiant.rb

@@ -5,7 +5,7 @@ unless defined? Radiant::Version
     module Version
       Major = '0'
       Minor = '6'
-      Tiny  = '2'
+      Tiny  = '3'
     
       class << self
         def to_s

data/lib/radiant/extension.rb

@@ -35,6 +35,7 @@ module Radiant
 
       def activate_extension
         return if instance.active?
+        load_plugins
         instance.activate if instance.respond_to? :activate
         ActionController::Routing::Routes.reload
         instance.active = true
@@ -72,6 +73,19 @@ module Radiant
         @route_definitions ||= []
       end
       
+      def load_plugins
+        plugins = Dir[self.root + "/vendor/plugins/*"].select{|path| File.directory?(path)}
+        plugins.each do |plugin|
+          const_name = "PLUGIN_#{File.basename(plugin).upcase}"
+          begin
+            Radiant::Extension.const_get(const_name)
+          rescue
+            $LOAD_PATH << "#{plugin}/lib"
+            require "#{plugin}/init.rb"
+            Radiant::Extension.const_set const_name, plugin
+          end
+        end
+      end
     end
   end
 end

data/lib/radiant/extension_loader.rb

@@ -1,107 +1,136 @@
-require 'radiant/extension'
-
-module Radiant
-  class ExtensionLoader
-    
-    class DependenciesObserver < MethodObserver
-      attr_accessor :config
-      
-      def initialize(rails_config)
-        @config = rails_config
-      end
-      
-      def before_clear(*args)
-        ExtensionLoader.deactivate_extensions
-      end
-      
-      def after_clear(*args)
-        ExtensionLoader.activate_extensions
-      end
-    end
-
-    include Simpleton
-    
-    attr_accessor :initializer
-    
-    def initialize
-      @extension_roots = []
-    end
-
-    def configuration
-      initializer.configuration
-    end
-    
-    def initializer=(initializer)
-      @initializer = initializer
-    end
-    
-    def run
-      DependenciesObserver.new(configuration).observe(Dependencies)
-      
-      discover_extensions
-      activate_extensions
-    end
-    
-    def discover_extensions
-      extension_roots = configuration.extension_paths.collect do |path|
-        Dir.glob("#{path}/*").sort.select { |f| File.directory?(f) }.collect do |ext_path|
-          ext_path = File.expand_path(ext_path)
-          load_paths = %w(lib app/models app/controllers app/helpers test/helpers).collect { |p| "#{ext_path}/#{p}" }
-          load_paths << ext_path
-          load_paths.each { |p| configuration.load_paths << p }
-          configuration.controller_paths << "#{ext_path}/app/controllers"
-          configuration.view_paths << "#{ext_path}/app/views"
-          @extension_roots << ext_path
-        end
-      end.flatten
-      initializer.set_autoload_paths
-      initializer.initialize_view_paths
-      extension_roots
-    end
-    
-    def deactivate_extensions
-      Extension.descendants.each { |extension| deactivate(extension) }
-    end
-    
-    def activate_extensions(enabled_extensions = nil)
-      initializer.initialize_default_admin_tabs
-      activated_extensions = @extension_roots.select do |root|
-        extension_file = "#{File.basename(root).sub(/^\d+_/,'')}_extension"
-        extension = extension_file.camelize.constantize
-        extension.root = root
-        extension.unloadable
-        if enabled_extensions
-          enabled = enabled_extensions.include?(extension.extension_name) || enabled_extensions.include?(extension)
-          enable(extension, enabled)
-        else
-          activate(extension)
-        end
-      end
-      initializer.initialize_routing
-      activated_extensions
-    end
-    alias :reactivate :activate_extensions
-    
-    private
-    
-      def activate(extension)
-        if extension.enabled?
-          extension.activate
-          extension
-        end
-      end
-      
-      def deactivate(extension)
-        if extension.active?
-          extension.deactivate
-          extension
-        end
-      end
-      
-      def enable(extension, enabled)
-        extension.enable(enabled)
-        extension if enabled
-      end
-      
-  end
+require 'radiant/extension'
+
+module Radiant
+  class ExtensionLoader
+    
+    class DependenciesObserver < MethodObserver
+      attr_accessor :config
+      
+      def initialize(rails_config)
+        @config = rails_config
+      end
+      
+      def before_clear(*args)
+        ExtensionLoader.deactivate_extensions
+      end
+      
+      def after_clear(*args)
+        ExtensionLoader.activate_extensions
+      end
+    end
+
+    include Simpleton
+    
+    attr_accessor :initializer
+    
+    def initialize
+      @extension_roots = []
+    end
+
+    def configuration
+      initializer.configuration
+    end
+    
+    def initializer=(initializer)
+      @initializer = initializer
+    end
+    
+    def run
+      DependenciesObserver.new(configuration).observe(Dependencies)
+      
+      discover_extensions
+      activate_extensions
+    end
+    
+    def discover_extensions
+      all_extension_roots = configuration.extension_paths.collect do |path|
+        Dir.glob("#{path}/*").sort.select { |f| File.directory?(f) }.collect do |ext_path|
+          ext_path = File.expand_path(ext_path)
+        end
+      end.flatten
+      if configuration.extensions
+        #put in the paths for extensions into the array
+        extension_roots = configuration.extensions.map do |ext_name|
+          if :all === ext_name
+            :all
+          else
+            ext_name = ext_name.to_s
+            ext_path = all_extension_roots.detect do |maybe_path|
+              File.basename(maybe_path).sub(/^\d+_/,'') == ext_name
+            end
+            raise(LoadError, "Cannot find the extension '#{ext_name}'!") if ext_path.nil?
+            all_extension_roots.delete(ext_path)
+            ext_path
+          end
+        end
+        #replace the :all symbol with any remaining paths
+        extension_roots.map! do |ext_path|
+          if :all === ext_path
+            all_extension_roots
+          else
+            ext_path
+          end
+        end
+        extension_roots.flatten!
+      else
+        extension_roots = all_extension_roots
+      end
+      extension_roots.each do |ext_path|
+          load_paths = %w(lib app/models app/controllers app/helpers test/helpers).collect { |p| "#{ext_path}/#{p}" }
+          load_paths << ext_path
+          load_paths.each { |p| configuration.load_paths << p }
+          configuration.controller_paths << "#{ext_path}/app/controllers"
+          configuration.view_paths << "#{ext_path}/app/views"
+          @extension_roots << ext_path
+      end
+      initializer.set_autoload_paths
+      initializer.initialize_view_paths
+      extension_roots
+    end
+    
+    def deactivate_extensions
+      Extension.descendants.each { |extension| deactivate(extension) }
+    end
+    
+    def activate_extensions(enabled_extensions = nil)
+      initializer.initialize_default_admin_tabs
+      activated_extensions = @extension_roots.select do |root|
+        extension_file = "#{File.basename(root).sub(/^\d+_/,'')}_extension"
+        extension = extension_file.camelize.constantize
+        extension.root = root
+        extension.unloadable
+        if enabled_extensions
+          enabled = enabled_extensions.include?(extension.extension_name) || enabled_extensions.include?(extension)
+          enable(extension, enabled)
+        else
+          activate(extension)
+        end
+      end
+      initializer.initialize_routing
+      activated_extensions
+    end
+    alias :reactivate :activate_extensions
+    
+    private
+    
+      def activate(extension)
+        if extension.enabled?
+          extension.activate
+          extension
+        end
+      end
+      
+      def deactivate(extension)
+        if extension.active?
+          extension.deactivate
+          extension
+        end
+      end
+      
+      def enable(extension, enabled)
+        extension.enable(enabled)
+        extension if enabled
+      end
+      
+  end
 end