refinerycms 0.9.5.31 → 0.9.6

data/test/fixtures/page_parts.yml

@@ -0,0 +1,9 @@
+home_page_body:
+  title: body
+  page: home_page
+  body: This is the body
+
+home_page_side_body:
+  title: side_body
+  page: home_page
+  body: This is the side body

data/test/fixtures/pages.yml

@@ -0,0 +1,88 @@
+# this page links to the inquiries plugin through a custom link_url
+contact_us:
+  title: Contact Us
+  position: 4
+  show_in_menu: true
+  link_url: /inquiries/new
+  menu_match: ^/inquiries.*$
+  deletable: true
+
+# A child page that is hidden
+thank_you:
+  title: Thank You
+  position: 5
+  show_in_menu: false
+  menu_match: ^/inquiries/thank_you$
+  deletable: true
+  parent: contact_us
+
+# this page is a draft
+draft_page:
+  title: Secret Product
+  position: 3
+  show_in_menu: true
+  deletable: true
+  draft: true
+  
+# page inside draft_page
+draft_page_child:
+  title: Secret information about secret product
+  position: 0
+  show_in_menu: true
+  deletable: true
+  draft: false # hopefully will actually be hidden from the menu becaues of it's parent
+  parent: draft_page # this is a child page.
+
+# this page has a few "SEO" bits that change the page around
+services:
+  title: Services
+  position: 2
+  show_in_menu: true
+  deletable: true
+  draft: false
+  browser_title: "Programming, Ruby, Rails"
+  custom_title_type: text
+  custom_title: Programming Services
+
+# this page is the home page
+home_page:
+  title: Home Page
+  position: 0
+  show_in_menu: true
+  deletable: false
+  link_url: /
+  
+# this is a products page that has 3 children, 1 that is hidden from the menu
+products:
+  title: Products
+  position: 1
+  show_in_menu: true
+  deletable: true
+  
+blue_jelly:
+  title: Blue Jelly
+  position: 0
+  show_in_menu: true
+  deletable: true
+  parent: products
+  
+green_jelly:
+  title: Green Jelly
+  position: 1
+  show_in_menu: true
+  deletable: true
+  parent: products
+
+rainbow_jelly:
+  title: Rainbow Jelly
+  position: 2
+  show_in_menu: true
+  deletable: true
+  parent: products
+
+# this page is the generic 404 page
+page_not_found:
+  title: Page Not Found
+  position: 0
+  show_in_menu: false
+  deletable: false

data/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionController::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,38 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'test_help'
+
+class ActiveSupport::TestCase
+  # Transactional fixtures accelerate your tests by wrapping each test method
+  # in a transaction that's rolled back on completion.  This ensures that the
+  # test database remains unchanged so your fixtures don't have to be reloaded
+  # between every test method.  Fewer database queries means faster tests.
+  #
+  # Read Mike Clark's excellent walkthrough at
+  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
+  #
+  # Every Active Record database supports transactions except MyISAM tables
+  # in MySQL.  Turn off transactional fixtures in this case; however, if you
+  # don't care one way or the other, switching from MyISAM to InnoDB tables
+  # is recommended.
+  #
+  # The only drawback to using transactional fixtures is when you actually 
+  # need to test transactions.  Since your test is bracketed by a transaction,
+  # any transactions started in your code will be automatically rolled back.
+  self.use_transactional_fixtures = true
+
+  # Instantiated fixtures are slow, but give you @david where otherwise you
+  # would need people(:david).  If you don't want to migrate your existing
+  # test cases which use the @david style and don't mind the speed hit (each
+  # instantiated fixtures translates to a database query per test method),
+  # then set this back to true.
+  self.use_instantiated_fixtures  = false
+
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/test/unit/image_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class ImageTest < ActiveSupport::TestCase
+
+	fixtures :images
+
+	def test_titles
+	end
+	
+	def test_per_page
+		
+	end
+
+end

data/test/unit/page_part_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class PagePartTest < ActiveSupport::TestCase
+	
+	fixtures :page_parts
+	
+	def setup
+		@new_page_part = PagePart.new
+	end
+	
+  def test_should_not_save_page_part_without_title
+		assert !@new_page_part.save, "Saved the page part without a title"
+  end
+
+  def test_alias_content_body_works
+		assert_equal page_parts(:home_page_body).body, page_parts(:home_page_body).content
+	end
+
+end

data/test/unit/page_test.rb

@@ -0,0 +1,130 @@
+require 'test_helper'
+
+class PageTest < ActiveSupport::TestCase
+	
+	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_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

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

@@ -16,7 +16,7 @@ class SessionsController < ApplicationController
       redirect_back_or_default(admin_root_url)
       flash[:notice] = "Logged in successfully"
     else
-      flash[:error] = "Sorry, your password or username was incorrect."
+      flash.now[:error] = "Sorry, your password or username was incorrect."
       render :action => 'new'
     end
   end

data/vendor/plugins/authentication/app/views/admin/users/index.html.erb

@@ -14,8 +14,7 @@
           <span class='title'>
             <span class='actions'>
               <%= link_to refinery_icon_tag('delete.png'), admin_user_path(user),
-                :confirm => "Are you sure you want to delete '#{user.login}'?",
-                :class => "cancel", :method => :delete,
+                                :class => "cancel confirm-delete",
                 :title => "Remove this user forever" if user.ui_deletable?(current_user) %>
               <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_user_path(user),
                 :title => 'Edit this user' %>

data/vendor/plugins/authentication/authentication.md

@@ -4,4 +4,12 @@
 
 At the heart of Refinery's user management is the authentication plugin located in ``vendor/plugins/authentication``
 
-What this really is is just a standard [RESTFul authentication](http://github.com/technoweenie/restful-authentication) install extended with a few extra features like "I forgot my password" and hooked directly into the heart of Refinery's plugin system.
+What this really is is just a standard [RESTFul authentication](http://github.com/technoweenie/restful-authentication) install extended with a few extra features like "I forgot my password" and hooked directly into the heart of Refinery's plugin system.
+
+## Adding New Users
+
+New users can be easily added by going to the 'Users' area admin and clicking on "Add new user".
+
+## Limiting and Granting Access
+
+Each user has a set of plugins they're allowed to see. You can control which plugins each user can see by checking and unchecking the checkboxes next to the plugin name when editing or adding a new user.

data/vendor/plugins/dashboard/dashboard.md

@@ -6,12 +6,12 @@
 
 Refinery's dashboard is a plugin that does two simple things
 
-* Reports recent activity on all the core plugins
+* Reports recent activity on all the core and custom plugins
 * Provides convenient links to common tasks.
 
-## How do I hook my custom plugin into the recent activity log?
+## How do I Hook my Custom Plugin into the Recent Activity log?
 
-Read in plugins.rdoc the section titled "Getting your plugin to report activity in the dashboard"
+Read ["Getting your Plugin to Report Activity in the Dashboard"](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md) in the Plugin documentation.
 
 ## Related Settings
 

data/vendor/plugins/images/app/controllers/admin/images_controller.rb

@@ -3,7 +3,7 @@ class Admin::ImagesController < Admin::BaseController
   include Admin::ImagesHelper
 
   crudify :image, :order => "created_at DESC", :conditions => "parent_id is NULL", :sortable => false
-  before_filter :change_list_mode_if_specified
+  before_filter :change_list_mode_if_specified, :init_dialog
 
   def index
     if searching?
@@ -28,20 +28,15 @@ class Admin::ImagesController < Admin::BaseController
   end
 
   def new
-    @image = Image.new
+    @image = Image.new unless @image.present?
+
     @url_override = admin_images_url(:dialog => from_dialog?)
   end
 
   def insert
     self.new if @image.nil?
-    @dialog = from_dialog?
-    @thickbox = !params[:thickbox].blank?
-    @field = params[:field]
-    @update_image = params[:update_image]
-    @thumbnail = params[:thumbnail]
-    @callback = params[:callback]
-    @conditions = params[:conditions]
-    @url_override = admin_images_url(:dialog => @dialog, :insert => true)
+
+    @url_override = admin_images_url(:dialog => from_dialog?, :insert => true)
 
     unless params[:conditions].blank?
       extra_condition = params[:conditions].split(',')
@@ -53,11 +48,13 @@ class Admin::ImagesController < Admin::BaseController
     else
       paginate_images
     end
+
     render :action => "insert"
   end
 
   def create
     @image = Image.create(params[:image])
+
     unless params[:insert]
       if @image.valid?
         flash[:notice] = "'#{@image.title}' was successfully created."
@@ -67,12 +64,10 @@ class Admin::ImagesController < Admin::BaseController
           render :text => "<script type='text/javascript'>parent.window.location = '#{admin_images_url}';</script>"
         end
       else
+        self.new # important for dialogs
         render :action => 'new'
       end
     else
-      # set the last page as the current page for image grid.
-      #@paginate_page_number = Image.last_page(Image.find_all_by_parent_id(nil, :order => "created_at DESC"), params[:dialog])
-      # currently images are sorting by date desc so the first page is always the selected page now.
       @image_id = @image.id
       @image = nil
       self.insert
@@ -81,6 +76,15 @@ class Admin::ImagesController < Admin::BaseController
 
 protected
 
+  def init_dialog
+    @thickbox = params[:thickbox].present?
+    @field = params[:field]
+    @update_image = params[:update_image]
+    @thumbnail = params[:thumbnail]
+    @callback = params[:callback]
+    @conditions = params[:conditions]
+  end
+
   def paginate_images(conditions={})
     @images = Image.paginate   :page => (@paginate_page_number ||= params[:page]),
                                :conditions => {:parent_id => nil}.merge!(conditions),