refinerycms 0.9.6.5 → 0.9.6.6

data/test/unit/page_test.rb

@@ -1,130 +1,130 @@
 require 'test_helper'
 
 class PageTest < ActiveSupport::TestCase
-	
-	fixtures :pages, :page_parts
-	
-	def setup
-		@new_page = Page.new
-	end
-	
+
+  fixtures :pages, :page_parts
+
+  def setup
+    @new_page = Page.new
+  end
+
   def test_should_not_save_page_without_title
-		assert !@new_page.save, "Saved the page without a title"
-  end
-
-	def test_should_stop_system_pages_from_being_deleted
-		assert_equal false, pages(:home_page).deletable?
-		assert_equal false, pages(:page_not_found).destroy
-	end
-	
-	def test_should_allow_normal_pages_to_be_deleted
-		assert_equal true, pages(:services).deletable?
-	end
-	
-	def test_should_stop_custom_link_pages_from_being_deleted
-		assert_equal false, pages(:contact_us).deletable?
-	end
-	
-	def test_page_tree_structure
-		assert_equal 1, pages(:draft_page_child).ancestors.size
-		assert_equal pages(:draft_page), pages(:draft_page_child).ancestors.first
-		assert_equal 0, pages(:home_page).ancestors.size
-		
-		assert_equal 3, pages(:products).children.size
-		assert_equal pages(:products), pages(:blue_jelly).ancestors.first
-	end
-	
-	def test_should_have_custom_seo_settings
-		assert_equal "Services", pages(:services).path
-		assert_equal "Secret Product - Secret information about secret product", pages(:draft_page_child).path
-		assert_equal "Secret information about secret product - Secret Product", pages(:draft_page_child).path(reverse = false)
-	end
-	
-	def test_should_force_a_non_deletable_page_to_be_deleted
-		assert_equal Page, pages(:page_not_found).destroy!.class # not .destroy. Returns the page you just destroyed
-	end
-	
-	def test_should_have_custom_url_override
-		assert_equal "/inquiries/new", pages(:contact_us).url # the contact us page links to the inquiries plugin form
-		assert_equal "/", pages(:home_page).url # the home page has a special "/" url
-	end
-	
-	def test_should_have_regular_url
-		assert pages(:services).url.include? "/pages/"
-		# not sure how I get it to render the friendly_id url /pages/services
-		# test seems to reduce the id instead e.g. /pages/234423
-	end
-	
-	def test_drafts
-		assert_equal false, pages(:draft_page).live? # the draft page is indeed a draft
-		assert_equal true, pages(:home_page).live? # the home page is not a draft
-		assert_equal true, pages(:draft_page_child).live? # child pages with draft parents should be drafts too
-	end
-	
-	def test_home_page
-		assert pages(:home_page).home?
-		assert !pages(:services).home?
-	end
-	
-	def test_in_menu_logic
-		assert_equal true, pages(:home_page).in_menu? # home page should be in menu
-		assert_equal false, pages(:draft_page_child).in_menu? # child pages with draft parents should be hidden
-		assert_equal false, pages(:draft_page).in_menu? # draft pages should be hidden
-		
-		pages(:home_page).toggle!(:draft) # make the page a draft
-		assert_equal false, pages(:home_page).live? # home page is no longer live
-		assert_equal false, pages(:home_page).in_menu? # it should also not appear in the menu now
-		
-		pages(:home_page).toggle!(:draft) # make the page live again
-		assert_equal true, pages(:home_page).in_menu? # home page should reappear in the menu
-		
-		pages(:home_page).toggle!(:show_in_menu) # now let's hide the home page from the menu
-		assert_equal false, pages(:home_page).in_menu? # yep, it's hidden.
-    
+    assert !@new_page.save, "Saved the page without a title"
+  end
+
+  def test_should_stop_system_pages_from_being_deleted
+    assert_equal false, pages(:home_page).deletable?
+    assert_equal false, pages(:page_not_found).destroy
+  end
+
+  def test_should_allow_normal_pages_to_be_deleted
+    assert_equal true, pages(:services).deletable?
+  end
+
+  def test_should_stop_custom_link_pages_from_being_deleted
+    assert_equal false, pages(:contact_us).deletable?
+  end
+
+  def test_page_tree_structure
+    assert_equal 1, pages(:draft_page_child).ancestors.size
+    assert_equal pages(:draft_page), pages(:draft_page_child).ancestors.first
+    assert_equal 0, pages(:home_page).ancestors.size
+
+    assert_equal 3, pages(:products).children.size
+    assert_equal pages(:products), pages(:blue_jelly).ancestors.first
+  end
+
+  def test_should_have_custom_seo_settings
+    assert_equal "Services", pages(:services).path
+    assert_equal "Secret Product - Secret information about secret product", pages(:draft_page_child).path
+    assert_equal "Secret information about secret product - Secret Product", pages(:draft_page_child).path(reverse = false)
+  end
+
+  def test_should_force_a_non_deletable_page_to_be_deleted
+    assert_equal Page, pages(:page_not_found).destroy!.class # not .destroy. Returns the page you just destroyed
+  end
+
+  def test_should_have_custom_url_override
+    assert_equal "/inquiries/new", pages(:contact_us).url # the contact us page links to the inquiries plugin form
+    assert_equal "/", pages(:home_page).url # the home page has a special "/" url
+  end
+
+  def test_should_have_regular_url
+    assert pages(:services).url.include? "/pages/"
+    # not sure how I get it to render the friendly_id url /pages/services
+    # test seems to reduce the id instead e.g. /pages/234423
+  end
+
+  def test_drafts
+    assert_equal false, pages(:draft_page).live? # the draft page is indeed a draft
+    assert_equal true, pages(:home_page).live? # the home page is not a draft
+    assert_equal true, pages(:draft_page_child).live? # child pages with draft parents should be drafts too
+  end
+
+  def test_home_page
+    assert pages(:home_page).home?
+    assert !pages(:services).home?
+  end
+
+  def test_in_menu_logic
+    assert_equal true, pages(:home_page).in_menu? # home page should be in menu
+    assert_equal false, pages(:draft_page_child).in_menu? # child pages with draft parents should be hidden
+    assert_equal false, pages(:draft_page).in_menu? # draft pages should be hidden
+
+    pages(:home_page).toggle!(:draft) # make the page a draft
+    assert_equal false, pages(:home_page).live? # home page is no longer live
+    assert_equal false, pages(:home_page).in_menu? # it should also not appear in the menu now
+
+    pages(:home_page).toggle!(:draft) # make the page live again
+    assert_equal true, pages(:home_page).in_menu? # home page should reappear in the menu
+
+    pages(:home_page).toggle!(:show_in_menu) # now let's hide the home page from the menu
+    assert_equal false, pages(:home_page).in_menu? # yep, it's hidden.
+
     assert_equal false,  pages(:thank_you).in_menu? # a live page that's hidden should not show in menu
