refinerycms 0.9.7.15 → 0.9.8

data/db/schema.rb

@@ -1,31 +1,29 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file,
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100729221735) do
+ActiveRecord::Schema.define(:version => 20100826232810) do
 
   create_table "images", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "content_type"
-    t.string   "filename"
-    t.string   "thumbnail"
-    t.integer  "size"
-    t.integer  "width"
-    t.integer  "height"
-    t.string   "image_type"
+    t.string   "image_mime_type"
+    t.string   "image_name"
+    t.integer  "image_size"
+    t.integer  "image_width"
+    t.integer  "image_height"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "image_uid"
+    t.string   "image_ext"
   end
 
-  add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
-
   create_table "inquiries", :force => true do |t|
     t.string   "name"
     t.string   "email"
@@ -95,12 +93,13 @@ ActiveRecord::Schema.define(:version => 20100729221735) do
   add_index "refinery_settings", ["name"], :name => "index_refinery_settings_on_name"
 
   create_table "resources", :force => true do |t|
-    t.string   "content_type"
-    t.string   "filename"
-    t.integer  "size"
-    t.integer  "parent_id"
+    t.string   "file_mime_type"
+    t.string   "file_name"
+    t.integer  "file_size"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "file_uid"
+    t.string   "file_ext"
   end
 
   create_table "roles", :force => true do |t|
@@ -130,7 +129,7 @@ ActiveRecord::Schema.define(:version => 20100729221735) do
     t.integer "position"
   end
 
-  add_index "user_plugins", ["name"], :name => "index_user_plugins_on_name"
+  add_index "user_plugins", ["name"], :name => "index_user_plugins_on_title"
   add_index "user_plugins", ["user_id", "name"], :name => "index_unique_user_plugins", :unique => true
 
   create_table "users", :force => true do |t|

data/db/seeds.rb

@@ -1,6 +1,3 @@
-# Create a default themes directory.
-Rails.root.join("themes").mkpath if Rails.root.writable?
-
 # Refinery settings
 Dir[Rails.root.join('db', 'seeds','*.rb').to_s].each do |file|
   load(file)

data/db/seeds/refinery_settings.rb

@@ -4,14 +4,13 @@
   {:name => "activity_show_limit", :value => 7},
   {:name => "preferred_image_view", :value => :grid},
   {:name => "analytics_page_code", :value => "UA-xxxxxx-x"},
-  {:name => "theme", :value => "demolicious"},
   {:name => "image_thumbnails", :value => {
-    :dialog_thumb => 'c106x106',
-    :grid => 'c135x135',
+    :dialog_thumb => '106x106#c',
+    :grid => '135x135#c',
     :small => '110x110>',
     :medium => '225x255>',
     :large => '450x450>',
-    :preview => 'c96x96'
+    :preview => '96x96#c'
     }
   }
 ].each do |setting|

data/vendor/refinerycms/authentication/app/controllers/admin/users_controller.rb

@@ -0,0 +1,58 @@
+class Admin::UsersController < Admin::BaseController
+
+  crudify :user, :order => 'login', :title_attribute => 'login'
+
+  # Protect these actions behind an admin login
+  before_filter :find_user, :except => [:index, :new, :create]
+  before_filter :load_available_plugins, :only => [:new, :create, :edit, :update]
+
+  layout 'admin'
+
+  def new
+    @user = User.new
+    @selected_plugin_names = []
+  end
+
+  def create
+    @user = User.new(params[:user])
+    @selected_plugin_names = params[:user][:plugins] || []
+    @user.add_role(:refinery)
+
+    if @user.save
+      @user.plugins = @selected_plugin_names
+      redirect_to(admin_users_url, :notice => t('refinery.crudify.created', :what => @user.login))
+    else
+      render :action => 'new'
+    end
+  end
+
+  def edit
+    @user = User.find params[:id]
+    @selected_plugin_names = @user.plugins.collect{|p| p.name}
+  end
+
+  def update
+    @selected_plugin_names = params[:user][:plugins]
+    # Prevent the current user from locking themselves out of the User manager
+    if current_user.id == @user.id and !params[:user][:plugins].include?("refinery_users")
+      flash.now[:error] = t('admin.users.update.cannot_remove_user_plugin_from_current_user')
+      render :action => "edit"
+    else
+      @previously_selected_plugin_names = @user.plugins.collect{|p| p.name}
+      if @user.update_attributes params[:user]
+        redirect_to admin_users_url, :notice => t('refinery.crudify.updated', :what => @user.login)
+      else
+        @user.plugins = @previously_selected_plugin_names
+        @user.save
+        render :action => 'edit'
+      end
+    end
+  end
+
+protected
+
+  def load_available_plugins
+    @available_plugins = ::Refinery::Plugins.registered.in_menu.collect{|a| {:name => a.name, :title => a.title} }.sort_by {|a| a[:title]}
+  end
+
+end

data/vendor/refinerycms/authentication/app/controllers/sessions_controller.rb

@@ -0,0 +1,40 @@
+class SessionsController < ApplicationController
+  layout 'login'
+
+  before_filter :redirect?, :only => [:new, :create]
+  before_filter :redirect_to_new, :only => [:index, :show]
+
+  def new
+    @session = UserSession.new
+  end
+
+  def create
+    if (@session = UserSession.create(params[:session])).valid?
+      flash[:notice] = t('sessions.login_successful') if refinery_user?
+      redirect_back_or_default(admin_root_url)
+    else
+      render :action => 'new'
+    end
+  end
+
+  def destroy
+    current_user_session.destroy if logged_in?
+
+    redirect_to(root_url)
+  end
+
+protected
+
+  def redirect?
+    if refinery_user?
+      redirect_to admin_root_url
+    elsif logged_in?
+      redirect_to root_url
+    end
+  end
+
+  def redirect_to_new
+    redirect_to :action => "new"
+  end
+
+end

data/vendor/refinerycms/authentication/app/controllers/users_controller.rb

@@ -0,0 +1,116 @@
+class UsersController < ApplicationController
+
+  # Protect these actions behind an admin login
+  before_filter :redirect?, :only => [:new, :create, :index]
+  before_filter :find_user, :only => [:suspend, :unsuspend, :destroy, :purge]
+
+  # authlogic default
+  #before_filter :require_no_user, :only => [:new, :create]
+  #before_filter :require_user, :only => [:show, :edit, :update]
+
+  layout 'login'
+
+  def new
+    @user = User.new
+  end
+
+  # This method should only be used to create the first Refinery user.
+  def create
+    # protects against session fixation attacks, wreaks havoc with request forgery protection.
+    # uncomment at your own risk:
+    # reset_session
+    @user = User.new(params[:user])
+    @selected_plugin_titles = params[:user][:plugins] || []
+
+    @user.save if @user.valid?
+
+    if @user.errors.empty?
+      @user.add_role(:refinery)
+      @user.plugins = @selected_plugin_titles
+      @user.save
+      UserSession.create!(@user)
+      if Role[:refinery].users.count == 1
+        # this is the superuser if this user is the only user.
+        @user.add_role(:superuser)
+        @user.save
+
+        # set this user as the recipient of inquiry notifications, if we're using that engine.
+        if defined?(InquirySetting) and
+          (notification_recipients = InquirySetting.find_or_create_by_name("Notification Recipients")).present?
+          notification_recipients.update_attributes({
+            :value => @user.email,
+            :destroyable => false
+          })
+        end
+      end
+
+      flash[:message] = "<h2>#{t('users.create.welcome', :who => @user.login).gsub(/\.$/, '')}.</h2>".html_safe
+
+      site_name_setting = RefinerySetting.find_or_create_by_name('site_name', :value => "Company Name")
+      if site_name_setting.value.to_s =~ /^(|Company\ Name)$/ or Role[:refinery].users.count == 1
+        flash[:message] << "<p>#{t('users.setup_website_name',
+                                   :link => edit_admin_refinery_setting_url(site_name_setting, :dialog => true),
+                                   :title => t('admin.refinery_settings.edit'))}</p>".html_safe
+      end
+
+      redirect_back_or_default(admin_root_url)
+    else
+      render :action => 'new'
+    end
+  end
+
+  def forgot
+    if request.post?
+      if params[:user].present? and (email = params[:user][:email]).present? and
+          (user = User.find_by_email(email)).present?
+
+        user.deliver_password_reset_instructions!(request)
+        redirect_to new_session_url, :notice => t('users.forgot.email_reset_sent')
+      else
+        @user = User.new(params[:user])
+        flash.now[:error] = if (email = params[:user][:email]).blank?
+          t('users.forgot.blank_email')
+        else
+          t('users.forgot.email_not_associated_with_account', :email => email).html_safe
+        end
+      end
+    end
+  end
+
+  def reset
+    if params[:reset_code] and @user = User.find_using_perishable_token(params[:reset_code])
+      if request.post?
+        if (params[:user][:password].present? and params[:user][:password_confirmation].present?)
+          if @user.update_attributes(:password => params[:user][:password],
+                                     :password_confirmation => params[:user][:password_confirmation])
+
+            UserSession.create(@user)
+
+            redirect_to(admin_root_url, :notice => t('users.reset.successful', :email => @user.email))
+          else
+            render :action => 'reset'
+          end
+        else
+          flash.now[:error] = t('users.reset.password_blank')
+        end
+      end
+    else
+      redirect_to(forgot_users_url, :flash => {:error => t('users.reset.code_invalid')})
+    end
+  end
+
+protected
+
+  def redirect?
+    if refinery_user?
+      redirect_to admin_users_url
+    elsif refinery_users_exist?
+      redirect_to root_url
+    end
+  end
+
+  def refinery_users_exist?
+    Role[:refinery].users.any?
+  end
+
+end

data/vendor/refinerycms/authentication/app/mailers/user_mailer.rb

@@ -0,0 +1,22 @@
+class UserMailer < ActionMailer::Base
+
+  def reset_notification(user, request)
+    setup_email(user)
+    subject I18n.translate('user_mailer.link_to_reset_your_password')
+    @url = reset_users_url(:host => request.host_with_port,
+                           :reset_code => user.perishable_token)
+  end
+
+protected
+
+  def url_prefix(request)
+    "#{request.protocol}#{request.host_with_port}"
+  end
+
+  def setup_email(user)
+    recipients  user.email
+    sent_on     Time.now
+    @user =     user
+  end
+
+end

data/vendor/refinerycms/authentication/app/models/role.rb

@@ -0,0 +1,16 @@
+class Role < ActiveRecord::Base
+
+  has_and_belongs_to_many :users
+
+  before_validation :camelize_title
+  validates :title, :uniqueness => true
+
+  def camelize_title(role_title = self.title)
+    self.title = role_title.to_s.camelize
+  end
+
+  def self.[](title)
+    find_or_create_by_title(title.to_s.camelize)
+  end
+
+end

data/vendor/refinerycms/authentication/app/models/user.rb

@@ -0,0 +1,71 @@
+require 'digest/sha1'
+
+class User < ActiveRecord::Base
+  #-------------------------------------------------------------------------------------------------
+  # Authentication
+
+  # See http://rdoc.info/rdoc/binarylogic/authlogic/blob/85b2a6b3e9993b18c7fb1e4f7b9c6d01cc8b5d17/Authlogic/ActsAsAuthentic
+  acts_as_authentic do |c|
+    c.perishable_token_valid_for 10.minutes
+
+    # http://www.binarylogic.com/2008/11/23/tutorial-easily-migrate-from-restful_authentication-to-authlogic/
+    # Unfortunately, this seems to cause problems when you add Refinery to an app that already had
+    # an Authlogic-created users table. You may need to comment these 2 lines out if that is the case.
+    c.act_like_restful_authentication = true
+    c.transition_from_restful_authentication = true
+
+    # If users prefer to use their e-mail address to log in, change this setting to 'email' in
+    # config/application.rb
+    # This currently only affects which field is displayed in the login form. As long as we have
+    # find_by_login_method :find_by_login_or_email, they can still actually use either one.
+    c.login_field = defined?(Refinery.authentication_login_field) ? Refinery.authentication_login_field : "login"
+  end if self.table_exists?
+
+  # Allow users to log in with either their username *or* email, even though we only ask for one of those.
+  def self.find_by_login_or_email(login_or_email)
+    find_by_login(login_or_email) || find_by_email(login_or_email)
+  end
+
+  def deliver_password_reset_instructions!(request)
+    reset_perishable_token!
+    UserMailer.reset_notification(self, request).deliver
+  end
+
+  #-------------------------------------------------------------------------------------------------
+
+  has_and_belongs_to_many :roles
+  has_many :plugins, :class_name => "UserPlugin", :order => "position ASC"
+  has_friendly_id :login, :use_slug => true
+
+  def plugins=(plugin_names)
+    unless self.new_record? # don't add plugins when the user_id is NULL.
+      self.plugins.delete_all
+
+      plugin_names.each_with_index do |plugin_name, index|
+        self.plugins.create(:name => plugin_name, :position => index) if plugin_name.is_a?(String)
+      end
+    end
+  end
+
+  def authorized_plugins
+    self.plugins.collect { |p| p.name } | Refinery::Plugins.always_allowed.names
+  end
+
+  def can_delete?(user_to_delete = self)
+    !user_to_delete.new_record? and
+      !user_to_delete.has_role?(:superuser) and
+      Role[:refinery].users.count > 1 and
+      self.id != user_to_delete.id
+  end
+
+  def add_role(title)
+    raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
+    self.roles << Role[title] unless self.has_role?(title)
+  end
+
+  def has_role?(title)
+    raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
+    (role = Role.find_by_title(title.to_s.camelize)).present? and self.roles.collect{|r| r.id}.include?(role.id)
+  end
+
+end

data/vendor/refinerycms/authentication/app/views/admin/users/_form.html.erb

@@ -0,0 +1,70 @@
+<%= form_for [:admin, @user] do |f| %>
+
+  <%= render :partial => "/shared/admin/error_messages",
+             :locals => {
+               :object => @user,
+               :include_object_name => true
+             } %>
+
+  <div class='field'>
+    <%= f.label :login %>
+    <%= f.text_field :login %>
+  </div>
+  <div class='field'>
+    <%= f.label :email %>
+    <%= f.text_field :email %>
+  </div>
+  <div class='field'>
+    <%= f.label :password %>
+    <%= f.password_field :password, :autocomplete => 'off' %>
+    <%= "<br /><span class='preview'>#{t('.blank_password_keeps_current')}</span>".html_safe unless @user.new_record? %>
+  </div>
+  <div class='field'>
+    <%= f.label :password_confirmation %>
+    <%= f.password_field :password_confirmation, :autocomplete => 'off' %>
+  </div>
+  <div class='field plugin_access'>
+    <span class='label_with_help'>
+      <%= f.label :plugin_access, nil, :class => "title_label" %>
+      <%= link_to "(#{t('.enable_all')})", "", :id => "user_plugins_enable_all" %>
+    </span>
+    <ul id='plugins'>
+      <% @available_plugins.each do |plugin| -%>
+        <% if Refinery::Plugins.always_allowed.names.include?(plugin[:name]) or
+              (plugin[:name] == 'refinery_users' and @user.id == current_user.id) %>
+          <%= hidden_field_tag 'user[plugins][]', plugin[:name] %>
+        <% else %>
+          <li>
+            <%= check_box_tag 'user[plugins][]',
+                              plugin[:name],
+                              @selected_plugin_names.include?(plugin[:name]),
+                              :id => "plugins_#{plugin[:name]}" %>
+            <%= f.label 'user[plugins][]',
+                        t("plugins.#{plugin[:name].downcase}.title", :default => plugin[:title]),
+                        :class => "stripped",
+                        :for => "plugins_#{plugin[:name]}" %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  </div>
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => f,
+               :continue_editing => false,
+               :hide_delete => !current_user.can_delete?(@user),
+               :delete_title => t('admin.users.delete'),
+               :delete_confirmation => t('shared.admin.delete.message', :title => @user.login)
+             } %>
+<% end %>
+
+<% content_for :head do %>
+  <script type='text/javascript'>
+    $(document).ready(function() {
+      $('#user_plugins_enable_all').click(function(e, a) {
+        $('div.field.plugin_access ul#plugins li input:checkbox').attr('checked', true);
+        e.preventDefault();
+      });
+    });
+  </script>
+<% end %>