radiant 0.8.0 → 0.8.1

data/config/database.db2.yml

@@ -0,0 +1,20 @@
+# This is only an example configuration. Please see the Rails
+# documentation for more details.
+
+development:
+  adapter: ibm_db
+  database: rad_dev
+  username: db2inst1
+  password:
+  
+test:
+  adapter: ibm_db
+  database: rad_test
+  username: db2inst1
+  password:
+
+production:
+  adapter: ibm_db
+  database: radiant
+  username: db2inst1
+  password:

data/config/environment.rb

@@ -35,16 +35,16 @@ Radiant::Initializer.run do |config|
   #
   # Additional options:
   #  :use_x_sendfile => true
-  #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd
+  #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
   #  :use_x_accel_redirect => '/some/virtual/path'
   #    Turns on X-Accel-Redirect support for nginx. You have to provide
   #    a path that corresponds to a virtual location in your webserver
   #    configuration.
-  #  :entitystore => "radiant:cache/entity"
+  #  :entitystore => "radiant:tmp/cache/entity"
   #    Sets the entity store type (preceding the colon) and storage
   #   location (following the colon, relative to Rails.root).
   #    We recommend you use radiant: since this will enable manual expiration.
-  #  :metastore => "radiant:cache/meta"
+  #  :metastore => "radiant:tmp/cache/meta"
   #    Sets the meta store type and storage location.  We recommend you use
   #    radiant: since this will enable manual expiration and acceleration headers.
   config.middleware.use ::Radiant::Cache
@@ -58,7 +58,7 @@ Radiant::Initializer.run do |config|
   config.active_record.observers = :user_action_observer
 
   # Make Active Record use UTC-base instead of local time
-  config.active_record.default_timezone = :utc
+  config.time_zone = 'UTC'
 
   # Set the default field error proc
   config.action_view.field_error_proc = Proc.new do |html, instance|

data/config/environments/test.rb

@@ -30,7 +30,6 @@ config.action_controller.allow_forgery_protection    = false
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-config.gem "rspec", :version => "1.2.6", :lib => false
-config.gem "rspec-rails", :version => "1.2.6", :lib => false
+config.gem "rspec-rails", :version => "~>1.2.6", :lib => false
 config.gem "webrat", :version => "~>0.4.4", :lib => false
 config.gem "cucumber", :version => "~>0.3.9", :lib => false

data/features/support/env.rb

@@ -1,6 +1,7 @@
 # Sets up the Rails environment for Cucumber
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(Dir.pwd + '/config/environment')
+rails_env = File.expand_path(Dir.pwd + '/config/environment')
+require rails_env if File.exist?(rails_env+'.rb')
 
 require 'cucumber/rails/world'
 require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support

data/lib/generators/extension/extension_generator.rb

@@ -35,10 +35,15 @@ class ExtensionGenerator < Rails::Generator::NamedBase
         m.directory "#{extension_path}/spec/models"        
         m.directory "#{extension_path}/spec/views"
         m.directory "#{extension_path}/spec/helpers"
+        m.directory "#{extension_path}/features/support"
+        m.directory "#{extension_path}/features/step_definitions/admin"
 
         m.template 'RSpecRakefile',       "#{extension_path}/Rakefile"
         m.template 'spec_helper.rb',      "#{extension_path}/spec/spec_helper.rb"
         m.file     'spec.opts',           "#{extension_path}/spec/spec.opts"
+        m.file     'cucumber.yml',        "#{extension_path}/cucumber.yml"
+        m.template 'cucumber_env.rb',     "#{extension_path}/features/support/env.rb"
+        m.template 'cucumber_paths.rb',   "#{extension_path}/features/support/paths.rb"
       end
     end
   end

data/lib/generators/extension/templates/RSpecRakefile

@@ -24,7 +24,8 @@ require 'rake/testtask'
 rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
 $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
 require 'spec/rake/spectask'
-# require 'spec/translator'
+require 'cucumber'
+require 'cucumber/rake/task'
 
 # Cleanup the RADIANT_ROOT constant so specs will load the environment
 Object.send(:remove_const, :RADIANT_ROOT)
@@ -40,6 +41,8 @@ Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
+task :features => 'spec:integration'
+
 namespace :spec do
   desc "Run all specs in spec directory with RCov"
   Spec::Rake::SpecTask.new(:rcov) do |t|
@@ -63,13 +66,13 @@ namespace :spec do
     end
   end
   
-  # Hopefully no one has written their extensions in pre-0.9 style
-  # desc "Translate specs from pre-0.9 to 0.9 style"
-  # task :translate do
-  #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
-  #   translator.translate(dir, dir)
-  # end
+  desc "Run the Cucumber features"
+  Cucumber::Rake::Task.new(:integration) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
+    t.profile = "default"
+  end
 
   # Setup specs for stats
   task :statsetup do

data/lib/generators/extension/templates/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress features --tags ~@proposed,~@in_progress

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

@@ -0,0 +1,16 @@
+# Sets up the Rails environment for Cucumber
+ENV["RAILS_ENV"] = "test"
+# Extension root
+extension_env = File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
+require extension_env+'.rb'
+
+Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step}
+ 
+Cucumber::Rails::World.class_eval do
+  include Dataset
+  datasets_directory "#{RADIANT_ROOT}/spec/datasets"
+  Dataset::Resolver.default = Dataset::DirectoryResolver.new("#{RADIANT_ROOT}/spec/datasets", File.dirname(__FILE__) + '/../../spec/datasets', File.dirname(__FILE__) + '/../datasets')
+  self.datasets_database_dump_path = "#{Rails.root}/tmp/dataset"
+  
+  # dataset :<%= file_name %>
+end

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

@@ -0,0 +1,14 @@
+def path_to(page_name)
+  case page_name
+  
+  when /the homepage/i
+    root_path
+  
+  when /login/i
+    login_path
+  # Add more page name => path mappings here
+  
+  else
+    raise "Can't find mapping from \"#{page_name}\" to a path."
+  end
+end

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

@@ -1,5 +1,5 @@
 # Uncomment this if you reference any of your controllers in activate
-# require_dependency 'application'
+# require_dependency 'application_controller'
 
 class <%= class_name %> < Radiant::Extension
   version "1.0"

data/lib/generators/instance/instance_generator.rb

@@ -4,7 +4,7 @@ class InstanceGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
   
-  DATABASES = %w( mysql postgresql sqlite3 sqlserver )
+  DATABASES = %w( mysql postgresql sqlite3 sqlserver db2 )
   
   MYSQL_SOCKET_LOCATIONS = [
     "/tmp/mysql.sock",                        # default

data/lib/generators/instance/templates/databases/db2.yml

@@ -0,0 +1,40 @@
+# DB2 9.7
+#
+# Home Page
+#   http://rubyforge.org/projects/rubyibm/
+#
+# To install the ibm_db gem:
+#   On Linux:
+#     $ sudo -s
+#     $ . /home/db2inst1/sqllib/db2profile
+#     $ export IBM_DB_LIB=/opt/ibm/db2/V9.7/lib
+#     $ export IBM_DB_INCLUDE=/opt/ibm/db2/V9.7/include
+#     $ gem install ibm_db
+#
+#   On Windows:
+#     Issue the command: gem install ibm_db
+#     If prompted, select the mswin32 option
+#
+# For more details on the installation and the available connection parameters refer to:
+# http://rubyforge.org/docman/?group_id=2361    
+
+development:
+  adapter: ibm_db
+  database: <%= app_name[0,4] %>_dev
+  username: db2inst1
+  password: 
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: ibm_db
+  database: <%= app_name[0,4] %>_tst
+  username: db2inst1
+  password:
+
+production:
+  adapter: ibm_db
+  database: <%= app_name[0,4] %>_prd
+  username: db2inst1
+  password: 

data/lib/generators/instance/templates/instance_environment.rb

@@ -29,7 +29,7 @@ Radiant::Initializer.run do |config|
   }
 
   # Comment out this line if you want to turn off all caching, or
-  # add options to modify the behavior. In the majority of deployment 
+  # add options to modify the behavior. In the majority of deployment
   # scenarios it is desirable to leave Radiant's cache enabled and in
   # the default configuration.
   #
@@ -38,13 +38,13 @@ Radiant::Initializer.run do |config|
   #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
   #  :use_x_accel_redirect => '/some/virtual/path'
   #    Turns on X-Accel-Redirect support for nginx. You have to provide
-  #    a path that corresponds to a virtual location in your webserver 
+  #    a path that corresponds to a virtual location in your webserver
   #    configuration.
-  #  :entitystore => "radiant:cache/entity"
-  #    Sets the entity store type (preceding the colon) and storage 
+  #  :entitystore => "radiant:tmp/cache/entity"
+  #    Sets the entity store type (preceding the colon) and storage
   #   location (following the colon, relative to Rails.root).
   #    We recommend you use radiant: since this will enable manual expiration.
-  #  :metastore => "radiant:cache/meta"
+  #  :metastore => "radiant:tmp/cache/meta"
   #    Sets the meta store type and storage location.  We recommend you use
   #    radiant: since this will enable manual expiration and acceleration headers.
   config.middleware.use ::Radiant::Cache