-	end
-	
-	def test_shown_siblings
-		assert_equal 3, pages(:products).children.size
-		assert_equal 3, pages(:products).shown_siblings.size
-	end
-	
-	def test_top_level_page_output
-		assert_equal 4, Page.top_level.size
-		
-		# testing the order of pages.
-		assert_equal pages(:home_page), Page.top_level.first
-		assert_equal pages(:contact_us), Page.top_level.last
-		assert_equal pages(:products), Page.top_level[1]
-		assert_equal pages(:services), Page.top_level[2]
-	end
-	
-	def test_order_of_children
-		assert_equal pages(:blue_jelly), pages(:products).children.first
-		assert_equal pages(:green_jelly), pages(:products).children[1]
-		assert_equal pages(:rainbow_jelly), pages(:products).children.last
-	end
-
-	def test_title_with_meta
-		assert_equal "Home Page", pages(:home_page).title_with_meta
-		assert_equal "Secret Product <em>(draft)</em>", pages(:draft_page).title_with_meta
-	end
-	
-	def test_per_page
-		assert_equal 20, Page.per_page
-		assert_equal 14, Page.per_page(dialog = true)
-	end
-	
-	def test_all_page_part_content
-		assert_equal "This is the body This is the side body", pages(:home_page).all_page_part_content
-	end
-	
-	def test_page_parts
-		assert_equal page_parts(:home_page_body).body, pages(:home_page)[:body]
-		assert_equal page_parts(:home_page_side_body).body, pages(:home_page)[:side_body]
-		
-		# but make sure we can still access other fields through []
-		assert_equal "Home Page", pages(:home_page)[:title]
-	end
-
-end
+  end
+
+  def test_shown_siblings
+    assert_equal 3, pages(:products).children.size
+    assert_equal 3, pages(:products).shown_siblings.size
+  end
+
+  def test_top_level_page_output
+    assert_equal 4, Page.top_level.size
+
+    # testing the order of pages.
+    assert_equal pages(:home_page), Page.top_level.first
+    assert_equal pages(:contact_us), Page.top_level.last
+    assert_equal pages(:products), Page.top_level[1]
+    assert_equal pages(:services), Page.top_level[2]
+  end
+
+  def test_order_of_children
+    assert_equal pages(:blue_jelly), pages(:products).children.first
+    assert_equal pages(:green_jelly), pages(:products).children[1]
+    assert_equal pages(:rainbow_jelly), pages(:products).children.last
+  end
+
+  def test_title_with_meta
+    assert_equal "Home Page", pages(:home_page).title_with_meta
+    assert_equal "Secret Product <em>(draft)</em>", pages(:draft_page).title_with_meta
+  end
+
+  def test_per_page
+    assert_equal 20, Page.per_page
+    assert_equal 14, Page.per_page(dialog = true)
+  end
+
+  def test_all_page_part_content
+    assert_equal "This is the body This is the side body", pages(:home_page).all_page_part_content
+  end
+
+  def test_page_parts
+    assert_equal page_parts(:home_page_body).body, pages(:home_page)[:body]
+    assert_equal page_parts(:home_page_side_body).body, pages(:home_page)[:side_body]
+
+    # but make sure we can still access other fields through []
+    assert_equal "Home Page", pages(:home_page)[:title]
+  end
+
+end

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

@@ -62,12 +62,12 @@ class UsersController < ApplicationController
       if user
         user.create_reset_code
 
-				begin
-					flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
-					UserMailer.deliver_reset_notification(user, request)
-				rescue
-					info.logger "error: email could not be sent for user password reset"
-				end
+        begin
+          flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
+          UserMailer.deliver_reset_notification(user, request)
+        rescue
+          info.logger "error: email could not be sent for user password reset"
+        end
       else
         flash[:notice] = "Sorry, #{params[:user][:email]} isn't associated with any acounts. Are you sure you typed the correct email address?"
       end
@@ -76,21 +76,21 @@ class UsersController < ApplicationController
     end
   end
 
-	def reset
-		@user = User.find_by_reset_code(params[:reset_code]) unless params[:reset_code].nil?
+  def reset
+    @user = User.find_by_reset_code(params[:reset_code]) unless params[:reset_code].nil?
 
-		if request.post?
-			if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
-				self.current_user = @user
-				@user.delete_reset_code
+    if request.post?
+      if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
+        self.current_user = @user
+        @user.delete_reset_code
 
-				flash[:notice] = "Password reset successfully for #{@user.email}"
-				redirect_back_or_default(admin_root_url)
-			else
-				render :action => :reset
-			end
-		end
-	end
+        flash[:notice] = "Password reset successfully for #{@user.email}"
+        redirect_back_or_default(admin_root_url)
+      else
+        render :action => :reset
+      end
+    end
+  end
 
 protected
 
@@ -100,4 +100,4 @@ protected
     User.count == 0
   end
 
-end
+end

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

@@ -1,6 +1,6 @@
 require 'digest/sha1'
 class User < ActiveRecord::Base
-	
+
   # Hack: Allow "rake gems:install" to run when this class is missing its gem dependency.
   # For further clarification on why, refer to:
   # https://rails.lighthouseapp.com/projects/8994/tickets/780-rake-gems-install-doesn-t-work-if-plugins-are-missing-gem-dependencies
@@ -112,11 +112,11 @@ class User < ActiveRecord::Base
 
   def create_reset_code
     @reset = true
-		code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
+    code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
     self.attributes = {:reset_code => code[0..6]}
     save(false)
-  end 
-  
+  end
+
   def recently_reset?
     @reset
   end
@@ -150,4 +150,4 @@ protected
     self.deleted_at = self.activation_code = nil
   end
 
-end
+end

data/vendor/plugins/authentication/app/views/user_mailer/reset_notification.html.erb

