refinerycms 0.9.7.15 → 0.9.8

data/config/environments/development.rb

@@ -1,31 +1,25 @@
-# Settings specified here will take precedence over those in config/environment.rb
-config.reload_plugins = true
+Refinery::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_view.debug_rjs                         = true
-config.action_controller.perform_caching             = false
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
 
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
 
-config.log_level = :debug
+  # Set the log level to the most chatty.
+  config.log_level = :debug
 
-# Uncomment the following lines if you're getting
-# "A copy of XX has been removed from the module tree but is still active!"
-# or you want to develop a plugin and don't want to restart every time a change is made:
-=begin
-config.after_initialize do
-  ::ActiveSupport::Dependencies.load_once_paths = ::ActiveSupport::Dependencies.load_once_paths.select do |path|
-    (path =~ /app/).nil?
-  end
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
 end
-=end

data/config/environments/production.rb

@@ -1,25 +1,55 @@
-# Settings specified here will take precedence over those in config/environment.rb
+Refinery::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
 
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
 
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
 
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
 
-# Disable delivery errors, bad email addresses will be ignored
-# config.action_mailer.raise_delivery_errors = false
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
 
-# Log level is set to :info by default which is the minimum to let you know what
-# is going on but without being chatty and therefore slow.
-config.log_level = :info
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server (Rails default)
+  # In production, Apache or nginx will already do this
+  # Warning: Refinery CMS has enabled this setting.
+  # Disabling this will means files in your public directly
+  # won't override core assets that are served from the plugin public directories.
+  config.serve_static_assets = true
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end
 
 # When true will use Amazon's Simple Storage Service on your production machine
 # instead of the default file system for resources and images

data/config/environments/test.rb

@@ -1,22 +1,35 @@
-# Settings specified here will take precedence over those in config/environment.rb
+Refinery::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# 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
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # 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
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
 
-# Disable request forgery protection in test environment
-config.action_controller.allow_forgery_protection    = false
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = 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
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer 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
+
+  # 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,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr <-- :log until authlogic calms down.
+  config.active_support.deprecation = :log
+end

data/config/initializers/acts_as_indexed_config.rb

@@ -0,0 +1,5 @@
+ActsAsIndexed.configure do |config|
+  config.index_file = Rails.root.join('tmp', 'index')
+  config.index_file_depth = 3
+  config.min_word_size = 3
+end

data/config/initializers/field_with_error_fix.rb

@@ -1,3 +1,3 @@
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-  "<span class=\"fieldWithErrors\">#{html_tag}</span>"
+  "<span class=\"fieldWithErrors\">#{html_tag}</span>".html_safe
 end

data/config/initializers/fix_rack.rb

@@ -0,0 +1,17 @@
+# TEMPORARY SOLUTION
+# Remove when Rack is fixed upstream
+module Rack
+  module Utils
+    def escape(s)
+      regexp = case
+        when RUBY_VERSION >= "1.9" && s.encoding === Encoding.find('UTF-8')
+          /([^ a-zA-Z0-9_.-]+)/u
+        else
+          /([^ a-zA-Z0-9_.-]+)/n
+        end
+      s.to_s.gsub(regexp) {
+        '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
+      }.tr(' ', '+')
+    end
+  end
+end

data/config/routes.rb

@@ -1,25 +1,74 @@
-ActionController::Routing::Routes.draw do |map|
-  map.filter(:locale)
+Refinery::Application.routes.draw do
 
-  # NB: Engine routes are loaded FIRST from Rails v2.3 onward.
-  # These routes are contained within vendor/plugins/engine_name/config/routes.rb
+  # REFINERY CMS ================================================================
 
-  # The priority is based upon order of creation: first created -> highest priority.
-  map.root :controller => "pages", :action => "home"
+  filter(:refinery_locales) if defined?(RoutingFilter::RefineryLocales) # optionally use i18n.
 
-  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
-    admin.root :controller => 'dashboard', :action => 'index'
+  root :to => 'pages#home'
+
+  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
+    root :to => 'dashboard#index'
   end
 
-  # Install the default routes as the lowest priority.
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
+  # Marketable URLs should be appended to routes by the Pages Engine.
+  # Catch all routes should be appended to routes by the Core Engine.
+
+  # END REFINERY CMS ============================================================
+
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get :short
+  #       post :toggle
+  #     end
+  #
+  #     collection do
+  #       get :sold
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get :recent, :on => :collection
+  #     end
+  #   end
 
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
 
-  map.redirect 'admin/*path', :controller => 'admin/base'
-  map.connect 'refinery/*path', :controller => 'admin/base', :action => 'error_404'
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
 
-  # Marketable URLs
-  map.connect '*path', :controller => 'pages', :action => 'show'
+  # See how all your routes lay out with "rake routes"
 
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
 end

data/db/migrate/20100305023037_remove_unused_users_columns.rb

@@ -13,4 +13,3 @@ class RemoveUnusedUsersColumns < ActiveRecord::Migration
     end
   end
 end
-

data/db/migrate/20100605132138_convert_resource_to_dragonfly.rb

@@ -0,0 +1,41 @@
+class ConvertResourceToDragonfly < ActiveRecord::Migration
+
+  # Use a basic model for the migration - otherwise the acts_as_indexed hooks
+  # make copying attributes problematic.
+  # (see: http://guides.rubyonrails.org/migrations.html#using-models-in-your-migrations)
+  class Resource < ActiveRecord::Base; end;
+
+  def self.up
+    # Dragonfly required column
+    add_column :resources, :file_uid, :string
+
+    # Optional Dragonfly columns - persist 'magic' attributes
+    add_column :resources, :file_ext, :string
+
+    # Rename columns to Dragonfly conventions - persist 'magic' attributes
+    rename_column :resources, :filename,     :file_name
+    rename_column :resources, :content_type, :file_mime_type
+    rename_column :resources, :size,         :file_size
+
+    # Populate the image_uid column for Dragonfly
+    Resource.all.each do |r|
+      r.update_attributes(:file_uid => ("%08d" % r.id).scan(/..../).join('/') << '/' << r.file_name,
+                          :file_ext => r.file_name.split('.').last)
+    end
+
+    # Remove child records, used by attachment_fu only
+    Resource.delete_all('parent_id is not null')
+    remove_column :resources, :parent_id
+  end
+
+  def self.down
+    remove_column :resources, :file_uid
+    remove_column :resources, :file_ext
+
+    rename_column :resources, :file_name,      :filename
+    rename_column :resources, :file_mime_type, :content_type
+    rename_column :resources, :file_size,      :size
+
+    add_column :resources, :parent_id, :integer
+  end
+end

data/db/migrate/20100605132208_convert_image_to_dragonfly.rb

@@ -0,0 +1,51 @@
+class ConvertImageToDragonfly < ActiveRecord::Migration
+
+  # Use a basic model for the migration - otherwise the acts_as_indexed hooks
+  # make copying attributes problematic.
+  # (see: http://guides.rubyonrails.org/migrations.html#using-models-in-your-migrations)
+  class Image < ActiveRecord::Base; end;
+
+  def self.up
+    # Dragonfly required column
+    add_column :images, :image_uid, :string
+
+    # Optional Dragonfly columns - persist 'magic' attributes
+    add_column :images, :image_ext, :string
+
+    # Rename columns to Dragonfly conventions - persist 'magic' attributes
+    rename_column :images, :filename,     :image_name
+    rename_column :images, :content_type, :image_mime_type
+    rename_column :images, :size,         :image_size
+    rename_column :images, :width,        :image_width
+    rename_column :images, :height,       :image_height
+
+    # Remove non-Dragonfly columns
+    remove_column :images, :thumbnail
+    remove_column :images, :image_type
+
+    # Populate the image_uid column for Dragonfly
+    Image.all.each do |i|
+      i.update_attributes(:image_uid => ("%08d" % i.id).scan(/..../).join('/') << '/' << i.image_name,
+                          :image_ext => i.image_name.split('.').last)
+    end
+
+    # Remove child records, used by attachment_fu only
+    Image.delete_all('parent_id is not null')
+    remove_column :images, :parent_id
+  end
+
+  def self.down
+    remove_column :images, :image_uid
+    remove_column :images, :image_ext
+
+    rename_column :images, :image_name,      :filename
+    rename_column :images, :image_mime_type, :content_type
+    rename_column :images, :image_size,      :size
+    rename_column :images, :image_width,     :width
+    rename_column :images, :image_height,    :height
+
+    add_column :images, :thumbnail,  :string
+    add_column :images, :parent_id,  :integer
+    add_column :images, :image_type, :string
+  end
+end

data/db/migrate/20100606135207_change_thumbnail_sizes_for_dragonfly.rb

@@ -0,0 +1,17 @@
+class ChangeThumbnailSizesForDragonfly < ActiveRecord::Migration
+  def self.up
+    RefinerySetting[:image_thumbnails] = {
+      :dialog_thumb => '106x106#c',
+      :grid         => '135x135#c',
+      :preview      => '96x96#c'
+    }
+  end
+
+  def self.down
+    RefinerySetting[:image_thumbnails] = {
+      :dialog_thumb => 'c106x106',
+      :grid         => 'c135x135',
+      :preview      => 'c96x96'
+    }
+  end
+end

data/db/migrate/20100701053151_remove_superuser_from_users.rb

@@ -3,7 +3,7 @@ class RemoveSuperuserFromUsers < ActiveRecord::Migration
     superusers = User.find_all_by_superuser(true)
     superusers.each do |user|
       user.add_role(:superuser)
-      user.save(false)
+      user.save(:validate => false)
     end
 
     remove_column :users, :superuser

data/db/migrate/20100826232810_move_inquiry_settings_to_refinery_settings.rb

@@ -0,0 +1,23 @@
+class MoveInquirySettingsToRefinerySettings < ActiveRecord::Migration
+  def self.up
+    if defined?(InquirySetting)
+      InquirySetting.all.each do |inquiry_setting|
+        RefinerySetting[:"inquiry_#{inquiry_setting.name.downcase.gsub(' ', '_')}"] = {
+          :value => inquiry_setting.value,
+          :destroyable => false
+        }
+
+      end
+    end
+  end
+
+  def self.down
+    if defined?(InquirySetting)
+      RefinerySetting.find(:all, :conditions => "name LIKE 'inquiry_%'").each do |rs|
+        InquirySetting.create(:name => rs.name.to_s.gsub('inquiry_', '').titleize,
+                              :value => rs.value,
+                              :destroyable => false)
+      end
+    end
+  end
+end