refinerycms 0.9.6.7 → 0.9.6.8

data/test/unit/news_items_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class NewsItemsTest < ActiveSupport::TestCase
+
+  fixtures :news_items
+
+  def setup
+    @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

data/test/unit/page_test.rb

@@ -45,12 +45,13 @@ class PageTest < ActiveSupport::TestCase
   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
+    assert_equal({:controller => "/inquiries/new"}, pages(:contact_us).url) # the contact us page links to the inquiries plugin form
+    assert_equal({:controller => "/"}, pages(:home_page).url) # the home page has a special "/" url
+    assert_equal "http://www.resolvedigital.co.nz", pages(:resolve_digital_page).url # this page links to an external url
   end
 
   def test_should_have_regular_url
-    assert pages(:services).url.include? "/pages/"
+    assert pages(:services).url[:controller] == "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
@@ -86,22 +87,22 @@ class PageTest < ActiveSupport::TestCase
 
   def test_shown_siblings
     assert_equal 3, pages(:products).children.size
-    assert_equal 3, pages(:products).shown_siblings.size
+    assert_equal 4, pages(:products).shown_siblings.size
   end
 
   def test_top_level_page_output
-    assert_equal 4, Page.top_level.size
+    assert_equal 5, 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]
+    assert_equal pages(:resolve_digital_page), Page.top_level.last
+    assert_equal pages(:products), Page.top_level.second
+    assert_equal pages(:services), Page.top_level.third
   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(:green_jelly), pages(:products).children.second
     assert_equal pages(:rainbow_jelly), pages(:products).children.last
   end
 
@@ -121,7 +122,9 @@ class PageTest < ActiveSupport::TestCase
 
   def test_page_parts
     assert_equal page_parts(:home_page_body).body, pages(:home_page)[:body]
+    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]
+    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]

data/test/unit/refinery_setting_test.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+
+class RefinerySettingTest < ActiveSupport::TestCase
+
+  fixtures :refinery_settings
+
+  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

data/test/unit/resource_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class ResourceTest < ActiveSupport::TestCase
+
+  fixtures :resources
+
+  def test_titles
+    assert_equal "teng.pdf", resources(:pdf_document).filename
+    assert_equal "Teng", resources(:pdf_document).title
+  end
+
+  def test_per_page
+    assert_equal 12, Resource.per_page(dialog = true)
+    assert_equal 20, Resource.per_page # dialog = false
+  end
+
+  def test_attachment_fu_options
+    assert_equal 50.megabytes, Resource.attachment_options[:max_size]
+
+    if USE_S3_BACKEND 
+      assert_equal :s3, Resource.attachment_options[:storage]
+      assert_nil Resource.attachment_options[:path_prefix]
+    else
+      assert_equal :file_system, Resource.attachment_options[:storage]
+      assert_equal 'public/system/resources', Resource.attachment_options[:path_prefix]
+    end
+  end
+  
+  def test_type_of_content
+    assert_equal "application pdf", resources(:pdf_document).type_of_content
+  end
+
+end

data/test/unit/theme_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class ThemeTest < ActiveSupport::TestCase
+
+  fixtures :themes
+  
+  def test_folder_title
+    assert_equal 'my_theme', themes(:my_theme).folder_title
+  end
+  
+  def test_theme_path
+    assert_equal "#{Rails.root}/themes/my_theme", themes(:my_theme).theme_path
+  end
+  
+  def test_preview_image
+    assert_equal "#{Rails.root}/themes/my_theme/preview.png", themes(:my_theme).preview_image
+  end
+  
+end

data/todo.md

@@ -0,0 +1,9 @@
+= Todo
+
+What are some of the known things that need to be done?
+
+== Tests
+
+* Add unit test coverage for user, user plugin and user mailer
+* Add unit test coverage for inquiry mailer and inquiry setting
+* Add functional tests for the whole of Refinery.

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

@@ -1,4 +1,5 @@
 require 'digest/sha1'