@@ -2,5 +2,5 @@ Request to reset password received for <%= @user.login %>
 
 Visit this url to choose a new password:
   <%= @url %>
-  
-(Your password will remain the same if no action is taken)
+
+(Your password will remain the same if no action is taken)

data/vendor/plugins/authentication/app/views/users/forgot.html.erb

@@ -10,4 +10,4 @@
     or
     <%= link_to "Cancel", login_url %>
   </div>
-<% end -%>
+<% end -%>

data/vendor/plugins/authentication/app/views/users/reset.html.erb

@@ -9,10 +9,10 @@
     <%= f.label :password_confirmation %>
     <%= f.password_field :password_confirmation %>
   </div>
-  
+
   <div class='form-actions'>
     <%= submit_tag 'Reset password' %>
     or
     <%= link_to "Cancel", login_url %>
   </div>
-<% end -%>
+<% end -%>

data/vendor/plugins/authentication/config/routes.rb

@@ -1,5 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-	
+
   map.resources :users
   map.resource :session
 
@@ -9,7 +9,7 @@ ActionController::Routing::Routes.draw do |map|
 
   map.login  '/login', :controller => 'sessions', :action => 'new'
   map.logout '/logout', :controller => 'sessions', :action => 'destroy'
-	map.forgot '/forgot', :controller => 'users', :action => 'forgot'
-	map.reset 'reset/:reset_code', :controller => 'users', :action => 'reset'
+  map.forgot '/forgot', :controller => 'users', :action => 'forgot'
+  map.reset 'reset/:reset_code', :controller => 'users', :action => 'reset'
 
-end
+end

data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb

@@ -16,4 +16,4 @@ module Admin::DashboardHelper
     end
   end
 
-end
+end

data/vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb

@@ -11,4 +11,4 @@
   <p>
     Nothing has happened yet.
   </p>
-<% end %>
+<% end %>

data/vendor/plugins/dashboard/rails/init.rb

@@ -3,4 +3,4 @@ Refinery::Plugin.register do |plugin|
   plugin.description = "Gives an overview of activity in Refinery"
   plugin.version = 1.0
   plugin.always_allow_access = true
-end
+end

data/vendor/plugins/images/app/models/image.rb

@@ -1,6 +1,6 @@
 class Image < ActiveRecord::Base
 
-	# Docs for attachment_fu http://github.com/technoweenie/attachment_fu
+  # Docs for attachment_fu http://github.com/technoweenie/attachment_fu
   has_attachment :content_type => :image,
                  :storage => (USE_S3_BACKEND ? :s3 : :file_system),
                  :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/images'),
@@ -8,30 +8,30 @@ class Image < ActiveRecord::Base
                  :thumbnails => ((((thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})).is_a?(Hash) ? thumbnails : (RefinerySetting[:image_thumbnails] = {}))) rescue {}),
                  :max_size => 50.megabytes
 
- 	validates_as_attachment
+  validates_as_attachment
 
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title],
-          				:index_file => [Rails.root.to_s, "tmp", "index"]
+                  :index_file => [Rails.root.to_s, "tmp", "index"]
 
-	named_scope :thumbnails, :conditions => "parent_id NOT NULL"
-	named_scope :originals, :conditions => {:parent_id => nil}
+  named_scope :thumbnails, :conditions => "parent_id IS NOT NULL"
+  named_scope :originals, :conditions => {:parent_id => nil}
 
-	# when a dialog pops up with images, how many images per page should there be
-	PAGES_PER_DIALOG = 18
+  # when a dialog pops up with images, how many images per page should there be
+  PAGES_PER_DIALOG = 18
 
-	# when listing images out in the admin area, how many images should show per page
-	PAGES_PER_ADMIN_INDEX = 20
+  # when listing images out in the admin area, how many images should show per page
+  PAGES_PER_ADMIN_INDEX = 20
 
-	# How many images per page should be displayed?
+  # How many images per page should be displayed?
   def self.per_page(dialog = false)
     dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   end
-  
+
   # Returns a titleized version of the filename
-	# my_file.jpg returns My File
+  # my_file.jpg returns My File
   def title
-    self.filename.gsub(/\.\w+$/, '').titleize
+    CGI::unescape(self.filename).gsub(/\.\w+$/, '').titleize
   end
 
-end
+end