refinerycms 0.9.6.18 → 0.9.6.19

data/VERSION

@@ -1 +1 @@
-0.9.6.18
+0.9.6.19

data/config/application.rb

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.18' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.19' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')
@@ -26,4 +26,4 @@ Refinery::Initializer.run do |config|
 
   # Specify your application's gem requirements here. See the example below:
   # config.gem "refinerycms-portfolio", :lib => "portfolio", :version => "~> 0.9.3.8"
-end
+end

data/config/environment.rb

@@ -1,2 +1,2 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('../application', __FILE__)

data/config/preinitializer.rb

@@ -20,4 +20,4 @@ else
   end
 
   require 'refinery_initializer'
-end
+end

data/db/seeds.rb

@@ -101,7 +101,7 @@ Page.create(:title => "Privacy Policy",
             :position => 6).parts.create(
             {
               :title => "Body",
-              :body => "<p><strong>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>"
+              :body => "<p>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>"
             }).page.parts.create(
             {
               :title => "Side Body",

data/lib/refinery/tasks/refinery.rb

@@ -13,4 +13,4 @@ end
 extra_rake_tasks << Dir[Rails.root.join("lib", "refinery", "tasks", "*.rake")]
 
 # Load in any extra tasks that we've found.
-extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }
+extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }

data/lib/refinery_initializer.rb

@@ -20,4 +20,4 @@ $LOAD_PATH.uniq!
 require 'refinery/initializer'
 
 # Pull in attachment_fu patch for windows
-require 'refinery/attachment_fu_patch' if RUBY_PLATFORM =~ /mswin/
+require 'refinery/attachment_fu_patch' if RUBY_PLATFORM =~ /mswin/

data/public/javascripts/refinery/admin.js

@@ -572,7 +572,8 @@ var list_reorder = {
 
     // parse any children branches too.
     $(li).find('> li[id], > ul li[id]').each(function(i, child) {
-      branch += list_reorder.parse_branch(indexes + [i], child);
+      current_indexes = $.merge($.merge([], indexes), [i]);
+      branch += list_reorder.parse_branch(current_indexes, child);
     });
 
     return branch;

data/readme.md

@@ -27,9 +27,9 @@ 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.6.18) are outlined below:
+Refinery runs using a number of gems which (as of Refinery version 0.9.6.19) are outlined below:
 