+
 class User < ActiveRecord::Base
 
   # Hack: Allow "rake gems:install" to run when this class is missing its gem dependency.

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

@@ -1,26 +1,34 @@
 class Image < ActiveRecord::Base
 
+  # What is the max image size a user can upload
+  MAX_SIZE_IN_MB = 20
+
   # 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'),
                  :processor => 'Rmagick',
                  :thumbnails => ((((thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})).is_a?(Hash) ? thumbnails : (RefinerySetting[:image_thumbnails] = {}))) rescue {}),
-                 :max_size => 50.megabytes
-
-   def validate
-     if self.filename.nil?
-       errors.add_to_base("You must choose an image to upload")
-     else
-       [:size, :content_type].each do |attr_name|
-         enum = attachment_options[attr_name]
-         unless enum.nil? || enum.include?(send(attr_name))
-           errors.add_to_base("Images should be smaller than 50 MB in size") if attr_name == :size
-           errors.add_to_base("Your image must be either a JPG, PNG or GIF") if attr_name == :content_type
-         end
-       end
-     end
-   end
+                 :max_size => MAX_SIZE_IN_MB.megabytes
+
+  # we could use validates_as_attachment but it produces 4 odd errors like
+  # "size is not in list". So we basically here enforce the same validation
+  # rules here accept display the error messages we want
+  # This is a known bug in attachment_fu
+  def validate
+    if self.filename.nil?
+      errors.add_to_base("You must choose an image to upload")
+    else
+      [:size, :content_type].each do |attr_name|
+        enum = attachment_options[attr_name]
+      
+        unless enum.nil? || enum.include?(send(attr_name))
+          errors.add_to_base("Images should be smaller than #{MAX_SIZE_IN_MB} MB in size") if attr_name == :size
+          errors.add_to_base("Your image must be either a JPG, PNG or GIF") if attr_name == :content_type
+        end
+      end
+    end
+  end
 
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
   acts_as_indexed :fields => [:title],

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

@@ -2,7 +2,7 @@ Refinery::Plugin.register do |plugin|
   plugin.title = "Images"
   plugin.description = "Manage images"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/((images)|(image_dialogs))$/
