refinerycms 0.9.6.14 → 0.9.6.15

data/public/stylesheets/refinery/refinery.css

@@ -865,6 +865,10 @@ body.dialog form {
 	background: 7px 7px no-repeat url('/images/refinery/icons/accept.png') #E0F5E0;
 }
 
+#dialog_main #pages_list .linked a em {
+    color: #00A017;
+}
+
 #dialog_main #web_address_area, #dialog_main #email_address_area {
 	padding: 12px;
 }
@@ -1029,7 +1033,7 @@ ul#page_parts_controls img {
 #TB_ajaxContent, #TB_ajaxContent.TB_modal {
 	padding: 0px;
 }
-.wym_dialog .form-actions {
+.wym_dialog .form-actions, .ui-dialog .form-actions {
 	margin-top: 0px;
 	border: 0px none;
 	border-top: 1px solid #E8E8E8;
@@ -1063,10 +1067,10 @@ textarea.wymeditor {
 	margin-bottom: 0px;
 	padding: 0px;
 }
-#TB_window div.field {
+#TB_window div.field, .ui-dialog div.field {
 	margin: 0px 10px;
 }
-#TB_window .form-actions {
+#TB_window .form-actions, .ui-dialog .form-actions {
 	margin-top: 12px;
 }
 
@@ -1077,13 +1081,13 @@ textarea.wymeditor {
 	position: absolute;
 	bottom: 0px;
 	left: 0px;
-	width: 100%;
+	right: 0px;
 	border-right: 0px;
 	border-left: 0px;
 	border-bottom: 0px;
 	padding: 10px 0px;
 }
-#dialog_container .form-actions #submit_button {
+#dialog_container .form-actions #submit_button, #dialog_container .form-actions .wym_submit {
 	margin-left: 10px;
 }
 #dialog_main .form-actions {
@@ -1093,6 +1097,15 @@ textarea.wymeditor {
 	padding: 10px;
 }
 
+.ui-dialog #dialog_loading {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    width: 208px;
+    height: 13px;
+    margin: -6px 0 0 -104px;
+}
+
 ul#image_grid {
 	width: 580px;
 	padding: 0px;
@@ -1216,10 +1229,9 @@ ul#plugins li {
 }
 .ui-dialog iframe {
     clear:both;
-	border:none;
+	border: 0px none;
 	margin-bottom:-1px;
 	margin-top:1px;
-	_margin-bottom:1px;
 	width: 100% !important;
 }
 

data/readme.md

@@ -27,7 +27,7 @@ Unlike other content managers, Refinery is truly aimed at the end user making it
 
 ## Requirements
 