-* [friendly_id ~> 2.3.2](http://rubygems.org/gems/friendly_id)
+* [friendly_id ~> 2.2.2](http://rubygems.org/gems/friendly_id)
 * [will_paginate ~> 2.3.11](http://rubygems.org/gems/will_paginate)
 * [rails ~> 2.3.5](http://rubygems.org/gems/rails)
 * [aasm ~> 2.1.3](http://rubygems.org/gems/aasm)

data/test/functional/dashboard_controller_test.rb

@@ -4,25 +4,25 @@ require 'admin/dashboard_controller'
 class Admin::DashboardController; def rescue_action(e) raise e end; end
 
 class DashboardControllerTest < ActionController::TestCase
-  
+
   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
     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)
@@ -32,13 +32,13 @@ class DashboardControllerTest < ActionController::TestCase
     # 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
+end

data/test/functional/images_controller_test.rb

@@ -4,14 +4,14 @@ 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
 
@@ -27,61 +27,61 @@ class ImagesControllerTest < ActionController::TestCase
     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
@@ -90,4 +90,4 @@ class ImagesControllerTest < ActionController::TestCase
     assert_redirected_to admin_images_path
   end
 
-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/helpers/admin/images_helper.rb

@@ -23,5 +23,5 @@ module Admin::ImagesHelper
                               :next_label => 'Next »',
                               :renderer => Refinery::LinkRenderer
   end
-  
-end
+
+end

data/vendor/plugins/images/app/views/admin/images/index.html.erb

@@ -39,4 +39,4 @@
       </p>
     <% end %>
   <% end %>
-</div>
+</div>

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

@@ -8,6 +8,3 @@ Refinery::Plugin.register do |plugin|
     {:class => InquirySetting, :url_prefix => "edit", :title => 'name', :url_prefix => 'edit', :created_image => "user_comment.png", :updated_image => "user_edit.png"}
   ]
 end
-
-# Set the actionmailer root so that it'll work for delivering emails from this plugin.
-ActionMailer::Base.template_root = Refinery.root.join("vendor", "plugins", "inquiries", "app", "views").to_s

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

@@ -5,11 +5,13 @@ class NewsItem < ActiveRecord::Base
   has_friendly_id :title, :use_slug => true
 
   acts_as_indexed :fields => [:title, :body],
-                  :index_file => [Rails.root.to_s, "tmp", "index"]
+                  :index_file => %W(#{Rails.root} tmp index)
 
   default_scope :order => "publish_date DESC"
-  named_scope :latest, :conditions => ["publish_date < ?", Time.now], :limit => 10
-  named_scope :published, :conditions => ["publish_date < ?", Time.now]
+  # If you're using a named scope that includes a changing variable you need to wrap it in a lambda
+  # This avoids the query being cached thus becoming unaffected by changes (i.e. Time.now is constant)
+  named_scope :latest, lambda { { :conditions => ["publish_date < ?", Time.now], :limit => 10 } }
+  named_scope :published, lambda { { :conditions => ["publish_date < ?", Time.now] } }
 
   def not_published? # has the published date not yet arrived?
     publish_date > Time.now

data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb

@@ -2,4 +2,4 @@
 <li class='clearfix<%= " child#{child}" if child %><%= " linked" if linked%>' id="<%= dom_id(page_link) -%>">
   <%= link_to page_link.title_with_meta, page_link.url, :title => 'Link to this Page', :rel => page_link.title, :class => 'page_link' %>
 </li>
-<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} if page_link.children.any? %>
+<%= render :partial => 'page_link', :collection => page_link.children, :locals => {:child => child ? (child+1) : 1} if page_link.children.any? %>

data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb

@@ -20,4 +20,4 @@
       </ul>
     <% end -%>
   </li>
-<% end -%>
+<% end -%>

data/vendor/plugins/refinery/lib/generators/refinery/README

@@ -15,6 +15,7 @@ There must be at least one attribute.
 == Examples
 ./script/generate refinery team_member title:string description:text
 ./script/generate refinery team_member title:string
+./script/generate refinery team_member title:string description:text image:image
 
 Results in:
 create  app/controllers/admin/team_members_controller.rb

data/vendor/plugins/refinery/lib/generators/refinery/USAGE

@@ -1,2 +1,2 @@
 Usage:
-  ./script/generate refinery team_member title:string description:text
+  ./script/generate refinery team_member title:string description:text image:image

data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb

@@ -55,10 +55,7 @@ class RefineryGenerator < Rails::Generator::NamedBase
       m.directory 'db/migrate/'
       m.migration_template 'migration.rb', 'db/migrate', :assigns => {:migration_name => "Create#{class_name.pluralize}"}, :migration_file_name => "create_#{singular_name.pluralize}"
 
-      puts "IMPORTANT"
-      puts "---------------------------------------"
-      puts "Now run 'rake db:migrate' to add the table to the DB"
-      puts "---------------------------------------"
+      m.readme "MIGRATE"
     end
   end
 

data/vendor/plugins/refinery/lib/generators/refinery/templates/MIGRATE

@@ -0,0 +1,4 @@
+IMPORTANT
+---------------------------------------
+Now run 'rake db:migrate' to add the table to the DB
+---------------------------------------

data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb

@@ -5,9 +5,9 @@ class <%= class_name %> < ActiveRecord::Base
 
   validates_presence_of :<%= attributes.first.name %>
   validates_uniqueness_of :<%= attributes.first.name %>
-  
+
 <% attributes.collect{|a| a if a.type.to_s == 'image'}.compact.uniq.each do |a| -%>
   belongs_to :<%= a.name.gsub("_id", "") %><%= ", :class_name => 'Image'" unless a.name =~ /^image(_id)?$/ %>
 <% end -%>
 
-end
+end

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb

@@ -18,4 +18,4 @@
   </div>
   <% end %>
   <%%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
-<%% end -%>
+<%% end -%>

data/vendor/plugins/refinery/lib/refinery.rb

@@ -15,4 +15,4 @@ module Refinery
     end
   end
 
-end
+end

data/vendor/plugins/refinery/lib/refinery/deprecations.rb

@@ -43,4 +43,4 @@ REFINERY_ROOT = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
       self.warned = true
     end
   end
-end).new
+end).new

data/vendor/plugins/refinery/lib/refinery/initializer.rb

@@ -49,7 +49,7 @@ module Refinery
       configuration.plugin_loader = Refinery::PluginLoader unless configuration.plugin_loader != Rails::Plugin::Loader
       configuration.plugins = [ :friendly_id, :will_paginate, :aasm, :all ] if configuration.plugins.nil?
       configuration.gem "aasm", :version => "~> 2.1.3", :lib => "aasm"
-      configuration.gem "friendly_id", :version => "~> 2.3.2", :lib => "friendly_id"
+      configuration.gem "friendly_id", :version => "~> 2.2.2", :lib => "friendly_id"
       configuration.gem "hpricot", :version => "~> 0.8.1", :lib => "hpricot"
       configuration.gem "slim_scrooge", :version => "~> 1.0.5", :lib => "slim_scrooge"
       configuration.gem "will_paginate", :version => "~> 2.3.11", :lib => "will_paginate"

data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb

@@ -24,4 +24,4 @@ class Admin::DialogsController < Admin::BaseController
     end
   end
 
-end
+end

data/vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb

@@ -17,4 +17,4 @@
     or
     <a href='' class='wym_cancel close_dialog'><%= @cancel_button_text ||= 'Cancel' %></a>
   </div>
-</form>
+</form>

data/vendor/plugins/themes/app/helpers/themes_helper.rb

@@ -22,4 +22,13 @@ module ThemesHelper
     tag.gsub!(/\/stylesheets\//, "/theme/stylesheets/") if theme
     tag.gsub(/theme=(.+?)\ /, '') # we need to remove any addition of theme='false' etc.
   end
+
+  def image_submit_tag(source, options = {})
+    theme = (options.delete(:theme) == true)
+
+    tag = super
+    # inject /theme/ into the image tag src if this is themed.
+    tag.gsub!(/src=[\"|\']/) { |m| "#{m}/theme/" }.gsub!("//", "/") if theme
+    tag.gsub(/theme=(.+?)\ /, '') # we need to remove any addition of theme='false' etc.
+  end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 18
-  version: 0.9.6.18
+  - 19
+  version: 0.9.6.19
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +13:00
+date: 2010-03-04 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -507,6 +507,7 @@ files:
 - vendor/plugins/refinery/lib/generators/refinery/USAGE
 - vendor/plugins/refinery/lib/generators/refinery/install.rb
 - vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb
+- vendor/plugins/refinery/lib/generators/refinery/templates/MIGRATE
 - vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb