refinerycms 0.9.5.29 → 0.9.5.30

data/.gitignore

@@ -1,10 +1,14 @@
 public/system/*
+public/themes/*
 log/*.log
 tmp/**/*
 .DS_Store
 doc/api
 doc/app
+doc/*
 config/database.yml
+config/amazon_s3.yml
+config/rackspace_cloudfiles.yml
 public/images/system/*
 nbproject
 index/**/*
@@ -13,4 +17,6 @@ db/*.sqlite3
 *.autobackupbyrefinery.*
 refinerycms*.gem
 public/javascripts/cache
-public/stylesheets/cache
+public/stylesheets/cache
+config/database.yml.example
+.yardoc/

data/.yardopts

@@ -0,0 +1,21 @@
+--title "Refinery CMS"
+lib/**/*.rb'
+app/**/*.rb
+db/seeds.rb
+config/preinitializer.rb
+vendor/plugins/images/**/*.rb
+vendor/plugins/authentication/**/*.rb
+vendor/plugins/dashboard/**/*.rb
+vendor/plugins/inquiries/**/*.rb
+vendor/plugins/news/**/*.rb
+vendor/plugins/pages/**/*.rb
+vendor/plugins/refinery/**/*.rb
+vendor/plugins/refinery_dialogs/**/*.rb
+vendor/plugins/refinery_settings/**/*.rb
+vendor/plugins/resources/**/*.rb
+vendor/plugins/themes/**/*.rb
+-
+README.rdoc
+LICENSE
+CONTRIBUTORS
+vendor/plugins/themes/themes.rdoc

data/CONTRIBUTORS

@@ -1,8 +1,11 @@
 Major Contributors
-- djones - David Jones - http://www.d-jones.com http://www.resolvedigital.co.nz
 - parndt - Philip Arndt - http://www.resolvedigital.co.nz
+- djones - David Jones - http://www.d-jones.com http://www.resolvedigital.co.nz
 
 Minor Contributors
 - ryanwood - Ryan Wood - http://www.ryanwood.com
 - hernan - Hernan Fernandez
-- btucker - Ben Tucker - http://btucker.net
+- btucker - Ben Tucker - http://btucker.net
+- avit - Andrew Vit - http://avit.ca
+- stevenheidel - Steven Heidel - http://www.livingskywebdesign.com
+- moretea - Maarten Hoogendoorn

data/{README → README.rdoc}

@@ -10,11 +10,14 @@ After building 40 real client sites, we began making our own content manager whi
 Refinery is released under the MIT license and is copyright (c) 2005-2009 Resolve Digital Ltd.
 A copy of the MIT license can be found in the LICENSE file.
 
-== Help
+== Help and Developer Documentation
 
 For help and general discussion about RefineryCMS, we have set up a Google Group at:
 http://groups.google.com/group/refinery-cms
 
+Developer documentation is available here:
+http://api.refinerycms.org
+
 == Setup
 
 Step One: Getting the Refinery code!
@@ -50,7 +53,7 @@ You will be prompted to setup your first user.
 
 == Environment required
 
-Refinery runs using a number of gems which (as of Refinery version 0.9.5.22) are outlined below:
+Refinery runs using a number of gems which (as of Refinery version 0.9.5.29) are outlined below:
 
 - "rake", :version => ">= 0.8.3"
 - "friendly_id", :version => ">= 2.2.2"
@@ -59,7 +62,7 @@ Refinery runs using a number of gems which (as of Refinery version 0.9.5.22) are
 - "aasm", :version => ">= 2.1.3"
 - "unicode", :version => ">= 0.1"
 - "slim_scrooge", :version => ">= 1.0.3"
-- "hpricot", :version => "= 0.8.1"
+- "hpricot", :version => ">= 0.8.1"
 
 == Updates to core files
 

data/Rakefile

@@ -4,7 +4,7 @@
 begin
   # Load up the environment instead of just the boot file because we want all of the tasks available.
   require(File.join(File.dirname(__FILE__), 'config', 'environment'))
-rescue
+rescue Exception
   # Load up the boot file instead because there's something wrong with the environment.
   require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 end
@@ -15,17 +15,12 @@ require 'rake/rdoctask'
 
 require 'tasks/rails'
 
+extra_rake_tasks = []
 # When running Refinery from a gem we lose the rake tasks, so add them back in:
-unless REFINERY_ROOT == RAILS_ROOT
-  Dir[File.join(REFINERY_ROOT, %w(vendor plugins * ** tasks ** *.rake))].sort.each { |ext| load ext }
-end
-
+extra_rake_tasks << Dir[File.join(REFINERY_ROOT, %w(vendor plugins * ** tasks ** *.rake))].sort unless REFINERY_ROOT == RAILS_ROOT
 # We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
-if defined?($refinery_gem_plugin_lib_paths) && !$refinery_gem_plugin_lib_paths.nil?
-  $refinery_gem_plugin_lib_paths.each do |path|
-    Dir[File.join(path, %w(tasks ** *.rake))].sort.each { |ext| load ext }
-  end
-end
+extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort} if defined?($refinery_gem_plugin_lib_paths) && !$refinery_gem_plugin_lib_paths.nil?
+extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }
 
 desc 'Removes trailing whitespace'
 task :whitespace do
@@ -41,7 +36,9 @@ begin
     s.email = %q{info@refinerycms.com}
     s.homepage = %q{http://refinerycms.com}
     s.authors = ["Resolve Digital", "David Jones", "Philip Arndt"]
-    s.extra_rdoc_files = %w(README CONTRIBUTORS LICENSE VERSION)
+    s.extra_rdoc_files = %w(README.rdoc CONTRIBUTORS LICENSE VERSION)
+    s.rdoc_options << "--inline-source"
+    s.has_rdoc = true
   end
 
   namespace :version do

data/VERSION

@@ -1 +1 @@
-0.9.5.29
+0.9.5.30

data/app/controllers/application.rb

@@ -1,3 +1,3 @@
 # This file is here to support web servers who load Rails in the old fashion e.g. some builds of Phusion Passenger.
 # This will simply load the application controller using the new style if this file is ever loaded.
-require_dependency 'application_controller'
+require_dependency 'application_controller'

data/app/controllers/application_controller.rb

@@ -4,5 +4,4 @@
 # You can extend refinery with your own functions here and they will likely not get overriden in an update.
 
 class ApplicationController < Refinery::ApplicationController
-
-end
+end

data/bin/refinery

@@ -16,45 +16,45 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
   unless File.exists? RAILS_ROOT and !ARGV.include?("--force")
     # make the application path directory
     FileUtils::makedirs RAILS_ROOT
-  
+
     # copy in all of the relevant directories and root files.
-    to_copy = %w(app config db lib public script CONTRIBUTORS LICENSE Rakefile README).map do |dir| 
+    to_copy = %w(app config db lib public script CONTRIBUTORS LICENSE Rakefile README.rdoc).map do |dir|
       File.join REFINERY_ROOT, dir
     end
     FileUtils::cp_r to_copy, RAILS_ROOT, :verbose => false
     # ensure lib/refinery_initializer.rb doesn't make it in.
     FileUtils::rm File.join(RAILS_ROOT, %w(lib refinery_initializer.rb)) if File.exists?(File.join(RAILS_ROOT, %w(lib refinery_initializer.rb)))
-    
-    # add in the database config file.
-    FileUtils::move File.join(RAILS_ROOT, %w(config database.yml.example)), File.join(RAILS_ROOT, %w(config database.yml))
-    
-    # figure out the database name from the install path and swap out your_local_database with this name.
-    unless RAILS_ROOT == "/" or RUBY_PLATFORM =~ /mswin/
-      database_name = RAILS_ROOT.split(File::SEPARATOR).last
-      # read in the file and split up the lines
-      lines = File.open(File.join(RAILS_ROOT, %w(config database.yml)), "r").read.split("\n")
-      lines.each do |line|
-        line.gsub!("your_local_database", database_name)
-        line.gsub!("your_test_database", "#{database_name}_test")
-        line.gsub!("your_production_database", "#{database_name}_production")
+
+    # add in the config files
+    for config in ["database", "amazon_s3", "rackspace_cloudfiles"]
+      FileUtils::move File.join(RAILS_ROOT, %W(config #{config}.yml.example)), File.join(RAILS_ROOT, %W(config #{config}.yml))
+
+      # figure out the app name from the install path and swap out your_local_xxx with this name.
+      unless RAILS_ROOT == "/" or RUBY_PLATFORM =~ /mswin/
+        app_name = RAILS_ROOT.split(File::SEPARATOR).last
+        # read in the file and split up the lines
+        lines = File.open(File.join(RAILS_ROOT, %W(config #{config}.yml)), "r").read.split("\n")
+        lines.each do |line|
+          line.gsub!("your_local_#{config}", "#{app_name}_development")
+          line.gsub!("your_test_#{config}", "#{app_name}_test")
+          line.gsub!("your_production_#{config}", "#{app_name}_production")
+        end
+        # write the new content into the file.
+        File.open(File.join(RAILS_ROOT, %W(config #{config}.yml)), "w").puts(lines.join("\n"))
       end
-      # write the new content into the file.
-      File.open(File.join(RAILS_ROOT, %w(config database.yml)), "w").puts(lines.join("\n"))
-    else
-      database_name = "your_local_database"
     end
 
     # update the environment file with a new secret key.
     require 'digest/sha1'
     new_digest = ""
     3.times { new_digest << Digest::SHA1.hexdigest("--refinery--#{Time.now.to_s}--#{rand(10000000)}--") }
-    
+
     # read in the file and split up the lines
     lines = File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "r").read.split("\n")
     lines.each do |line|
       match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
       line.gsub!(match, new_digest) unless match.nil?
-    end  
+    end
     # write the new content into the file.
     File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "w").puts(lines.join("\n"))
 
@@ -63,14 +63,14 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
 
     # update core script files with symlinks.
     system "refinery-update-core #{RAILS_ROOT} --from-refinery-installer"
-  
+
     puts "=== ACTION REQUIRED ==="
     puts "\nNow run these commands:"
     puts "\ncd #{RAILS_ROOT}"
     puts "rake gems:install"
     puts "rake db:setup"
     puts "\nruby script/server"
-    puts "\nThis will install all the required gems, set up your database (named '#{database_name}') and launches the built-in webserver."
+    puts "\nThis will install all the required gems, set up your database, and launches the built-in webserver."
     puts "You can now see your site running in your browser at http://localhost:3000"
     puts "\nThanks for installing Refinery, enjoy creating your new application!"
   	puts "---------\n\n"

data/config/amazon_s3.yml.example

@@ -0,0 +1,18 @@
+login: &login
+  access_key_id: 
+  secret_access_key: 
+
+development:
+  bucket_name: your_local_amazon_s3
+  <<: *login
+  distribution_domain: 
+
+test:
+  bucket_name: your_test_amazon_s3
+  <<: *login
+  distribution_domain: 
+
+production:
+  bucket_name: your_production_amazon_s3
+  <<: *login
+  distribution_domain: 

data/config/environment.rb

@@ -7,7 +7,7 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 # Freeze to a specific version of refinerycms when running as a gem
-# REFINERY_GEM_VERSION = '0.9.5.18' unless defined? REFINERY_GEM_VERSION
+# REFINERY_GEM_VERSION = '0.9.5.29' unless defined? REFINERY_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -64,11 +64,12 @@ eval("#{(defined? Refinery::Initializer) ? Refinery : Rails}::Initializer").run
 
   #===REFINERY REQUIRED GEMS===
   config.gem "rake", :version => ">= 0.8.3", :lib => "rake"
+	config.gem "rubyzip", :version => ">= 0.9.1", :lib => "zip/zip"
   config.gem "friendly_id", :version => ">= 2.2.2", :lib => "friendly_id"
   config.gem "will_paginate", :version => ">= 2.3.11", :lib => "will_paginate", :source => "http://gemcutter.org"
   config.gem "rails", :version => ">= 2.3.5", :lib => "rails"
   config.gem "aasm", :version => ">= 2.1.3", :lib => "aasm", :source => "http://gemcutter.org"
   config.gem "slim_scrooge", :version => ">= 1.0.3", :lib => "slim_scrooge", :source => "http://gemcutter.org" #unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem when windows is running.
-  config.gem "hpricot", :version => "= 0.8.1", :lib => "hpricot", :source => "http://gemcutter.org"
+  config.gem "hpricot", :version => ">= 0.8.1", :lib => "hpricot", :source => "http://gemcutter.org"
   #===REFINERY END OF REQUIRED GEMS===
-end
+end

data/config/environments/production.rb

@@ -19,4 +19,9 @@ config.action_controller.perform_caching             = true
 # config.action_mailer.raise_delivery_errors = false
 
 # We don't really need all the other stuff:
-config.log_level = :warn
+config.log_level = :warn
+
+# Set to true in order to use Amazon's Simple Storage Service on your production machine
+# instead of the default file system for resources and images
+# Make sure to your bucket info is correct in amazon_s3.yml
+USE_S3_BACKEND = false

data/config/preinitializer.rb

@@ -22,3 +22,7 @@ end
 
 
 REFINERY_ROOT = RAILS_ROOT unless defined? REFINERY_ROOT
+
+# Set to true in your environment specific file (e.g. production.rb) to use Amazon's Simple
+# Storage Service instead of the default file system for resources and images
+USE_S3_BACKEND = false unless defined?(USE_S3_BACKEND)

data/config/rackspace_cloudfiles.yml.example

@@ -0,0 +1,14 @@
+development:
+    container_name: your_local_rackspace_cloudfiles
+    username:
+    api_key: 
+
+test:
+    container_name: your_test_rackspace_cloudfiles
+    username: 
+    api_key: 
+
+production:
+    container_name: your_production_rackspace_cloudfiles
+    username: 
+    api_key: 

data/db/migrate/20100114092849_add_themes_table.rb

@@ -0,0 +1,19 @@
+class AddThemesTable < ActiveRecord::Migration
+	
+  def self.up
+	  create_table "themes", :force => true do |t|
+	    t.integer "size"
+	    t.string "content_type"
+	    t.string "filename"
+	    t.string "title"
+	    t.text "description"
+	    t.text "license"
+			t.timestamps
+		end
+  end
+
+  def self.down
+		drop_table :themes
+  end
+
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091207033335) do
+ActiveRecord::Schema.define(:version => 20100114092849) do
 
   create_table "images", :force => true do |t|
     t.integer  "parent_id"
@@ -123,6 +123,17 @@ ActiveRecord::Schema.define(:version => 20091207033335) do
   add_index "slugs", ["name", "sluggable_type", "scope", "sequence"], :name => "index_slugs_on_name_and_sluggable_type_and_scope_and_sequence", :unique => true
   add_index "slugs", ["sluggable_id"], :name => "index_slugs_on_sluggable_id"
 
+  create_table "themes", :force => true do |t|
+    t.integer  "size"
+    t.string   "content_type"
+    t.string   "filename"
+    t.string   "title"
+    t.text     "description"
+    t.text     "license"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "user_plugins", :force => true do |t|
     t.integer "user_id"
     t.string  "title"

data/db/seeds.rb

@@ -3,6 +3,7 @@
   {:name => "activity_show_limit", :value => 25},
   {:name => "preferred_image_view", :value => :grid},
   {:name => "analytics_page_code", :value => "UA-xxxxxx-x"},
+	{:name => "theme", :value => "demolicious"},
   {:name => "image_thumbnails", :value => {
     :dialog_thumb => 'c106x106',
     :grid => 'c135x135',

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -774,12 +774,13 @@ WYMeditor.editor.prototype.init = function() {
 				if(oClass.name)	{
 					if (oClass.rules && oClass.rules.length > 0) {
 						var sRules = "";
-						oClass.rules.each(function(rule){
-							sClass = this._options.classesItemHtml;
+						var wym = this;
+						jQuery.each(oClass.rules, function(index, rule) {
+							sClass = wym._options.classesItemHtml;
 							sClass = h.replaceAll(sClass, WYMeditor.CLASS_NAME, oClass.name + (oClass.join || "") + rule);
 							sClass = h.replaceAll(sClass, WYMeditor.CLASS_TITLE, rule.title || titleize(rule));
 							sRules += sClass;
-						}.bind(this)); // need to bind 'this' or else it will think 'this' is the window.
+						});
 
 						var sClassMultiple = this._options.classesItemHtmlMultiple;
 						sClassMultiple = h.replaceAll(sClassMultiple, WYMeditor.CLASS_TITLE, oClass.title || titleize(oClass.name));
@@ -4101,7 +4102,7 @@ WYMeditor.Helper = {
 
 function titleize(words) {
 	parts = [];
-	words.gsub(/\./, '').gsub(/[-_]/, ' ').split(' ').each(function(part){
+	jQuery.each(words.replace(/\./, '').replace(/[-_]/, ' ').split(' '), function(index, part){
 		parts.push(part[0].toUpperCase() + part.substring(1));
 	});
 

data/public/stylesheets/refinery/refinery.css

@@ -490,15 +490,6 @@ ul.reordering li {
 
 textarea {
 	line-height: 20px;
-}
-
-label {
-	font-size: 90%;
-	margin-bottom: 5px;
-	display: block;
-}
-
-textarea {
 	padding: 5px;
 }
 
@@ -517,6 +508,7 @@ label {
 	margin-bottom: 5px;
 	font-weight: bold;
 	margin-top: 20px;
+	display: block;
 }
 
 label.input_label {

data/themes/demolicious/LICENSE

@@ -0,0 +1,21 @@
+== MIT License
+ 
+Copyright (c) 2005-2009 Resolve Digital Ltd.
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.