radiant 0.6.7 → 0.6.8

data/app/views/layouts/application.html.haml

@@ -29,7 +29,7 @@
           #error
             %p= flash[:error]
         #content
-          = yield
+          = find_and_preserve(yield)
       %hr{:class=>"hidden"}/
       #footer
         %p 

data/config/environment.rb

@@ -45,7 +45,7 @@ Radiant::Initializer.run do |config|
   # Use the database for sessions instead of the cookie-based default,
   # which shouldn't be used to store highly confidential information
   # (create the session table with 'rake db:sessions:create')
-  config.action_controller.session_store = :active_record_store
+  config.action_controller.session_store = :cookie_store
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
@@ -84,4 +84,6 @@ Radiant::Initializer.run do |config|
     ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
     ResponseCache.defaults[:logger]    = ActionController::Base.logger
   end
-end
+end
+
+Page.load_subclasses

data/db/migrate/020_add_session_info_to_users.rb

@@ -0,0 +1,11 @@
+class AddSessionInfoToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :session_token, :string
+    add_column :users, :session_expire, :datetime
+  end
+
+  def self.down
+    remove_column :users, :session_token
+    remove_column :users, :session_expire
+  end
+end

data/db/migrate/021_remove_session_expire_from_users.rb

@@ -0,0 +1,9 @@
+class RemoveSessionExpireFromUsers < ActiveRecord::Migration
+  def self.up
+    remove_column :users, :session_expire
+  end
+
+  def self.down
+    add_column :users, :session_expire, :datetime
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 19) do
+ActiveRecord::Schema.define(:version => 21) do
 
   create_table "config", :force => true do |t|
     t.string "key",   :limit => 40, :default => "", :null => false
@@ -67,8 +67,8 @@ ActiveRecord::Schema.define(:version => 19) do
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
   add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
 
   create_table "snippets", :force => true do |t|
     t.string   "name",          :limit => 100, :default => "", :null => false
@@ -97,6 +97,7 @@ ActiveRecord::Schema.define(:version => 19) do
     t.text     "notes"
     t.integer  "lock_version",                 :default => 0
     t.string   "salt"
+    t.string   "session_token"
   end
 
   add_index "users", ["login"], :name => "login", :unique => true

data/lib/generators/instance/instance_generator.rb

@@ -77,7 +77,8 @@ class InstanceGenerator < Rails::Generator::Base
       # Instance Configurations
       m.file "instance_routes.rb", "config/routes.rb"
       m.template "instance_environment.rb", "config/environment.rb", :assigns => {
-        :radiant_environment => File.join(File.dirname(__FILE__), 'templates', radiant_root("config/environment.rb"))
+        :radiant_environment => File.join(File.dirname(__FILE__), 'templates', radiant_root("config/environment.rb")),
+        :app_name => File.basename(File.expand_path(@destination_root))
       }
       m.template "instance_boot.rb", "config/boot.rb"
       

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

@@ -39,13 +39,13 @@ Radiant::Initializer.run do |config|
   # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
     :session_key => '_radiant_session',
-    :secret      => 'asdfqwerfxcoivswqenadfasdfqewpfioutyqwel'
+    :secret      => <% require 'digest/sha1' %>'<%= Digest::SHA1.hexdigest("--#{app_name}--#{Time.now.to_s}--#{rand(10000000)}--") %>'
   }
   
   # Use the database for sessions instead of the cookie-based default,
   # which shouldn't be used to store highly confidential information
   # (create the session table with 'rake db:sessions:create')
-  config.action_controller.session_store = :active_record_store
+  config.action_controller.session_store = :cookie_store
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
@@ -84,4 +84,6 @@ Radiant::Initializer.run do |config|
     ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
     ResponseCache.defaults[:logger]    = ActionController::Base.logger
   end
-end
+end
+
+Page.load_subclasses

data/lib/login_system.rb

@@ -30,6 +30,7 @@ module LoginSystem
     
     def authenticate
       action = params['action'].to_s.intern
+      login_from_cookie
       if no_login_required? or (current_user and user_has_access_to_action?(action))
         true
       else
@@ -69,6 +70,18 @@ module LoginSystem
         true
       end
     end