@@ -58,7 +58,7 @@ Radiant::Initializer.run do |config|
   config.active_record.observers = :user_action_observer
 
   # Make Active Record use UTC-base instead of local time
-  config.active_record.default_timezone = :utc
+  config.time_zone = 'UTC'
 
   # Set the default field error proc
   config.action_view.field_error_proc = Proc.new do |html, instance|

data/lib/local_time.rb

@@ -1,12 +1,6 @@
-require 'radiant/config'
 module LocalTime
   def adjust_time(time)
-    if (tz_string = Radiant::Config["local.timezone"]) and 
-        timezone = (ActiveSupport::TimeZone[tz_string] || ActiveSupport::TimeZone[tz_string.to_i]) 
-      # adjust time 
-      time.in_time_zone(timezone).time
-    else 
-      time 
-    end 
+    ::ActiveSupport::Deprecation.warn("`adjust_time' is deprecated. All time output is now auto-adjusted to Radiant::Config['local.timezone'] or the default ActiveRecord time zone.", caller)
+    time
   end 
-end
+end

data/lib/radiant.rb

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

data/lib/radiant/cache.rb

@@ -16,9 +16,11 @@ module Radiant
       self.use_x_sendfile = options.delete(:use_x_sendfile) if options[:use_x_sendfile]
       self.use_x_accel_redirect = options.delete(:use_x_accel_redirect) if options[:use_x_accel_redirect]
       Rack::Cache.new(app, {
-          :entitystore => "radiant:cache/entity", 
-          :metastore => "radiant:cache/meta",
-          :verbose => false}.merge(options))
+          :entitystore => "radiant:tmp/cache/entity",
+          :metastore => "radiant:tmp/cache/meta",
+          :verbose => false,
+          :allow_reload => false,
+          :allow_revalidate => false}.merge(options))
     end
 
     def self.clear
@@ -27,7 +29,7 @@ module Radiant
     end
 
     class EntityStore < Rack::Cache::EntityStore::Disk
-      def initialize(root="#{Rails.root}/cache/entity")
+      def initialize(root="#{Rails.root}/tmp/cache/entity")
         super
         Radiant::Cache.entity_stores << self
       end
@@ -38,7 +40,7 @@ module Radiant
     end
 
     class MetaStore < Rack::Cache::MetaStore::Disk
-      def initialize(root="#{Rails.root}/cache/meta")
+      def initialize(root="#{Rails.root}/tmp/cache/meta")
         super
         Radiant::Cache.meta_stores << self
       end
@@ -48,7 +50,7 @@ module Radiant
       end
 
       private
-      def restore_response(hash, body)
+      def restore_response(hash, body=nil)
         # Cribbed from the Rack::Cache source
         status = hash.delete('X-Status').to_i
         response = Rack::Cache::Response.new(status, hash, body)
@@ -57,14 +59,14 @@ module Radiant
         if Radiant::Cache.use_x_sendfile
           accelerate(response, 'X-Sendfile', File.expand_path(body.path))
         elsif Radiant::Cache.use_x_accel_redirect
-          virtual_path = File.expand_path(body.path) 
+          virtual_path = File.expand_path(body.path)
           entity_path = File.expand_path(Radiant::Cache.entity_stores.first.root)
           virtual_path[entity_path] = Radiant::Cache.use_x_accel_redirect
           accelerate(response,'X-Accel-Redirect', virtual_path)
         end
         response
       end
-      
+
       def accelerate(response, header, value)
         response.headers[header] = value
         response.body = []

data/lib/radiant/extension.rb

@@ -15,6 +15,14 @@ module Radiant
       @active
     end
     
+    def migrated?
+      migrator.new(:up, migrations_path).pending_migrations.empty?
+    end
+    
+    def enabled?
+      active? and migrated?
+    end
+    
     def migrations_path
       File.join(self.root, 'db', 'migrate')
     end
@@ -31,6 +39,20 @@ module Radiant
       AdminUI.instance
     end
 
+    # Determine if another extension is installed and up to date.
+    #
+    # if MyExtension.extension_enabled?(:third_party)
+    #   ThirdPartyExtension.extend(MyExtension::IntegrationPoints)
+    # end
+    def extension_enabled?(extension)
+      begin
+        extension = (extension.to_s.camelcase + 'Extension').constantize
+        extension.enabled?
+      rescue NameError
+        false
+      end
+    end
+
     class << self
 
       def activate_extension
@@ -59,6 +81,20 @@ module Radiant
       def route_definitions
         @route_definitions ||= []
       end
+
+      # Expose the configuration object for depencencies, init hooks, &c
+      # class MyExtension < ActiveRecord::Base
+      #   extension_config do |config|
+      #     config.gem 'gem_name'
+      #     config.extension 'radiant-extension-name'
+      #     config.after_initialize do
+      #       run_something
+      #     end
+      #   end
+      # end
+      def extension_config(&block)
+        yield Rails.configuration
+      end
     end
   end
 end

data/lib/radiant/extension/script.rb

@@ -277,7 +277,7 @@ module Radiant
           if installed?
             find_extension && extension.uninstall
           else
-            puts "#{extension} is not installed."
+            puts "#{extension_name} is not installed."
           end
         end
       end

data/lib/radiant/extension_loader.rb

@@ -63,6 +63,10 @@ module Radiant
     def view_paths
       extensions.map { |extension| "#{extension.root}/app/views" }.select { |d| File.directory?(d) }.reverse
     end
+    
+    def metal_paths
+      load_extension_roots.map { |extension| "#{extension}/app/metal" }.select { |d| File.directory?(d) }.reverse
+    end
 
     # Load the extensions
     def load_extensions
@@ -101,7 +105,7 @@ module Radiant
 
       def load_paths_for(dir)
         if File.directory?(dir)
-          %w(lib app/models app/controllers app/helpers test/helpers).collect do |p|
+          %w(lib app/models app/controllers app/metal app/helpers test/helpers).collect do |p|
             path = "#{dir}/#{p}"
             path if File.directory?(path)
           end.compact << dir

data/lib/radiant/initializer.rb

@@ -12,10 +12,12 @@ module Radiant
     attr_accessor :extension_paths
     attr_writer :extensions
     attr_accessor :view_paths
+    attr_accessor :extension_dependencies
 
     def initialize
       self.view_paths = []
       self.extension_paths = default_extension_paths
+      self.extension_dependencies = []
       super
     end
 
@@ -35,13 +37,45 @@ module Radiant
     def all_available_extensions
       extension_paths.map do |path|
         Dir["#{path}/*"].select {|f| File.directory?(f) }
-      end.flatten.map {|f| File.basename(f).sub(/^\d+_/, '') }.sort.map(&:to_sym)
+      end.flatten.map {|f| File.basename(f).sub(/^\d+_/, '') }.sort.map {|e| e.to_sym }
     end
     
     def admin
       AdminUI.instance
     end
 
+    # Declare another extension as a dependency. Does not allow for the
+    # specification of versions.
+    # class MyExtension < Radiant::Extension
+    #   extension_config do |config|
+    #     config.extension 'multisite'
+    #   end
+    # end
+    def extension(ext)
+      @extension_dependencies << ext unless @extension_dependencies.include?(ext)
+    end
+
+    def check_extension_dependencies
+      unloaded_extensions = []
+      @extension_dependencies.each do |ext|
+        extension = ext.camelcase + 'Extension'
+        begin
+          extension_class = extension.constantize
+          unloaded_extensions << extension unless defined?(extension_class) && (extension_class.active?)
+        rescue NameError
+          unloaded_extensions << extension
+        end
+      end
+      if unloaded_extensions.any?
+        abort <<-end_error
+Missing these required extensions:
+#{unloaded_extensions}
+end_error
+      else
+        return true
+      end
+    end
+
     private
 
       def library_directories
@@ -75,12 +109,10 @@ module Radiant
         # Add the app's controller directory
         paths.concat(Dir["#{RADIANT_ROOT}/app/controllers/"])
 
-        # Then components subdirectories.
-        paths.concat(Dir["#{RADIANT_ROOT}/components/[_a-z]*"])
-
         # Followed by the standard includes.
         paths.concat %w(
           app
+          app/metal
           app/models
           app/controllers
           app/helpers
@@ -120,6 +152,18 @@ module Radiant
       extension_loader.add_extension_paths
       super
     end
+    
+    # override Rails initializer to insert extension metals
+    def initialize_metal
+      Rails::Rack::Metal.requested_metals = configuration.metals
+      Rails::Rack::Metal.metal_paths = ["#{RADIANT_ROOT}/app/metal"] # reset Rails default to RADIANT_ROOT
+      Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
+      Rails::Rack::Metal.metal_paths += extension_loader.metal_paths
+    
+      configuration.middleware.insert_before(
+        :"ActionController::ParamsParser",
+        Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
+    end
 
     def add_plugin_load_paths
       # checks for plugins within extensions:
@@ -130,11 +174,15 @@ module Radiant
     def load_plugins
       super
       extension_loader.load_extensions
+      add_gem_load_paths
+      load_gems
+      check_gem_dependencies
     end
 
     def after_initialize
       super
       extension_loader.activate_extensions
+      configuration.check_extension_dependencies
     end
 
     def initialize_default_admin_tabs