-Refinery runs using a number of gems which (as of Refinery version 0.9.5.29) are outlined below:
+Refinery runs using a number of gems which (as of Refinery version 0.9.6.14) are outlined below:
 
 * [rake >= 0.8.3](http://rubygems.org/gems/rake)
 * [friendly_id >= 2.3.2](http://rubygems.org/gems/friendly_id)
@@ -91,7 +91,7 @@ You will be prompted to setup your first user.
 
 If you're using [Heroku](http://heroku.com/) you will want to put
 
-    USE_S3_BACKEND = true
+    Refinery.s3_backend = true
 
 in your ``config/production.rb`` file to make Refinery store files uploaded on Amazon S3.
 

data/test/fixtures/user_plugins.yml

@@ -0,0 +1,36 @@
+quentin_images:
+  user: quentin
+  title: Images
+  
+quentin_inquiries:
+  user: quentin
+  title: Inquiries
+  
+quentin_users:
+  user: quentin
+  title: Users
+  
+quentin_news:
+  user: quentin
+  title: News
+
+quentin_pages:
+  user: quentin
+  title: Pages
+
+quentin_dialogs:
+  user: quentin
+  title: Dialogs
+  
+quentin_settings:
+  user: quentin
+  title: Settings
+  
+quentin_resources:
+  user: quentin
+  title: Resources
+  
+# TODO: I don't think we need this one  
+quentin_refinery:
+  user: quentin
+  title: Refinery

data/test/fixtures/users.yml

@@ -1,13 +1,12 @@
 quentin:
-  id: 1
   login: quentin
   email: quentin@example.com
   salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd
   crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test
   created_at: <%%= 5.days.ago.to_s :db %>
   state: active
+  
 aaron:
-  id: 2
   login: aaron
   email: aaron@example.com
   salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd

data/test/functional/dashboard_controller_test.rb

@@ -5,20 +5,40 @@ class Admin::DashboardController; def rescue_action(e) raise e end; end
 
 class DashboardControllerTest < ActionController::TestCase
   
-  fixtures :users
+  fixtures :users, :pages
   
   def setup
     @controller = Admin::DashboardController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    
+    login_as(:quentin)
   end
   
   def test_should_get_index
-    login_as(:quentin)
-    
     get :index
     assert_response :success
+    
     assert_not_nil assigns(:recent_activity)
+
   end
   
+  def test_recent_activity_should_report_activity
+    sleep 1
+    pages(:home_page).update_attribute(:updated_at, Time.now)
+
+    get :index
+
+    # now the home page is updated is it at the top?
+    assert_equal pages(:home_page).id, assigns(:recent_activity).first.id
+  end
+  
+  def test_should_require_login_and_redirect
+    logout
+    
+    get :index
+    assert_response :redirect
+    assert_nil assigns(:recent_activity)
+  end
+
 end

data/test/functional/images_controller_test.rb

@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'admin/images_controller'
+
+class Admin::ImagesController; def rescue_action(e) raise e end; end
+
+class ImagesControllerTest < ActionController::TestCase
+  
+  fixtures :users, :images
+  
+  def setup
+    @controller = Admin::ImagesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    
+    login_as(:quentin)
+  end
+
+  def test_should_get_index
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:images)
+    assert assigns(:images).size, Image.count
+  end
+
+  def test_new_image_form
+    get :new
+    assert_not_nil assigns(:image)
+    assert_not_nil assigns(:url_override)
+  end
+  
+  def test_search
+    get :index, :search => "Car"
+    
+    assert 1, assigns(:images).size
+    assert images(:the_world), assigns(:images).first
+    assert_not_nil assigns(:images)
+  end
+  
+  def test_should_require_login_and_redirect
+    logout
+    
+    get :index
+    assert_response :redirect
+    assert_nil assigns(:images)
+  end
+  
+  def test_edit
+    get :edit, :id => images(:the_world).id
+    
+    assert_response :success
+    
+    assert_not_nil assigns(:image)
+    assert_equal images(:the_world), assigns(:image)
+  end
+  
+  def test_insert
+    get :insert
+    
+    assert_not_nil assigns(:image)
+    assert_not_nil assigns(:url_override)
+  end
+  
+  def test_update
+    put :update, :id => images(:the_world).id, :image => {}
+    assert_redirected_to admin_images_path
+  end
+  
+  def test_create_with_errors
+    post :create # didn't provide an image to upload
+    assert_not_nil assigns(:image)
+    assert_response :success
+  end
+  
+  def test_successful_create
+    # This needs to be sorted out yet. I'm not sure how to upload
+    # a file through tests
+    
+    # assert_difference('Image.count', +1) do
+    #   post :create, :post => {} # didn't provide an image to upload
+    #   assert_not_nil assigns(:image)
+    #   assert_redirected_to admin_images_path
+    # end
+  end
+  
+  def test_destroy
+    assert_difference('Image.count', -1) do
+      delete :destroy, :id => images(:the_world).id
+    end
+
+    assert_redirected_to admin_images_path
+  end
+
+end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+# this allows us to run rake test:refinery from an application using the Refinery gem.
+require (ENV["RAILS_ROOT"] ||= (File.expand_path(File.dirname(__FILE__)) + "/..")) + "/config/environment"
 require 'test_help'
 
 class ActiveSupport::TestCase
@@ -32,12 +33,17 @@ class ActiveSupport::TestCase
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests
   # -- they do not yet inherit this setting
+  self.fixture_path = Refinery.root.join("test", "fixtures").to_s
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
-  
+
   def login_as(user)
     @request.session[:user_id] = user ? users(user).id : nil
   end
-  
+
+  def logout
+    @request.session[:user_id] = nil
+  end
+
 end

data/test/unit/image_test.rb

@@ -19,9 +19,9 @@ class ImageTest < ActiveSupport::TestCase
 
   def test_attachment_fu_options
     assert_equal 20.megabytes, Image.attachment_options[:max_size]
-    
+
     # want to change this to ImageScience at some point. Rmagick sucks.
     assert_equal 'Rmagick', Image.attachment_options[:processor]
   end
 
-end
+end

data/test/unit/inquiry_test.rb

@@ -13,13 +13,13 @@ class InquiryTest < ActiveSupport::TestCase
 
   def test_should_force_name_and_email_to_be_valid
     assert !@new_inquiry.save
-    
+
     assert_equal "can't be blank", @new_inquiry.errors.on('name')
     assert_equal "must be valid", @new_inquiry.errors.on('email')
 
     assert_nil @new_inquiry.errors.on('phone')
     assert_nil @new_inquiry.errors.on('message')
-    
+
     assert !@bad_email_inquiry.save
     assert_equal "must be valid", @bad_email_inquiry.errors.on('email')
     assert_nil @bad_email_inquiry.errors.on('phone')
@@ -29,13 +29,13 @@ class InquiryTest < ActiveSupport::TestCase
     assert @valid_inquiry.save
     assert @full_valid_inquiry.save
   end
-  
+
   def test_named_scopes
     assert_equal 2, Inquiry.open.size
     assert_equal 1, Inquiry.closed.size
-    
+
     # check the order. Phil is the newest person to inquire
     assert_equal inquiries(:phil), Inquiry.open.first
   end
-  
-end
+
+end

data/test/unit/news_items_test.rb

@@ -8,26 +8,26 @@ class NewsItemsTest < ActiveSupport::TestCase
     @new_news_item = NewsItem.new
     @new_valid_news_item = NewsItem.new(:title => "valid post", :body => "yep looks valid", :publish_date => Date.today)
   end
-  
+
   def test_should_not_save_without_title_and_body
     assert !@new_news_item.save
-    
+
     assert_equal "can't be blank", @new_news_item.errors.on('title')
     assert_equal "can't be blank", @new_news_item.errors.on('body')
     assert_equal "can't be blank", @new_news_item.errors.on('publish_date')
-    
+
     assert @new_valid_news_item.save
   end
-  
+
   def test_per_page
     assert_equal 20, NewsItem.per_page
   end
-  
+
   def test_named_scopes
     assert_equal 2, NewsItem.published.size
     assert NewsItem.latest.size < 10
-    
+
     assert_equal news_items(:new_team_member), NewsItem.latest.first
   end
-  
-end
+
+end

data/test/unit/refinery_setting_test.rb

@@ -7,51 +7,51 @@ class RefinerySettingTest < ActiveSupport::TestCase
   def test_title
     assert_equal "Site Name", refinery_settings(:site_name).title
   end
-  
+
   def test_getter_method
     assert_equal "My Site", RefinerySetting[:site_name]
     assert_equal "My Site", RefinerySetting['site_name']
     assert_equal "My Site", RefinerySetting.site_name
   end
-  
+
   def test_find_or_set
     # creating a new setting on the fly
     assert_equal "test", RefinerySetting.find_or_set(:my_setting, "test")
     assert_equal "test", RefinerySetting[:my_setting]
   end
-  
+
   def test_setter_methods
     assert_equal "My Site", RefinerySetting[:site_name]
-    
+
     # change the site name setting
     RefinerySetting[:site_name] = "My New Site Name"
     assert_equal "My New Site Name", RefinerySetting[:site_name]
-    
+
     # change the site name setting again this time with quotes not symbols
     RefinerySetting['site_name'] = "My Site 2"
     assert_equal "My Site 2", RefinerySetting[:site_name]
   end
-  
+
   def test_per_page
     assert_equal 10, RefinerySetting.per_page
   end
-  
+
   def test_boolean_settings
     RefinerySetting[:show_dashboard] = true
     assert RefinerySetting[:show_dashboard]
-    
+
     RefinerySetting[:show_dashboard] = false
     assert !RefinerySetting[:show_dashboard]
   end
-  
+
   def test_hash_settings
     RefinerySetting[:site_owner_information] = {:name => "david", :email => "dave@test.com"}
     assert_equal "david", RefinerySetting[:site_owner_information][:name]
   end
-  
+
   def test_integer_settings
     RefinerySetting[:recent_activity_size] = 19
     assert_equal 19, RefinerySetting[:recent_activity_size]
   end
-  
-end
+
+end