+  plugin.menu_match = /admin\/image(_dialog)?s$/
   plugin.activity = {
     :class => Image,
     :title => 'title',

data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb

@@ -21,7 +21,7 @@ class Admin::InquiriesController < Admin::BaseController
 protected
 
   def find_all_inquiries
-    @open_inquiries = Inquiry.opened
+    @open_inquiries = Inquiry.open
     @closed_inquiries = Inquiry.closed
     @inquiries = @open_inquiries
   end

data/vendor/plugins/inquiries/app/models/inquiry.rb

@@ -7,13 +7,10 @@ class Inquiry < ActiveRecord::Base
 
   acts_as_indexed :fields => [:name, :email, :message, :phone],
                   :index_file => [Rails.root.to_s, "tmp", "index"]
+  
+  default_scope :order => 'created_at DESC'
+  
+  named_scope :closed, :conditions => {:open => false}
+  named_scope :open, :conditions => {:open => true}
 
-  def self.closed
-    find_all_by_open(false, :order => "created_at DESC")
-  end
-
-  def self.opened
-    find_all_by_open(true, :order => "created_at DESC")
-  end
-
-end
+end

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

@@ -2,7 +2,7 @@ Refinery::Plugin.register do |plugin|
   plugin.title = "Inquiries"
   plugin.description = "Provides a contact form and stores inquiries"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/((inquiries)|(inquiry_settings))$/
+  plugin.menu_match = /admin\/inquir(ies|y_settings)$/
   plugin.activity = [
     {:class => Inquiry, :title => "name", :url_prefix => "", :created_image => "user_comment.png", :updated_image => "user_edit.png"},
     {:class => InquirySetting, :url_prefix => "edit", :title => 'name', :url_prefix => 'edit', :created_image => "user_comment.png", :updated_image => "user_edit.png"}

data/vendor/plugins/news/app/controllers/admin/news_items_controller.rb

@@ -2,4 +2,4 @@ class Admin::NewsItemsController < Admin::BaseController
 
   crudify :news_item, :order => "created_at DESC"
 
-end
+end

data/vendor/plugins/news/app/controllers/news_items_controller.rb

@@ -6,15 +6,15 @@ class NewsItemsController < ApplicationController
 protected
 
   def find_latest_news_items
-    @news_items = NewsItem.latest
+    @news_items = NewsItem.latest # 10 items
   end
 
   def find_news_item
-    @news_item = NewsItem.find(params[:id], :conditions => ["publish_date < ?", Time.now])
+    @news_item = NewsItem.published.find(params[:id])
   end
 
   def find_page
     @page = Page.find_by_link_url("/news", :include => [:parts, :slugs])
   end
 
-end
+end

data/vendor/plugins/news/app/models/news_item.rb

@@ -1,17 +1,15 @@
 class NewsItem < ActiveRecord::Base
 
-  validates_presence_of :title, :content
-  alias_attribute :content, :body
+  validates_presence_of :title, :body, :publish_date
 
   has_friendly_id :title, :use_slug => true
 
   acts_as_indexed :fields => [:title, :body],
                   :index_file => [Rails.root.to_s, "tmp", "index"]
-
-  def self.latest(amount = 10)
-    find(:all, :order => "publish_date DESC", :limit => amount,
-               :conditions => ["publish_date < ?", Time.now])
-  end
+  
+  default_scope :order => "publish_date DESC"
+  named_scope :latest, :conditions => ["publish_date < ?", Time.now], :limit => 10
+  named_scope :published, :conditions => ["publish_date < ?", Time.now]
 
   def not_published? # has the published date not yet arrived?
     publish_date > Time.now
@@ -21,4 +19,4 @@ class NewsItem < ActiveRecord::Base
     20
   end
 
-end
+end

data/vendor/plugins/news/app/views/admin/news_items/_form.html.erb

@@ -10,10 +10,10 @@
   </div>
   <div class='clearfix' style='width:963px'>
     <div class='field'>
-      <%= f.label :content %>
-      <%= f.text_area :content, :rows => "20", :class => "wymeditor" %>
+      <%= f.label :body %>
+      <%= f.text_area :body, :rows => "20", :class => "wymeditor" %>
     </div>
   </div>
-
-  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => true} %>
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f,
+                                                                   :continue_editing => true} %>
 <% end %>

data/vendor/plugins/news/app/views/admin/news_items/_news_item.html.erb

@@ -2,13 +2,14 @@
   <span class='title'>
     <span class='actions'>
       <%= link_to refinery_icon_tag('application_go.png'), news_item_url(news_item),
-          :title => 'View this news item live <br/><em>(opens in a new window)</em>', :target => "_blank" %>
+                  :title => 'View this news item live <br/><em>(opens in a new window)</em>',
+                  :target => "_blank" %>
       <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_news_item_path(news_item),
                   :title => 'Edit this news item' %>
       <%= link_to refinery_icon_tag('delete.png'), admin_news_item_path(news_item),
-                                                          :class => "cancel confirm-delete",
-                             :title => "Remove this news item forever" %>
+                  :class => "cancel confirm-delete",
+                  :title => "Remove this news item forever" %>
     </span>
     <%=h news_item.title %> <span class="preview">&nbsp;</span>
   </span>
-</li>
+</li>

data/vendor/plugins/news/app/views/admin/news_items/edit.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

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

@@ -2,7 +2,7 @@ Refinery::Plugin.register do |plugin|
   plugin.title = "News"
   plugin.description = "Provides a blog-like news section"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/((news)|(news_items))$/
+  plugin.menu_match = /admin\/news(_items)?$/
   plugin.activity = {
     :class => NewsItem,
     :title => 'title',