+
+    def login_from_cookie
+      if !cookies[:session_token].blank? && user = User.find_by_session_token(cookies[:session_token]) # don't find by empty value
+        user.remember_me
+        self.current_user = user
+        set_session_cookie
+      end
+    end
+
+    def set_session_cookie
+      cookies[:session_token] = { :value => current_user.session_token , :expires => Radiant::Config['session_timeout'].to_i.from_now.utc }
+    end
   
   module ClassMethods
     def no_login_required

data/lib/radiant.rb

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

data/lib/radiant/admin_ui.rb

@@ -5,29 +5,29 @@ module Radiant
   class AdminUI
     # This may be loaded before ActiveSupport, so do an explicit require
     require 'radiant/admin_ui/region_set'
-    
+
     class DuplicateTabNameError < StandardError; end
-    
+
     class Tab
       attr_accessor :name, :url, :visibility
-      
+
       def initialize(name, url, options = {})
         @name, @url = name, url
         @visibility = [options[:for], options[:visibility]].flatten.compact
         @visibility = [:all] if @visibility.empty?
       end
-      
+
       def shown_for?(user)
         visibility.include?(:all) or
           visibility.any? { |role| user.send("#{role}?") }
-      end  
+      end
     end
-    
+
     class TabSet
       def initialize
         @tabs = []
       end
-    
+
       def add(name, url, options = {})
         options.symbolize_keys!
         before = options.delete(:before)
@@ -45,15 +45,15 @@ module Radiant
           end
         end
       end
-      
+
       def remove(name)
         @tabs.delete(self[name])
       end
-      
+
       def size
         @tabs.size
       end
-      
+
       def [](index)
         if index.kind_of? Integer
           @tabs[index]
@@ -61,31 +61,29 @@ module Radiant
           @tabs.find { |tab| tab.name == index }
         end
       end
-      
+
       def each
         @tabs.each { |t| yield t }
       end
-      
+
       def clear
         @tabs.clear
       end
-      
+
       include Enumerable
     end
-    
+
     include Simpleton
-    
+
     attr_accessor :tabs
-    
+
     # Region sets
     attr_accessor :page, :snippet, :layout, :user
-    
+
     def initialize
       @tabs = TabSet.new
       load_default_regions
     end
-    
-    private
 
     def load_default_regions
       @page = load_default_page_regions
@@ -93,7 +91,9 @@ module Radiant
       @layout = load_default_layout_regions
       @user = load_default_user_regions
     end
-      
+
+    private
+
     def load_default_page_regions
       returning OpenStruct.new do |page|
         page.edit = RegionSet.new do |edit|
@@ -117,7 +117,7 @@ module Radiant
       returning OpenStruct.new do |user|
         user.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form}
-          edit.form.concat %w{edit_name edit_email edit_username edit_password 
+          edit.form.concat %w{edit_name edit_email edit_username edit_password
                               edit_roles edit_notes}
           edit.form_bottom.concat %w{edit_timestamp edit_buttons}
         end

data/lib/radiant/extension/script.rb

@@ -0,0 +1,251 @@
+require 'active_resource'
+require 'tmpdir'
+require 'fileutils'
+
+module Registry
+  class Extension < ActiveResource::Base
+    self.site = ENV['REGISTRY_URL'] || "http://ext.radiantcms.org/"
+
+    def install
+      Registry.const_get(install_type).new(self).install
+    end
+
+    def uninstall
+      Uninstaller.new(self).uninstall
+    end
+  end
+
+  class Action
+    def rake(command)
+      `rake #{command} RAILS_ENV=#{RAILS_ENV}`
+    end
+  end
+
+  class Installer < Action
+    attr_accessor :url, :path, :name
+    def initialize(url, name)
+      self.url, self.name = url, name
+    end
+
+    def install
+      copy_to_vendor_extensions
+      migrate
+      update
+    end
+
+    def copy_to_vendor_extensions
+      FileUtils.cp_r(self.path, File.expand_path(File.join(RAILS_ROOT, 'vendor', 'extensions', name)))
+      FileUtils.rm_r(self.path)
+    end
+
+    def migrate
+      rake "radiant:extensions:#{name}:migrate"
+    end
+
+    def update
+      rake "radiant:extensions:#{name}:update"
+    end
+  end
+
+  class Uninstaller < Action
+    attr_accessor :name
+    def initialize(extension)
+      self.name = extension.name
+    end
+
+    def uninstall
+      migrate_down
+      remove_extension_directory
+    end
+
+    def migrate_down
+      rake "radiant:extensions:#{name}:migrate VERSION=0"
+    end
+
+    def remove_extension_directory
+      FileUtils.rm_r(File.join(RAILS_ROOT, 'vendor', 'extensions', name))
+    end
+  end
+
+  class Checkout < Installer
+    def initialize(extension)
+      super(extension.repository_url, extension.name)
+    end
+
+    def checkout_command
+      raise "Not Implemented!"
+    end
+
+    def install
+      checkout
+      super
+    end
+
+    def checkout
+      self.path = File.join(Dir.tmpdir, name)
+      system "cd #{Dir.tmpdir}; #{checkout_command}"
+    end
+  end
+
+  class Download < Installer
+    def initialize(extension)
+      super(extension.download_url, extension.name)
+    end
+
+    def install
+      download
+      unpack
+      super
+    end
+
+    def unpack
+      raise "Not Implemented!"
+    end
+
+    def filename
+      File.basename(self.url)
+    end
+
+    def download
+      require 'open-uri'
+      File.open(File.join(Dir.tmpdir, self.filename), 'w') {|f| f.write open(self.url).read }
+    end
+  end
+
+  class Git < Checkout
+    def checkout_command
+      "git clone #{url} #{name}"
+    end
+  end
+
+  class Subversion < Checkout
+    def checkout_command
+      "svn checkout #{url} #{name}"
+    end
+  end
+
+  class Gem < Download
+    def download
+      # Don't download the gem if it's already installed
+      begin
+        gem filename.split('-').first
+      rescue ::Gem::LoadError
+        super
+        `gem install #{filename}`
+      end
+    end
+
+    def unpack
+      output = `cd #{Dir.tmpdir}; gem unpack #{filename.split('-').first}`
+      self.path = output.match(/'(.*)'/)[1]
+    end
+  end
+
+  class Tarball < Download
+    def filename
+      "#{self.name}.tar"
+    end
+    
+    def unpack
+      output = `cd #{Dir.tmpdir}; tar xvf #{filename}`
+      self.path = File.join(Dir.tmpdir, output.split(/\n/).first.split('/').first)
+    end
+  end
+  
+  class Gzip < Tarball
+    def filename
+      @unpacked ? super : "#{self.name}.tar.gz"
+    end
+    
+    def unpack
+      system "cd #{Dir.tmpdir}; gunzip #{self.filename}"
+      @unpacked = true
+      super
+    end
+  end
+  
+  class Bzip2 < Tarball
+    def filename
+      @unpacked ? super : "#{self.name}.tar.bz2"
+    end
+    
+    def unpack
+      system "cd #{Dir.tmpdir}; bunzip2 #{self.filename}"
+      @unpacked = true
+      super
+    end
+  end
+
+  class Zip < Download
+    def unpack
+      output = `cd #{Dir.tmpdir}; unzip #{filename} -d #{name}`
+      self.path = File.join(Dir.tmpdir, name)
+    end
+  end
+end
+
+module Radiant
+  class Extension
+    module Script
+      class << self
+        def execute(args)
+          command = args.shift
+          const_get(command.camelize).new(args)
+        end
+      end
+
+      module Util
+        attr_accessor :extension_name, :extension
+
+        def to_extension_name(string)
+          string.to_s.underscore
+        end
+
+        def installed?
+          path_match = Regexp.compile("#{extension_name}$")
+          extension_paths.any? {|p| p =~ path_match }
+        end
+
+        def extension_paths
+          [RAILS_ROOT, RADIANT_ROOT].uniq.map { |p| Dir["#{p}/vendor/extensions/*"] }.flatten
+        end
+
+        def load_extensions
+          Registry::Extension.find(:all)
+        end
+
+        def find_extension
+          self.extension = load_extensions.find{|e| e.name == self.extension_name }
+        end
+      end
+
+      class Install
+        include Util
+
+        def initialize(args=[])
+          raise ArgumentError, "You must specify an extension to install." if args.blank?
+          self.extension_name = to_extension_name(args.shift)
+          if installed?
+            puts "#{extension_name} is already installed."
+          else
+            find_extension && extension.install
+          end
+        end
+      end
+
+      class Uninstall
+        include Util
+
+        def initialize(args=[])
+          raise ArgumentError, "You must specify an extension to uninstall." if args.blank?
+          self.extension_name = to_extension_name(args.shift)
+          if installed?
+            find_extension && extension.uninstall
+          else
+            puts "#{extension} is not installed."
+          end
+        end
+      end
+    end
+  end
+end